ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject [ofbiz-framework] branch trunk updated: Improved: Corrected line is longer than 150 characters checkstyle issues in framework component. (OFBIZ-11921) Also fixed some other extra space and naming related checkstyle issues observed. Thanks Jacques for review.
Date Fri, 04 Sep 2020 06:55:32 GMT
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 bc5e945  Improved: Corrected line is longer than 150 characters checkstyle issues in framework component. (OFBIZ-11921) Also fixed some other extra space and naming related checkstyle issues observed. Thanks Jacques for review.
bc5e945 is described below

commit bc5e945dedd25fbd7ffa8f45c1c05c9cf131fdd1
Author: Suraj Khurana <suraj.khurana@hotwax.co>
AuthorDate: Fri Sep 4 12:25:12 2020 +0530

    Improved: Corrected line is longer than 150 characters checkstyle issues in framework component.
    (OFBIZ-11921)
    Also fixed some other extra space and naming related checkstyle issues observed.
    Thanks Jacques for review.
---
 .../apache/ofbiz/base/conversion/Converters.java   |  3 +-
 .../org/apache/ofbiz/base/crypto/HashCrypt.java    |  9 ++-
 .../base/location/ComponentLocationResolver.java   |  3 +-
 .../ofbiz/base/test/GenericTestCaseBase.java       | 14 ++--
 .../apache/ofbiz/base/util/AliasKeyManager.java    | 15 ++--
 .../java/org/apache/ofbiz/base/util/Debug.java     |  3 +-
 .../org/apache/ofbiz/base/util/KeyStoreUtil.java   | 10 ++-
 .../org/apache/ofbiz/base/util/ObjectType.java     | 20 ++++--
 .../org/apache/ofbiz/base/util/ScriptHelper.java   |  3 +-
 .../org/apache/ofbiz/base/util/ScriptUtil.java     |  3 +-
 .../org/apache/ofbiz/base/util/StringUtil.java     |  9 +--
 .../org/apache/ofbiz/base/util/TimeDuration.java   | 18 +++--
 .../java/org/apache/ofbiz/base/util/UtilCodec.java | 21 ++++--
 .../org/apache/ofbiz/base/util/UtilDateTime.java   | 18 +++--
 .../org/apache/ofbiz/base/util/UtilJavaParse.java  |  3 +-
 .../java/org/apache/ofbiz/base/util/UtilMisc.java  |  5 +-
 .../org/apache/ofbiz/base/util/UtilNumber.java     |  9 ++-
 .../org/apache/ofbiz/base/util/UtilValidate.java   |  4 +-
 .../java/org/apache/ofbiz/base/util/UtilXml.java   | 18 +++--
 .../ofbiz/base/util/collections/MapContext.java    |  3 +-
 .../ofbiz/base/util/collections/MapStack.java      |  3 +-
 .../collections/test/FlexibleMapAccessorTests.java | 12 ++--
 .../org/apache/ofbiz/base/util/string/UelUtil.java |  9 ++-
 .../catalina/container/SslAcceleratorValve.java    | 17 +++--
 .../org/apache/ofbiz/common/CommonWorkers.java     | 20 ++++--
 .../java/org/apache/ofbiz/common/FindServices.java | 43 ++++++-----
 .../java/org/apache/ofbiz/common/FtpServices.java  | 21 ++++--
 .../org/apache/ofbiz/common/KeywordSearchUtil.java | 21 ++++--
 .../apache/ofbiz/common/email/EmailServices.java   | 51 ++++++++-----
 .../org/apache/ofbiz/common/geo/GeoWorker.java     |  6 +-
 .../apache/ofbiz/common/image/ImageTransform.java  | 39 ++++++----
 .../common/preferences/PreferenceServices.java     | 15 ++--
 .../ofbiz/common/preferences/PreferenceWorker.java |  9 ++-
 .../apache/ofbiz/common/qrcode/QRCodeEvents.java   |  5 +-
 .../ofbiz/common/telecom/TelecomServices.java      |  9 ++-
 .../org/apache/ofbiz/common/uom/UomWorker.java     |  3 +-
 .../java/org/apache/ofbiz/entity/Delegator.java    | 24 ++++---
 .../entity/condition/EntityComparisonOperator.java |  2 +-
 .../entity/condition/EntityConditionSubSelect.java | 15 +++-
 .../entity/condition/EntityConditionValue.java     | 20 ++++--
 .../apache/ofbiz/entity/condition/EntityExpr.java  |  4 +-
 .../ofbiz/entity/condition/EntityFieldValue.java   | 12 ++--
 .../ofbiz/entity/condition/EntityOperator.java     |  8 +--
 .../ofbiz/entity/condition/EntityWhereString.java  |  6 +-
 .../ofbiz/entity/config/model/Datasource.java      |  3 +-
 .../ofbiz/entity/config/model/InlineJdbc.java      |  3 +-
 .../entity/connection/DebugManagedDataSource.java  | 12 +++-
 .../ofbiz/entity/datasource/GenericHelper.java     | 13 ++--
 .../ofbiz/entity/datasource/GenericHelperDAO.java  | 23 +++---
 .../ofbiz/entity/datasource/ReadOnlyHelperDAO.java | 23 +++---
 .../apache/ofbiz/entity/eca/EntityEcaHandler.java  |  3 +-
 .../ofbiz/entity/finder/ByConditionFinder.java     |  7 +-
 .../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java  |  6 +-
 .../ofbiz/entity/model/DynamicViewEntity.java      |  6 +-
 .../org/apache/ofbiz/entity/model/ModelKeyMap.java |  6 +-
 .../org/apache/ofbiz/entity/model/ModelReader.java | 28 +++++---
 .../apache/ofbiz/entity/model/ModelRelation.java   | 17 +++--
 .../apache/ofbiz/entity/test/EntityTestSuite.java  | 42 +++++++----
 .../entity/transaction/DumbTransactionFactory.java |  9 ++-
 .../transaction/GeronimoTransactionFactory.java    |  3 +-
 .../ofbiz/entity/transaction/TransactionUtil.java  | 59 +++++++++------
 .../org/apache/ofbiz/entity/util/EntityCrypto.java |  6 +-
 .../apache/ofbiz/entity/util/EntityDataAssert.java |  3 +-
 .../apache/ofbiz/entity/util/EntityDataLoader.java | 12 ++--
 .../ofbiz/entity/util/EntityFindOptions.java       | 19 ++---
 .../apache/ofbiz/entity/util/EntityTypeUtil.java   |  6 +-
 .../ofbiz/entity/util/EntityUtilProperties.java    | 12 ++--
 .../apache/ofbiz/entityext/EntityGroupUtil.java    | 12 ++--
 .../ofbiz/entityext/EntityWatchServices.java       | 12 ++--
 .../ofbiz/entityext/data/EntityDataServices.java   | 21 ++++--
 .../ofbiz/entityext/data/UpgradeServices.java      |  5 +-
 .../ofbiz/entityext/eca/DelegatorEcaHandler.java   | 19 +++--
 .../ofbiz/entityext/eca/EntityEcaAction.java       |  3 +-
 .../ofbiz/entityext/eca/EntityEcaCondition.java    | 18 ++---
 .../apache/ofbiz/entityext/eca/EntityEcaRule.java  | 15 ++--
 .../permission/EntityPermissionChecker.java        | 83 ++++++++++++----------
 .../synchronization/EntitySyncContext.java         |  5 +-
 .../org/apache/ofbiz/minilang/MiniLangUtil.java    |  5 +-
 .../apache/ofbiz/minilang/MiniLangValidate.java    |  6 +-
 .../ofbiz/minilang/method/MessageElement.java      |  3 +-
 .../ofbiz/minilang/method/MethodContext.java       | 35 +++++----
 .../minilang/method/callops/CallServiceAsynch.java |  6 +-
 .../method/callops/CallSimpleMapProcessor.java     |  6 +-
 .../minilang/method/callops/CallSimpleMethod.java  | 19 +++--
 .../minilang/method/callops/SetServiceFields.java  |  3 +-
 .../method/conditional/CompareCondition.java       |  3 +-
 .../method/conditional/CompareFieldCondition.java  |  3 +-
 .../method/conditional/ConditionalFactory.java     |  3 +-
 .../method/conditional/HasPermissionCondition.java |  3 +-
 .../conditional/ValidateMethodCondition.java       |  3 +-
 .../ofbiz/minilang/method/entityops/EntityAnd.java |  3 +-
 .../minilang/method/entityops/EntityCount.java     |  6 +-
 .../method/entityops/FilterListByDate.java         |  6 +-
 .../ofbiz/minilang/method/entityops/FindByAnd.java |  3 +-
 .../method/entityops/FindByPrimaryKey.java         |  6 +-
 .../method/entityops/TransactionBegin.java         |  3 +-
 .../method/entityops/TransactionCommit.java        |  3 +-
 .../method/entityops/TransactionRollback.java      |  3 +-
 .../ofbiz/minilang/method/envops/CheckErrors.java  |  3 +-
 .../ofbiz/minilang/method/envops/CreateObject.java |  3 +-
 .../ofbiz/minilang/method/envops/SetCalendar.java  |  8 ++-
 .../ofbiz/minilang/method/envops/SetOperation.java |  5 +-
 .../apache/ofbiz/minilang/method/envops/While.java |  3 +-
 .../ofbiz/minilang/method/otherops/Calculate.java  | 15 ++--
 .../ofbiz/minilang/operation/BaseCompare.java      | 23 ++++--
 .../ofbiz/minilang/operation/PropertyOper.java     |  7 +-
 .../minilang/operation/SimpleMapOperation.java     |  6 +-
 .../ofbiz/service/GeneralServiceException.java     |  3 +-
 .../org/apache/ofbiz/service/ModelService.java     | 25 +++++--
 .../java/org/apache/ofbiz/service/ServiceUtil.java |  7 +-
 .../ofbiz/service/ServiceValidationException.java  |  6 +-
 .../ofbiz/service/config/model/ThreadPool.java     |  3 +-
 .../apache/ofbiz/service/eca/ServiceEcaUtil.java   |  9 ++-
 .../ofbiz/service/engine/EntityAutoEngine.java     |  3 +-
 .../ofbiz/service/engine/InterfaceEngine.java      | 10 +--
 .../apache/ofbiz/service/engine/RouteEngine.java   |  3 +-
 .../ofbiz/service/engine/SoapSerializer.java       |  4 +-
 .../ofbiz/service/group/GroupServiceModel.java     |  6 +-
 .../ofbiz/service/group/ServiceGroupReader.java    |  3 +-
 .../apache/ofbiz/service/jms/JmsSerializer.java    |  3 +-
 .../org/apache/ofbiz/service/job/JobServices.java  |  3 +-
 .../apache/ofbiz/service/mail/ServiceMcaRule.java  |  3 +-
 .../apache/ofbiz/service/rmi/RemoteDispatcher.java |  3 +-
 .../ofbiz/service/rmi/RmiServiceContainer.java     |  9 +--
 .../apache/ofbiz/testtools/JunitSuiteWrapper.java  | 18 ++++-
 .../apache/ofbiz/webapp/control/ContextFilter.java |  5 +-
 .../ofbiz/webapp/control/ControlEventListener.java | 15 ++--
 .../apache/ofbiz/webapp/control/JWTManager.java    |  6 +-
 .../apache/ofbiz/webapp/control/LoginWorker.java   |  3 +-
 .../ofbiz/webapp/control/RequestHandler.java       |  6 +-
 .../apache/ofbiz/webapp/control/TokenFilter.java   | 20 ++++--
 .../ofbiz/webapp/event/GroovyEventHandler.java     |  3 +-
 .../webapp/event/JSONRequestBodyMapHandler.java    |  3 +-
 .../ofbiz/webapp/ftl/OfbizCurrencyTransform.java   | 11 +--
 .../apache/ofbiz/webapp/taglib/ContentUrlTag.java  |  4 +-
 .../apache/ofbiz/webapp/view/HttpViewHandler.java  |  9 ++-
 .../apache/ofbiz/webapp/view/JspViewHandler.java   |  6 +-
 .../org/apache/ofbiz/webapp/view/ViewHandler.java  |  3 +-
 .../ofbiz/webapp/website/WebSiteProperties.java    |  3 +-
 .../org/apache/ofbiz/webtools/GenericWebEvent.java |  6 +-
 .../org/apache/ofbiz/webtools/UtilCacheEvents.java | 17 +++--
 .../webtools/artifactinfo/ArtifactInfoBase.java    | 21 ++++--
 .../ControllerRequestArtifactInfo.java             | 33 +++++----
 .../artifactinfo/ControllerViewArtifactInfo.java   |  4 +-
 .../webtools/artifactinfo/EntityArtifactInfo.java  | 12 ++--
 .../artifactinfo/FormWidgetArtifactInfo.java       | 30 ++++----
 .../artifactinfo/ScreenWidgetArtifactInfo.java     | 50 +++++++++----
 .../webtools/artifactinfo/ServiceArtifactInfo.java | 30 ++++----
 .../artifactinfo/ServiceEcaArtifactInfo.java       |  6 +-
 .../ofbiz/webtools/labelmanager/LabelFile.java     | 22 +++++-
 .../webtools/labelmanager/LabelManagerFactory.java |  4 +-
 .../webtools/labelmanager/SaveLabelsToXmlFile.java |  8 ++-
 .../org/apache/ofbiz/widget/cache/ScreenCache.java | 22 +++++-
 .../widget/content/WidgetDataResourceWorker.java   |  5 +-
 .../apache/ofbiz/widget/model/ModelActionUtil.java |  3 +-
 .../apache/ofbiz/widget/model/ModelFormField.java  | 42 ++++++++---
 .../ofbiz/widget/portal/PortalPageWorker.java      | 26 ++++---
 .../apache/ofbiz/widget/renderer/FormRenderer.java | 23 +++---
 .../apache/ofbiz/widget/renderer/UtilHelpText.java |  3 +-
 .../widget/renderer/macro/MacroFormRenderer.java   | 18 +++--
 .../widget/renderer/macro/MacroMenuRenderer.java   |  6 +-
 .../widget/renderer/macro/MacroScreenRenderer.java |  8 ++-
 .../renderer/macro/MacroScreenViewHandler.java     |  7 +-
 .../ofbiz/widget/test/WidgetMacroLibraryTests.java | 24 ++++---
 164 files changed, 1274 insertions(+), 657 deletions(-)

diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java
index af64858..bcd4fa7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java
@@ -120,7 +120,8 @@ public class Converters {
         } while (true);
     }
 
-    private static <S, SS extends S, T, TT extends T> Converter<SS, TT> createConverter(ConverterCreator creater, Class<SS> sourceClass, Class<TT> targetClass) {
+    private static <S, SS extends S, T, TT extends T> Converter<SS, TT> createConverter(ConverterCreator creater, Class<SS> sourceClass,
+                                                                                        Class<TT> targetClass) {
         return creater.createConverter(sourceClass, targetClass);
     }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
index 2b12e07..51914c1 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
@@ -51,7 +51,8 @@ public class HashCrypt {
     private static final String PBKDF2_SHA256 = "PBKDF2-SHA256";
     private static final String PBKDF2_SHA384 = "PBKDF2-SHA384";
     private static final String PBKDF2_SHA512 = "PBKDF2-SHA512";
-    private static final int PBKDF2_ITERATIONS = UtilProperties.getPropertyAsInteger("security.properties", "password.encrypt.pbkdf2.iterations", 10000);
+    private static final int PBKDF2_ITERATIONS = UtilProperties.getPropertyAsInteger("security.properties",
+            "password.encrypt.pbkdf2.iterations", 10000);
 
     public static MessageDigest getMessageDigest(String type) {
         try {
@@ -87,7 +88,8 @@ public class HashCrypt {
         }
         // This next block should be removed when all {prefix}oldFunnyHex are fixed.
         if (hashed.equals(oldFunnyHex(digestBytes))) {
-            Debug.logWarning("Warning: detected oldFunnyHex password prefixed with a hashType; this is not valid, please update the value in the database with ({%s}%s)", MODULE, hashType, checkCrypted);
+            Debug.logWarning("Warning: detected oldFunnyHex password prefixed with a hashType; this is not valid, please update the value "
+                    + "in the database with ({%s}%s)", MODULE, hashType, checkCrypted);
             return true;
         }
         return false;
@@ -207,7 +209,8 @@ public class HashCrypt {
             String hashType = crypted.substring(1, typeEnd);
             String[] parts = crypted.split("\\$");
             int iterations = Integer.parseInt(parts[0].substring(typeEnd + 1));
-            byte[] salt = Arrays.toString(java.util.Base64.getMimeDecoder().decode(parts[1].getBytes(StandardCharsets.UTF_8))).getBytes(StandardCharsets.UTF_8);
+            byte[] salt = Arrays.toString(java.util.Base64.getMimeDecoder().decode(parts[1].getBytes(StandardCharsets.UTF_8)))
+                    .getBytes(StandardCharsets.UTF_8);
             byte[] hash = Base64.decodeBase64(parts[2].getBytes(StandardCharsets.UTF_8));
 
             PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterations, hash.length * 8);
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
index 4bf9b74..15af5f3 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
@@ -59,7 +59,8 @@ public class ComponentLocationResolver implements LocationResolver {
         int firstSlash = baseLocation.indexOf("/");
         int secondSlash = baseLocation.indexOf("/", firstSlash + 1);
         if (firstSlash != 0 || secondSlash == -1) {
-            throw new MalformedURLException("Bad component location [" + location + "]: base location missing slashes [" + baseLocation + "], first = " + firstSlash + ", second = " + secondSlash + "; should be like: component://{component-name}/relative/path");
+            throw new MalformedURLException("Bad component location [" + location + "]: base location missing slashes [" + baseLocation
+                    + "], first = " + firstSlash + ", second = " + secondSlash + "; should be like: component://{component-name}/relative/path");
         }
         String componentName = baseLocation.substring(firstSlash + 1, secondSlash);
         // got the componentName, now remove it from the baseLocation, removing the second slash too (just in case the rootLocation has one)
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java b/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java
index 02ae8c7..fe61bf3 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java
@@ -58,7 +58,8 @@ public abstract class GenericTestCaseBase extends TestCase {
     public static void assertStaticHelperClass(Class<?> clz) throws Exception {
         Constructor<?>[] constructors = clz.getDeclaredConstructors();
         assertEquals(clz.getName() + " constructor count", 1, constructors.length);
-        assertEquals(clz.getName() + " private declared constructor", 1 << Constructor.DECLARED, constructors[0].getModifiers() & ~(1 << Constructor.PUBLIC) & (1 << Constructor.DECLARED));
+        assertEquals(clz.getName() + " private declared constructor", 1 << Constructor.DECLARED, constructors[0].getModifiers()
+                & ~(1 << Constructor.PUBLIC) & (1 << Constructor.DECLARED));
         constructors[0].setAccessible(true);
         constructors[0].newInstance();
     }
@@ -71,7 +72,8 @@ public abstract class GenericTestCaseBase extends TestCase {
         }
     }
 
-    public static <V, E extends Exception> void assertFuture(String label, Future<V> future, V wanted, boolean interruptable, Class<E> thrownClass, String thrownMessage) {
+    public static <V, E extends Exception> void assertFuture(String label, Future<V> future, V wanted, boolean interruptable, Class<E> thrownClass,
+                                                             String thrownMessage) {
         try {
             assertEquals(label + ": future return", wanted, future.get());
         } catch (InterruptedException e) {
@@ -168,7 +170,7 @@ public abstract class GenericTestCaseBase extends TestCase {
         assertNotNull(msg + "expected a value", got);
         List<T> list = new ArrayList<>(wanted);
         Iterator<?> rightIt = ((Collection<?>) got).iterator();
-OUTER:
+        OUTER:
         while (rightIt.hasNext()) {
             Object right = rightIt.next();
             for (int i = 0; i < list.size(); i++) {
@@ -283,11 +285,13 @@ OUTER:
         assertFalse(label + ":got-done", gotIt.hasNext());
     }
 
-    public static <V, I extends Iterable<V>> void assertEqualsIterable(String label, List<? extends V> wanted, List<? extends V> wantedExtra, I got, List<? extends V> gotExtra) {
+    public static <V, I extends Iterable<V>> void assertEqualsIterable(String label, List<? extends V> wanted, List<? extends V> wantedExtra,
+                                                                       I got, List<? extends V> gotExtra) {
         assertEqualsIterable(label, wanted, wantedExtra, false, got, gotExtra, false);
     }
 
-    public static <V, I extends Iterable<V>> void assertEqualsIterable(String label, List<? extends V> wanted, List<? extends V> wantedExtra, boolean removeWanted, I got, List<? extends V> gotExtra, boolean removeGot) {
+    public static <V, I extends Iterable<V>> void assertEqualsIterable(String label, List<? extends V> wanted, List<? extends V> wantedExtra,
+                                                                       boolean removeWanted, I got, List<? extends V> gotExtra, boolean removeGot) {
         Iterator<? extends V> wantedIt = wanted.iterator();
         Iterator<V> gotIt = got.iterator();
         while (wantedIt.hasNext() && gotIt.hasNext()) {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
index 17ca29c..c20d45a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
@@ -32,8 +32,8 @@ import javax.net.ssl.X509KeyManager;
 public class AliasKeyManager implements X509KeyManager {
     private static final String MODULE = X509KeyManager.class.getName();
 
-    protected X509KeyManager keyManager = null;
-    protected String alias = null;
+    private X509KeyManager keyManager = null;
+    private String alias = null;
 
     protected AliasKeyManager() { }
 
@@ -67,7 +67,13 @@ public class AliasKeyManager implements X509KeyManager {
         return keyManager.chooseServerAlias(keyType, issuers, socket);
     }
 
-    // these just pass through the keyManager
+    /**
+     * Choose server alias string.
+     * @param keyType the key type
+     * @param socket the socket
+     * @param issuers the issuers
+     * @return the string
+     */
     public String chooseServerAlias(String keyType, Socket socket, Principal... issuers) {
         return keyManager.chooseServerAlias(keyType, issuers, socket);
     }
@@ -90,7 +96,8 @@ public class AliasKeyManager implements X509KeyManager {
     public PrivateKey getPrivateKey(String alias) {
         PrivateKey pk = keyManager.getPrivateKey(alias);
         if (Debug.verboseOn()) {
-            Debug.logVerbose("getPrivateKey for alias [" + alias + "] got " + (pk == null ? "[Not Found!]" : "[alg:" + pk.getAlgorithm() + ";format:" + pk.getFormat() + "]"), MODULE);
+            Debug.logVerbose("getPrivateKey for alias [" + alias + "] got " + (pk == null ? "[Not Found!]" : "[alg:" + pk.getAlgorithm()
+                    + ";format:" + pk.getFormat() + "]"), MODULE);
         }
         return pk;
     }
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java
index 333a9f2..b015aa7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java
@@ -46,7 +46,8 @@ public final class Debug {
     public static final int ERROR = 6;
     public static final int FATAL = 7;
 
-    private static final String[] LEVEL_PROPS = {"", "print.verbose", "print.timing", "print.info", "print.important", "print.warning", "print.error", "print.fatal"};
+    private static final String[] LEVEL_PROPS = {"", "print.verbose", "print.timing", "print.info", "print.important", "print.warning",
+            "print.error", "print.fatal"};
     private static final Level[] LEVEL_OBJS = {Level.OFF, Level.DEBUG, Level.TRACE, Level.INFO, Level.INFO, Level.WARN, Level.ERROR, Level.FATAL};
 
     private static final Map<String, Integer> LEVEL_STRING_MAP = new HashMap<>();
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 6cfb43f..3ae3eed 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
@@ -64,7 +64,8 @@ public final class KeyStoreUtil {
 
     private KeyStoreUtil() { }
 
-    public static void storeComponentKeyStore(String componentName, String keyStoreName, KeyStore store) throws IOException, GenericConfigException, NoSuchAlgorithmException, CertificateException, KeyStoreException {
+    public static void storeComponentKeyStore(String componentName, String keyStoreName, KeyStore store)
+            throws IOException, GenericConfigException, NoSuchAlgorithmException, CertificateException, KeyStoreException {
         ComponentConfig.KeystoreInfo ks = ComponentConfig.getKeystoreInfo(componentName, keyStoreName);
         File file = FileUtil.getFile(ks.createResourceHandler().getFullLocation());
         try (FileOutputStream out = new FileOutputStream(file)) {
@@ -72,7 +73,8 @@ public final class KeyStoreUtil {
         }
     }
 
-    public static KeyStore getComponentKeyStore(String componentName, String keyStoreName) throws IOException, GeneralSecurityException, GenericConfigException {
+    public static KeyStore getComponentKeyStore(String componentName, String keyStoreName)
+            throws IOException, GeneralSecurityException, GenericConfigException {
         ComponentConfig.KeystoreInfo ks = ComponentConfig.getKeystoreInfo(componentName, keyStoreName);
         return getStore(ks.createResourceHandler().getURL(), ks.getPassword(), ks.getType());
     }
@@ -146,7 +148,8 @@ public final class KeyStoreUtil {
         return x500Map;
     }
 
-    public static void importPKCS8CertChain(KeyStore ks, String alias, byte[] keyBytes, String keyPass, byte[] certChain) throws InvalidKeySpecException, NoSuchAlgorithmException, CertificateException, KeyStoreException {
+    public static void importPKCS8CertChain(KeyStore ks, String alias, byte[] keyBytes, String keyPass, byte[] certChain)
+            throws InvalidKeySpecException, NoSuchAlgorithmException, CertificateException, KeyStoreException {
         // load the private key
         KeyFactory kf = KeyFactory.getInstance("RSA");
         PKCS8EncodedKeySpec keysp = new PKCS8EncodedKeySpec(keyBytes);
@@ -203,6 +206,7 @@ public final class KeyStoreUtil {
         String line;
 
         // ignore up to the header
+        //TODO: Correct it for checkstyle
         while ((line = reader.readLine()) != null && !line.equals(header)) {
         }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
index f6b2018..71e5187 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
@@ -251,7 +251,8 @@ public class ObjectType {
     }
 
     /** See also {@link #simpleTypeOrObjectConvert(Object obj, String type, String format, TimeZone timeZone, Locale locale, boolean noTypeFail)}. */
-    public static Object simpleTypeOrObjectConvert(Object obj, String type, String format, Locale locale, boolean noTypeFail) throws GeneralException {
+    public static Object simpleTypeOrObjectConvert(Object obj, String type, String format, Locale locale, boolean noTypeFail)
+            throws GeneralException {
         return simpleTypeOrObjectConvert(obj, type, format, null, locale, noTypeFail);
     }
 
@@ -275,7 +276,8 @@ public class ObjectType {
      */
     @SourceMonitored
     @SuppressWarnings("unchecked")
-    public static Object simpleTypeOrObjectConvert(Object obj, String type, String format, TimeZone timeZone, Locale locale, boolean noTypeFail) throws GeneralException {
+    public static Object simpleTypeOrObjectConvert(Object obj, String type, String format, TimeZone timeZone, Locale locale, boolean noTypeFail)
+            throws GeneralException {
         if (obj == null || UtilValidate.isEmpty(type) || "Object".equals(type) || "java.lang.Object".equals(type)) {
             return obj;
         }
@@ -360,7 +362,8 @@ public class ObjectType {
             throw new GeneralException("Conversion from " + obj.getClass().getName() + " to " + type + " not currently supported");
         }
         if (Debug.infoOn()) {
-            Debug.logInfo("No type conversion available for " + obj.getClass().getName() + " to " + targetClass.getName() + ", returning original object.", MODULE);
+            Debug.logInfo("No type conversion available for " + obj.getClass().getName() + " to " + targetClass.getName()
+                    + ", returning original object.", MODULE);
         }
         return obj;
     }
@@ -371,7 +374,7 @@ public class ObjectType {
     }
 
     public static Boolean doRealCompare(Object value1, Object value2, String operator, String type, String format,
-        List<Object> messages, Locale locale, ClassLoader loader, boolean value2InlineConstant) {
+            List<Object> messages, Locale locale, ClassLoader loader, boolean value2InlineConstant) {
         boolean verboseOn = Debug.verboseOn();
 
         if (verboseOn) {
@@ -384,7 +387,8 @@ public class ObjectType {
                 type = clz.getName();
             }
         } catch (ClassNotFoundException e) {
-            Debug.logWarning("The specified type [" + type + "] is not a valid class or a known special type, may see more errors later because of this: " + e.getMessage(), MODULE);
+            Debug.logWarning("The specified type [" + type
+                    + "] is not a valid class or a known special type, may see more errors later because of this: " + e.getMessage(), MODULE);
         }
 
         if (value1 == null) {
@@ -435,7 +439,8 @@ public class ObjectType {
             } else if ("not-equals".equals(operator)) {
                 return convertedValue1 == null && convertedValue2 == null ? Boolean.FALSE : Boolean.TRUE;
             } else if ("is-not-empty".equals(operator) || "is-empty".equals(operator)) {
-                // do nothing, handled later...
+                // do nothing, handled later...Logging to avoid checkstyle issue.
+                Debug.logInfo("Operator not handled:" + operator, MODULE);
             } else {
                 if (convertedValue1 == null) {
                     messages.add("Left value is null, cannot complete compare for the operator " + operator);
@@ -502,7 +507,8 @@ public class ObjectType {
                 }
             }
             result = str1.compareTo(str2);
-        } else if ("java.lang.Double".equals(type) || "java.lang.Float".equals(type) || "java.lang.Long".equals(type) || "java.lang.Integer".equals(type) || "java.math.BigDecimal".equals(type)) {
+        } else if ("java.lang.Double".equals(type) || "java.lang.Float".equals(type) || "java.lang.Long".equals(type)
+                || "java.lang.Integer".equals(type) || "java.math.BigDecimal".equals(type)) {
             Number tempNum = (Number) convertedValue1;
             double value1Double = tempNum.doubleValue();
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
index bd2cb33..0ce95e7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
@@ -143,7 +143,8 @@ public interface ScriptHelper {
      * @return
      * @throws ScriptException
      */
-    Map<String, ? extends Object> runService(String serviceName, Map<String, ? extends Object> inputMap, Map<String, ? extends Object> args) throws ScriptException;
+    Map<String, ? extends Object> runService(String serviceName, Map<String, ? extends Object> inputMap, Map<String, ? extends Object> args)
+            throws ScriptException;
 
     /**
      * Sets the event/service status to success status.
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
index 28bb36b..0cf6519 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
@@ -331,7 +331,8 @@ public final class ScriptUtil {
      * @throws IOException
      * @throws IllegalArgumentException
      */
-    public static Object executeScript(String filePath, String functionName, ScriptContext scriptContext, Object[] args) throws ScriptException, NoSuchMethodException, IOException {
+    public static Object executeScript(String filePath, String functionName, ScriptContext scriptContext, Object[] args)
+            throws ScriptException, NoSuchMethodException, IOException {
         Assert.notNull("filePath", filePath, "scriptContext", scriptContext);
         scriptContext.setAttribute(ScriptEngine.FILENAME, filePath, ScriptContext.ENGINE_SCOPE);
         if (functionName == null) {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
index e36aaf5..4af9c74 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
@@ -269,7 +269,8 @@ public class StringUtil {
         return newMap;
     }
 
-    /** Make sure the string starts with a forward slash but does not end with one; converts back-slashes to forward-slashes; if in String is null or empty, returns zero length string. */
+    /** Make sure the string starts with a forward slash but does not end with one; converts back-slashes to forward-slashes;
+     * if in String is null or empty, returns zero length string. */
     public static String cleanUpPathPrefix(String prefix) {
         if (UtilValidate.isEmpty(prefix)) {
             return "";
@@ -288,7 +289,7 @@ public class StringUtil {
 
     /** Removes all spaces from a string */
     public static String removeSpaces(String str) {
-        return removeRegex(str,"[\\ ]");
+        return removeRegex(str, "[\\ ]");
     }
 
     public static String toHexString(byte[] bytes) {
@@ -314,7 +315,7 @@ public class StringUtil {
         }
     }
 
-    private static char[] hexChar = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+    private static char[] hexChar = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
     public static char[] encodeInt(int i, int j, char digestChars[]) {
         if (i < 16) {
             digestChars[j] = '0';
@@ -329,7 +330,7 @@ public class StringUtil {
 
     /** Removes all non-numbers from str */
     public static String removeNonNumeric(String str) {
-        return removeRegex(str,"[\\D]");
+        return removeRegex(str, "[\\D]");
     }
 
     /**
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
index dd40dce..7eef8ba 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
@@ -92,7 +92,13 @@ public class TimeDuration implements Serializable, Comparable<TimeDuration> {
 
         // shortcut for equal dates
         if (deltaMillis == 0) {
-            this.years = this.months = this.days = this.hours = this.minutes = this.seconds = this.milliseconds = 0;
+            this.years = 0;
+            this.months = 0;
+            this.days = 0;
+            this.hours = 0;
+            this.minutes = 0;
+            this.seconds = 0;
+            this.milliseconds = 0;
             return;
         }
 
@@ -197,7 +203,8 @@ public class TimeDuration implements Serializable, Comparable<TimeDuration> {
      */
     @Override
     public String toString() {
-        return this.years + ":" + this.months + ":" + this.days + ":" + this.hours + ":" + this.minutes + ":" + this.seconds + ":" + this.milliseconds;
+        return this.years + ":" + this.months + ":" + this.days + ":" + this.hours + ":" + this.minutes + ":" + this.seconds + ":"
+                + this.milliseconds;
     }
 
     @Override
@@ -236,7 +243,7 @@ public class TimeDuration implements Serializable, Comparable<TimeDuration> {
      * @return <code>true</code> if this duration is negative
      */
     public boolean isNegative() {
-        return years < 0 || months < 0  || days < 0 || hours < 0 || minutes < 0 || seconds < 0 || milliseconds < 0;
+        return years < 0 || months < 0 || days < 0 || hours < 0 || minutes < 0 || seconds < 0 || milliseconds < 0;
     }
 
     /** Returns <code>true</code> if this duration is zero.
@@ -244,7 +251,7 @@ public class TimeDuration implements Serializable, Comparable<TimeDuration> {
      */
     public boolean isZero() {
         return this.milliseconds == 0 && this.seconds == 0
-                &&  this.minutes == 0 && this.hours == 0 && this.days == 0
+                && this.minutes == 0 && this.hours == 0 && this.days == 0
                 && this.months == 0 && this.years == 0;
     }
 
@@ -381,8 +388,7 @@ public class TimeDuration implements Serializable, Comparable<TimeDuration> {
      * @return the duration encoded as a <code>long</code> value
      */
     public static long toLong(TimeDuration duration) {
-        return
-                (0x757B12C00L * duration.years)
+        return (0x757B12C00L * duration.years)
                 + (0x9CA41900L * duration.months)
                 + (86400000 * (long) duration.days)
                 + (3600000 * (long) duration.hours)
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 394595a..5faae93 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
@@ -181,7 +181,8 @@ public class UtilCodec {
         // You might even want to adapt the PERMISSIVE_POLICY to your needs...
         // Be sure to check https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet before...
         // And https://github.com/OWASP/java-html-sanitizer/blob/master/docs/getting_started.md for examples.
-        // If you want another example: https://android.googlesource.com/platform/packages/apps/UnifiedEmail/+/ec0fa48/src/com/android/mail/utils/HtmlSanitizer.java
+        // If you want another example:
+        // https://android.googlesource.com/platform/packages/apps/UnifiedEmail/+/ec0fa48/src/com/android/mail/utils/HtmlSanitizer.java
         public static final PolicyFactory PERMISSIVE_POLICY = new HtmlPolicyBuilder()
                 .allowWithoutAttributes("html", "body")
                 .allowAttributes("id", "class").globally()
@@ -387,8 +388,6 @@ public class UtilCodec {
         if (UtilValidate.isEmpty(value)) {
             return value;
         }
-        
-
         // canonicalize, strict (error on double-encoding)
         try {
             value = canonicalize(value, true);
@@ -465,8 +464,7 @@ public class UtilCodec {
             if (locale.equals(new Locale("test"))) {
                 customPolicyClass = Class.forName("org.apache.ofbiz.base.html.CustomSafePolicy");
             } else {
-            customPolicyClass = Class.forName(UtilProperties.getPropertyValue("owasp",
-                    "sanitizer.custom.safe.policy.class"));
+                customPolicyClass = Class.forName(UtilProperties.getPropertyValue("owasp", "sanitizer.custom.safe.policy.class"));
             }
             Object obj = customPolicyClass.getConstructor().newInstance();
             if (SanitizerCustomPolicy.class.isAssignableFrom(customPolicyClass)) {
@@ -513,14 +511,23 @@ public class UtilCodec {
             return mapWrapper;
         }
 
-        protected Map<K, Object> internalMap = null;
-        protected SimpleEncoder encoder = null;
+        private Map<K, Object> internalMap = null;
+        private SimpleEncoder encoder = null;
         protected HtmlEncodingMapWrapper() { }
 
+        /**
+         * Sets .
+         * @param mapToWrap the map to wrap
+         * @param encoder the encoder
+         */
         public void setup(Map<K, Object> mapToWrap, SimpleEncoder encoder) {
             this.internalMap = mapToWrap;
             this.encoder = encoder;
         }
+
+        /**
+         * Reset.
+         */
         public void reset() {
             this.internalMap = null;
             this.encoder = null;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
index f58eb28..f3765ae 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
@@ -538,7 +538,12 @@ public final class UtilDateTime {
     public static java.util.Date toDate(String monthStr, String dayStr, String yearStr, String hourStr,
             String minuteStr, String secondStr) {
 
-        int month, day, year, hour, minute, second;
+        int month;
+        int day;
+        int year;
+        int hour;
+        int minute;
+        int second;
         try {
             month = Integer.parseInt(monthStr);
             day = Integer.parseInt(dayStr);
@@ -623,7 +628,8 @@ public final class UtilDateTime {
     }
 
     /**
-     * Makes a time String in the format HH:MM:SS from a separate ints for hour, minute, and second. If the seconds are 0, then the output is in HH:MM.
+     * Makes a time String in the format HH:MM:SS from a separate ints for hour, minute, and second. If the seconds are 0,
+     * then the output is in HH:MM.
      * @param hour   The hour int
      * @param minute The minute int
      * @param second The second int
@@ -720,9 +726,9 @@ public final class UtilDateTime {
         calendar.setFirstDayOfWeek(startOfWeek);
 
         if (startOfWeek == Calendar.MONDAY) {
-           calendar.setMinimalDaysInFirstWeek(4);
+            calendar.setMinimalDaysInFirstWeek(4);
         } else if (startOfWeek == Calendar.SUNDAY) {
-           calendar.setMinimalDaysInFirstWeek(3);
+            calendar.setMinimalDaysInFirstWeek(3);
         }
 
         calendar.setTime(new java.util.Date(input.getTime()));
@@ -865,8 +871,8 @@ public final class UtilDateTime {
     }
 
     public static Timestamp getYearStart(Timestamp stamp, Number daysLater, Number monthsLater, Number yearsLater, TimeZone timeZone, Locale locale) {
-        return getYearStart(stamp, (daysLater == null ? 0 : daysLater.intValue()),
-                (monthsLater == null ? 0 : monthsLater.intValue()), (yearsLater == null ? 0 : yearsLater.intValue()), timeZone, locale);
+        return getYearStart(stamp, (daysLater == null ? 0 : daysLater.intValue()), (monthsLater == null
+                ? 0 : monthsLater.intValue()), (yearsLater == null ? 0 : yearsLater.intValue()), timeZone, locale);
     }
 
     public static Timestamp getYearStart(Timestamp stamp, int daysLater, int monthsLater, int yearsLater, TimeZone timeZone, Locale locale) {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java
index ccca665..d790a92 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java
@@ -31,7 +31,8 @@ import org.apache.ofbiz.base.component.ComponentConfig;
 /**
  * Java Source Parsing Utilities
  *
- * NOTE: the approach here is not the best and it may be better to use a parser, line one based on antlr, or using a Java Bytecode parser to look at .class files.
+ * NOTE: the approach here is not the best and it may be better to use a parser, line one based on antlr, or using a Java
+ * Bytecode parser to look at .class files.
  *
  */
 public final class UtilJavaParse {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
index 6d39f72..3b080bb 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
@@ -255,7 +255,8 @@ public final class UtilMisc {
         } else if (currentNumberObj instanceof Long) {
             currentNumber = new BigDecimal((Long) currentNumberObj);
         } else {
-            throw new IllegalArgumentException("In addToBigDecimalInMap found a Map value of a type not supported: " + currentNumberObj.getClass().getName());
+            throw new IllegalArgumentException("In addToBigDecimalInMap found a Map value of a type not supported: "
+                    + currentNumberObj.getClass().getName());
         }
 
         if (addNumber == null || ZERO_BD.compareTo(addNumber) == 0) {
@@ -613,7 +614,7 @@ public final class UtilMisc {
             throw new IOException("File is a directory, not a file, cannot copy");
         }
         try (InputStream in = new FileInputStream(sourceLocation);
-             OutputStream out = new FileOutputStream(targetLocation);) {
+                OutputStream out = new FileOutputStream(targetLocation);) {
             // Copy the bits from instream to outstream
             byte[] buf = new byte[1024];
             int len;
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 433c012..66c9ce3 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
@@ -196,7 +196,8 @@ public final class UtilNumber {
             Debug.logWarning(e, e.getMessage(), MODULE);
         }
         if (scale == -1) {
-            Debug.logWarning("Could not set decimal precision from " + property + "=" + value + ". Using default scale of " + DEFAULT_BD_SCALE + ".", MODULE);
+            Debug.logWarning("Could not set decimal precision from " + property + "=" + value + ". Using default scale of "
+                    + DEFAULT_BD_SCALE + ".", MODULE);
             scale = DEFAULT_BD_SCALE;
         }
         return scale;
@@ -248,7 +249,8 @@ public final class UtilNumber {
         String value = UtilProperties.getPropertyValue(file, property);
         RoundingMode mode = roundingModeFromString(value);
         if (mode == null) {
-            Debug.logWarning("Could not set decimal rounding mode from " + property + "=" + value + ". Using default mode of " + DEFAULT_BD_SCALE + ".", MODULE);
+            Debug.logWarning("Could not set decimal rounding mode from " + property + "=" + value + ". Using default mode of "
+                    + DEFAULT_BD_SCALE + ".", MODULE);
             return DEFAULT_BD_ROUNDING_MODE;
         }
         return mode;
@@ -302,7 +304,8 @@ public final class UtilNumber {
     public static String formatRuleBasedAmount(double amount, Locale locale) {
         String ruleSet = rbnfRuleSets.get(locale);
         if (ruleSet == null) {
-            Debug.logWarning("Cannot format rule based amount for locale " + locale.toString() + " because rule set for that locale does not exist", MODULE);
+            Debug.logWarning("Cannot format rule based amount for locale " + locale.toString()
+                    + " because rule set for that locale does not exist", MODULE);
             return "";
         }
         return formatRuleBasedAmount(amount, ruleSet, null, locale);
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 0929149..d91187e 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
@@ -149,8 +149,8 @@ public final class UtilValidate {
             + "NH|NJ|NM|NY|NC|ND|MP|OH|OK|OR|PW|PA|PR|RI|SC|SD|TN|TX|UT|VT|VI|VA|WA|WV|WI|WY|AE|AA|AE|AE|AP";
 
     /** Valid contiguous U.S. postal codes */
-    public static final String CONTIGUOUS_US_STATE_CODES = "AL|AZ|AR|CA|CO|CT|DE|DC|FL|GA|ID|IL|IN|IA|KS|KY|LA|ME|MD|MA|MI|MN|MS|MO|MT|NE|NV|NH|NJ|NM|"
-            + "NY|NC|ND|OH|OK|OR|PA|RI|SC|SD|TN|TX|UT|VT|VA|WA|WV|WI|WY";
+    public static final String CONTIGUOUS_US_STATE_CODES = "AL|AZ|AR|CA|CO|CT|DE|DC|FL|GA|ID|IL|IN|IA|KS|KY|LA|ME|MD|MA|MI|MN|MS|MO|MT|NE|NV|NH|"
+            + "NJ|NM|NY|NC|ND|OH|OK|OR|PA|RI|SC|SD|TN|TX|UT|VT|VA|WA|WV|WI|WY";
 
     /** Check whether an object is empty, will see if it is a String, Map, Collection, etc. */
     public static boolean isEmpty(Object o) {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
index f9f50b9..581c862 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
@@ -108,7 +108,8 @@ public final class UtilXml {
      * @throws InstantiationException
      * @throws IllegalAccessException
      */
-    public static DOMImplementationLS getDomLsImplementation() throws ClassCastException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    public static DOMImplementationLS getDomLsImplementation()
+            throws ClassCastException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
         return (DOMImplementationLS) registry.getDOMImplementation("LS");
     }
@@ -164,7 +165,8 @@ public final class UtilXml {
      * @throws InstantiationException
      * @throws IllegalAccessException
      */
-    public static void writeXmlDocument(OutputStream os, Node node, String encoding, boolean includeXmlDeclaration, boolean enablePrettyPrint) throws ClassCastException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    public static void writeXmlDocument(OutputStream os, Node node, String encoding, boolean includeXmlDeclaration, boolean enablePrettyPrint)
+            throws ClassCastException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         DOMImplementationLS impl = getDomLsImplementation();
         LSOutput out = createLSOutput(impl, os, encoding);
         LSSerializer writer = createLSSerializer(impl, includeXmlDeclaration, enablePrettyPrint);
@@ -186,7 +188,8 @@ public final class UtilXml {
      * @see <a href="http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.html">JAXP TrAX</a>
      * @throws TransformerConfigurationException
      */
-    public static Transformer createOutputTransformer(String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount) throws TransformerConfigurationException {
+    public static Transformer createOutputTransformer(String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount)
+            throws TransformerConfigurationException {
         // Developers: This stylesheet strips all formatting space characters from the XML,
         // then indents the XML using the specified indentation.
         StringBuilder sb = new StringBuilder();
@@ -242,7 +245,8 @@ public final class UtilXml {
      * @see <a href="http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.html">JAXP TrAX</a>
      * @throws TransformerException
      */
-    public static void writeXmlDocument(Node node, OutputStream os, String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount) throws TransformerException {
+    public static void writeXmlDocument(Node node, OutputStream os, String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount)
+            throws TransformerException {
         Transformer transformer = createOutputTransformer(encoding, omitXmlDeclaration, indent, indentAmount);
         transformDomDocument(transformer, node, os);
     }
@@ -516,7 +520,8 @@ public final class UtilXml {
             }
 
             @Override
-            public void startDocument(XMLLocator locator, String encoding, NamespaceContext namespaceContext, Augmentations augs) throws XNIException {
+            public void startDocument(XMLLocator locator, String encoding, NamespaceContext namespaceContext, Augmentations augs)
+                    throws XNIException {
                 super.startDocument(locator, encoding, namespaceContext, augs);
                 this.locator = locator;
                 setLineColumn();
@@ -993,7 +998,8 @@ public final class UtilXml {
         StringBuilder sb = new StringBuilder();
         for (int index = 0; index < nodeName.length(); index++) {
             char character = nodeName.charAt(index);
-            if ((sb.length() == 0 && !Character.isJavaIdentifierStart(character)) || (sb.length() != 0 && !Character.isJavaIdentifierPart(character))) {
+            if ((sb.length() == 0 && !Character.isJavaIdentifierStart(character))
+                    || (sb.length() != 0 && !Character.isJavaIdentifierPart(character))) {
                 capitalize = true;
                 continue;
             }
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java
index 0545493..bf4459a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java
@@ -64,7 +64,8 @@ public class MapContext<K, V> implements Map<K, V>, LocalizedMap<V> {
         contexts.addFirst(existingMap);
     }
 
-    /** Puts an existing Map on the BOTTOM of the stack (bottom meaning will be overriden by lower layers on the stack, ie everything else already there) */
+    /** Puts an existing Map on the BOTTOM of the stack (bottom meaning will be overriden by lower layers on the stack,
+     * ie everything else already there) */
     public void addToBottom(Map<K, V> existingMap) {
         if (existingMap == null) {
             throw new IllegalArgumentException("Error: cannot add null existing Map to bottom of a MapContext");
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java
index edec9e8..74f7058 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java
@@ -113,7 +113,8 @@ public class MapStack<K> extends MapContext<K, Object> {
     public Object put(K key, Object value) {
         if ("context".equals(key)) {
             if (value == null || this != value) {
-                Debug.logWarning("Putting a value in a MapStack with key [context] that is not this MapStack, will be hidden by the current MapStack self-reference: " + value, MODULE);
+                Debug.logWarning("Putting a value in a MapStack with key [context] that is not this MapStack, will be hidden"
+                        + " by the current MapStack self-reference: " + value, MODULE);
             }
         }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
index 53f78eb..7af5bb2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
@@ -129,17 +129,19 @@ public class FlexibleMapAccessorTests extends GenericTestCaseBase {
         assertNotNull(label + ":toString", fma.toString());
     }
 
-    // These tests rely upon FlexibleStringExpander, so they
-    // should follow the FlexibleStringExpander tests.
+    /** These tests rely upon FlexibleStringExpander, so they should follow the FlexibleStringExpander tests. */
     public void testFlexibleMapAccessor() {
         fmaEmptyTest("fmaEmpty", "");
         fmaEmptyTest("fmaNull", null);
         fmaEmptyTest("fma\"null\"", "null");
         fmaTest("UEL auto-vivify Map", "parameters.var", "Hello ${parameters.var}!", "World", "Hello World!");
-        fmaTest("UEL auto-vivify List", "parameters.someList[0]", "parameters.someList[+0]", "Hello ${parameters.someList[0]}!", null, "World", "Hello World!");
+        fmaTest("UEL auto-vivify List", "parameters.someList[0]", "parameters.someList[+0]", "Hello ${parameters.someList[0]}!",
+                null, "World", "Hello World!");
         fmaTest("fse", "para${'meter'}s.var", "Hello ${parameters.var}!", "World", "Hello World!");
-        fmaTest("foo", "'The total is ${total?currency(USD)}.'", "total", "The total is ${total?currency(USD)}.", LOCALE_TO_TEST, new BigDecimal("12345678.90"), "The total is $12,345,678.90.");
-        assertTrue("containsNestedExpression method returns true", FlexibleMapAccessor.getInstance("Hello ${parameters.var}!").containsNestedExpression());
+        fmaTest("foo", "'The total is ${total?currency(USD)}.'", "total", "The total is ${total?currency(USD)}.",
+                LOCALE_TO_TEST, new BigDecimal("12345678.90"), "The total is $12,345,678.90.");
+        assertTrue("containsNestedExpression method returns true", FlexibleMapAccessor.getInstance("Hello ${parameters.var}!")
+                .containsNestedExpression());
         assertFalse("containsNestedExpression method returns false", FlexibleMapAccessor.getInstance("Hello World!").containsNestedExpression());
     }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
index 428b648..97fa430 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
@@ -371,14 +371,16 @@ public final class UelUtil {
                 String str = property.toString();
                 if ("add".equals(str)) {
                     if (Debug.verboseOn()) {
-                        Debug.logVerbose("ExtendedListResolver.setValue adding List element: base = " + base + ", property = " + property + ", value = " + val, MODULE);
+                        Debug.logVerbose("ExtendedListResolver.setValue adding List element: base = " + base + ", property = "
+                                + property + ", value = " + val, MODULE);
                     }
                     context.setPropertyResolved(true);
                     List<Object> list = UtilGenerics.cast(base);
                     list.add(val);
                 } else if (str.startsWith("insert@")) {
                     if (Debug.verboseOn()) {
-                        Debug.logVerbose("ExtendedListResolver.setValue inserting List element: base = " + base + ", property = " + property + ", value = " + val, MODULE);
+                        Debug.logVerbose("ExtendedListResolver.setValue inserting List element: base = " + base + ", property = "
+                                + property + ", value = " + val, MODULE);
                     }
                     context.setPropertyResolved(true);
                     String indexStr = str.replace("insert@", "");
@@ -432,7 +434,8 @@ public final class UelUtil {
                 }
                 if (locale == null) {
                     if (Debug.verboseOn()) {
-                        Debug.logVerbose("ExtendedMapResolver.getValue: unable to find Locale for LocalizedMap element, using default locale", MODULE);
+                        Debug.logVerbose("ExtendedMapResolver.getValue: unable to find Locale for LocalizedMap element, using default locale",
+                                MODULE);
                     }
                     locale = Locale.getDefault();
                 }
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
index 38a9697..6e5905f 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
@@ -32,22 +32,31 @@ import org.apache.catalina.valves.ValveBase;
  * <p>
  *    &lt;property name="ssl-accelerator-port" value="8443"/&gt;
  * <p>
- *
- * Once that is done just setup a connector just like the example http-connector and have it listen on the port you set in the ssl-accelerator-port value.
+ * Once that is done just setup a connector just like the example http-connector and have it listen on the port you set in the
+ * ssl-accelerator-port value.
  */
 public class SslAcceleratorValve extends ValveBase {
 
-    protected Integer sslAcceleratorPort = null;
+    private Integer sslAcceleratorPort = null;
 
+    /**
+     * Sets ssl accelerator port.
+     * @param sslAcceleratorPort the ssl accelerator port
+     */
     public void setSslAcceleratorPort(Integer sslAcceleratorPort) {
         this.sslAcceleratorPort = sslAcceleratorPort;
     }
 
+    /**
+     * Gets ssl accelerator port.
+     * @return the ssl accelerator port
+     */
     public Integer getSslAcceleratorPort() {
         return sslAcceleratorPort;
     }
 
-    public @Override void invoke(Request req, Response resp) throws IOException, ServletException {
+    @Override
+    public void invoke(Request req, Response resp) throws IOException, ServletException {
         if (sslAcceleratorPort != null && req.getLocalPort() == sslAcceleratorPort.intValue()) {
             req.setSecure(true);
         }
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java
index 0335816..8466c00 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java
@@ -57,7 +57,8 @@ public final class CommonWorkers {
         }
 
         List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("geoTypeId", EntityOperator.EQUALS, "COUNTRY"));
-        List<String> countriesAvailable = StringUtil.split(EntityUtilProperties.getPropertyValue("general", "countries.geo.id.available", delegator), ",");
+        List<String> countriesAvailable = StringUtil.split(EntityUtilProperties.getPropertyValue("general",
+                "countries.geo.id.available", delegator), ",");
         if (UtilValidate.isNotEmpty(countriesAvailable)) {
             // only available countries (we don't verify the list of geoId in countries.geo.id.available)
             exprs.add(EntityCondition.makeCondition("geoId", EntityOperator.IN, countriesAvailable));
@@ -73,7 +74,7 @@ public final class CommonWorkers {
             geoList.add(defaultGeo);
             boolean removeDefaultGeo = UtilValidate.isEmpty(countriesList);
             if (!removeDefaultGeo) {
-                for (GenericValue country  : countriesList) {
+                for (GenericValue country : countriesList) {
                     if (country.get("geoId").equals(defaultGeo.get("geoId"))) {
                         removeDefaultGeo = true;
                     }
@@ -91,7 +92,8 @@ public final class CommonWorkers {
 
     public static List<GenericValue> getStateList(Delegator delegator) {
         List<GenericValue> geoList = new LinkedList<>();
-        EntityCondition condition = EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), EntityCondition.makeCondition("geoTypeId", "TERRITORY"),
+        EntityCondition condition = EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"),
+                EntityCondition.makeCondition("geoTypeId", "PROVINCE"), EntityCondition.makeCondition("geoTypeId", "TERRITORY"),
                 EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY"));
         try {
             geoList = EntityQuery.use(delegator).from("Geo").where(condition).orderBy("geoName").cache(true).queryList();
@@ -147,7 +149,11 @@ public final class CommonWorkers {
             EntityCondition stateProvinceFindCond = EntityCondition.makeCondition(
                     EntityCondition.makeCondition("geoIdFrom", country),
                     EntityCondition.makeCondition("geoAssocTypeId", "REGIONS"),
-                    EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY"), EntityCondition.makeCondition("geoTypeId", "TERRITORY"), EntityCondition.makeCondition("geoTypeId", "COUNTY")));
+                    EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"),
+                            EntityCondition.makeCondition("geoTypeId", "PROVINCE"),
+                            EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY"),
+                            EntityCondition.makeCondition("geoTypeId", "TERRITORY"),
+                            EntityCondition.makeCondition("geoTypeId", "COUNTY")));
             geoList.addAll(EntityQuery.use(delegator)
                                       .from("GeoAssocAndGeoToWithState")
                                       .where(stateProvinceFindCond)
@@ -171,10 +177,12 @@ public final class CommonWorkers {
      * @param parentTypeField Field in Type entity which stores the parent type.
      * @param parentType      Value of the parent type against which check is performed.
      * @return boolean value based on the check results.
-     * @deprecated Moved to {@link org.apache.ofbiz.entity.util.EntityTypeUtil#hasParentType(Delegator, String, String, String, String, String) EntityTypeUtil}
+     * @deprecated Moved to {@link org.apache.ofbiz.entity.util.EntityTypeUtil#hasParentType(Delegator, String, String, String, String, String)
+     * EntityTypeUtil}
      */
     @Deprecated
-    public static boolean hasParentType(Delegator delegator, String entityName, String primaryKey, String childType, String parentTypeField, String parentType) {
+    public static boolean hasParentType(Delegator delegator, String entityName, String primaryKey, String childType,
+                                        String parentTypeField, String parentType) {
         return EntityTypeUtil.hasParentType(delegator, entityName, primaryKey, childType, parentTypeField, parentType);
     }
 }
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 eb87687..5b505bd 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
@@ -96,7 +96,8 @@ public class FindServices {
      * @param inputFields     Input parameters run thru UtilHttp.getParameterMap
      * @return a map with field name and operator
      */
-    public static Map<String, Map<String, Map<String, Object>>> prepareField(Map<String, ?> inputFields, Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap) {
+    public static Map<String, Map<String, Map<String, Object>>> prepareField(Map<String, ?> inputFields, Map<String, Object>
+            queryStringMap, Map<String, List<Object[]>> origValueMap) {
         // Strip the "_suffix" off of the parameter name and
         // build a three-level map of values keyed by fieldRoot name,
         //    fld0 or fld1, and, then, "op" or "value"
@@ -212,7 +213,8 @@ public class FindServices {
      * @param context
      * @return returns an EntityCondition list
      */
-    public static List<EntityCondition> createConditionList(Map<String, ? extends Object> parameters, List<ModelField> fieldList, Map<String, Object> queryStringMap, Delegator delegator, Map<String, ?> context) {
+    public static List<EntityCondition> createConditionList(Map<String, ? extends Object> parameters, List<ModelField> fieldList,
+                                                            Map<String, Object> queryStringMap, Delegator delegator, Map<String, ?> context) {
         Set<String> processed = new LinkedHashSet<>();
         Set<String> keys = new LinkedHashSet<>();
         Map<String, ModelField> fieldMap = new LinkedHashMap<>();
@@ -321,7 +323,8 @@ public class FindServices {
      * @param context
      * @return return an EntityCondition
      */
-    public static EntityCondition createSingleCondition(ModelField modelField, String operation, Object fieldValue, boolean ignoreCase, Delegator delegator, Map<String, ?> context) {
+    public static EntityCondition createSingleCondition(ModelField modelField, String operation, Object fieldValue, boolean ignoreCase,
+                                                        Delegator delegator, Map<String, ?> context) {
         EntityCondition cond = null;
         String fieldName = modelField.getName();
         Locale locale = (Locale) context.get("locale");
@@ -350,13 +353,16 @@ public class FindServices {
                 fieldOp = EntityOperator.LESS_THAN_EQUAL_TO;
             } else if ("greaterThanFromDayStart".equals(operation)) {
                 String timeStampString = (String) fieldValue;
-                Object startValue = modelField.getModelEntity().convertFieldValue(modelField, dayStart(timeStampString, 0, timeZone, locale), delegator, context);
+                Object startValue = modelField.getModelEntity().convertFieldValue(modelField, dayStart(timeStampString, 0,
+                        timeZone, locale), delegator, context);
                 return EntityCondition.makeCondition(fieldName, EntityOperator.GREATER_THAN_EQUAL_TO, startValue);
             } else if ("sameDay".equals(operation)) {
                 String timeStampString = (String) fieldValue;
-                Object startValue = modelField.getModelEntity().convertFieldValue(modelField, dayStart(timeStampString, 0, timeZone, locale), delegator, context);
+                Object startValue = modelField.getModelEntity().convertFieldValue(modelField, dayStart(timeStampString, 0,
+                        timeZone, locale), delegator, context);
                 EntityCondition startCond = EntityCondition.makeCondition(fieldName, EntityOperator.GREATER_THAN_EQUAL_TO, startValue);
-                Object endValue = modelField.getModelEntity().convertFieldValue(modelField, dayStart(timeStampString, 1, timeZone, locale), delegator, context);
+                Object endValue = modelField.getModelEntity().convertFieldValue(modelField, dayStart(timeStampString, 1,
+                        timeZone, locale), delegator, context);
                 EntityCondition endCond = EntityCondition.makeCondition(fieldName, EntityOperator.LESS_THAN, endValue);
                 return EntityCondition.makeCondition(startCond, endCond);
             } else {
@@ -375,8 +381,8 @@ public class FindServices {
             fieldObject = modelField.getModelEntity().convertFieldValue(modelField, fieldValue, delegator, context);
         }
         if (ignoreCase && fieldObject instanceof String) {
-            cond = EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName), fieldOp, EntityFunction.UPPER(
-                    ((String) fieldValue).toUpperCase(Locale.getDefault())));
+            cond = EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName), fieldOp, EntityFunction.UPPER(((String)
+                    fieldValue).toUpperCase(Locale.getDefault())));
         } else {
             if (fieldObject.equals(GenericEntity.NULL_FIELD.toString())) {
                 fieldObject = null;
@@ -397,7 +403,8 @@ public class FindServices {
      * @param normalizedFields list of field the user have populated
      * @return a arrayList usable to create an entityCondition
      */
-    public static List<EntityCondition> createCondition(ModelEntity modelEntity, Map<String, Map<String, Map<String, Object>>> normalizedFields, Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap, Delegator delegator, Map<String, ?> context) {
+    public static List<EntityCondition> createCondition(ModelEntity modelEntity, Map<String, Map<String, Map<String, Object>>> normalizedFields,
+            Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap, Delegator delegator, Map<String, ?> context) {
         Map<String, Map<String, Object>> subMap = null;
         Map<String, Object> subMap2 = null;
         Object fieldValue = null; // If it is a "value" field, it will be the value to be used in the query.
@@ -474,7 +481,7 @@ public class FindServices {
         List<GenericValue> list = null;
         Integer listSize = 0;
         try (EntityListIterator it = (EntityListIterator) result.get("listIt")) {
-            list = it.getPartialList(start+1, viewSize); // list starts at '1'
+            list = it.getPartialList(start + 1, viewSize); // list starts at '1'
             listSize = it.getResultsSizeAfterPartialList();
         } catch (ClassCastException | NullPointerException | GenericEntityException e) {
             Debug.logInfo("Problem getting partial list" + e, MODULE);
@@ -539,10 +546,12 @@ public class FindServices {
         try {
             prepareResult = dispatcher.runSync("prepareFind", UtilMisc.toMap("entityName", entityName, "orderBy", orderBy,
                                                "inputFields", inputFields, "filterByDate", filterByDate, "noConditionFind", noConditionFind,
-                                               "filterByDateValue", filterByDateValue, "userLogin", userLogin, "fromDateName", fromDateName, "thruDateName", thruDateName,
+                                               "filterByDateValue", filterByDateValue, "userLogin", userLogin, "fromDateName", fromDateName,
+                    "thruDateName", thruDateName,
                                                "locale", context.get("locale"), "timeZone", context.get("timeZone")));
         } catch (GenericServiceException gse) {
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonFindErrorPreparingConditions", UtilMisc.toMap("errorString", gse.getMessage()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonFindErrorPreparingConditions",
+                    UtilMisc.toMap("errorString", gse.getMessage()), locale));
         }
         EntityConditionList<EntityCondition> exprList = UtilGenerics.cast(prepareResult.get("entityConditionList"));
         List<String> orderByList = checkCollection(prepareResult.get("orderByList"), String.class);
@@ -555,7 +564,8 @@ public class FindServices {
                                                                              "locale", context.get("locale"), "timeZone", context.get("timeZone"),
                                                                              "maxRows", maxRows));
         } catch (GenericServiceException gse) {
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonFindErrorRetrieveIterator", UtilMisc.toMap("errorString", gse.getMessage()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonFindErrorRetrieveIterator",
+                    UtilMisc.toMap("errorString", gse.getMessage()), locale));
         }
 
         if (executeResult.get("listIt") == null) {
@@ -639,7 +649,7 @@ public class FindServices {
 
         List<String> orderByList = null;
         if (UtilValidate.isNotEmpty(orderBy)) {
-            orderByList = StringUtil.split(orderBy,"|");
+            orderByList = StringUtil.split(orderBy, "|");
         }
 
         Map<String, Object> results = ServiceUtil.returnSuccess();
@@ -688,7 +698,8 @@ public class FindServices {
                 listSize = listIt.getResultsSizeAfterPartialList();
             }
         } catch (GenericEntityException e) {
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonFindErrorRunning", UtilMisc.toMap("entityName", entityName, "errorString", e.getMessage()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonFindErrorRunning",
+                    UtilMisc.toMap("entityName", entityName, "errorString", e.getMessage()), locale));
         }
 
         Map<String, Object> results = ServiceUtil.returnSuccess();
@@ -788,7 +799,7 @@ public class FindServices {
         Map<String, Object> result = org.apache.ofbiz.common.FindServices.performFind(dctx, context);
 
         List<GenericValue> list = null;
-        GenericValue item= null;
+        GenericValue item = null;
         try (EntityListIterator it = (EntityListIterator) result.get("listIt")) {
             list = it.getPartialList(1, 1); // list starts at '1'
             if (UtilValidate.isNotEmpty(list)) {
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java
index 1d7352e..67e8ec8 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java
@@ -77,7 +77,8 @@ public class FtpServices {
                 Debug.logInfo("[putFile] logging in: username=" + username + ", password=" + password, MODULE);
                 if (!ftp.login(username, password)) {
                     Debug.logInfo("[putFile] login failed", MODULE);
-                    errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpLoginFailure", UtilMisc.toMap("username", username, "password", password), locale));
+                    errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpLoginFailure", UtilMisc.toMap("username",
+                            username, "password", password), locale));
                 } else {
                     Boolean binaryTransfer = (Boolean) context.get("binaryTransfer");
                     boolean binary = (binaryTransfer == null) ? false : binaryTransfer;
@@ -92,7 +93,8 @@ public class FtpServices {
                     Debug.logInfo("[putFile] storing local file remotely as: " + context.get("remoteFilename"), MODULE);
                     if (!ftp.storeFile((String) context.get("remoteFilename"), localFile)) {
                         Debug.logInfo("[putFile] store was unsuccessful", MODULE);
-                        errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpFileNotSentSuccesfully", UtilMisc.toMap("replyString", ftp.getReplyString()), locale));
+                        errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpFileNotSentSuccesfully",
+                                UtilMisc.toMap("replyString", ftp.getReplyString()), locale));
                     } else {
                         Debug.logInfo("[putFile] store was successful", MODULE);
                         List<String> siteCommands = checkCollection(context.get("siteCommands"), String.class);
@@ -100,7 +102,8 @@ public class FtpServices {
                             for (String command : siteCommands) {
                                 Debug.logInfo("[putFile] sending SITE command: " + command, MODULE);
                                 if (!ftp.sendSiteCommand(command)) {
-                                    errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpSiteCommandFailed", UtilMisc.toMap("command", command, "replyString", ftp.getReplyString()), locale));
+                                    errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpSiteCommandFailed",
+                                            UtilMisc.toMap("command", command, "replyString", ftp.getReplyString()), locale));
                                 }
                             }
                         }
@@ -110,7 +113,8 @@ public class FtpServices {
             }
         } catch (IOException ioe) {
             Debug.logWarning(ioe, "[putFile] caught exception: " + ioe.getMessage(), MODULE);
-            errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpProblemWithTransfer", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
+            errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpProblemWithTransfer", UtilMisc.toMap("errorString",
+                    ioe.getMessage()), locale));
         } finally {
             try {
                 if (ftp.isConnected()) {
@@ -153,7 +157,8 @@ public class FtpServices {
                 String username = (String) context.get("username");
                 String password = (String) context.get("password");
                 if (!ftp.login(username, password)) {
-                    errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpLoginFailure", UtilMisc.toMap("username", username, "password", password), locale));
+                    errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpLoginFailure", UtilMisc.toMap("username",
+                            username, "password", password), locale));
                 } else {
                     Boolean binaryTransfer = (Boolean) context.get("binaryTransfer");
                     boolean binary = (binaryTransfer == null) ? false : binaryTransfer;
@@ -166,14 +171,16 @@ public class FtpServices {
                         ftp.enterLocalPassiveMode();
                     }
                     if (!ftp.retrieveFile((String) context.get("remoteFilename"), localFile)) {
-                        errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpFileNotSentSuccesfully", UtilMisc.toMap("replyString", ftp.getReplyString()), locale));
+                        errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpFileNotSentSuccesfully",
+                                UtilMisc.toMap("replyString", ftp.getReplyString()), locale));
                     }
                 }
                 ftp.logout();
             }
         } catch (IOException ioe) {
             Debug.logWarning(ioe, "[getFile] caught exception: " + ioe.getMessage(), MODULE);
-            errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpProblemWithTransfer", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
+            errorList.add(UtilProperties.getMessage(RESOURCE, "CommonFtpProblemWithTransfer", UtilMisc.toMap("errorString",
+                    ioe.getMessage()), locale));
         } finally {
             try {
                 if (ftp.isConnected()) {
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java b/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java
index 3f297bd..6dd8472 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java
@@ -89,7 +89,8 @@ public final class KeywordSearchUtil {
         return stemSet;
     }
 
-    public static void processForKeywords(String str, Map<String, Long> keywords, boolean forSearch, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+    public static void processForKeywords(String str, Map<String, Long> keywords, boolean forSearch, boolean anyPrefix,
+                                          boolean anySuffix, boolean isAnd) {
         String separators = getSeparators();
         String stopWordBagOr = getStopWordBagOr();
         String stopWordBagAnd = getStopWordBagAnd();
@@ -100,23 +101,28 @@ public final class KeywordSearchUtil {
         processForKeywords(str, keywords, separators, stopWordBagAnd, stopWordBagOr, removeStems, stemSet, forSearch, anyPrefix, anySuffix, isAnd);
     }
 
-    public static void processKeywordsForIndex(String str, Map<String, Long> keywords, String separators, String stopWordBagAnd, String stopWordBagOr, boolean removeStems, Set<String> stemSet) {
+    public static void processKeywordsForIndex(String str, Map<String, Long> keywords, String separators, String stopWordBagAnd, String
+            stopWordBagOr, boolean removeStems, Set<String> stemSet) {
         processForKeywords(str, keywords, separators, stopWordBagAnd, stopWordBagOr, removeStems, stemSet, false, false, false, false);
     }
 
-    public static void processForKeywords(String str, Map<String, Long> keywords, String separators, String stopWordBagAnd, String stopWordBagOr, boolean removeStems, Set<String> stemSet, boolean forSearch, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+    public static void processForKeywords(String str, Map<String, Long> keywords, String separators, String stopWordBagAnd, String stopWordBagOr,
+                                          boolean removeStems, Set<String> stemSet, boolean forSearch, boolean anyPrefix, boolean anySuffix, boolean
+                                                  isAnd) {
         Set<String> keywordSet = makeKeywordSet(str, separators, forSearch);
         fixupKeywordSet(keywordSet, keywords, stopWordBagAnd, stopWordBagOr, removeStems, stemSet, forSearch, anyPrefix, anySuffix, isAnd);
     }
 
-    public static void fixupKeywordSet(Set<String> keywordSet, Map<String, Long> keywords, String stopWordBagAnd, String stopWordBagOr, boolean removeStems, Set<String> stemSet, boolean forSearch, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+    public static void fixupKeywordSet(Set<String> keywordSet, Map<String, Long> keywords, String stopWordBagAnd, String stopWordBagOr, boolean
+            removeStems, Set<String> stemSet, boolean forSearch, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
         if (keywordSet == null) {
             return;
         }
 
         for (String token: keywordSet) {
 
-            // when cleaning up the tokens the ordering is inportant: check stop words, remove stems, then get rid of 1 character tokens (1 digit okay)
+            // when cleaning up the tokens the ordering is inportant: check stop words, remove stems, then get rid of 1 character
+            // tokens (1 digit okay)
 
             // check stop words
             String colonToken = ":" + token + ":";
@@ -219,7 +225,7 @@ public final class KeywordSearchUtil {
             }
         }
         return keywords;
-}
+    }
 
     public static Set<String> fixKeywordsForSearch(Set<String> keywordSet, boolean anyPrefix, boolean anySuffix, boolean removeStems, boolean isAnd) {
         Map<String, Long> keywords = new LinkedHashMap<>();
@@ -231,7 +237,8 @@ public final class KeywordSearchUtil {
         boolean replaceEnteredKeyword = false;
 
         try {
-            List<GenericValue> thesaurusList = EntityQuery.use(delegator).from("KeywordThesaurus").where("enteredKeyword", enteredKeyword).cache(true).queryList();
+            List<GenericValue> thesaurusList = EntityQuery.use(delegator).from("KeywordThesaurus").where("enteredKeyword", enteredKeyword)
+                    .cache(true).queryList();
             for (GenericValue keywordThesaurus: thesaurusList) {
                 String relationshipEnumId = (String) keywordThesaurus.get("relationshipEnumId");
                 if (thesaurusRelsToInclude.contains(relationshipEnumId)) {
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 9384fca..4356517 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
@@ -206,7 +206,8 @@ public class EmailServices {
                 socketFactoryFallback = EntityUtilProperties.getPropertyValue("general", "mail.smtp.socketFactory.fallback", "false", delegator);
             }
             if (sendPartial == null) {
-                sendPartial = EntityUtilProperties.propertyValueEqualsIgnoreCase("general", "mail.smtp.sendpartial", "true", delegator) ? true : false;
+                sendPartial = EntityUtilProperties.propertyValueEqualsIgnoreCase("general", "mail.smtp.sendpartial", "true", delegator)
+                        ? true : false;
             }
             if (isStartTLSEnabled == null) {
                 isStartTLSEnabled = EntityUtilProperties.propertyValueEqualsIgnoreCase("general", "mail.smtp.starttls.enable", "true", delegator);
@@ -313,16 +314,19 @@ public class EmailServices {
                 mail.saveChanges();
             }
         } catch (MessagingException e) {
-            Debug.logError(e, "MessagingException when creating message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc + "] bcc [" + sendBcc + "] subject [" + subject + "]", MODULE);
+            Debug.logError(e, "MessagingException when creating message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc + "] bcc ["
+                    + sendBcc + "] subject [" + subject + "]", MODULE);
             Debug.logError("Email message that could not be created to [" + sendTo + "] had context: " + context, MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendMessagingException", UtilMisc.toMap("sendTo", sendTo, "sendFrom", sendFrom, "sendCc", sendCc, "sendBcc", sendBcc, "subject", subject), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendMessagingException", UtilMisc.toMap("sendTo",
+                    sendTo, "sendFrom", sendFrom, "sendCc", sendCc, "sendBcc", sendBcc, "subject", subject), locale));
         }
 
         // check to see if sending mail is enabled
         String mailEnabled = EntityUtilProperties.getPropertyValue("general", "mail.notifications.enabled", "N", delegator);
         if (!"Y".equalsIgnoreCase(mailEnabled)) {
             // no error; just return as if we already processed
-            Debug.logImportant("Mail notifications disabled in general.properties; mail with subject [" + subject + "] not sent to addressee [" + sendTo + "]", MODULE);
+            Debug.logImportant("Mail notifications disabled in general.properties; mail with subject [" + subject + "] not sent to addressee ["
+                    + sendTo + "]", MODULE);
             if (Debug.verboseOn()) {
                 Debug.logVerbose("What would have been sent, the addressee: " + sendTo + " subject: " + subject + " context: " + context, MODULE);
             }
@@ -344,13 +348,15 @@ public class EmailServices {
             trans.close();
         } catch (SendFailedException e) {
             // message code prefix may be used by calling services to determine the cause of the failure
-            Debug.logError(e, "[ADDRERR] Address error when sending message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc + "] bcc [" + sendBcc + "] subject [" + subject + "]", MODULE);
+            Debug.logError(e, "[ADDRERR] Address error when sending message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc
+                    + "] bcc [" + sendBcc + "] subject [" + subject + "]", MODULE);
             List<SMTPAddressFailedException> failedAddresses = new LinkedList<>();
             Exception nestedException = null;
             while ((nestedException = e.getNextException()) != null && nestedException instanceof MessagingException) {
                 if (nestedException instanceof SMTPAddressFailedException) {
                     SMTPAddressFailedException safe = (SMTPAddressFailedException) nestedException;
-                    Debug.logError("Failed to send message to [" + safe.getAddress() + "], return code [" + safe.getReturnCode() + "], return message [" + safe.getMessage() + "]", MODULE);
+                    Debug.logError("Failed to send message to [" + safe.getAddress() + "], return code [" + safe.getReturnCode()
+                            + "], return message [" + safe.getMessage() + "]", MODULE);
                     failedAddresses.add(safe);
                     break;
                 }
@@ -366,13 +372,16 @@ public class EmailServices {
                     Debug.logError(e1, MODULE);
                 }
             } else {
-                return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendAddressError", UtilMisc.toMap("sendTo", sendTo, "sendFrom", sendFrom, "sendCc", sendCc, "sendBcc", sendBcc, "subject", subject), locale));
+                return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendAddressError", UtilMisc.toMap("sendTo",
+                        sendTo, "sendFrom", sendFrom, "sendCc", sendCc, "sendBcc", sendBcc, "subject", subject), locale));
             }
         } catch (MessagingException e) {
             // message code prefix may be used by calling services to determine the cause of the failure
-            Debug.logError(e, "[CON] Connection error when sending message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc + "] bcc [" + sendBcc + "] subject [" + subject + "]", MODULE);
+            Debug.logError(e, "[CON] Connection error when sending message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc
+                    + "] bcc [" + sendBcc + "] subject [" + subject + "]", MODULE);
             Debug.logError("Email message that could not be sent to [" + sendTo + "] had context: " + context, MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendConnectionError", UtilMisc.toMap("sendTo", sendTo, "sendFrom", sendFrom, "sendCc", sendCc, "sendBcc", sendBcc, "subject", subject), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendConnectionError", UtilMisc.toMap("sendTo",
+                    sendTo, "sendFrom", sendFrom, "sendCc", sendCc, "sendBcc", sendBcc, "subject", subject), locale));
         }
         return results;
     }
@@ -397,7 +406,8 @@ public class EmailServices {
             url = new URL(bodyUrl);
         } catch (MalformedURLException e) {
             Debug.logWarning(e, MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendMalformedUrl", UtilMisc.toMap("bodyUrl", bodyUrl, "errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendMalformedUrl", UtilMisc.toMap("bodyUrl",
+                    bodyUrl, "errorString", e.toString()), locale));
         }
 
         HttpClient httpClient = new HttpClient(url, bodyUrlParameters);
@@ -407,7 +417,8 @@ public class EmailServices {
             body = httpClient.post();
         } catch (HttpClientException e) {
             Debug.logWarning(e, MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendGettingError", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendGettingError", UtilMisc.toMap("errorString",
+                    e.toString()), locale));
         }
 
         sendMailContext.put("body", body);
@@ -503,7 +514,8 @@ public class EmailServices {
             screenStringRenderer = new MacroScreenRenderer(visualTheme.getModelTheme(), "screen");
         } catch (TemplateException | IOException e) {
             Debug.logError("Error rendering screen for email: " + e.toString(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendRenderingScreenEmailError", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendRenderingScreenEmailError",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         }
         ScreenRenderer screens = new ScreenRenderer(bodyWriter, screenContext, screenStringRenderer);
         screens.populateContextForService(dctx, bodyParameters);
@@ -514,7 +526,8 @@ public class EmailServices {
                 screens.render(bodyScreenUri);
             } catch (GeneralException | IOException | SAXException | ParserConfigurationException e) {
                 Debug.logError(e, "Error rendering screen for email: " + e.toString(), MODULE);
-                return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendRenderingScreenEmailError", UtilMisc.toMap("errorString", e.toString()), locale));
+                return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendRenderingScreenEmailError",
+                        UtilMisc.toMap("errorString", e.toString()), locale));
             }
         }
 
@@ -525,9 +538,11 @@ public class EmailServices {
             List<Map<String, ? extends Object>> bodyParts = new LinkedList<>();
             if (bodyText != null) {
                 bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale);
-                bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", UtilValidate.isNotEmpty(contentType) ? contentType : "text/html"));
+                bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", UtilValidate.isNotEmpty(contentType) ? contentType
+                        : "text/html"));
             } else {
-                bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyWriter.toString(), "type", UtilValidate.isNotEmpty(contentType) ? contentType : "text/html"));
+                bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyWriter.toString(), "type", UtilValidate.isNotEmpty(contentType)
+                        ? contentType : "text/html"));
             }
             for (int i = 0; i < xslfoAttachScreenLocationList.size(); i++) {
                 String xslfoAttachScreenLocation = xslfoAttachScreenLocationList.get(i);
@@ -636,7 +651,8 @@ public class EmailServices {
             }
         } catch (Exception e) {
             Debug.logError(e, "Error send email:" + e.toString(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendError", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendError",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         }
         if (ServiceUtil.isError(sendMailResult)) {
             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(sendMailResult));
@@ -670,7 +686,8 @@ public class EmailServices {
         serviceContext.put("hideInLog", true);
         return sendMailFromScreen(dctx, serviceContext);
     }
-    public static void sendFailureNotification(DispatchContext dctx, Map<String, ? extends Object> context, MimeMessage message, List<SMTPAddressFailedException> failures) {
+    public static void sendFailureNotification(DispatchContext dctx, Map<String, ? extends Object> context, MimeMessage message,
+                                               List<SMTPAddressFailedException> failures) {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> newContext = new LinkedHashMap<>();
         newContext.put("userLogin", context.get("userLogin"));
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
index c8c9ea3..ed16f4e 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
@@ -121,7 +121,8 @@ public final class GeoWorker {
         return geoList.contains(geo);
     }
 
-    public static GenericValue findLatestGeoPoint(Delegator delegator, String entityName, String mainId, String mainValueId, String secondId, String secondValueId) {
+    public static GenericValue findLatestGeoPoint(Delegator delegator, String entityName, String mainId, String mainValueId, String secondId,
+                                                  String secondValueId) {
         List<GenericValue> gptList = null;
         if (UtilValidate.isNotEmpty(secondId) && UtilValidate.isNotEmpty(secondValueId)) {
             try {
@@ -131,7 +132,8 @@ public final class GeoWorker {
                                      .orderBy("-fromDate")
                                      .queryList();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Error while finding latest GeoPoint for " + mainId + " with Id [" + mainValueId + "] and " + secondId + " Id [" + secondValueId + "] " + e.toString(), MODULE);
+                Debug.logError(e, "Error while finding latest GeoPoint for " + mainId + " with Id [" + mainValueId + "] and " + secondId
+                        + " Id [" + secondValueId + "] " + e.toString(), MODULE);
             }
         } else {
             try {
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
index 3257afb..2afe037 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
@@ -65,7 +65,7 @@ public class ImageTransform {
      * @throws  IOException Error prevents the document from being fully parsed
      * @throws  IllegalArgumentException Errors occur in parsing
      */
-    public static  Map<String, Object> getBufferedImage(String fileLocation, Locale locale)
+    public static Map<String, Object> getBufferedImage(String fileLocation, Locale locale)
         throws IllegalArgumentException, IOException {
 
         /* VARIABLES */
@@ -81,7 +81,8 @@ public class ImageTransform {
             result.put(ModelService.ERROR_MESSAGE, errMsg);
             return result;
         } catch (IOException e) {
-            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.error_occurs_during_reading", locale) + " : " + fileLocation + "; " + e.toString();
+            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.error_occurs_during_reading", locale) + " : "
+                    + fileLocation + "; " + e.toString();
             Debug.logError(errMsg, MODULE);
             result.put(ModelService.ERROR_MESSAGE, errMsg);
             return result;
@@ -104,11 +105,14 @@ public class ImageTransform {
      * @param   sizeType        Size type to scale
      * @return                  New scaled buffered image
      */
-    public static Map<String, Object> scaleImage(BufferedImage bufImg, double imgHeight, double imgWidth, Map<String, Map<String, String>> dimensionMap, String sizeType, Locale locale) {
+    public static Map<String, Object> scaleImage(BufferedImage bufImg, double imgHeight, double imgWidth, Map<String, Map<String, String>>
+            dimensionMap, String sizeType, Locale locale) {
 
         /* VARIABLES */
         BufferedImage bufNewImg;
-        double defaultHeight, defaultWidth, scaleFactor;
+        double defaultHeight;
+        double defaultWidth;
+        double scaleFactor;
         Map<String, Object> result = new LinkedHashMap<>();
 
         /* DIMENSIONS from ImageProperties */
@@ -124,7 +128,8 @@ public class ImageTransform {
             defaultWidth = -1;
         }
         if (defaultHeight == 0.0 || defaultWidth == 0.0) {
-            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.one_default_dimension_is_null", locale) + " : defaultHeight = " + defaultHeight + "; defaultWidth = " + defaultWidth;
+            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.one_default_dimension_is_null", locale)
+                    + " : defaultHeight = " + defaultHeight + "; defaultWidth = " + defaultWidth;
             Debug.logError(errMsg, MODULE);
             result.put(ModelService.ERROR_MESSAGE, errMsg);
             return result;
@@ -135,7 +140,8 @@ public class ImageTransform {
         if (defaultHeight == -1) {
             scaleFactor = defaultWidth / imgWidth;
             if (scaleFactor == 0.0) {
-                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.width_scale_factor_is_null", locale) + "  (defaultWidth = " + defaultWidth + "; imgWidth = " + imgWidth;
+                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.width_scale_factor_is_null", locale)
+                        + "  (defaultWidth = " + defaultWidth + "; imgWidth = " + imgWidth;
                 Debug.logError(errMsg, MODULE);
                 result.put(ModelService.ERROR_MESSAGE, errMsg);
                 return result;
@@ -143,7 +149,8 @@ public class ImageTransform {
         } else if (defaultWidth == -1) {
             scaleFactor = defaultHeight / imgHeight;
             if (scaleFactor == 0.0) {
-                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.height_scale_factor_is_null", locale) + "  (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight;
+                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.height_scale_factor_is_null", locale)
+                        + "  (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight;
                 Debug.logError(errMsg, MODULE);
                 result.put(ModelService.ERROR_MESSAGE, errMsg);
                 return result;
@@ -151,7 +158,8 @@ public class ImageTransform {
         } else if (imgHeight > imgWidth) {
             scaleFactor = defaultHeight / imgHeight;
             if (scaleFactor == 0.0) {
-                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.height_scale_factor_is_null", locale) + "  (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight;
+                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.height_scale_factor_is_null", locale)
+                        + "  (defaultHeight = " + defaultHeight + "; imgHeight = " + imgHeight;
                 Debug.logError(errMsg, MODULE);
                 result.put(ModelService.ERROR_MESSAGE, errMsg);
                 return result;
@@ -163,7 +171,8 @@ public class ImageTransform {
         } else {
             scaleFactor = defaultWidth / imgWidth;
             if (scaleFactor == 0.0) {
-                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.width_scale_factor_is_null", locale) + "  (defaultWidth = " + defaultWidth + "; imgWidth = " + imgWidth;
+                String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.width_scale_factor_is_null", locale)
+                        + "  (defaultWidth = " + defaultWidth + "; imgWidth = " + imgWidth;
                 Debug.logError(errMsg, MODULE);
                 result.put(ModelService.ERROR_MESSAGE, errMsg);
                 return result;
@@ -209,7 +218,7 @@ public class ImageTransform {
      * @param fileFullPath      File path to parse
      * @return Map contains asked attribute values by attribute name
      */
-    public static  Map<String, Object> getXMLValue(String fileFullPath, Locale locale)
+    public static Map<String, Object> getXMLValue(String fileFullPath, Locale locale)
         throws IllegalStateException, IOException {
 
         /* VARIABLES */
@@ -222,12 +231,14 @@ public class ImageTransform {
         try {
             document = UtilXml.readXmlDocument(new FileInputStream(fileFullPath), fileFullPath);
         } catch (ParserConfigurationException | SAXException e) {
-            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.errors_occurred_during_parsing", locale) +  " ImageProperties.xml " + e.toString();
+            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.errors_occurred_during_parsing", locale)
+                    + " ImageProperties.xml " + e.toString();
             Debug.logError(errMsg, MODULE);
             result.put(ModelService.ERROR_MESSAGE, "error");
             return result;
         } catch (IOException e) {
-            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.error_prevents_the document_from_being_fully_parsed", locale) + e.toString();
+            String errMsg = UtilProperties.getMessage(RESOURCE, "ImageTransform.error_prevents_the document_from_being_fully_parsed",
+                    locale) + e.toString();
             Debug.logError(errMsg, MODULE);
             result.put(ModelService.ERROR_MESSAGE, "error");
             return result;
@@ -243,7 +254,9 @@ public class ImageTransform {
         }
 
         /* get NAME and VALUE */
-        List<? extends Element> children = UtilXml.childElementList(rootElt); // FIXME : despite upgrading to jdom 1.1, it seems that getChildren is pre 1.5 java code (ie getChildren does not retun List<Element> but only List)
+        List<? extends Element> children = UtilXml.childElementList(rootElt);
+        // FIXME : despite upgrading to jdom 1.1, it seems that getChildren is pre 1.5 java code (ie getChildren does not retun List<Element>
+        //  but only List)
         for (Element currentElt : children) {
             Map<String, String> eltMap = new LinkedHashMap<>();
             List<? extends Element> children2 = UtilXml.childElementList(currentElt);
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java
index b1fcde4..3d6eb7f 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java
@@ -127,10 +127,12 @@ public class PreferenceServices {
         Map<String, Object> userPrefMap = null;
         try {
             Map<String, String> fieldMap = UtilMisc.toMap("userLoginId", "_NA_", "userPrefGroupTypeId", userPrefGroupTypeId);
-            userPrefMap = PreferenceWorker.createUserPrefMap(EntityQuery.use(delegator).from("UserPreference").where(fieldMap).cache(true).queryList());
+            userPrefMap = PreferenceWorker.createUserPrefMap(EntityQuery.use(delegator).from("UserPreference").where(fieldMap)
+                    .cache(true).queryList());
             if (userLoginId != null) {
                 fieldMap.put("userLoginId", userLoginId);
-                userPrefMap.putAll(PreferenceWorker.createUserPrefMap(EntityQuery.use(delegator).from("UserPreference").where(fieldMap).cache(true).queryList()));
+                userPrefMap.putAll(PreferenceWorker.createUserPrefMap(EntityQuery.use(delegator).from("UserPreference")
+                        .where(fieldMap).cache(true).queryList()));
             }
         } catch (GeneralException e) {
             Debug.logWarning(e.getMessage(), MODULE);
@@ -177,7 +179,8 @@ public class PreferenceServices {
             if (UtilValidate.isNotEmpty(userPrefDataType)) {
                 userPrefValue = ObjectType.simpleTypeOrObjectConvert(userPrefValue, userPrefDataType, null, null, false);
             }
-            GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, userPrefTypeId, userPrefGroupTypeId, userPrefValue));
+            GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, userPrefTypeId,
+                    userPrefGroupTypeId, userPrefValue));
             delegator.createOrStore(rec);
         } catch (GeneralException e) {
             Debug.logWarning(e.getMessage(), MODULE);
@@ -235,7 +238,8 @@ public class PreferenceServices {
 
         try {
             for (Map.Entry<String, Object> mapEntry: userPrefMap.entrySet()) {
-                GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, mapEntry.getKey(), userPrefGroupTypeId, mapEntry.getValue()));
+                GenericValue rec = delegator.makeValidValue("UserPreference", PreferenceWorker.toFieldMap(userLoginId, mapEntry.getKey(),
+                        userPrefGroupTypeId, mapEntry.getValue()));
                 delegator.createOrStore(rec);
             }
         } catch (GeneralException e) {
@@ -279,7 +283,8 @@ public class PreferenceServices {
             }
         } catch (GenericEntityException e) {
             Debug.logWarning(e.getMessage(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "copyPreference.writeFailure", new Object[] {e.getMessage() }, locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "copyPreference.writeFailure", new Object[] {e.getMessage() },
+                    locale));
         }
 
         return ServiceUtil.returnSuccess();
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java
index 52b517a..f63bb6a 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java
@@ -66,7 +66,8 @@ public final class PreferenceWorker {
             // default to String
             userPrefMap.put(rec.getString("userPrefTypeId"), rec.getString("userPrefValue"));
         } else {
-            userPrefMap.put(rec.getString("userPrefTypeId"), ObjectType.simpleTypeOrObjectConvert(rec.get("userPrefValue"), prefDataType, null, null, false));
+            userPrefMap.put(rec.getString("userPrefTypeId"), ObjectType.simpleTypeOrObjectConvert(rec.get("userPrefValue"),
+                    prefDataType, null, null, false));
         }
         return userPrefMap;
     }
@@ -250,8 +251,10 @@ public final class PreferenceWorker {
      * @throws GeneralException
      * @return field map
      */
-    public static Map<String, Object> toFieldMap(String userLoginId, String userPrefTypeId, String userPrefGroupTypeId, Object userPrefValue) throws GeneralException {
-        Map<String, Object> fieldMap = UtilMisc.toMap("userLoginId", userLoginId, "userPrefTypeId", userPrefTypeId, "userPrefValue", ObjectType.simpleTypeOrObjectConvert(userPrefValue, "String", null, null, false));
+    public static Map<String, Object> toFieldMap(String userLoginId, String userPrefTypeId, String userPrefGroupTypeId, Object userPrefValue)
+            throws GeneralException {
+        Map<String, Object> fieldMap = UtilMisc.toMap("userLoginId", userLoginId, "userPrefTypeId", userPrefTypeId, "userPrefValue",
+                ObjectType.simpleTypeOrObjectConvert(userPrefValue, "String", null, null, false));
         if (UtilValidate.isNotEmpty(userPrefGroupTypeId)) {
             fieldMap.put("userPrefGroupTypeId", userPrefGroupTypeId);
         }
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java
index 035ec65..3cfb0d0 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java
@@ -79,7 +79,8 @@ public class QRCodeEvents {
         try {
             response.setContentType(mimeType);
             OutputStream os = response.getOutputStream();
-            Map<String, Object> context = UtilMisc.<String, Object>toMap("message", message, "format", format, "userLogin", userLogin, "locale", locale);
+            Map<String, Object> context = UtilMisc.<String, Object>toMap("message", message, "format", format, "userLogin", userLogin,
+                    "locale", locale);
             if (UtilValidate.isNotEmpty(width)) {
                 try {
                     context.put("width", Integer.parseInt(width));
@@ -132,7 +133,7 @@ public class QRCodeEvents {
             if (ServiceUtil.isSuccess(results)) {
                 BufferedImage bufferedImage = (BufferedImage) results.get("bufferedImage");
                 if (!ImageIO.write(bufferedImage, format, os)) {
-                    String errMsg = UtilProperties.getMessage("QRCodeUiLabels", "ErrorWriteFormatToFile", new Object[] { format }, locale);
+                    String errMsg = UtilProperties.getMessage("QRCodeUiLabels", "ErrorWriteFormatToFile", new Object[] {format }, locale);
                     request.setAttribute("_ERROR_MESSAGE_", errMsg);
                     return "error";
                 }
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
index a81a98e..4ec0302 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
@@ -54,8 +54,10 @@ public class TelecomServices {
         String message = (String) context.get("message");
         String telecomEnabled = EntityUtilProperties.getPropertyValue("general", "telecom.notifications.enabled", delegator);
         if (!"Y".equals(telecomEnabled)) {
-            Debug.logImportant("Telecom message not sent to " + numbers.toString() +" because telecom.notifications.enabled property is set to N or empty", MODULE);
-            return ServiceUtil.returnSuccess("Telecom message not sent to " + numbers.toString() +" because sms.notifications.enabled property is set to N or empty");
+            Debug.logImportant("Telecom message not sent to " + numbers.toString()
+                    + " because telecom.notifications.enabled property is set to N or empty", MODULE);
+            return ServiceUtil.returnSuccess("Telecom message not sent to " + numbers.toString()
+                    + " because sms.notifications.enabled property is set to N or empty");
         }
 
         String redirectNumber = EntityUtilProperties.getPropertyValue("general", "telecom.notifications.redirectTo", delegator);
@@ -103,8 +105,9 @@ public class TelecomServices {
 
                     createCommEventCtx.clear();
                     createCommEventCtx.put("communicationEventId", communicationEventId);
-                    if (UtilValidate.isNotEmpty(createCommEventResult.get("response")))
+                    if (UtilValidate.isNotEmpty(createCommEventResult.get("response"))) {
                         createCommEventCtx.put("note", customMethodResult.get("response"));
+                    }
                     createCommEventCtx.put("statusId", "COM_COMPLETE");
                     createCommEventCtx.put("userLogin", userLogin);
                     dispatcher.runSync("updateCommunicationEvent", createCommEventCtx);
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 de76f17..1e4e357 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,8 @@ 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/Delegator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java
index 63574bc..73da59c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java
@@ -50,7 +50,7 @@ import org.xml.sax.SAXException;
 
 public interface Delegator {
 
-    enum OperationType {INSERT, UPDATE, DELETE}
+    enum OperationType { INSERT, UPDATE, DELETE }
 
     void clearAllCacheLinesByDummyPK(Collection<GenericPK> dummyPKs);
 
@@ -229,7 +229,8 @@ public interface Delegator {
      *         ARE DONE WITH IT, AND DON'T LEAVE IT OPEN TOO LONG BEACUSE IT
      *         WILL MAINTAIN A DATABASE CONNECTION.
      */
-    EntityListIterator find(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, Set<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions) throws GenericEntityException;
+    EntityListIterator find(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, Set<String>
+            fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions) throws GenericEntityException;
 
     /**
      * Finds all Generic entities
@@ -258,7 +259,8 @@ public interface Delegator {
      *            Whether to cache the results
      * @return List of GenericValue instances that match the query
      */
-    List<GenericValue> findByAnd(String entityName, Map<String, ? extends Object> fields, List<String> orderBy, boolean useCache) throws GenericEntityException;
+    List<GenericValue> findByAnd(String entityName, Map<String, ? extends Object> fields, List<String> orderBy, boolean useCache)
+            throws GenericEntityException;
 
     /**
      * Find a Generic Entity by its Primary Key and only returns the values
@@ -281,7 +283,8 @@ public interface Delegator {
      * @return long value with hit count
      * @throws GenericEntityException
      */
-    long findCountByCondition(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, EntityFindOptions findOptions) throws GenericEntityException;
+    long findCountByCondition(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition,
+                              EntityFindOptions findOptions) throws GenericEntityException;
 
     /**
      * Gets the hit count of GenericValues for the given EntityCondition objects.
@@ -317,7 +320,8 @@ public interface Delegator {
      *            options. See the EntityFindOptions JavaDoc for more details.
      * @return List of GenericValue objects representing the result
      */
-    List<GenericValue> findList(String entityName, EntityCondition entityCondition, Set<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions, boolean useCache) throws GenericEntityException;
+    List<GenericValue> findList(String entityName, EntityCondition entityCondition, Set<String> fieldsToSelect, List<String> orderBy,
+                                EntityFindOptions findOptions, boolean useCache) throws GenericEntityException;
 
     /**
      * Finds GenericValues by the conditions specified in the EntityCondition
@@ -376,7 +380,9 @@ public interface Delegator {
      *         LEAVE IT OPEN TOO LONG BEACUSE IT WILL MAINTAIN A DATABASE
      *         CONNECTION.
      */
-    EntityListIterator findListIteratorByCondition(DynamicViewEntity dynamicViewEntity, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions) throws GenericEntityException;
+    EntityListIterator findListIteratorByCondition(DynamicViewEntity dynamicViewEntity, EntityCondition whereEntityCondition,
+            EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
+            throws GenericEntityException;
 
     /**
      * Find a Generic Entity by its primary key.
@@ -540,7 +546,8 @@ public interface Delegator {
      * @return List of GenericValue instances as specified in the relation
      *         definition
      */
-    List<GenericValue> getMultiRelation(GenericValue value, String relationNameOne, String relationNameTwo, List<String> orderBy) throws GenericEntityException;
+    List<GenericValue> getMultiRelation(GenericValue value, String relationNameOne, String relationNameTwo, List<String> orderBy)
+            throws GenericEntityException;
 
     /**
      * Get the next guaranteed unique seq id from the sequence with the given
@@ -615,7 +622,8 @@ public interface Delegator {
      * @return List of GenericValue instances as specified in the relation
      *         definition
      */
-    List<GenericValue> getRelated(String relationName, Map<String, ? extends Object> byAndFields, List<String> orderBy, GenericValue value, boolean useCache) throws GenericEntityException;
+    List<GenericValue> getRelated(String relationName, Map<String, ? extends Object> byAndFields, List<String> orderBy, GenericValue value,
+                                  boolean useCache) throws GenericEntityException;
 
     /**
      * Get a dummy primary key for the named Related Entity for the GenericValue.
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 ca8af65..4e621d4 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
@@ -84,7 +84,7 @@ public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R
 
         // if this is an IN operator and the rhs Object isEmpty, add "1=0" instead of the normal SQL.
         // Note that "FALSE" does not work with all databases.
-        if (this.idInt == EntityOperator.ID_IN && UtilValidate.isEmpty(rhs)) {
+        if (this.getId() == EntityOperator.ID_IN && UtilValidate.isEmpty(rhs)) {
             sql.append("1=0");
             return;
         }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java
index ce1b1fa..ecc67f9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java
@@ -57,10 +57,11 @@ public class EntityConditionSubSelect extends EntityConditionValue {
     }
 
     @Override
-    public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity parentModelEntity, List<EntityConditionParam> entityConditionParams,
-            boolean includeTableNamePrefix, Datasource datasourceInfo) {
+    public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity parentModelEntity, List<EntityConditionParam>
+            entityConditionParams, boolean includeTableNamePrefix, Datasource datasourceInfo) {
         if (localModelEntity instanceof ModelViewEntity && datasourceInfo == null) {
-            throw new IllegalArgumentException("Call to EntityConditionSubSelect.addSqlValue with datasourceInfo=null which is not allowed because the local entity [" + this.localModelEntity.getEntityName() + "] is a view entity");
+            throw new IllegalArgumentException("Call to EntityConditionSubSelect.addSqlValue with datasourceInfo=null which is not allowed "
+                    + "because the local entity [" + this.localModelEntity.getEntityName() + "] is a view entity");
         }
         try {
             // add select and where and such, based on local entity not on the main entity
@@ -117,10 +118,18 @@ public class EntityConditionSubSelect extends EntityConditionValue {
         return new EntityConditionSubSelect(localModelEntity, keyFieldName, (whereCond != null ? whereCond.freeze() : null), requireAll);
     }
 
+    /**
+     * Gets key field name.
+     * @return the key field name
+     */
     public String getKeyFieldName() {
         return this.keyFieldName;
     }
 
+    /**
+     * Gets model entity.
+     * @return the model entity
+     */
     public ModelEntity getModelEntity() {
         return this.localModelEntity;
     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
index 6e9baa3..1d3ef93 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
@@ -51,7 +51,8 @@ public abstract class EntityConditionValue implements Serializable {
         }
 
         @Override
-        public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix, Datasource datasourceinfo) {
+        public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam>
+                entityConditionParams, boolean includeTableNamePrefix, Datasource datasourceinfo) {
             sql.append(value);
         }
 
@@ -92,16 +93,21 @@ public abstract class EntityConditionValue implements Serializable {
      * @param includeTableNamePrefix the include table name prefix
      * @param datasourceinfo the datasourceinfo
      */
-    public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix,
-            Datasource datasourceinfo) {
+    public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams,
+                            boolean includeTableNamePrefix, Datasource datasourceinfo) {
         addSqlValue(sql, EMPTY_ALIASES, modelEntity, entityConditionParams, includeTableNamePrefix, datasourceinfo);
     }
 
-    public abstract void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams,
-            boolean includeTableNamePrefix, Datasource datasourceinfo);
+    public abstract void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam>
+            entityConditionParams, boolean includeTableNamePrefix, Datasource datasourceinfo);
 
     public abstract void validateSql(ModelEntity modelEntity) throws GenericModelException;
 
+    /**
+     * Gets value.
+     * @param entity the entity
+     * @return the value
+     */
     public Object getValue(GenericEntity entity) {
         if (entity == null) {
             return null;
@@ -113,6 +119,10 @@ public abstract class EntityConditionValue implements Serializable {
 
     public abstract EntityConditionValue freeze();
 
+    /**
+     * To string.
+     * @param sb the sb
+     */
     public void toString(StringBuilder sb) {
         addSqlValue(sb, null, new ArrayList<EntityConditionParam>(), false, null);
     }
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 5c5dc5d..8cfc8a0 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
@@ -256,12 +256,12 @@ public final class EntityExpr implements EntityCondition {
             } catch (ClassNotFoundException e) {
                 String msg = "Warning using [" + value.getClass().getName() + "]"
                         + " and entity field [" + modelEntity.getEntityName() + "." + curField.getName() + "]."
-                        + " The Java type of keyFieldName : [" + valueType.getJavaType()+ "] could not be found]";
+                        + " The Java type of keyFieldName : [" + valueType.getJavaType() + "] could not be found]";
                 // Eventually we should do this, but for now we'll do a "soft" failure:
                 // throw new IllegalArgumentException(msg);
                 Debug.logWarning(e, "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr =-=-=-=-=-=-=-=-= " + msg,
                         MODULE);
-             }
+            }
         } else if (value instanceof EntityFieldValue) {
             EntityFieldValue efv = (EntityFieldValue) lhs;
             String rhsFieldName = efv.getFieldName();
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
index 7d6ec10..d81ec0d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
@@ -56,7 +56,8 @@ public class EntityFieldValue extends EntityConditionValue {
         return efv;
     }
 
-    public static EntityFieldValue makeFieldValue(String fieldName, String entityAlias, List<String> entityAliasStack, ModelViewEntity modelViewEntity) {
+    public static EntityFieldValue makeFieldValue(String fieldName, String entityAlias, List<String> entityAliasStack,
+                                                  ModelViewEntity modelViewEntity) {
         EntityFieldValue efv = new EntityFieldValue();
         efv.init(fieldName, entityAlias, entityAliasStack, modelViewEntity);
         return efv;
@@ -78,7 +79,8 @@ public class EntityFieldValue extends EntityConditionValue {
         }
         this.modelViewEntity = modelViewEntity;
         if (UtilValidate.isNotEmpty(this.entityAliasStack) && UtilValidate.isEmpty(this.entityAlias)) {
-            // look it up on the view entity so it can be part of the big list, this only happens for aliased fields, so find the entity-alias and field-name for the alias
+            // look it up on the view entity so it can be part of the big list, this only happens for aliased fields, so find
+            // the entity-alias and field-name for the alias
             ModelAlias modelAlias = this.modelViewEntity.getAlias(this.fieldName);
             if (modelAlias != null) {
                 this.entityAlias = modelAlias.getEntityAlias();
@@ -153,13 +155,15 @@ public class EntityFieldValue extends EntityConditionValue {
     public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity,
                             List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix, Datasource datasourceInfo) {
         if (this.modelViewEntity != null) {
-            // NOTE: this section is a bit of a hack; the other code is terribly complex and really needs to be refactored to incorporate support for this
+            // NOTE: this section is a bit of a hack; the other code is terribly complex and really needs to be refactored to
+            // incorporate support for this
 
             if (UtilValidate.isNotEmpty(entityAlias)) {
                 ModelEntity memberModelEntity = modelViewEntity.getMemberModelEntity(entityAlias);
                 ModelField modelField = memberModelEntity.getField(fieldName);
 
-                // using entityAliasStack (ordered top to bottom) build a big long alias; not that dots will be replaced after it is combined with the column name in the SQL gen
+                // using entityAliasStack (ordered top to bottom) build a big long alias; not that dots will be replaced after it is
+                // combined with the column name in the SQL gen
                 if (UtilValidate.isNotEmpty(this.entityAliasStack)) {
                     boolean dotUsed = false;
                     for (String curEntityAlias: entityAliasStack) {
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 915e8f4..b226764 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
@@ -174,8 +174,8 @@ public abstract class EntityOperator<L, R> implements Serializable {
         register("lessThanEqualTo", LESS_THAN_EQUAL_TO); }
     static {
         register("<=", LESS_THAN_EQUAL_TO); }
-    public static final EntityComparisonOperator<?, ?> GREATER_THAN_EQUAL_TO = new ComparableEntityComparisonOperator<Object>(ID_GREATER_THAN_EQUAL_TO,
-            ">=") {
+    public static final EntityComparisonOperator<?, ?> GREATER_THAN_EQUAL_TO = new ComparableEntityComparisonOperator<Object>(
+            ID_GREATER_THAN_EQUAL_TO, ">=") {
         @Override
         public boolean compare(Comparable<Object> lhs, Object rhs) {
             return EntityComparisonOperator.compareGreaterThanEqualTo(lhs, rhs); }
@@ -253,8 +253,8 @@ public abstract class EntityOperator<L, R> implements Serializable {
         register("not-in", NOT_IN);
     }
 
-    protected int idInt;
-    protected String codeString;
+    private int idInt;
+    private String codeString;
 
     public EntityOperator(int id, String code) {
         idInt = id;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
index 67baa5c..c70bf48 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
@@ -65,12 +65,14 @@ public final class EntityWhereString implements EntityCondition {
     }
 
     @Override
-    public void checkCondition(ModelEntity modelEntity) throws GenericModelException { // no nothing, this is always assumed to be fine... could do funky SQL syntax checking, but hey this is a HACK anyway
+    public void checkCondition(ModelEntity modelEntity) throws GenericModelException { // no nothing, this is always assumed to be fine...
+        // could do funky SQL syntax checking, but hey this is a HACK anyway
     }
 
     @Override
     public boolean entityMatches(GenericEntity entity) {
-        throw new UnsupportedOperationException("Cannot do entityMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString);
+        throw new UnsupportedOperationException("Cannot do entityMatches on a WhereString, ie no SQL evaluation in EE; Where String is: "
+                + sqlString);
     }
 
     @Override
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
index 0a29687..977c8b0 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
@@ -220,7 +220,8 @@ public final class Datasource {
             jdbcElementCount++;
         }
         if (jdbcElementCount > 1) {
-            throw new GenericEntityConfException("<datasource> element is invalid: Only one of <inline-jdbc>, <jndi-jdbc>, <tyrex-dataSource> is allowed" + lineNumberText);
+            throw new GenericEntityConfException("<datasource> element is invalid: Only one of <inline-jdbc>, <jndi-jdbc>, "
+                    + "<tyrex-dataSource> is allowed" + lineNumberText);
         }
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java
index 5556a25..6f62127 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java
@@ -118,7 +118,8 @@ public final class InlineJdbc extends JdbcElement {
             try {
                 this.softMinEvictableIdleTimeMillis = Integer.parseInt(softMinEvictableIdleTimeMillis);
             } catch (Exception e) {
-                throw new GenericEntityConfException("<inline-jdbc> element soft-min-evictable-idle-time-millis attribute is invalid" + lineNumberText);
+                throw new GenericEntityConfException("<inline-jdbc> element soft-min-evictable-idle-time-millis attribute is invalid"
+                        + lineNumberText);
             }
         }
         String poolSleeptime = element.getAttribute("pool-sleeptime");
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
index af2980a..e3bfb3c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
@@ -43,16 +43,24 @@ public class DebugManagedDataSource<C extends Connection> extends ManagedDataSou
         if (Debug.verboseOn()) {
             if (super.getPool() instanceof GenericObjectPool) {
                 GenericObjectPool<?> objectPool = (GenericObjectPool<?>) super.getPool();
-                Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + objectPool.getNumActive() + "/" + objectPool.getNumIdle() + "/" + (objectPool.getNumActive() + objectPool.getNumIdle()) + "; min idle/max idle/max total: " + objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() + "/" + objectPool.getMaxTotal(), MODULE);
+                Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + objectPool.getNumActive()
+                        + "/" + objectPool.getNumIdle() + "/" + (objectPool.getNumActive() + objectPool.getNumIdle())
+                        + "; min idle/max idle/max total: " + objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() + "/"
+                        + objectPool.getMaxTotal(), MODULE);
             } else {
                 if (Debug.verboseOn()) {
-                    Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + super.getPool().getNumActive() + "/" + super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() + super.getPool().getNumIdle()), MODULE);
+                    Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + super.getPool().getNumActive()
+                            + "/" + super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() + super.getPool().getNumIdle()), MODULE);
                 }
             }
         }
         return super.getConnection();
     }
 
+    /**
+     * Gets info.
+     * @return the info
+     */
     public Map<String, Object> getInfo() {
         Map<String, Object> dataSourceInfo = new HashMap<>();
         dataSourceInfo.put("poolNumActive", super.getPool().getNumActive());
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java
index 09e885f..33020df 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java
@@ -79,12 +79,14 @@ public interface GenericHelper {
     int removeByPrimaryKey(GenericPK primaryKey) throws GenericEntityException;
 
     List<GenericValue> findByMultiRelation(GenericValue value, ModelRelation modelRelationOne, ModelEntity modelEntityOne,
-        ModelRelation modelRelationTwo, ModelEntity modelEntityTwo, List<String> orderBy) throws GenericEntityException;
+            ModelRelation modelRelationTwo, ModelEntity modelEntityTwo, List<String> orderBy) throws GenericEntityException;
 
     /** Finds GenericValues by the conditions specified in the EntityCondition object, the the EntityCondition javadoc for more details.
      *@param modelEntity The ModelEntity of the Entity as defined in the entity XML file
-     *@param whereEntityCondition The EntityCondition object that specifies how to constrain this query before any groupings are done (if this is a view entity with group-by aliases)
-     *@param havingEntityCondition The EntityCondition object that specifies how to constrain this query after any groupings are done (if this is a view entity with group-by aliases)
+     *@param whereEntityCondition The EntityCondition object that specifies how to constrain this query before any groupings are done
+     * (if this is a view entity with group-by aliases)
+     *@param havingEntityCondition The EntityCondition object that specifies how to constrain this query after any groupings are done
+     * (if this is a view entity with group-by aliases)
      *@param fieldsToSelect The fields of the named entity to get from the database; if empty or null all fields will be retreived
      *@param orderBy The fields of the named entity to order the query by; optionally add a " ASC" for ascending or " DESC" for descending
      *@param findOptions An instance of EntityFindOptions that specifies advanced query options. See the EntityFindOptions JavaDoc for more details.
@@ -93,7 +95,7 @@ public interface GenericHelper {
      *      AND DON'T LEAVE IT OPEN TOO LONG BECAUSE IT WILL MAINTAIN A DATABASE CONNECTION.
      */
     EntityListIterator findListIteratorByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition,
-        EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
+            EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
         throws GenericEntityException;
 
     long findCountByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition,
@@ -117,7 +119,8 @@ public interface GenericHelper {
      *@return int representing number of rows effected by this operation
      *@throws GenericEntityException
      */
-    int storeByCondition(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fieldsToSet, EntityCondition condition) throws GenericEntityException;
+    int storeByCondition(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fieldsToSet, EntityCondition condition)
+            throws GenericEntityException;
 
     /** Store the Entity from the GenericValue to the persistent store
      *@param value GenericValue instance containing the entity
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
index 925e8a4..2cc1e33 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
@@ -44,8 +44,8 @@ public class GenericHelperDAO implements GenericHelper {
 
     private static final String MODULE = GenericHelperDAO.class.getName();
 
-    protected GenericDAO genericDAO;
-    protected GenericHelperInfo helperInfo;
+    private GenericDAO genericDAO;
+    private GenericHelperInfo helperInfo;
 
     public GenericHelperDAO(GenericHelperInfo helperInfo) {
         this.helperInfo = helperInfo;
@@ -139,8 +139,10 @@ public class GenericHelperDAO implements GenericHelper {
 
     /** Finds GenericValues by the conditions specified in the EntityCondition object, the the EntityCondition javadoc for more details.
      *@param modelEntity The ModelEntity of the Entity as defined in the entity XML file
-     *@param whereEntityCondition The EntityCondition object that specifies how to constrain this query before any groupings are done (if this is a view entity with group-by aliases)
-     *@param havingEntityCondition The EntityCondition object that specifies how to constrain this query after any groupings are done (if this is a view entity with group-by aliases)
+     *@param whereEntityCondition The EntityCondition object that specifies how to constrain this query before any groupings are done
+     * (if this is a view entity with group-by aliases)
+     *@param havingEntityCondition The EntityCondition object that specifies how to constrain this query after any groupings are done
+     * (if this is a view entity with group-by aliases)
      *@param fieldsToSelect The fields of the named entity to get from the database; if empty or null all fields will be retreived
      *@param orderBy The fields of the named entity to order the query by; optionally add a " ASC" for ascending or " DESC" for descending
      *@param findOptions An instance of EntityFindOptions that specifies advanced query options. See the EntityFindOptions JavaDoc for more details.
@@ -150,19 +152,21 @@ public class GenericHelperDAO implements GenericHelper {
      */
     @Override
     public EntityListIterator findListIteratorByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition,
-        EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
+            EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
         throws GenericEntityException {
-        return genericDAO.selectListIteratorByCondition(delegator, modelEntity, whereEntityCondition, havingEntityCondition, fieldsToSelect, orderBy, findOptions);
+        return genericDAO.selectListIteratorByCondition(delegator, modelEntity, whereEntityCondition, havingEntityCondition, fieldsToSelect,
+                orderBy, findOptions);
     }
 
     @Override
     public List<GenericValue> findByMultiRelation(GenericValue value, ModelRelation modelRelationOne, ModelEntity modelEntityOne,
-        ModelRelation modelRelationTwo, ModelEntity modelEntityTwo, List<String> orderBy) throws GenericEntityException {
+            ModelRelation modelRelationTwo, ModelEntity modelEntityTwo, List<String> orderBy) throws GenericEntityException {
         return genericDAO.selectByMultiRelation(value, modelRelationOne, modelEntityOne, modelRelationTwo, modelEntityTwo, orderBy);
     }
 
     @Override
-    public long findCountByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, EntityFindOptions findOptions) throws GenericEntityException {
+    public long findCountByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition, EntityCondition
+            havingEntityCondition, EntityFindOptions findOptions) throws GenericEntityException {
         return genericDAO.selectCountByCondition(delegator, modelEntity, whereEntityCondition, havingEntityCondition, findOptions);
     }
 
@@ -205,7 +209,8 @@ public class GenericHelperDAO implements GenericHelper {
      *@throws GenericEntityException
      */
     @Override
-    public int storeByCondition(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fieldsToSet, EntityCondition condition) throws GenericEntityException {
+    public int storeByCondition(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fieldsToSet, EntityCondition condition)
+            throws GenericEntityException {
         if (modelEntity == null || condition == null) {
             return 0;
         }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
index ca68172..0ab31dd 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
@@ -43,8 +43,8 @@ public class ReadOnlyHelperDAO implements GenericHelper {
 
     private static final String MODULE = ReadOnlyHelperDAO.class.getName();
 
-    protected GenericDAO genericDAO;
-    protected GenericHelperInfo helperInfo;
+    private GenericDAO genericDAO;
+    private GenericHelperInfo helperInfo;
 
     public ReadOnlyHelperDAO(GenericHelperInfo helperInfo) {
         this.helperInfo = helperInfo;
@@ -124,8 +124,10 @@ public class ReadOnlyHelperDAO implements GenericHelper {
 
     /** Finds GenericValues by the conditions specified in the EntityCondition object, the the EntityCondition javadoc for more details.
      *@param modelEntity The ModelEntity of the Entity as defined in the entity XML file
-     *@param whereEntityCondition The EntityCondition object that specifies how to constrain this query before any groupings are done (if this is a view entity with group-by aliases)
-     *@param havingEntityCondition The EntityCondition object that specifies how to constrain this query after any groupings are done (if this is a view entity with group-by aliases)
+     *@param whereEntityCondition The EntityCondition object that specifies how to constrain this query before any groupings are done
+     * (if this is a view entity with group-by aliases)
+     *@param havingEntityCondition The EntityCondition object that specifies how to constrain this query after any groupings are done
+     * (if this is a view entity with group-by aliases)
      *@param fieldsToSelect The fields of the named entity to get from the database; if empty or null all fields will be retreived
      *@param orderBy The fields of the named entity to order the query by; optionally add a " ASC" for ascending or " DESC" for descending
      *@param findOptions An instance of EntityFindOptions that specifies advanced query options. See the EntityFindOptions JavaDoc for more details.
@@ -134,19 +136,21 @@ public class ReadOnlyHelperDAO implements GenericHelper {
      */
     @Override
     public EntityListIterator findListIteratorByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition,
-        EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
+            EntityCondition havingEntityCondition, Collection<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions)
         throws GenericEntityException {
-        return genericDAO.selectListIteratorByCondition(delegator, modelEntity, whereEntityCondition, havingEntityCondition, fieldsToSelect, orderBy, findOptions);
+        return genericDAO.selectListIteratorByCondition(delegator, modelEntity, whereEntityCondition, havingEntityCondition, fieldsToSelect,
+                orderBy, findOptions);
     }
 
     @Override
     public List<GenericValue> findByMultiRelation(GenericValue value, ModelRelation modelRelationOne, ModelEntity modelEntityOne,
-        ModelRelation modelRelationTwo, ModelEntity modelEntityTwo, List<String> orderBy) throws GenericEntityException {
+            ModelRelation modelRelationTwo, ModelEntity modelEntityTwo, List<String> orderBy) throws GenericEntityException {
         return genericDAO.selectByMultiRelation(value, modelRelationOne, modelEntityOne, modelRelationTwo, modelEntityTwo, orderBy);
     }
 
     @Override
-    public long findCountByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, EntityFindOptions findOptions) throws GenericEntityException {
+    public long findCountByCondition(Delegator delegator, ModelEntity modelEntity, EntityCondition whereEntityCondition, EntityCondition
+            havingEntityCondition, EntityFindOptions findOptions) throws GenericEntityException {
         return genericDAO.selectCountByCondition(delegator, modelEntity, whereEntityCondition, havingEntityCondition, findOptions);
     }
 
@@ -177,7 +181,8 @@ public class ReadOnlyHelperDAO implements GenericHelper {
      *@return 0
      */
     @Override
-    public int storeByCondition(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fieldsToSet, EntityCondition condition) throws GenericEntityException {
+    public int storeByCondition(Delegator delegator, ModelEntity modelEntity, Map<String, ? extends Object> fieldsToSet, EntityCondition condition)
+            throws GenericEntityException {
         return 0;
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java
index ec330a2..50bf61f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java
@@ -51,5 +51,6 @@ public interface EntityEcaHandler<T> {
 
     Map<String, List<T>> getEntityEventMap(String entityName);
 
-    void evalRules(String currentOperation, Map<String, List<T>> eventMap, String event, GenericEntity value, boolean isError) throws GenericEntityException;
+    void evalRules(String currentOperation, Map<String, List<T>> eventMap, String event, GenericEntity value, boolean isError)
+            throws GenericEntityException;
 }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java
index 8d4f8e6..dcc37d3 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java
@@ -38,13 +38,14 @@ import org.w3c.dom.Element;
 public class ByConditionFinder extends ListFinder {
     private static final String MODULE = ByConditionFinder.class.getName();
 
-    protected Condition whereCondition;
-    protected Condition havingCondition;
+    private Condition whereCondition;
+    private Condition havingCondition;
 
     public ByConditionFinder(Element element) {
         super(element, "condition");
 
-        // NOTE: the whereCondition can be null, ie (condition-expr | condition-list) is optional; if left out, means find all, or with no condition in essense
+        // NOTE: the whereCondition can be null, ie (condition-expr | condition-list) is optional; if left out, means find all,
+        // or with no condition in essense
         // process condition-expr | condition-list
         Element conditionExprElement = UtilXml.firstChildElement(element, "condition-expr");
         Element conditionListElement = UtilXml.firstChildElement(element, "condition-list");
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 a1b320f..06aabeb 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
@@ -412,7 +412,8 @@ public final class SqlJdbcUtil {
                     }
 
                     // ModelViewEntity.ModelMemberEntity linkMemberEntity = modelViewEntity.getMemberModelMemberEntity(viewLink.getEntityAlias());
-                    // ModelViewEntity.ModelMemberEntity relLinkMemberEntity = modelViewEntity.getMemberModelMemberEntity(viewLink.getRelEntityAlias());
+                    // ModelViewEntity.ModelMemberEntity relLinkMemberEntity =
+                    // modelViewEntity.getMemberModelMemberEntity(viewLink.getRelEntityAlias());
 
                     for (int j = 0; j < viewLink.getKeyMapsSize(); j++) {
                         ModelKeyMap keyMap = viewLink.getKeyMap(j);
@@ -845,7 +846,8 @@ public final class SqlJdbcUtil {
             } catch (ClassNotFoundException ex) {
                 if (Debug.verboseOn()) {
                     Debug.logVerbose("Class not found: Unable to cast BLOB data to an Java object while getting value: " + curField.getName()
-                            + " [" + curField.getColName() + "] (" + ind + "); most likely because it is a straight byte[], so just using the raw bytes" + ex.toString(), MODULE);
+                            + " [" + curField.getColName() + "] (" + ind + "); most likely because it is a straight byte[], "
+                            + "so just using the raw bytes" + ex.toString(), MODULE);
                 }
                 return null;
             } finally {
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
index 778632f..9729491 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
@@ -302,7 +302,8 @@ public class DynamicViewEntity {
      * @param function           the function
      * @param complexAliasMember the complex alias member
      */
-    public void addAlias(String entityAlias, String name, String field, String colAlias, Boolean primKey, Boolean groupBy, String function, ComplexAliasMember complexAliasMember) {
+    public void addAlias(String entityAlias, String name, String field, String colAlias, Boolean primKey, Boolean groupBy, String function,
+                         ComplexAliasMember complexAliasMember) {
         addAlias(entityAlias, name, field, colAlias, primKey, groupBy, function, null, complexAliasMember);
     }
 
@@ -318,7 +319,8 @@ public class DynamicViewEntity {
      * @param fieldSet           the field set
      * @param complexAliasMember the complex alias member
      */
-    public void addAlias(String entityAlias, String name, String field, String colAlias, Boolean primKey, Boolean groupBy, String function, String fieldSet, ComplexAliasMember complexAliasMember) {
+    public void addAlias(String entityAlias, String name, String field, String colAlias, Boolean primKey, Boolean groupBy, String function,
+                         String fieldSet, ComplexAliasMember complexAliasMember) {
         if (entityAlias == null && complexAliasMember == null) {
             throw new IllegalArgumentException("entityAlias cannot be null if this is not a complex alias in call to DynamicViewEntity.addAlias");
         }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java
index 3b618ac..d113c3d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java
@@ -86,8 +86,10 @@ public final class ModelKeyMap implements Comparable<ModelKeyMap>, Serializable
     public static List<ModelKeyMap> makeKeyMapList(String fieldName1, String relFieldName1, String fieldName2, String relFieldName2) {
         return UtilMisc.toList(new ModelKeyMap(fieldName1, relFieldName1), new ModelKeyMap(fieldName2, relFieldName2));
     }
-    public static List<ModelKeyMap> makeKeyMapList(String fieldName1, String relFieldName1, String fieldName2, String relFieldName2, String fieldName3, String relFieldName3) {
-        return UtilMisc.toList(new ModelKeyMap(fieldName1, relFieldName1), new ModelKeyMap(fieldName2, relFieldName2), new ModelKeyMap(fieldName3, relFieldName3));
+    public static List<ModelKeyMap> makeKeyMapList(String fieldName1, String relFieldName1, String fieldName2, String relFieldName2,
+                                                   String fieldName3, String relFieldName3) {
+        return UtilMisc.toList(new ModelKeyMap(fieldName1, relFieldName1), new ModelKeyMap(fieldName2, relFieldName2),
+                new ModelKeyMap(fieldName3, relFieldName3));
     }
 
     @Override
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 773120d..5f15212 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
@@ -268,8 +268,9 @@ public class ModelReader implements Serializable {
                     for (Element extendEntityElement : tempExtendEntityElementList) {
                         String entityName = UtilXml.checkEmpty(extendEntityElement.getAttribute("entity-name"));
                         ModelEntity modelEntity = entityCache.get(entityName);
-                        if (modelEntity == null)
+                        if (modelEntity == null) {
                             throw new GenericEntityConfException("Entity to extend does not exist: " + entityName);
+                        }
                         modelEntity.addExtendEntity(this, extendEntityElement);
                     }
 
@@ -321,7 +322,8 @@ public class ModelReader implements Serializable {
                                 }
                             }
                             for (String perViewMissingEntity : perViewMissingEntities) {
-                                sb.append("\t[").append(curViewEntity.getEntityName()).append("] missing member entity [").append(perViewMissingEntity).append("]\n");
+                                sb.append("\t[").append(curViewEntity.getEntityName()).append("] missing member entity [")
+                                        .append(perViewMissingEntity).append("]\n");
                             }
 
                         }
@@ -353,7 +355,8 @@ public class ModelReader implements Serializable {
                                         relatedEnt = this.getModelEntity(modelRelation.getRelEntityName());
                                     } catch (GenericModelException e) {
                                         throw new GenericModelException(
-                                                "Error getting related entity [" + modelRelation.getRelEntityName() + "] definition from entity [" + curEntityName + "]", e);
+                                                "Error getting related entity [" + modelRelation.getRelEntityName()
+                                                        + "] definition from entity [" + curEntityName + "]", e);
                                     }
                                     // create the new relationship even if one exists so we can show what we are
                                     // looking for in the info message
@@ -393,7 +396,8 @@ public class ModelReader implements Serializable {
                                     } else {
                                         type = "many";
                                     }
-                                    ModelRelation newRel = ModelRelation.create(relatedEnt, description, type, title, relEntityName, fkName, keyMaps, isAutoRelation);
+                                    ModelRelation newRel = ModelRelation.create(relatedEnt, description, type, title, relEntityName,
+                                            fkName, keyMaps, isAutoRelation);
 
                                     ModelRelation existingRelation = relatedEnt.getRelation(title + curModelEntity.getEntityName());
                                     if (existingRelation == null) {
@@ -407,18 +411,22 @@ public class ModelReader implements Serializable {
                                         if (newRel.equals(existingRelation)) {
                                             // don't warn if the target title+entity = current title+entity
                                             if (Debug.infoOn()
-                                                    && !(title + curModelEntity.getEntityName()).equals(modelRelation.getTitle() + modelRelation.getRelEntityName())) {
+                                                    && !(title + curModelEntity.getEntityName()).equals(modelRelation.getTitle()
+                                                    + modelRelation.getRelEntityName())) {
                                                 // String errorMsg = "Relation already exists to entity[] with title ["
                                                 // + targetTitle + "], from entity[]";
                                                 String message = "Entity [" + relatedEnt.getPackageName() + ":" + relatedEnt.getEntityName()
-                                                        + "] already has identical relationship to entity [" + curModelEntity.getEntityName() + "] title [" + title
-                                                        + "]; would auto-create: type [" + newRel.getType() + "] and fields [" + newRel.keyMapString(",", "") + "]";
+                                                        + "] already has identical relationship to entity [" + curModelEntity.getEntityName()
+                                                        + "] title [" + title
+                                                        + "]; would auto-create: type [" + newRel.getType() + "] and fields ["
+                                                        + newRel.keyMapString(",", "") + "]";
                                                 orderedMessages.add(message);
                                             }
                                         } else {
-                                            String message = "Existing relationship with the same name, but different specs found from what would be auto-created for Entity ["
-                                                    + relatedEnt.getEntityName() + "] and relationship to entity [" + curModelEntity.getEntityName() + "] title [" + title
-                                                    + "]; would auto-create: type [" + newRel.getType() + "] and fields [" + newRel.keyMapString(",", "") + "]";
+                                            String message = "Existing relationship with the same name, but different specs found from what would"
+                                                    + " be auto-created for Entity [" + relatedEnt.getEntityName() + "] and relationship to entity ["
+                                                    + curModelEntity.getEntityName() + "] title [" + title + "]; would auto-create: type ["
+                                                    + newRel.getType() + "] and fields [" + newRel.keyMapString(",", "") + "]";
                                             if (Debug.verboseOn()) {
                                                 Debug.logVerbose(message, MODULE);
                                             }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java
index 893bfea..ba429b5 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java
@@ -50,7 +50,8 @@ public final class ModelRelation extends ModelChild {
      * @param keyMaps The key maps included in this relation.
      * @param isAutoRelation <code>true</code> if this relation was generated automatically by the entity engine.
      */
-    public static ModelRelation create(ModelEntity modelEntity, String description, String type, String title, String relEntityName, String fkName, List<ModelKeyMap> keyMaps, boolean isAutoRelation) {
+    public static ModelRelation create(ModelEntity modelEntity, String description, String type, String title, String relEntityName,
+                                       String fkName, List<ModelKeyMap> keyMaps, boolean isAutoRelation) {
         if (description == null) {
             description = "";
         }
@@ -86,7 +87,7 @@ public final class ModelRelation extends ModelChild {
         String relEntityName = relationElement.getAttribute("rel-entity-name").intern();
         String fkName = relationElement.getAttribute("fk-name").intern();
         String description = UtilXml.childElementValue(relationElement, "description");
-        List<ModelKeyMap >keyMaps = Collections.emptyList();
+        List<ModelKeyMap> keyMaps = Collections.emptyList();
         List<? extends Element> elementList = UtilXml.childElementList(relationElement, "key-map");
         if (!elementList.isEmpty()) {
             keyMaps = new ArrayList<>(elementList.size());
@@ -126,7 +127,8 @@ public final class ModelRelation extends ModelChild {
 
     private final String combinedName;
 
-    private ModelRelation(ModelEntity modelEntity, String description, String type, String title, String relEntityName, String fkName, List<ModelKeyMap> keyMaps, boolean isAutoRelation) {
+    private ModelRelation(ModelEntity modelEntity, String description, String type, String title, String relEntityName, String fkName,
+                          List<ModelKeyMap> keyMaps, boolean isAutoRelation) {
         super(modelEntity, description);
         this.title = title;
         this.type = type;
@@ -196,8 +198,9 @@ public final class ModelRelation extends ModelChild {
     /** Find a KeyMap with the specified relFieldName */
     public ModelKeyMap findKeyMapByRelated(String relFieldName) {
         for (ModelKeyMap keyMap: keyMaps) {
-            if (keyMap.getRelFieldName().equals(relFieldName))
+            if (keyMap.getRelFieldName().equals(relFieldName)) {
                 return keyMap;
+            }
         }
         return null;
     }
@@ -245,8 +248,9 @@ public final class ModelRelation extends ModelChild {
 
     // TODO: Externalize this.
     public String keyMapUpperString(String separator, String afterLast) {
-        if (keyMaps.size() < 1)
+        if (keyMaps.size() < 1) {
             return "";
+        }
 
         StringBuilder returnString = new StringBuilder(keyMaps.size() * 10);
         int i = 0;
@@ -268,8 +272,9 @@ public final class ModelRelation extends ModelChild {
 
     // TODO: Externalize this.
     public String keyMapRelatedUpperString(String separator, String afterLast) {
-        if (keyMaps.size() < 1)
+        if (keyMaps.size() < 1) {
             return "";
+        }
 
         StringBuilder returnString = new StringBuilder(keyMaps.size() * 10);
         int i = 0;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
index bd0fc0a..c88b4f9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
@@ -90,7 +90,8 @@ public class EntityTestSuite extends EntityTestCase {
         assertNotNull("TestingType entity model not null", modelEntity);
         ModelField modelField = modelEntity.getField("description");
         assertNotNull("TestingType.description field model not null", modelField);
-        modelField = ModelField.create(modelEntity, null, "newDesc", modelField.getType(), "NEW_DESC", null, null, false, false, false, false, false, null);
+        modelField = ModelField.create(modelEntity, null, "newDesc", modelField.getType(), "NEW_DESC", null,
+                null, false, false, false, false, false, null);
         modelEntity.addField(modelField);
         modelField = modelEntity.getField("newDesc");
         assertNotNull("TestingType.newDesc field model not null", modelField);
@@ -1007,13 +1008,15 @@ public class EntityTestSuite extends EntityTestCase {
                 findOptions.setOffset((page - 1) * rowsPerPage);
                 EntityListIterator iterator = null;
                 try {
-                    iterator = delegator.getEntityHelper(entityName).findListIteratorByCondition(modelEntity, null, null, null, UtilMisc.toList("lastUpdatedStamp DESC"), findOptions);
+                    iterator = delegator.getEntityHelper(entityName).findListIteratorByCondition(modelEntity, null,
+                    null, null, UtilMisc.toList("lastUpdatedStamp DESC"), findOptions);
                     while (iterator != null) {
                         GenericValue gv = iterator.next();
                         if (gv == null) {
                             break;
                         }
-                        Debug.logInfo(gv.getString("contentId") + ": " + gv.getString("contentName") + "       (updated: " + gv.getTimestamp("lastUpdatedStamp") + ")", MODULE);
+                        Debug.logInfo(gv.getString("contentId") + ": " + gv.getString("contentName") + "
+                        (updated: " + gv.getTimestamp("lastUpdatedStamp") + ")", MODULE);
                     }
                 } catch (GenericEntityException e) {
                     Debug.logError(e, MODULE);
@@ -1032,7 +1035,8 @@ public class EntityTestSuite extends EntityTestCase {
                 Debug.logInfo("Page " + page + ":", MODULE);
                 EntityListIterator iterator = null;
                 try {
-                    iterator = ((GenericHelperDAO) delegator.getEntityHelper(entityName)).findListIteratorByCondition(modelEntity, null, null, null, UtilMisc.toList("lastUpdatedStamp DESC"), null);
+                    iterator = ((GenericHelperDAO) delegator.getEntityHelper(entityName))
+                    .findListIteratorByCondition(modelEntity, null, null, null, UtilMisc.toList("lastUpdatedStamp DESC"), null);
                     if (iterator == null) {
                         continue;
                     }
@@ -1045,7 +1049,8 @@ public class EntityTestSuite extends EntityTestCase {
                     }
                     gvs = gvs.subList(fromIndex, toIndex);
                     for (GenericValue gv : gvs) {
-                        Debug.logInfo(gv.getString("contentId") + ": " + gv.getString("contentName") + "       (updated: " + gv.getTimestamp("lastUpdatedStamp") + ")", MODULE);
+                        Debug.logInfo(gv.getString("contentId") + ": " + gv.getString("contentName") + "
+                        (updated: " + gv.getTimestamp("lastUpdatedStamp") + ")", MODULE);
                     }
                 } catch (GenericEntityException e) {
                     Debug.logError(e, MODULE);
@@ -1073,9 +1078,11 @@ public class EntityTestSuite extends EntityTestCase {
                 + "<TestingType testingTypeId=\"JUNIT-TEST\" description=\"junit test\"/>"
                 + "<create>"
                 + "    <TestingType testingTypeId=\"JUNIT-TEST2\" description=\"junit test\"/>"
-                + "    <Testing testingId=\"T1\" testingTypeId=\"JUNIT-TEST\" testingName=\"First test\" testingSize=\"10\" testingDate=\"2010-01-01 00:00:00\"/>"
+                + "    <Testing testingId=\"T1\" testingTypeId=\"JUNIT-TEST\" testingName=\"First test\" testingSize=\"10\" "
+                        + "testingDate=\"2010-01-01 00:00:00\"/>"
                 + "</create>"
-                + "<Testing testingId=\"T2\" testingTypeId=\"JUNIT-TEST2\" testingName=\"Second test\" testingSize=\"20\" testingDate=\"2010-02-01 00:00:00\"/>"
+                + "<Testing testingId=\"T2\" testingTypeId=\"JUNIT-TEST2\" testingName=\"Second test\" testingSize=\"20\" "
+                        + "testingDate=\"2010-02-01 00:00:00\"/>"
                 + "</entity-engine-xml>";
         EntitySaxReader reader = new EntitySaxReader(delegator);
         long numberLoaded = reader.parse(xmlContentLoad);
@@ -1103,13 +1110,15 @@ public class EntityTestSuite extends EntityTestCase {
         String xmlContentLoad =
                 "<entity-engine-xml>"
                 + "<TestingType testingTypeId=\"reader-create-skip\" description=\"reader create skip\"/>"
-                + "<Testing testingId=\"reader-create-skip\" testingTypeId=\"reader-create-skip\" testingName=\"reader create skip\" testingSize=\"10\" testingDate=\"2010-01-01 00:00:00\"/>"
+                + "<Testing testingId=\"reader-create-skip\" testingTypeId=\"reader-create-skip\" testingName=\"reader "
+                        + "create skip\" testingSize=\"10\" testingDate=\"2010-01-01 00:00:00\"/>"
                 + "</entity-engine-xml>";
         EntitySaxReader reader = new EntitySaxReader(delegator);
         long numberLoaded = reader.parse(xmlContentLoad);
         xmlContentLoad =
                 "<create>"
-                + "    <Testing testingId=\"reader-create-skip\" testingName=\"reader create skip updated\" testingSize=\"20\" testingDate=\"2012-02-02 02:02:02\"/>"
+                + "    <Testing testingId=\"reader-create-skip\" testingName=\"reader create skip updated\" testingSize=\"20\" "
+                        + "testingDate=\"2012-02-02 02:02:02\"/>"
                 + "</create>";
         reader = new EntitySaxReader(delegator);
         numberLoaded += reader.parse(xmlContentLoad);
@@ -1131,10 +1140,13 @@ public class EntityTestSuite extends EntityTestCase {
                 "<entity-engine-xml>"
                 + "<TestingType testingTypeId=\"create-update\" description=\"create update\"/>"
                 + "<TestingType testingTypeId=\"create-updated\" description=\"create update updated\"/>"
-                + "<Testing testingId=\"create-update-T3\" testingTypeId=\"create-update\" testingName=\"Test 3\" testingSize=\"10\" testingDate=\"2010-01-01 00:00:00\"/>"
+                + "<Testing testingId=\"create-update-T3\" testingTypeId=\"create-update\" testingName=\"Test 3\" testingSize=\"10\" "
+                        + "testingDate=\"2010-01-01 00:00:00\"/>"
                 + "<create-update>"
-                + "    <Testing testingId=\"create-update-T1\" testingTypeId=\"create-update\" testingName=\"First test update\" testingSize=\"20\" testingDate=\"2010-01-01 00:00:00\"/>"
-                + "    <Testing testingId=\"create-update-T3\" testingTypeId=\"create-updated\" testingName=\"Third test\" testingSize=\"30\" testingDate=\"2010-03-01 00:00:00\"/>"
+                + "    <Testing testingId=\"create-update-T1\" testingTypeId=\"create-update\" testingName=\"First test update\" testingSize=\"20\" "
+                        + "testingDate=\"2010-01-01 00:00:00\"/>"
+                + "    <Testing testingId=\"create-update-T3\" testingTypeId=\"create-updated\" testingName=\"Third test\" testingSize=\"30\" "
+                        + "testingDate=\"2010-03-01 00:00:00\"/>"
                 + "</create-update>"
                 + "</entity-engine-xml>";
         EntitySaxReader reader = new EntitySaxReader(delegator);
@@ -1163,11 +1175,13 @@ public class EntityTestSuite extends EntityTestCase {
         String xmlContentLoad =
                 "<entity-engine-xml>"
                 + "<TestingType testingTypeId=\"create-replace\" description=\"reader create skip\"/>"
-                + "<Testing testingTypeId=\"create-replace\" testingId=\"create-replace-T1\" testingName=\"First test\" testingSize=\"10\" testingDate=\"2010-01-01 00:00:00\"/>"
+                + "<Testing testingTypeId=\"create-replace\" testingId=\"create-replace-T1\" testingName=\"First test\" testingSize=\"10\" "
+                        + "testingDate=\"2010-01-01 00:00:00\"/>"
                 + "<create-replace>"
                 + "    <Testing testingTypeId=\"create-replace\" testingId=\"create-replace-T1\" testingName=\"First test replace\" />"
                 + "</create-replace>"
-                + "<Testing testingTypeId=\"create-replace\" testingId=\"create-replace-T2\" testingName=\"Second test update\" testingSize=\"20\" testingDate=\"2010-02-01 00:00:00\"/>"
+                + "<Testing testingTypeId=\"create-replace\" testingId=\"create-replace-T2\" testingName=\"Second test update\" "
+                        + "testingSize=\"20\" testingDate=\"2010-02-01 00:00:00\"/>"
                 + "</entity-engine-xml>";
         EntitySaxReader reader = new EntitySaxReader(delegator);
         long numberLoaded = reader.parse(xmlContentLoad);
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java
index 3989267..a379447 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java
@@ -54,7 +54,8 @@ public class DumbTransactionFactory implements TransactionFactory {
             }
 
             @Override
-            public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException {
+            public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException,
+                    IllegalStateException, SystemException {
             }
 
             @Override
@@ -98,7 +99,8 @@ public class DumbTransactionFactory implements TransactionFactory {
             }
 
             @Override
-            public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException {
+            public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException,
+                    IllegalStateException, SystemException {
             }
 
             @Override
@@ -133,7 +135,8 @@ public class DumbTransactionFactory implements TransactionFactory {
             Connection otherCon = ConnectionFactoryLoader.getInstance().getConnection(helperInfo, datasourceInfo.getInlineJdbc());
             return TransactionUtil.getCursorConnection(helperInfo, otherCon);
         }
-        Debug.logError("Dumb/Empty is the configured transaction manager but no inline-jdbc element was specified in the " + helperInfo.getHelperBaseName() + " datasource. Please check your configuration", MODULE);
+        Debug.logError("Dumb/Empty is the configured transaction manager but no inline-jdbc element was specified in the "
+                + helperInfo.getHelperBaseName() + " datasource. Please check your configuration", MODULE);
         return null;
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
index dcf51a0..7ba0248 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
@@ -76,7 +76,8 @@ public class GeronimoTransactionFactory implements TransactionFactory {
         if (datasourceInfo != null && datasourceInfo.getInlineJdbc() != null) {
             return ConnectionFactoryLoader.getInstance().getConnection(helperInfo, datasourceInfo.getInlineJdbc());
         }
-        Debug.logError("Geronimo is the configured transaction manager but no inline-jdbc element was specified in the " + helperInfo.getHelperBaseName() + " datasource. Please check your configuration", MODULE);
+        Debug.logError("Geronimo is the configured transaction manager but no inline-jdbc element was specified in the "
+                + helperInfo.getHelperBaseName() + " datasource. Please check your configuration", MODULE);
         return null;
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java
index 2e422dc..7515c2f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java
@@ -73,17 +73,22 @@ public final class TransactionUtil implements Status {
     private static ThreadLocal<Timestamp> transactionLastNowStamp = new ThreadLocal<>();
 
     private static final boolean DEBUG_RESOURCES = readDebugResources();
-    public static final Map<Xid, DebugXaResource> DEBUG_RES_MAP = Collections.<Xid, DebugXaResource>synchronizedMap(new HashMap<Xid, DebugXaResource>());
-    // in order to improve performance allThreadsTransactionBeginStack and allThreadsTransactionBeginStackSave are only maintained when logging level INFO is on
+    public static final Map<Xid, DebugXaResource> DEBUG_RES_MAP =
+            Collections.<Xid, DebugXaResource>synchronizedMap(new HashMap<Xid, DebugXaResource>());
+    // in order to improve performance allThreadsTransactionBeginStack and allThreadsTransactionBeginStackSave are only
+    // maintained when logging level INFO is on
     private static Map<Long, Exception> allThreadsTransactionBeginStack = Collections.<Long, Exception>synchronizedMap(new HashMap<>());
-    private static Map<Long, List<Exception>> allThreadsTransactionBeginStackSave = Collections.<Long, List<Exception>>synchronizedMap(new HashMap<>());
+    private static Map<Long, List<Exception>> allThreadsTransactionBeginStackSave =
+            Collections.<Long, List<Exception>>synchronizedMap(new HashMap<>());
 
     private TransactionUtil() { }
-    public static <V> V doNewTransaction(Callable<V> callable, String ifErrorMessage, int timeout, boolean printException) throws GenericEntityException {
+    public static <V> V doNewTransaction(Callable<V> callable, String ifErrorMessage, int timeout, boolean printException)
+            throws GenericEntityException {
         return noTransaction(inTransaction(callable, ifErrorMessage, timeout, printException)).call();
     }
 
-    public static <V> V doTransaction(Callable<V> callable, String ifErrorMessage, int timeout, boolean printException) throws GenericEntityException {
+    public static <V> V doTransaction(Callable<V> callable, String ifErrorMessage, int timeout, boolean printException)
+            throws GenericEntityException {
         return inTransaction(callable, ifErrorMessage, timeout, printException).call();
     }
 
@@ -125,7 +130,8 @@ public final class TransactionUtil implements Status {
                 } else if (currentStatus == Status.STATUS_MARKED_ROLLBACK) {
                     Exception e = getTransactionBeginStack();
                     if (e != null) {
-                        Debug.logWarning(e, "Active transaction marked for rollback in place, so no transaction begun; this stack trace shows when the exception began: ", MODULE);
+                        Debug.logWarning(e, "Active transaction marked for rollback in place, so no transaction begun; "
+                                + "this stack trace shows when the exception began: ", MODULE);
                     } else {
                         Debug.logWarning("Active transaction marked for rollback in place, so no transaction begun", MODULE);
                     }
@@ -133,7 +139,8 @@ public final class TransactionUtil implements Status {
                     RollbackOnlyCause roc = getSetRollbackOnlyCause();
                     // do we have a cause? if so, throw special exception
                     if (UtilValidate.isNotEmpty(roc)) {
-                        throw new GenericTransactionException("The current transaction is marked for rollback, not beginning a new transaction and aborting current operation; the rollbackOnly was caused by: " + roc.getCauseMessage(), roc.getCauseThrowable());
+                        throw new GenericTransactionException("The current transaction is marked for rollback, not beginning a new transaction and "
+                                + "aborting current operation; the rollbackOnly was caused by: " + roc.getCauseMessage(), roc.getCauseThrowable());
                     }
                     return false;
                 }
@@ -238,7 +245,8 @@ public final class TransactionUtil implements Status {
                     Debug.logVerbose("Current status : " + getTransactionStateString(status), MODULE);
                 }
 
-                if (status != STATUS_NO_TRANSACTION && status != STATUS_COMMITTING && status != STATUS_COMMITTED && status != STATUS_ROLLING_BACK && status != STATUS_ROLLEDBACK) {
+                if (status != STATUS_NO_TRANSACTION && status != STATUS_COMMITTING && status != STATUS_COMMITTED
+                        && status != STATUS_ROLLING_BACK && status != STATUS_ROLLEDBACK) {
                     ut.commit();
 
                     // clear out the stamps to keep it clean
@@ -263,10 +271,12 @@ public final class TransactionUtil implements Status {
                     clearSetRollbackOnlyCause();
 
                     Debug.logError(e, "Rollback Only was set when trying to commit transaction here; throwing rollbackOnly cause exception", MODULE);
-                    throw new GenericTransactionException("Roll back error, could not commit transaction, was rolled back instead because of: " + rollbackOnlyCause.getCauseMessage(), rollbackOnlyCause.getCauseThrowable());
+                    throw new GenericTransactionException("Roll back error, could not commit transaction, was rolled back instead because of: "
+                            + rollbackOnlyCause.getCauseMessage(), rollbackOnlyCause.getCauseThrowable());
                 }
                 Throwable t = e.getCause() == null ? e : e.getCause();
-                throw new GenericTransactionException("Roll back error (with no rollbackOnly cause found), could not commit transaction, was rolled back instead: " + t.toString(), t);
+                throw new GenericTransactionException("Roll back error (with no rollbackOnly cause found), could not commit transaction, "
+                        + "was rolled back instead: " + t.toString(), t);
             } catch (IllegalStateException e) {
                 Throwable t = e.getCause() == null ? e : e.getCause();
                 throw new GenericTransactionException("Could not commit transaction, IllegalStateException exception: " + t.toString(), t);
@@ -376,7 +386,8 @@ public final class TransactionUtil implements Status {
                 }
             } catch (IllegalStateException e) {
                 Throwable t = e.getCause() == null ? e : e.getCause();
-                throw new GenericTransactionException("Could not set rollback only on transaction, IllegalStateException exception: " + t.toString(), t);
+                throw new GenericTransactionException("Could not set rollback only on transaction, IllegalStateException exception: "
+                        + t.toString(), t);
             } catch (SystemException e) {
                 Throwable t = e.getCause() == null ? e : e.getCause();
                 throw new GenericTransactionException("System error, could not set rollback only on transaction: " + t.toString(), t);
@@ -468,7 +479,8 @@ public final class TransactionUtil implements Status {
             }
         } catch (RollbackException e) {
             //This is Java 1.4 only, but useful for certain debuggins: Throwable t = e.getCause() == null ? e : e.getCause();
-            throw new GenericTransactionException("Roll Back error, could not enlist resource in transaction even though transactions are available, current transaction rolled back", e);
+            throw new GenericTransactionException("Roll Back error, could not enlist resource in transaction even though transactions are "
+                    + "available, current transaction rolled back", e);
         } catch (SystemException e) {
             //This is Java 1.4 only, but useful for certain debuggins: Throwable t = e.getCause() == null ? e : e.getCause();
             throw new GenericTransactionException("System error, could not enlist resource in transaction even though transactions are available", e);
@@ -552,9 +564,11 @@ public final class TransactionUtil implements Status {
                 }
             }
         } catch (RollbackException e) {
-            throw new GenericTransactionException("Roll Back error, could not register synchronization in transaction even though transactions are available, current transaction rolled back", e);
+            throw new GenericTransactionException("Roll Back error, could not register synchronization in transaction even though "
+                    + "transactions are available, current transaction rolled back", e);
         } catch (SystemException e) {
-            throw new GenericTransactionException("System error, could not register synchronization in transaction even though transactions are available", e);
+            throw new GenericTransactionException("System error, could not register synchronization in transaction even though "
+                    + "transactions are available", e);
         }
     }
 
@@ -705,12 +719,15 @@ public final class TransactionUtil implements Status {
             Exception transactionBeginStack = attbsMapEntry.getValue();
             List<Exception> txBeginStackList = allThreadsTransactionBeginStackSave.get(curThreadId);
 
-            Debug.logInfo(transactionBeginStack, "===================================================\n===================================================\n Current tx begin stack for thread [" + curThreadId + "]:", MODULE);
+            Debug.logInfo(transactionBeginStack, "===================================================\n================================="
+                    + "==================\n Current tx begin stack for thread [" + curThreadId + "]:", MODULE);
 
             if (UtilValidate.isNotEmpty(txBeginStackList)) {
                 int stackLevel = 0;
                 for (Exception stack : txBeginStackList) {
-                    Debug.logInfo(stack, "===================================================\n===================================================\n Tx begin stack history for thread [" + curThreadId + "] history number [" + stackLevel + "]:", MODULE);
+                    Debug.logInfo(stack, "===================================================\n================================"
+                            + "===================\n Tx begin stack history for thread [" + curThreadId + "] history number ["
+                            + stackLevel + "]:", MODULE);
                     stackLevel++;
                 }
             } else {
@@ -727,7 +744,8 @@ public final class TransactionUtil implements Status {
     private static void setTransactionBeginStack(Exception newExc) {
         if (transactionBeginStack.get() != null) {
             Exception e = transactionBeginStack.get();
-            Debug.logWarning(e, "In setTransactionBeginStack a stack placeholder was already in place, here is where the transaction began: ", MODULE);
+            Debug.logWarning(e, "In setTransactionBeginStack a stack placeholder was already in place, here is where the transaction began: ",
+                    MODULE);
             Exception e2 = new Exception("Current Stack Trace");
             Debug.logWarning(e2, "In setTransactionBeginStack a stack placeholder was already in place, here is the current location: ", MODULE);
         }
@@ -766,8 +784,8 @@ public final class TransactionUtil implements Status {
     // ROLLBACK ONLY CAUSE
     // =======================================
     private static class RollbackOnlyCause {
-        protected String causeMessage;
-        protected Throwable causeThrowable;
+        private String causeMessage;
+        private Throwable causeThrowable;
 
         RollbackOnlyCause(String causeMessage, Throwable causeThrowable) {
             this.causeMessage = causeMessage;
@@ -906,7 +924,8 @@ public final class TransactionUtil implements Status {
             try {
                 registerSynchronization(new StampClearSync());
             } catch (GenericTransactionException e) {
-                Debug.logError(e, "Error registering StampClearSync synchronization, stamps will still be reset if begin/commit/rollback are call through TransactionUtil, but not if otherwise", MODULE);
+                Debug.logError(e, "Error registering StampClearSync synchronization, stamps will still be reset if "
+                        + "begin/commit/rollback are call through TransactionUtil, but not if otherwise", MODULE);
             }
         }
         return curStamp;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
index c353fa4..5f313d8 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
@@ -133,7 +133,8 @@ public final class EntityCrypto {
             Debug.logInfo("Decrypt with DES key from standard key name hash failed, trying old/funny variety of key name hash", MODULE);
             for (int i = 1; i < handlers.length; i++) {
                 try {
-                    // try using the old/bad hex encoding approach; this is another path the code may take, ie if there is an exception thrown in decrypt
+                    // try using the old/bad hex encoding approach; this is another path the code may take, ie if there
+                    // is an exception thrown in decrypt
                     return doDecrypt(keyName, encryptMethod, encryptedString, handlers[i]);
                 } catch (GeneralException e1) {
                     // NOTE: this throws the original exception back, not the new one if it fails using the other approach
@@ -358,7 +359,8 @@ public final class EntityCrypto {
                 try {
                     key = DesCrypt.getDesKey(kek);
                 } catch (GeneralException e) {
-                    Debug.logInfo("Invalid key-encryption-key specified for SaltedBase64StorageHandler; the key is probably valid for the newer ShiroStorageHandler", MODULE);
+                    Debug.logInfo("Invalid key-encryption-key specified for SaltedBase64StorageHandler; the key is probably "
+                            + "valid for the newer ShiroStorageHandler", MODULE);
                 }
             }
             this.kek = key;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java
index 4d74177..f56157c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java
@@ -39,7 +39,8 @@ public class EntityDataAssert {
 
     private static final String MODULE = EntityDataAssert.class.getName();
 
-    public static int assertData(URL dataUrl, Delegator delegator, List<Object> errorMessages) throws GenericEntityException, SAXException, ParserConfigurationException, IOException {
+    public static int assertData(URL dataUrl, Delegator delegator, List<Object> errorMessages) throws GenericEntityException,
+            SAXException, ParserConfigurationException, IOException {
         int rowsChecked = 0;
 
         if (dataUrl == null) {
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
index f12be8c..905154e 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
@@ -308,10 +308,14 @@ public class EntityDataLoader {
                 }
 
                 /*
-                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_VIEW", "description", "Permission to View a " + entity.getEntityName() + " entity."));
-                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_CREATE", "description", "Permission to Create a " + entity.getEntityName() + " entity."));
-                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_UPDATE", "description", "Permission to Update a " + entity.getEntityName() + " entity."));
-                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_DELETE", "description", "Permission to Delete a " + entity.getEntityName() + " entity."));
+                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_VIEW", "description", "Permission to View a "
+                + entity.getEntityName() + " entity."));
+                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_CREATE", "description", "Permission to Create a "
+                + entity.getEntityName() + " entity."));
+                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_UPDATE", "description", "Permission to Update a "
+                + entity.getEntityName() + " entity."));
+                toStore.add(delegator.makeValue("SecurityPermission", "permissionId", baseName + "_DELETE", "description", "Permission to Delete a "
+                + entity.getEntityName() + " entity."));
 
                 toStore.add(delegator.makeValue("SecurityGroupPermission", "groupId", "FLEXADMIN", "permissionId", baseName + "_VIEW"));
                 toStore.add(delegator.makeValue("SecurityGroupPermission", "groupId", "FLEXADMIN", "permissionId", baseName + "_CREATE"));
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java
index aa5841e..67db584 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java
@@ -41,18 +41,18 @@ public class EntityFindOptions implements java.io.Serializable {
     /** Concurrency constant from the java.sql.ResultSet object for convenience */
     public static final int CONCUR_UPDATABLE = ResultSet.CONCUR_UPDATABLE;
 
-    protected boolean specifyTypeAndConcur = true;
-    protected int resultSetType = TYPE_FORWARD_ONLY;
-    protected int resultSetConcurrency = CONCUR_READ_ONLY;
-    protected int fetchSize = -1;
-    protected int maxRows = -1;
-    protected boolean distinct = false;
+    private boolean specifyTypeAndConcur = true;
+    private int resultSetType = TYPE_FORWARD_ONLY;
+    private int resultSetConcurrency = CONCUR_READ_ONLY;
+    private int fetchSize = -1;
+    private int maxRows = -1;
+    private boolean distinct = false;
 
     /** LIMIT option */
-    protected int limit = -1;
+    private int limit = -1;
 
     /** OFFSET option */
-    protected int offset = -1;
+    private int offset = -1;
 
     /** Default constructor. Defaults are as follows:
      *      specifyTypeAndConcur = true
@@ -63,7 +63,8 @@ public class EntityFindOptions implements java.io.Serializable {
      */
     public EntityFindOptions() { }
 
-    public EntityFindOptions(boolean specifyTypeAndConcur, int resultSetType, int resultSetConcurrency, int fetchSize, int maxRows, boolean distinct) {
+    public EntityFindOptions(boolean specifyTypeAndConcur, int resultSetType, int resultSetConcurrency, int fetchSize,
+                             int maxRows, boolean distinct) {
         this.specifyTypeAndConcur = specifyTypeAndConcur;
         this.resultSetType = resultSetType;
         this.resultSetConcurrency = resultSetConcurrency;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
index ecb24da..ddd2f9a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
@@ -92,8 +92,9 @@ public final class EntityTypeUtil {
             Debug.logWarning(e, MODULE);
             return null;
         }
-        if (childrenTypes == null)
+        if (childrenTypes == null) {
             return null;
+        }
 
         // ... and add them as direct descendants
         descendantTypes.addAll(childrenTypes);
@@ -130,7 +131,8 @@ public final class EntityTypeUtil {
      * @param parentType      Value of the parent type against which check is performed.
      * @return boolean value based on the check results.
      */
-    public static boolean hasParentType(Delegator delegator, String entityName, String primaryKey, String childType, String parentTypeField, String parentType) {
+    public static boolean hasParentType(Delegator delegator, String entityName, String primaryKey, String childType, String parentTypeField,
+                                        String parentType) {
         GenericValue childTypeValue = null;
         try {
             childTypeValue = EntityQuery.use(delegator).from(entityName).where(primaryKey, childType).cache(true).queryOne();
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
index 5af8014..1a6a6e9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
@@ -69,7 +69,8 @@ public final class EntityUtilProperties implements Serializable {
             if (systemProperty != null) {
                 //property exists in database
                 results.put("isExistInDb", "Y");
-                results.put("value", (systemProperty.getString("systemPropertyValue") != null) ? systemProperty.getString("systemPropertyValue") : "");
+                results.put("value", (systemProperty.getString("systemPropertyValue") != null)
+                        ? systemProperty.getString("systemPropertyValue") : "");
             }
         } catch (GenericEntityException e) {
             Debug.logError("Could not get a system property for " + name + " : " + e.getMessage(), MODULE);
@@ -262,11 +263,13 @@ public final class EntityUtilProperties implements Serializable {
                 prevValue = gv.getString("systemPropertyValue");
                 gv.set("systemPropertyValue", value);
             } else {
-                gv = delegator.makeValue("SystemProperty", UtilMisc.toMap("systemResourceId", resourceName, "systemPropertyId", name, "systemPropertyValue", value, "description", null));
+                gv = delegator.makeValue("SystemProperty", UtilMisc.toMap("systemResourceId", resourceName, "systemPropertyId",
+                        name, "systemPropertyValue", value, "description", null));
             }
             gv.store();
         } catch (GenericEntityException e) {
-            Debug.logError(String.format("tenantId=%s, exception=%s, message=%s", delegator.getDelegatorTenantId(), e.getClass().getName(), e.getMessage()), MODULE);
+            Debug.logError(String.format("tenantId=%s, exception=%s, message=%s", delegator.getDelegatorTenantId(), e.getClass().getName(),
+                    e.getMessage()), MODULE);
         }
         return prevValue;
     }
@@ -346,7 +349,8 @@ public final class EntityUtilProperties implements Serializable {
         return UtilProperties.resolvePropertiesUrl(resource, locale);
     }
 
-    public static Properties xmlToProperties(InputStream in, Locale locale, Properties properties) throws IOException, InvalidPropertiesFormatException {
+    public static Properties xmlToProperties(InputStream in, Locale locale, Properties properties)
+            throws IOException, InvalidPropertiesFormatException {
         return UtilProperties.xmlToProperties(in, locale, properties);
     }
 }
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
index 2324161..0b09f28 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
@@ -40,10 +40,12 @@ public final class EntityGroupUtil {
 
     private EntityGroupUtil() { }
 
-    public static Set<String> getEntityNamesByGroup(String entityGroupId, Delegator delegator, boolean requireStampFields) throws GenericEntityException {
+    public static Set<String> getEntityNamesByGroup(String entityGroupId, Delegator delegator, boolean requireStampFields)
+            throws GenericEntityException {
         Set<String> entityNames = new HashSet<>();
 
-        List<GenericValue> entitySyncGroupIncludes = EntityQuery.use(delegator).from("EntityGroupEntry").where("entityGroupId", entityGroupId).queryList();
+        List<GenericValue> entitySyncGroupIncludes = EntityQuery.use(delegator).from("EntityGroupEntry").where("entityGroupId", entityGroupId)
+                .queryList();
         List<ModelEntity> modelEntities = getModelEntitiesFromRecords(entitySyncGroupIncludes, delegator, requireStampFields);
         for (ModelEntity modelEntity: modelEntities) {
             entityNames.add(modelEntity.getEntityName());
@@ -52,7 +54,8 @@ public final class EntityGroupUtil {
         return entityNames;
     }
 
-    public static List<ModelEntity> getModelEntitiesFromRecords(List<GenericValue> entityGroupEntryValues, Delegator delegator, boolean requireStampFields) throws GenericEntityException {
+    public static List<ModelEntity> getModelEntitiesFromRecords(List<GenericValue> entityGroupEntryValues, Delegator delegator,
+                                                                boolean requireStampFields) throws GenericEntityException {
         List<ModelEntity> entityModelToUseList = new LinkedList<>();
 
         for (String entityName: delegator.getModelReader().getEntityNames()) {
@@ -74,7 +77,8 @@ public final class EntityGroupUtil {
             } else {
                 // we have different types of include applications: ESIA_INCLUDE, ESIA_EXCLUDE, ESIA_ALWAYS
                 // if we find an always we can break right there because this will always be include regardless of excludes, etc
-                // if we find an include or exclude we have to finish going through the rest of them just in case there is something that overrides it (ie an exclude for an include or an always for an exclude)
+                // if we find an include or exclude we have to finish going through the rest of them just in case there is something
+                // that overrides it (ie an exclude for an include or an always for an exclude)
                 boolean matchesInclude = false;
                 boolean matchesExclude = false;
                 boolean matchesAlways = false;
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java
index ec8449e..04f8712 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java
@@ -70,13 +70,15 @@ public class EntityWatchServices {
                 }
 
                 if (changed) {
-                    String errMsg = "Watching entity [" + currentValue.getEntityName() + "] field [" + fieldName + "] value changed from [" + currentFieldValue + "] to [" + newFieldValue + "] for pk [" + newValue.getPrimaryKey() + "]";
+                    String errMsg = "Watching entity [" + currentValue.getEntityName() + "] field [" + fieldName + "] value changed from ["
+                            + currentFieldValue + "] to [" + newFieldValue + "] for pk [" + newValue.getPrimaryKey() + "]";
                     Debug.logInfo(new Exception(errMsg), errMsg, MODULE);
                 }
             } else {
                 // watch the whole entity
                 if (!currentValue.equals(newValue)) {
-                    String errMsg = "Watching entity [" + currentValue.getEntityName() + "] values changed from [" + currentValue + "] to [" + newValue + "] for pk [" + newValue.getPrimaryKey() + "]";
+                    String errMsg = "Watching entity [" + currentValue.getEntityName() + "] values changed from [" + currentValue + "] to ["
+                            + newValue + "] for pk [" + newValue.getPrimaryKey() + "]";
                     Debug.logInfo(new Exception(errMsg), errMsg, MODULE);
                 }
             }
@@ -84,11 +86,13 @@ public class EntityWatchServices {
             if (UtilValidate.isNotEmpty(fieldName)) {
                 // just watch the field
                 Object newFieldValue = newValue.get(fieldName);
-                String errMsg = "Watching entity [" + newValue.getEntityName() + "] field [" + fieldName + "] value changed from [null] to [" + newFieldValue + "] for pk [" + newValue.getPrimaryKey() + "]";
+                String errMsg = "Watching entity [" + newValue.getEntityName() + "] field [" + fieldName + "] value changed from [null] to ["
+                        + newFieldValue + "] for pk [" + newValue.getPrimaryKey() + "]";
                 Debug.logInfo(new Exception(errMsg), errMsg, MODULE);
             } else {
                 // watch the whole entity
-                String errMsg = "Watching entity [" + newValue.getEntityName() + "] values changed from [null] to [" + newValue + "] for pk [" + newValue.getPrimaryKey() + "]";
+                String errMsg = "Watching entity [" + newValue.getEntityName() + "] values changed from [null] to [" + newValue + "] for pk ["
+                        + newValue.getPrimaryKey() + "]";
                 Debug.logInfo(new Exception(errMsg), errMsg, MODULE);
             }
         }
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
index e55c7ad..6dd3d49 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
@@ -87,7 +87,8 @@ public class EntityDataServices {
         String rootDirectory = (String) context.get("rootDirectory");
         URL rootDirectoryUrl = UtilURL.fromResource(rootDirectory);
         if (rootDirectoryUrl == null) {
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtUnableToLocateRootDirectory", UtilMisc.toMap("rootDirectory", rootDirectory), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtUnableToLocateRootDirectory",
+                    UtilMisc.toMap("rootDirectory", rootDirectory), locale));
         }
 
         String delimiter = (String) context.get("delimiter");
@@ -119,7 +120,8 @@ public class EntityDataServices {
                 }
             }
         } else {
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtNoFileAvailableInTheRootDirectory", UtilMisc.toMap("rootDirectory", rootDirectory), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtNoFileAvailableInTheRootDirectory",
+                    UtilMisc.toMap("rootDirectory", rootDirectory), locale));
         }
 
         return ServiceUtil.returnSuccess();
@@ -151,10 +153,12 @@ public class EntityDataServices {
         } catch (GeneralException e) {
             return ServiceUtil.returnError(e.getMessage());
         } catch (FileNotFoundException e) {
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtFileNotFound", UtilMisc.toMap("fileName", file.getName()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtFileNotFound", UtilMisc.toMap("fileName",
+                    file.getName()), locale));
         } catch (IOException e) {
             Debug.logError(e, MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtProblemReadingFile", UtilMisc.toMap("fileName", file.getName()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtProblemReadingFile",
+                    UtilMisc.toMap("fileName", file.getName()), locale));
         }
 
         long endTime = System.currentTimeMillis();
@@ -346,7 +350,8 @@ public class EntityDataServices {
             modelEntities = delegator.getModelEntityMapByGroup(groupName);
         } catch (GenericEntityException e) {
             Debug.logError(e, "Error getting list of entities in group: " + e.toString(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorGettingListOfEntityInGroup", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorGettingListOfEntityInGroup",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         }
 
         // step 1 - remove FK indices
@@ -440,7 +445,8 @@ public class EntityDataServices {
             }
         } catch (GenericEntityException e) {
             Debug.logError(e, "Error unwrapping ByteWrapper records: " + e.toString(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorUnwrappingRecords", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorUnwrappingRecords",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         }
 
         return ServiceUtil.returnSuccess();
@@ -515,7 +521,8 @@ public class EntityDataServices {
             modelEntities = delegator.getModelEntityMapByGroup(groupName);
         } catch (GenericEntityException e) {
             Debug.logError(e, "Error getting list of entities in group: " + e.toString(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorGettingListOfEntityInGroup", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorGettingListOfEntityInGroup",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         }
 
         for (ModelEntity modelEntity: modelEntities.values()) {
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java
index 641c57f..026bfcd 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java
@@ -68,7 +68,7 @@ public class UpgradeServices {
      * @param context
      * @return Map with the success result of the service,
      */
-    public static Map<String, Object> generateMySqlFileWithAlterTableForTimestamps (DispatchContext dctx, Map<String, Object> context) {
+    public static Map<String, Object> generateMySqlFileWithAlterTableForTimestamps(DispatchContext dctx, Map<String, Object> context) {
         Delegator delegator = dctx.getDelegator();
         Security security = dctx.getSecurity();
         Locale locale = (Locale) context.get("locale");
@@ -109,7 +109,8 @@ public class UpgradeServices {
             dataWriter.println("SET FOREIGN_KEY_CHECKS=1;");
         } catch (GenericEntityException e) {
             Debug.logError(e, "Error getting list of entities in group: " + e.toString(), MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorGettingListOfEntityInGroup", UtilMisc.toMap("errorString", e.toString()), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EntityExtErrorGettingListOfEntityInGroup",
+                    UtilMisc.toMap("errorString", e.toString()), locale));
         } catch (FileNotFoundException | UnsupportedEncodingException e) {
             Debug.logError(e, e.getMessage(), MODULE);
             return ServiceUtil.returnError(e.getMessage());
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
index d1e1996..c5a18a5 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
@@ -45,10 +45,10 @@ public class DelegatorEcaHandler implements EntityEcaHandler<EntityEcaRule> {
 
     private static final String MODULE = DelegatorEcaHandler.class.getName();
 
-    protected Delegator delegator = null;
-    protected String delegatorName = null;
-    protected String entityEcaReaderName = null;
-    protected AtomicReference<Future<DispatchContext>> dctx = new AtomicReference<>();
+    private Delegator delegator = null;
+    private String delegatorName = null;
+    private String entityEcaReaderName = null;
+    private AtomicReference<Future<DispatchContext>> dctx = new AtomicReference<>();
 
     public DelegatorEcaHandler() { }
 
@@ -70,6 +70,11 @@ public class DelegatorEcaHandler implements EntityEcaHandler<EntityEcaRule> {
         EntityEcaUtil.getEntityEcaCache(this.entityEcaReaderName);
     }
 
+    /**
+     * Gets dispatch context.
+     * @return the dispatch context
+     * @throws GenericEntityException the generic entity exception
+     */
     protected DispatchContext getDispatchContext() throws GenericEntityException {
         Future<DispatchContext> future = this.dctx.get();
         try {
@@ -87,7 +92,8 @@ public class DelegatorEcaHandler implements EntityEcaHandler<EntityEcaRule> {
     }
 
     @Override
-    public void evalRules(String currentOperation, Map<String, List<EntityEcaRule>> eventMap, String event, GenericEntity value, boolean isError) throws GenericEntityException {
+    public void evalRules(String currentOperation, Map<String, List<EntityEcaRule>> eventMap, String event, GenericEntity value, boolean isError)
+            throws GenericEntityException {
         // if the eventMap is passed we save a HashMap lookup, but if not that's okay we'll just look it up now
         if (eventMap == null) eventMap = this.getEntityEventMap(value.getEntityName());
         if (UtilValidate.isEmpty(eventMap)) {
@@ -96,7 +102,8 @@ public class DelegatorEcaHandler implements EntityEcaHandler<EntityEcaRule> {
         }
 
         List<EntityEcaRule> rules = eventMap.get(event);
-        //Debug.logInfo("Handler.evalRules for entity " + value.getEntityName() + ", event " + event + ", num rules=" + (rules == null ? 0 : rules.size()), MODULE);
+        //Debug.logInfo("Handler.evalRules for entity " + value.getEntityName() + ", event " + event + ", num rules=" + (rules == null ? 0
+        // : rules.size()), MODULE);
 
         if (UtilValidate.isEmpty(rules)) {
             return;
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
index 94ed1a7..01261d1 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
@@ -78,7 +78,8 @@ public final class EntityEcaAction implements java.io.Serializable {
             }
 
             //Debug.logInfo("Running Entity ECA action service " + this.serviceName + " triggered by entity: " + value.getEntityName(), MODULE);
-            //Debug.logInfo("Running Entity ECA action service " + this.serviceName + "; value=" + value + "; actionContext=" + actionContext, MODULE);
+            //Debug.logInfo("Running Entity ECA action service " + this.serviceName + "; value=" + value + "; actionContext="
+            // + actionContext, MODULE);
 
             // setup the run-as-user
             GenericValue userLoginToRunAs = null;
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
index 44450ea..a3e6a2c 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
@@ -44,14 +44,14 @@ public final class EntityEcaCondition implements java.io.Serializable {
 
     private static final String MODULE = EntityEcaCondition.class.getName();
 
-    protected String lhsValueName = null;
-    protected String rhsValueName = null;
-    protected String operator = null;
-    protected String compareType = null;
-    protected String format = null;
-    protected boolean constant = false;
-    protected boolean isService = false;
-    protected String conditionService = null;
+    private String lhsValueName = null;
+    private String rhsValueName = null;
+    private String operator = null;
+    private String compareType = null;
+    private String format = null;
+    private boolean constant = false;
+    private boolean isService = false;
+    private String conditionService = null;
 
     public EntityEcaCondition(Element condition, boolean constant, boolean isService) {
         if (isService) {
@@ -96,7 +96,7 @@ public final class EntityEcaCondition implements java.io.Serializable {
                 }
                 return conditionReply;
             } catch (GenericServiceException gse) {
-                throw new GenericEntityException("Error in calling condition service " + conditionService+". " + gse.getMessage());
+                throw new GenericEntityException("Error in calling condition service " + conditionService + ". " + gse.getMessage());
             }
         }
 
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
index 3833cc5..a19b440 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
@@ -116,13 +116,15 @@ public final class EntityEcaRule implements java.io.Serializable {
         return this.conditions;
     }
 
-    public void eval(String currentOperation, DispatchContext dctx, GenericEntity value, boolean isError, Set<String> actionsRun) throws GenericEntityException {
+    public void eval(String currentOperation, DispatchContext dctx, GenericEntity value, boolean isError, Set<String> actionsRun)
+            throws GenericEntityException {
         if (!enabled) {
             Debug.logInfo("Entity ECA [" + this.entityName + "] on [" + this.eventName + "] is disabled; not running.", MODULE);
             return;
         }
 
-        //Debug.logInfo("eval eeca rule: operation=" + currentOperation + ", in event=" + this.eventName + ", on entity=" + this.entityName + ", for value=" + value, MODULE);
+        //Debug.logInfo("eval eeca rule: operation=" + currentOperation + ", in event=" + this.eventName + ", on entity=" + this.entityName
+        // + ", for value=" + value, MODULE);
         if (isError && !this.runOnError) {
             return;
         }
@@ -167,7 +169,8 @@ public final class EntityEcaRule implements java.io.Serializable {
                     //only execute a given service name once per service call phase
                     if (actionsRun.add(ea.getServiceName())) {
                         if (Debug.infoOn()) {
-                            Debug.logInfo("Running Entity ECA Service: " + ea.getServiceName() + ", triggered by rule on Entity: " + value.getEntityName(), MODULE);
+                            Debug.logInfo("Running Entity ECA Service: " + ea.getServiceName() + ", triggered by rule on Entity: "
+                                    + value.getEntityName(), MODULE);
                         }
                         ea.runAction(dctx, context, value);
                     }
@@ -209,7 +212,7 @@ public final class EntityEcaRule implements java.io.Serializable {
 
     @Override
     public boolean equals(Object obj) {
-    if (obj instanceof EntityEcaRule) {
+        if (obj instanceof EntityEcaRule) {
             EntityEcaRule other = (EntityEcaRule) obj;
             if (!Objects.equals(this.entityName, other.entityName)) {
                 return false;
@@ -242,6 +245,8 @@ public final class EntityEcaRule implements java.io.Serializable {
 
     @Override
     public String toString() {
-        return "EntityEcaRule:" + this.entityName + ":" + this.operationName + ":" + this.eventName +  ":runOnError=" + this.runOnError + ":enabled=" + this.enabled + ":conditions=" + this.conditions + ":actionsAndSets=" + this.actionsAndSets + ":conditionFieldNames" + this.conditionFieldNames;
+        return "EntityEcaRule:" + this.entityName + ":" + this.operationName + ":" + this.eventName + ":runOnError=" + this.runOnError
+                + ":enabled=" + this.enabled + ":conditions=" + this.conditions + ":actionsAndSets=" + this.actionsAndSets + ":conditionFieldNames"
+                + this.conditionFieldNames;
     }
 }
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 e01ef58..9c89a03 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
@@ -283,7 +283,8 @@ public class EntityPermissionChecker {
 
         List<GenericValue> targetOperationEntityList = EntityQuery.use(delegator)
                                                                   .from(modelOperationEntity.getEntityName())
-                                                                  .where(EntityCondition.makeCondition(lcEntityName + "OperationId", EntityOperator.IN, targetOperationList))
+                                                                  .where(EntityCondition.makeCondition(lcEntityName + "OperationId",
+                                                                          EntityOperator.IN, targetOperationList))
                                                                   .cache(true)
                                                                   .queryList();
         Map<String, GenericValue> entities = new HashMap<>();
@@ -426,8 +427,9 @@ public class EntityPermissionChecker {
             roles.put(entityId, roleList);
         }
 
-        if (passed)
+        if (passed) {
             return true;
+        }
 
         // Follow ownedEntityIds
         if (modelEntity.getField("owner" + entityName + "Id") != null) {
@@ -439,7 +441,8 @@ public class EntityPermissionChecker {
                 List<String> ownedContentIdList = new LinkedList<>();
                 getEntityOwners(delegator, entity, ownedContentIdList, "Content", "ownerContentId");
 
-                List<String> ownedContentRoleIds = getUserRolesFromList(delegator, ownedContentIdList, partyId, "contentId", "partyId", "roleTypeId", "ContentRole");
+                List<String> ownedContentRoleIds = getUserRolesFromList(delegator, ownedContentIdList, partyId, "contentId",
+                        "partyId", "roleTypeId", "ContentRole");
                 String statusId = null;
                 if (hasStatusOp && hasStatusField) {
                     statusId = entity.getString("statusId");
@@ -511,8 +514,9 @@ public class EntityPermissionChecker {
 
         return passed;
     }
-    public static boolean checkPermissionMethod(Delegator delegator, String partyId, String entityName, List<? extends Object> entityIdList, AuxiliaryValueGetter auxiliaryValueGetter, RelatedRoleGetter relatedRoleGetter, PermissionConditionGetter permissionConditionGetter) throws GenericEntityException {
-
+    public static boolean checkPermissionMethod(Delegator delegator, String partyId, String entityName, List<? extends Object> entityIdList,
+            AuxiliaryValueGetter auxiliaryValueGetter, RelatedRoleGetter relatedRoleGetter, PermissionConditionGetter permissionConditionGetter)
+            throws GenericEntityException {
         permissionConditionGetter.init(delegator);
         if (Debug.verboseOn()) {
             Debug.logVerbose(permissionConditionGetter.dumpAsText(), MODULE);
@@ -547,8 +551,7 @@ public class EntityPermissionChecker {
             if (passed) {
                 break;
             }
-       }
-
+        }
         if (passed) {
             return true;
         }
@@ -586,10 +589,9 @@ public class EntityPermissionChecker {
                 }
             }
         }
-
-        if (passed)
+        if (passed) {
             return true;
-
+        }
         if (relatedRoleGetter != null) {
             for (Object id: entityIdList) {
                 GenericValue entity = getNextEntity(delegator, entityName, pkFieldName, id, entities);
@@ -602,13 +604,12 @@ public class EntityPermissionChecker {
                 }
             }
         }
-
-
         return passed;
     }
 
 
-    public static GenericValue getNextEntity(Delegator delegator, String entityName, String pkFieldName, Object obj, Map<String, GenericValue> entities) throws GenericEntityException {
+    public static GenericValue getNextEntity(Delegator delegator, String entityName, String pkFieldName, Object obj, Map<String,
+            GenericValue> entities) throws GenericEntityException {
         GenericValue entity = null;
         if (obj instanceof String) {
             String entityId = (String) obj;
@@ -662,8 +663,9 @@ public class EntityPermissionChecker {
                                 break;
                             }
                         }
-                        if (hasRoleOperation)
+                        if (hasRoleOperation) {
                             break;
+                        }
                     }
                 }
             } catch (GenericEntityException e) {
@@ -674,7 +676,8 @@ public class EntityPermissionChecker {
         return hasRoleOperation;
     }
 
-    public static boolean hasMatch(String entityName, List<GenericValue> targetOperations, List<String> roles, boolean hasPurposeOp, List<String> purposes, boolean hasStatusOp, String targStatusId) {
+    public static boolean hasMatch(String entityName, List<GenericValue> targetOperations, List<String> roles, boolean hasPurposeOp,
+                                   List<String> purposes, boolean hasStatusOp, String targStatusId) {
         boolean isMatch = false;
 
     //    if (UtilValidate.isNotEmpty(targPrivilegeEnumId) && !targPrivilegeEnumId.equals("_NA_") && !targPrivilegeEnumId.equals("_00_")) {
@@ -697,9 +700,11 @@ public class EntityPermissionChecker {
                 //testPrivilegeEnumId = (String) targetOp.get("privilegeEnumId");
             //int testPrivilegeSeq = 0;
 
-            boolean purposesCond = (!hasPurposeOp || (purposes != null && purposes.contains(testContentPurposeTypeId)) || "_NA_".equals(testContentPurposeTypeId));
+            boolean purposesCond = (!hasPurposeOp || (purposes != null && purposes.contains(testContentPurposeTypeId))
+                    || "_NA_".equals(testContentPurposeTypeId));
             boolean statusCond = (!hasStatusOp || "_NA_".equals(testStatusId) || (targStatusId != null && targStatusId.equals(testStatusId)));
-            //boolean privilegeCond = (!hasPrivilegeOp || testPrivilegeEnumId.equals("_NA_") || testPrivilegeSeq <= targPrivilegeSeq || testPrivilegeEnumId.equals(targPrivilegeEnumId));
+            //boolean privilegeCond = (!hasPrivilegeOp || testPrivilegeEnumId.equals("_NA_") || testPrivilegeSeq <= targPrivilegeSeq
+            // || testPrivilegeEnumId.equals(targPrivilegeEnumId));
             boolean roleCond = ("_NA_".equals(testRoleTypeId) || (roles != null && roles.contains(testRoleTypeId)));
 
 
@@ -711,7 +716,8 @@ public class EntityPermissionChecker {
         return isMatch;
     }
 
-    public static boolean hasMatch(GenericValue entity, PermissionConditionGetter permissionConditionGetter, RelatedRoleGetter relatedRoleGetter, AuxiliaryValueGetter auxiliaryValueGetter, String partyId, boolean checkAncestors) throws GenericEntityException {
+    public static boolean hasMatch(GenericValue entity, PermissionConditionGetter permissionConditionGetter, RelatedRoleGetter relatedRoleGetter,
+                                   AuxiliaryValueGetter auxiliaryValueGetter, String partyId, boolean checkAncestors) throws GenericEntityException {
 
         ModelEntity modelEntity = entity.getModelEntity();
         Delegator delegator = entity.getDelegator();
@@ -764,9 +770,12 @@ public class EntityPermissionChecker {
             String auxiliaryConditionId = permissionConditionGetter.getAuxiliaryValue();
             String statusConditionId = permissionConditionGetter.getStatusValue();
 
-            boolean auxiliaryCond = (auxiliaryConditionId == null ||  "_NA_".equals(auxiliaryConditionId) || (auxiliaryValueList != null && auxiliaryValueList.contains(auxiliaryConditionId)) );
-            boolean statusCond = (statusConditionId == null || "_NA_".equals(statusConditionId) || (targStatusId != null && targStatusId.equals(statusConditionId)));
-            boolean roleCond = (roleConditionId == null || "_NA_".equals(roleConditionId) || (roleValueList != null && roleValueList.contains(roleConditionId)));
+            boolean auxiliaryCond = (auxiliaryConditionId == null || "_NA_".equals(auxiliaryConditionId) || (auxiliaryValueList != null
+                    && auxiliaryValueList.contains(auxiliaryConditionId)));
+            boolean statusCond = (statusConditionId == null || "_NA_".equals(statusConditionId) || (targStatusId != null
+                    && targStatusId.equals(statusConditionId)));
+            boolean roleCond = (roleConditionId == null || "_NA_".equals(roleConditionId) || (roleValueList != null
+                    && roleValueList.contains(roleConditionId)));
 
             if (auxiliaryCond && statusCond && roleCond) {
                 if (Debug.verboseOn()) {
@@ -804,12 +813,9 @@ public class EntityPermissionChecker {
             Debug.logError(e, "No associated purposes found. ", MODULE);
             return purposeIds;
         }
-
         for (GenericValue val: purposes) {
             purposeIds.add((String) val.get(lcEntityName + "PurposeTypeId"));
         }
-
-
         return purposeIds;
     }
 
@@ -919,7 +925,8 @@ public class EntityPermissionChecker {
 
         List<GenericValue> partyRelationships = null;
         try {
-            partyRelationships = EntityQuery.use(delegator).from("PartyRelationship").where("partyIdFrom", partyIdFrom, "partyIdTo", partyIdTo).queryList();
+            partyRelationships = EntityQuery.use(delegator).from("PartyRelationship").where("partyIdFrom", partyIdFrom, "partyIdTo",
+                    partyIdTo).queryList();
         } catch (GenericEntityException e) {
             Debug.logError(e, "Problem finding PartyRelationships. ", MODULE);
             return false;
@@ -962,8 +969,7 @@ public class EntityPermissionChecker {
         private String auxiliaryFieldName;
         private String entityName;
 
-        public StdPermissionConditionGetter () {
-
+        public StdPermissionConditionGetter() {
             this.operationFieldName = "contentOperationId";
             this.roleFieldName = "roleTypeId";
             this.statusFieldName = "statusId";
@@ -972,8 +978,8 @@ public class EntityPermissionChecker {
             this.entityName = "ContentPurposeOperation";
         }
 
-        public StdPermissionConditionGetter(String entityName, String operationFieldName, String roleFieldName, String statusFieldName, String auxiliaryFieldName, String privilegeFieldName) {
-
+        public StdPermissionConditionGetter(String entityName, String operationFieldName, String roleFieldName, String statusFieldName,
+                                            String auxiliaryFieldName, String privilegeFieldName) {
             this.operationFieldName = operationFieldName;
             this.roleFieldName = roleFieldName;
             this.statusFieldName = statusFieldName;
@@ -982,7 +988,7 @@ public class EntityPermissionChecker {
             this.entityName = entityName;
         }
 
-        public StdPermissionConditionGetter (Element getterElement) {
+        public StdPermissionConditionGetter(Element getterElement) {
             this.operationFieldName = getterElement.getAttribute("operation-field-name");
             this.roleFieldName = getterElement.getAttribute("role-field-name");
             this.statusFieldName = getterElement.getAttribute("status-field-name");
@@ -1203,6 +1209,10 @@ public class EntityPermissionChecker {
             this.entityList = new LinkedList<>();
         }
 
+        /**
+         * Sets list.
+         * @param lst the lst
+         */
         public void setList(List<String> lst) {
             this.entityList = lst;
         }
@@ -1211,7 +1221,7 @@ public class EntityPermissionChecker {
         public void init(Delegator delegator, String entityId) throws GenericEntityException {
 
             if (this.entityList == null) {
-               this.entityList = new LinkedList<>();
+                this.entityList = new LinkedList<>();
             }
             if (UtilValidate.isEmpty(this.entityName)) {
                 return;
@@ -1266,7 +1276,8 @@ public class EntityPermissionChecker {
             this.roleEntityIdName = "contentId";
         }
 
-        public StdRelatedRoleGetter(String entityName, String roleTypeFieldName, String roleEntityIdName, String partyFieldName, String ownerEntityFieldName, String roleEntityName) {
+        public StdRelatedRoleGetter(String entityName, String roleTypeFieldName, String roleEntityIdName, String partyFieldName,
+                                    String ownerEntityFieldName, String roleEntityName) {
 
             this.roleTypeFieldName = roleTypeFieldName;
             this.partyFieldName = partyFieldName;
@@ -1303,7 +1314,6 @@ public class EntityPermissionChecker {
 
         @Override
         public void init(Delegator delegator, String entityId, String partyId, GenericValue entity) throws GenericEntityException {
-
             List<String> lst = getUserRolesFromList(delegator, UtilMisc.toList(entityId), partyId, this.roleEntityIdName,
                     this.partyFieldName, this.roleTypeFieldName, this.roleEntityName);
             this.roleIdList.addAll(lst);
@@ -1369,8 +1379,8 @@ public class EntityPermissionChecker {
         }
     }
 
-    public static List<String> getUserRolesFromList(Delegator delegator, List<String> idList, String partyId, String entityIdFieldName, String partyIdFieldName, String roleTypeIdFieldName, String entityName) throws GenericEntityException {
-
+    public static List<String> getUserRolesFromList(Delegator delegator, List<String> idList, String partyId, String entityIdFieldName, String
+            partyIdFieldName, String roleTypeIdFieldName, String entityName) throws GenericEntityException {
         EntityExpr expr = EntityCondition.makeCondition(entityIdFieldName, EntityOperator.IN, idList);
         EntityExpr expr2 = EntityCondition.makeCondition(partyIdFieldName, partyId);
         List<GenericValue> roleList = EntityQuery.use(delegator)
@@ -1388,7 +1398,8 @@ public class EntityPermissionChecker {
         return distinctList;
     }
 
-    public static void getEntityOwners(Delegator delegator, GenericValue entity, List<String> contentOwnerList, String entityName, String ownerIdFieldName) throws GenericEntityException {
+    public static void getEntityOwners(Delegator delegator, GenericValue entity, List<String> contentOwnerList, String entityName, String
+            ownerIdFieldName) throws GenericEntityException {
 
         String ownerContentId = entity.getString(ownerIdFieldName);
         if (UtilValidate.isNotEmpty(ownerContentId)) {
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 37b2d7b..775b638 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
@@ -451,7 +451,8 @@ public class EntitySyncContext {
                         // sort by the tx stamp and then the record stamp
                         // find first value in valuesToCreate list, starting with the current insertBefore value, that has a CREATE_STAMP_TX_FIELD
                         // after the nextValue.CREATE_STAMP_TX_FIELD, then do the same with CREATE_STAMP_FIELD
-                        while (insertBefore < valuesToCreate.size() && valuesToCreate.get(insertBefore).getTimestamp(ModelEntity.CREATE_STAMP_TX_FIELD)
+                        while (insertBefore < valuesToCreate.size() && valuesToCreate.get(insertBefore)
+                                .getTimestamp(ModelEntity.CREATE_STAMP_TX_FIELD)
                                 .before(nextValue.getTimestamp(ModelEntity.CREATE_STAMP_TX_FIELD))) {
                             insertBefore++;
                         }
@@ -888,7 +889,7 @@ public class EntitySyncContext {
 
             // 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);
+                    "lastSuccessfulSynchTime", this.currentRunEndTime, "userLogin", userLogin), 60, true);
 
             GenericValue entitySyncHistory = EntityQuery.use(delegator).from("EntitySyncHistory").where("startDate", startDate, "entitySyncId",
                     entitySyncId).queryOne();
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
index cad9ff8..bdaef40 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
@@ -107,7 +107,8 @@ public final class MiniLangUtil {
      * @param retFieldFma
      * @throws MiniLangRuntimeException
      */
-    public static void callMethod(MethodOperation operation, MethodContext methodContext, List<MethodObject<?>> parameters, Class<?> methodClass, Object methodObject, String methodName, FlexibleMapAccessor<Object> retFieldFma) throws MiniLangRuntimeException {
+    public static void callMethod(MethodOperation operation, MethodContext methodContext, List<MethodObject<?>> parameters, Class<?>
+            methodClass, Object methodObject, String methodName, FlexibleMapAccessor<Object> retFieldFma) throws MiniLangRuntimeException {
         Object[] args = null;
         Class<?>[] parameterTypes = null;
         if (parameters != null) {
@@ -282,7 +283,7 @@ public final class MiniLangUtil {
             styleSheetURL = FlexibleLocation.resolveLocation("component://minilang/config/MiniLang.xslt");
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             try (InputStream styleSheetInStream = styleSheetURL.openStream()) {
-            transformer = transformerFactory.newTransformer(new StreamSource(styleSheetInStream));
+                transformer = transformerFactory.newTransformer(new StreamSource(styleSheetInStream));
             }
         } catch (Exception e) {
             Debug.logWarning(e, "Error reading minilang/config/MiniLang.xslt: ", MODULE);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
index e7fbb36..47f42d8 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
@@ -118,7 +118,8 @@ public final class MiniLangValidate {
         for (String name : attributeNames) {
             String attributeValue = element.getAttribute(name);
             if (!MiniLangUtil.isConstantPlusExpressionAttribute(attributeValue)) {
-                handleError("Constant+expr attribute \"" + name + "\" is missing a constant value (expression-only constants are not allowed).", method, element);
+                handleError("Constant+expr attribute \"" + name + "\" is missing a constant value (expression-only constants are not allowed).",
+                        method, element);
             }
             if (MiniLangUtil.containsScript(attributeValue)) {
                 handleError("Constant+expr attribute \"" + name + "\" cannot contain a script (remove script).", method, element);
@@ -134,7 +135,8 @@ public final class MiniLangValidate {
      * @param fixInstruction Instructions to fix the deprecated attribute
      * @throws ValidationException If the deprecated attribute is found and <code>validation.level=strict</code>
      */
-    public static void deprecatedAttribute(SimpleMethod method, Element element, String attributeName, String fixInstruction) throws ValidationException {
+    public static void deprecatedAttribute(SimpleMethod method, Element element, String attributeName, String fixInstruction)
+            throws ValidationException {
         String attributeValue = element.getAttribute(attributeName);
         if (!attributeValue.isEmpty()) {
             handleError("Attribute \"" + attributeName + "\" is deprecated (" + fixInstruction + ")", method, element);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
index 7e99cf4..fe9471f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
@@ -78,7 +78,8 @@ public final class MessageElement extends MiniLangElement {
         if (messageFse != null) {
             return messageFse.expandString(methodContext.getEnvMap());
         } else {
-            return UtilProperties.getMessage(propertyResource, propertyFse.expandString(methodContext.getEnvMap()), methodContext.getEnvMap(), methodContext.getLocale());
+            return UtilProperties.getMessage(propertyResource, propertyFse.expandString(methodContext.getEnvMap()), methodContext.getEnvMap(),
+                    methodContext.getLocale());
         }
     }
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
index a443366..a60a0d0 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
@@ -102,7 +102,8 @@ public final class MethodContext {
     }
 
     /**
-     * This is a very simple constructor which assumes the needed objects (dispatcher, delegator, security, request, response, etc) are in the context. Will result in calling method as a
+     * This is a very simple constructor which assumes the needed objects (dispatcher, delegator, security, request, response,
+     * etc) are in the context. Will result in calling method as a
      * service or event, as specified.
      */
     public MethodContext(Map<String, ? extends Object> context, ClassLoader loader, int methodType) {
@@ -118,22 +119,28 @@ public final class MethodContext {
         if (methodType == MethodContext.EVENT) {
             this.request = (HttpServletRequest) context.get("request");
             this.response = (HttpServletResponse) context.get("response");
-            if (this.locale == null)
+            if (this.locale == null) {
                 this.locale = UtilHttp.getLocale(request);
-            if (this.timeZone == null)
+            }
+            if (this.timeZone == null) {
                 this.timeZone = UtilHttp.getTimeZone(request);
+            }
             // make sure the delegator and other objects are in place, getting from
             // request if necessary; assumes this came through the ControlServlet
             // or something similar
             if (this.request != null) {
-                if (this.dispatcher == null)
+                if (this.dispatcher == null) {
                     this.dispatcher = (LocalDispatcher) this.request.getAttribute("dispatcher");
-                if (this.delegator == null)
+                }
+                if (this.delegator == null) {
                     this.delegator = (Delegator) this.request.getAttribute("delegator");
-                if (this.security == null)
+                }
+                if (this.security == null) {
                     this.security = (Security) this.request.getAttribute("security");
-                if (this.userLogin == null)
+                }
+                if (this.userLogin == null) {
                     this.userLogin = (GenericValue) this.request.getSession().getAttribute("userLogin");
+                }
             }
         }
         if (this.loader == null) {
@@ -158,7 +165,8 @@ public final class MethodContext {
     }
 
     /**
-     * Gets the named value from the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List entries. This value is expanded, supporting the
+     * Gets the named value from the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket)
+     * syntax to access List entries. This value is expanded, supporting the
      * insertion of other environment values using the "${}" notation.
      * @param key
      *            The name of the environment value to get. Can contain "." and "[]" syntax elements as described above.
@@ -244,9 +252,11 @@ public final class MethodContext {
     }
 
     /**
-     * Puts the named value in the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List entries. If the brackets for a list are empty the value
-     * will be appended to end of the list, otherwise the value will be set in the position of the number in the brackets. If a "+" (plus sign) is included inside the square brackets before the index
-     * number the value will inserted/added at that index instead of set at that index. This value is expanded, supporting the insertion of other environment values using the "${}" notation.
+     * Puts the named value in the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List
+     * entries. If the brackets for a list are empty the value will be appended to end of the list, otherwise the value will be set in the position
+     * of the number in the brackets. If a "+" (plus sign) is included inside the square brackets before the index number the value will
+     * inserted/added at that index instead of set at that index. This value is expanded, supporting the insertion of other environment values
+     * using the "${}" notation.
      * @param key
      *            The name of the environment value to get. Can contain "." syntax elements as described above.
      * @param value
@@ -271,7 +281,8 @@ public final class MethodContext {
     }
 
     /**
-     * Removes the named value from the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List entries. This value is expanded, supporting the
+     * Removes the named value from the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access
+     * List entries. This value is expanded, supporting the
      * insertion of other environment values using the "${}" notation.
      * @param key
      *            The name of the environment value to get. Can contain "." syntax elements as described above.
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
index 5430a62..a34a046 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
@@ -88,10 +88,12 @@ public final class CallServiceAsynch extends MethodOperation {
             methodContext.getDispatcher().runAsync(serviceName, inMap);
         } catch (GenericServiceException e) {
             if (methodContext.isTraceOn()) {
-                outputTraceMessage(methodContext, "Service engine threw an exception: " + e.getMessage() + ", halting script execution. End call-service-asynch.");
+                outputTraceMessage(methodContext, "Service engine threw an exception: " + e.getMessage()
+                        + ", halting script execution. End call-service-asynch.");
             }
             Debug.logError(e, MODULE);
-            String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [problem invoking the " + serviceName + " service: " + e.getMessage() + "]";
+            String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [problem invoking the "
+                    + serviceName + " service: " + e.getMessage() + "]";
             if (methodContext.getMethodType() == MethodContext.EVENT) {
                 methodContext.putEnv(simpleMethod.getEventErrorMessageName(), errMsg);
                 methodContext.putEnv(simpleMethod.getEventResponseCodeName(), simpleMethod.getDefaultErrorCode());
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
index 0d166ad..4001f09 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
@@ -50,7 +50,8 @@ public final class CallSimpleMapProcessor extends MethodOperation {
     public CallSimpleMapProcessor(Element element, SimpleMethod simpleMethod) throws MiniLangException {
         super(element, simpleMethod);
         if (MiniLangValidate.validationOn()) {
-            MiniLangValidate.attributeNames(simpleMethod, element, "processor-name", "xml-resource", "in-map-name", "out-map-name", "error-list-name");
+            MiniLangValidate.attributeNames(simpleMethod, element, "processor-name", "xml-resource", "in-map-name",
+                    "out-map-name", "error-list-name");
             MiniLangValidate.constantAttributes(simpleMethod, element, "processor-name", "xml-resource", "error-list-name");
             MiniLangValidate.expressionAttributes(simpleMethod, element, "in-map-name", "out-map-name");
             MiniLangValidate.requiredAttributes(simpleMethod, element, "in-map-name", "out-map-name");
@@ -88,7 +89,8 @@ public final class CallSimpleMapProcessor extends MethodOperation {
         // run external map processor first
         if (!this.xmlResource.isEmpty() && !this.processorName.isEmpty()) {
             try {
-                SimpleMapProcessor.runSimpleMapProcessor(xmlResource, processorName, inMap, outMap, messages, methodContext.getLocale(), methodContext.getLoader());
+                SimpleMapProcessor.runSimpleMapProcessor(xmlResource, processorName, inMap, outMap, messages, methodContext.getLocale(),
+                        methodContext.getLoader());
             } catch (MiniLangException e) {
                 messages.add("Error running SimpleMapProcessor in XML file \"" + xmlResource + "\": " + e.toString());
             }
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
index 3d1e314..051d513 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
@@ -72,7 +72,8 @@ public final class CallSimpleMethod extends MethodOperation {
         try {
             xmlURL = FlexibleLocation.resolveLocation(this.xmlResource);
         } catch (MalformedURLException e) {
-            MiniLangValidate.handleError("Could not find SimpleMethod XML document in resource: " + this.xmlResource + "; error was: " + e.toString(), simpleMethod, element);
+            MiniLangValidate.handleError("Could not find SimpleMethod XML document in resource: " + this.xmlResource
+                    + "; error was: " + e.toString(), simpleMethod, element);
         }
         this.xmlURL = xmlURL;
         this.scope = element.getAttribute("scope");
@@ -98,7 +99,8 @@ public final class CallSimpleMethod extends MethodOperation {
         }
         SimpleMethod simpleMethodToCall = SimpleMethod.getSimpleMethod(this.xmlURL, this.methodName);
         if (simpleMethodToCall == null) {
-            throw new MiniLangRuntimeException("Could not find <simple-method name=\"" + this.methodName + "\"> in XML document " + this.xmlResource, this);
+            throw new MiniLangRuntimeException("Could not find <simple-method name=\"" + this.methodName + "\"> in XML document "
+                    + this.xmlResource, this);
         }
         MethodContext localContext = methodContext;
         if ("function".equals(this.scope)) {
@@ -110,7 +112,8 @@ public final class CallSimpleMethod extends MethodOperation {
         }
         String returnVal = simpleMethodToCall.exec(localContext);
         if (Debug.verboseOn()) {
-             Debug.logVerbose("Called simple-method named [" + this.methodName + "] in resource [" + this.xmlResource + "], returnVal is [" + returnVal + "]", MODULE);
+            Debug.logVerbose("Called simple-method named [" + this.methodName + "] in resource [" + this.xmlResource + "], returnVal is ["
+                     + returnVal + "]", MODULE);
         }
         if (simpleMethodToCall.getDefaultErrorCode().equals(returnVal)) {
             if (methodContext.getMethodType() == MethodContext.EVENT) {
@@ -125,7 +128,8 @@ public final class CallSimpleMethod extends MethodOperation {
             // response code. Since response codes are configurable per method, this code will fail.
             String responseCode = (String) localContext.getEnv(this.simpleMethod.getEventResponseCodeName());
             if (this.simpleMethod.getDefaultErrorCode().equals(responseCode)) {
-                Debug.logWarning("Got error [" + responseCode + "] calling inline simple-method named [" + this.methodName + "] in resource [" + this.xmlResource + "], message is " + methodContext.getEnv(this.simpleMethod.getEventErrorMessageName()), MODULE);
+                Debug.logWarning("Got error [" + responseCode + "] calling inline simple-method named [" + this.methodName + "] in resource ["
+                        + this.xmlResource + "], message is " + methodContext.getEnv(this.simpleMethod.getEventErrorMessageName()), MODULE);
                 return false;
             }
         } else if (methodContext.getMethodType() == MethodContext.SERVICE) {
@@ -133,7 +137,9 @@ public final class CallSimpleMethod extends MethodOperation {
             // response message. Since response messages are configurable per method, this code will fail.
             String responseMessage = (String) localContext.getEnv(this.simpleMethod.getServiceResponseMessageName());
             if (this.simpleMethod.getDefaultErrorCode().equals(responseMessage)) {
-                Debug.logWarning("Got error [" + responseMessage + "] calling inline simple-method named [" + this.methodName + "] in resource [" + this.xmlResource + "], message is " + methodContext.getEnv(this.simpleMethod.getServiceErrorMessageName()) + ", and the error message list is: "
+                Debug.logWarning("Got error [" + responseMessage + "] calling inline simple-method named [" + this.methodName + "] in resource ["
+                        + this.xmlResource + "], message is " + methodContext.getEnv(this.simpleMethod.getServiceErrorMessageName())
+                        + ", and the error message list is: "
                         + methodContext.getEnv(this.simpleMethod.getServiceErrorMessageListName()), MODULE);
                 return false;
             }
@@ -161,7 +167,8 @@ public final class CallSimpleMethod extends MethodOperation {
                 }
             }
         } catch (MiniLangException e) {
-            Debug.logWarning("Could not find <simple-method name=\"" + this.methodName + "\"> in XML document " + this.xmlResource + ": " + e.toString(), MODULE);
+            Debug.logWarning("Could not find <simple-method name=\"" + this.methodName + "\"> in XML document " + this.xmlResource + ": "
+                    + e.toString(), MODULE);
         }
     }
 
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
index f79c44e..5268785 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
@@ -103,7 +103,8 @@ public final class SetServiceFields extends MethodOperation {
             toMapFma.put(methodContext.getEnvMap(), toMap);
         }
         List<Object> errorMessages = new LinkedList<>();
-        Map<String, Object> validAttributes = modelService.makeValid(fromMap, mode, true, errorMessages, methodContext.getTimeZone(), methodContext.getLocale());
+        Map<String, Object> validAttributes = modelService.makeValid(fromMap, mode, true, errorMessages,
+                methodContext.getTimeZone(), methodContext.getLocale());
         if (!errorMessages.isEmpty()) {
             for (Object obj : errorMessages) {
                 simpleMethod.addErrorMessage(methodContext, (String) obj);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
index 02251bc..274e6f6 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
@@ -74,7 +74,8 @@ public final class CompareCondition extends MethodOperation implements Condition
         Class<?> targetClass = null;
         if (!this.type.isEmpty()) {
             if ("contains".equals(this.operator)) {
-                MiniLangValidate.handleError("Operator \"contains\" does not support type conversions (remove the type attribute).", simpleMethod, element);
+                MiniLangValidate.handleError("Operator \"contains\" does not support type conversions (remove the type attribute).",
+                        simpleMethod, element);
                 targetClass = Object.class;
             } else {
                 try {
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
index f9ea7f0..af46dd2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
@@ -201,7 +201,8 @@ public final class CompareFieldCondition extends MethodOperation implements Cond
     /**
      * A &lt;if-compare-field&gt; element factory.
      */
-    public static final class CompareFieldConditionFactory extends ConditionalFactory<CompareFieldCondition> implements Factory<CompareFieldCondition> {
+    public static final class CompareFieldConditionFactory extends ConditionalFactory<CompareFieldCondition> implements
+            Factory<CompareFieldCondition> {
         @Override
         public CompareFieldCondition createCondition(Element element, SimpleMethod simpleMethod) throws MiniLangException {
             return new CompareFieldCondition(element, simpleMethod);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
index f37ec4a..4af4f0e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
@@ -43,7 +43,8 @@ public abstract class ConditionalFactory<C extends Conditional> {
 
     static {
         Map<String, ConditionalFactory<?>> factories = new HashMap<>();
-        Iterator<ConditionalFactory<?>> it = UtilGenerics.cast(ServiceLoader.load(ConditionalFactory.class, ConditionalFactory.class.getClassLoader()).iterator());
+        Iterator<ConditionalFactory<?>> it = UtilGenerics.cast(ServiceLoader.load(ConditionalFactory.class,
+                ConditionalFactory.class.getClassLoader()).iterator());
         while (it.hasNext()) {
             ConditionalFactory<?> factory = it.next();
             factories.put(factory.getName(), factory);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
index d05f9fa..b0ccfe2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
@@ -144,7 +144,8 @@ public final class HasPermissionCondition extends MethodOperation implements Con
     /**
      * A &lt;if-has-permission&gt; element factory.
      */
-    public static final class HasPermissionConditionFactory extends ConditionalFactory<HasPermissionCondition> implements Factory<HasPermissionCondition> {
+    public static final class HasPermissionConditionFactory extends ConditionalFactory<HasPermissionCondition>
+            implements Factory<HasPermissionCondition> {
         @Override
         public HasPermissionCondition createCondition(Element element, SimpleMethod simpleMethod) throws MiniLangException {
             return new HasPermissionCondition(element, simpleMethod);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
index 1c7c768..108e21e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
@@ -158,7 +158,8 @@ public final class ValidateMethodCondition extends MethodOperation implements Co
     /**
      * A &lt;if-validate-method&gt; element factory.
      */
-    public static final class ValidateMethodConditionFactory extends ConditionalFactory<ValidateMethodCondition> implements Factory<ValidateMethodCondition> {
+    public static final class ValidateMethodConditionFactory extends ConditionalFactory<ValidateMethodCondition>
+            implements Factory<ValidateMethodCondition> {
         @Override
         public ValidateMethodCondition createCondition(Element element, SimpleMethod simpleMethod) throws MiniLangException {
             return new ValidateMethodCondition(element, simpleMethod);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
index 6185fda..b11cf9b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
@@ -42,7 +42,8 @@ public final class EntityAnd extends EntityOperation {
     public EntityAnd(Element element, SimpleMethod simpleMethod) throws MiniLangException {
         super(element, simpleMethod);
         if (MiniLangValidate.validationOn()) {
-            MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "filter-by-date", "list", "distinct", "delegator-name");
+            MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "filter-by-date",
+                    "list", "distinct", "delegator-name");
             MiniLangValidate.requiredAttributes(simpleMethod, element, "entity-name", "list");
             MiniLangValidate.expressionAttributes(simpleMethod, element, "list");
             MiniLangValidate.childElements(simpleMethod, element, "field-map", "order-by", "limit-range", "limit-view", "use-iterator");
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
index 664b19e..59da2e2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
@@ -97,11 +97,13 @@ public final class EntityCount extends EntityOperation {
             ModelEntity modelEntity = delegator.getModelEntity(entityName);
             EntityCondition whereEntityCondition = null;
             if (this.whereCondition != null) {
-                whereEntityCondition = this.whereCondition.createCondition(methodContext.getEnvMap(), modelEntity, delegator.getModelFieldTypeReader(modelEntity));
+                whereEntityCondition = this.whereCondition.createCondition(methodContext.getEnvMap(), modelEntity,
+                        delegator.getModelFieldTypeReader(modelEntity));
             }
             EntityCondition havingEntityCondition = null;
             if (this.havingCondition != null) {
-                havingEntityCondition = this.havingCondition.createCondition(methodContext.getEnvMap(), modelEntity, delegator.getModelFieldTypeReader(modelEntity));
+                havingEntityCondition = this.havingCondition.createCondition(methodContext.getEnvMap(), modelEntity,
+                        delegator.getModelFieldTypeReader(modelEntity));
             }
             long count = EntityQuery.use(delegator).from(entityName).where(whereEntityCondition).having(havingEntityCondition).queryCount();
             this.countFma.put(methodContext.getEnvMap(), count);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
index c2426db..6f8908f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
@@ -68,9 +68,11 @@ public final class FilterListByDate extends MethodOperation {
     @Override
     public boolean exec(MethodContext methodContext) throws MiniLangException {
         if (!validDateFma.isEmpty()) {
-            toListFma.put(methodContext.getEnvMap(), EntityUtil.filterByDate(listFma.get(methodContext.getEnvMap()), validDateFma.get(methodContext.getEnvMap()), fromFieldName, thruFieldName, true));
+            toListFma.put(methodContext.getEnvMap(), EntityUtil.filterByDate(listFma.get(methodContext.getEnvMap()),
+                    validDateFma.get(methodContext.getEnvMap()), fromFieldName, thruFieldName, true));
         } else {
-            toListFma.put(methodContext.getEnvMap(), EntityUtil.filterByDate(listFma.get(methodContext.getEnvMap()), UtilDateTime.nowTimestamp(), fromFieldName, thruFieldName, true));
+            toListFma.put(methodContext.getEnvMap(), EntityUtil.filterByDate(listFma.get(methodContext.getEnvMap()),
+                    UtilDateTime.nowTimestamp(), fromFieldName, thruFieldName, true));
         }
         return true;
     }
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
index 3d97c79..2fd6c8f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
@@ -56,7 +56,8 @@ public final class FindByAnd extends EntityOperation {
     public FindByAnd(Element element, SimpleMethod simpleMethod) throws MiniLangException {
         super(element, simpleMethod);
         if (MiniLangValidate.validationOn()) {
-            MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "fields-to-select-list", "use-iterator", "list", "map", "order-by-list", "delegator-name");
+            MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "fields-to-select-list",
+                    "use-iterator", "list", "map", "order-by-list", "delegator-name");
             MiniLangValidate.requiredAttributes(simpleMethod, element, "entity-name", "list", "map");
             MiniLangValidate.expressionAttributes(simpleMethod, element, "list", "map", "fields-to-select-list", "order-by-list", "delegator-name");
             MiniLangValidate.noChildElements(simpleMethod, element);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
index e323f79..dfb55da 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
@@ -55,7 +55,8 @@ public final class FindByPrimaryKey extends EntityOperation {
     public FindByPrimaryKey(Element element, SimpleMethod simpleMethod) throws MiniLangException {
         super(element, simpleMethod);
         if (MiniLangValidate.validationOn()) {
-            MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "fields-to-select-list", "map", "value-field", "delegator-name");
+            MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "fields-to-select-list",
+                    "map", "value-field", "delegator-name");
             MiniLangValidate.requiredAttributes(simpleMethod, element, "value-field", "map");
             MiniLangValidate.expressionAttributes(simpleMethod, element, "value-field", "map", "fields-to-select-list", "delegator-name");
             MiniLangValidate.noChildElements(simpleMethod, element);
@@ -86,7 +87,8 @@ public final class FindByPrimaryKey extends EntityOperation {
         Collection<String> fieldsToSelectList = fieldsToSelectListFma.get(methodContext.getEnvMap());
         try {
             if (fieldsToSelectList != null) {
-                valueFma.put(methodContext.getEnvMap(), delegator.findByPrimaryKeyPartial(delegator.makePK(entityName, inMap), UtilMisc.toSet(fieldsToSelectList)));
+                valueFma.put(methodContext.getEnvMap(), delegator.findByPrimaryKeyPartial(delegator.makePK(entityName, inMap),
+                        UtilMisc.toSet(fieldsToSelectList)));
             } else {
                 valueFma.put(methodContext.getEnvMap(), EntityQuery.use(delegator).from(entityName).where(inMap).cache(useCache).queryOne());
             }
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
index 8e30776..52d5127 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
@@ -46,7 +46,8 @@ public final class TransactionBegin extends MethodOperation {
             MiniLangValidate.expressionAttributes(simpleMethod, element, "began-transaction-name");
             MiniLangValidate.noChildElements(simpleMethod, element);
         }
-        beganTransactionFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("began-transaction-name"), "beganTransaction"));
+        beganTransactionFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("began-transaction-name"),
+                "beganTransaction"));
     }
 
     @Override
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
index a3a93cd..5b514d9 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
@@ -46,7 +46,8 @@ public final class TransactionCommit extends MethodOperation {
             MiniLangValidate.expressionAttributes(simpleMethod, element, "began-transaction-name");
             MiniLangValidate.noChildElements(simpleMethod, element);
         }
-        beganTransactionFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("began-transaction-name"), "beganTransaction"));
+        beganTransactionFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("began-transaction-name"),
+                "beganTransaction"));
     }
 
     @Override
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
index d071219..9a39d25 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
@@ -46,7 +46,8 @@ public final class TransactionRollback extends MethodOperation {
             MiniLangValidate.expressionAttributes(simpleMethod, element, "began-transaction-name");
             MiniLangValidate.noChildElements(simpleMethod, element);
         }
-        beganTransactionFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("began-transaction-name"), "beganTransaction"));
+        beganTransactionFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("began-transaction-name"),
+                "beganTransaction"));
     }
 
     @Override
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
index 04e6de8..66d7e36 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
@@ -44,7 +44,8 @@ public final class CheckErrors extends MethodOperation {
             MiniLangValidate.noChildElements(simpleMethod, element);
         }
         this.errorCodeFse = FlexibleStringExpander.getInstance(element.getAttribute("error-code"));
-        this.errorListNameFse = FlexibleStringExpander.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("error-list-name"), "error_list"));
+        this.errorListNameFse = FlexibleStringExpander.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("error-list-name"),
+                "error_list"));
     }
 
     @Override
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
index c0c3da1..b2dac5b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
@@ -100,7 +100,8 @@ public final class CreateObject extends MethodOperation {
                 try {
                     typeClass = methodObjectDef.getTypeClass(methodContext);
                 } catch (ClassNotFoundException e) {
-                    String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [Parameter type not found with name " + methodObjectDef.getTypeName() + "]";
+                    String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription()
+                            + " process [Parameter type not found with name " + methodObjectDef.getTypeName() + "]";
                     Debug.logWarning(e, errMsg, MODULE);
                     simpleMethod.addErrorMessage(methodContext, errMsg);
                     return false;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
index 82ec73c..fe9f028 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
@@ -107,7 +107,8 @@ public final class SetCalendar extends MethodOperation {
             MiniLangValidate.deprecatedAttribute(simpleMethod, element, "from-field", "replace with \"from\"");
             MiniLangValidate.deprecatedAttribute(simpleMethod, element, "default-value", "replace with \"default\"");
             MiniLangValidate.attributeNames(simpleMethod, element, "field", "from-field", "from", "value", "default-value", "default", "set-if-null",
-                    "years", "months", "days", "hours", "minutes", "seconds", "millis", "period-align-start", "period-align-end", "locale", "time-zone");
+                    "years", "months", "days", "hours", "minutes", "seconds", "millis", "period-align-start", "period-align-end", "locale",
+                    "time-zone");
             MiniLangValidate.requiredAttributes(simpleMethod, element, "field");
             MiniLangValidate.requireAnyAttribute(simpleMethod, element, "from", "value");
             MiniLangValidate.constantPlusExpressionAttributes(simpleMethod, element, "value");
@@ -188,7 +189,8 @@ public final class SetCalendar extends MethodOperation {
                 locale = Locale.getDefault();
             }
             if (!this.timeZoneFse.isEmpty()) {
-                timeZone = (TimeZone) ObjectType.simpleTypeOrObjectConvert(this.timeZoneFse.expand(methodContext.getEnvMap()), "TimeZone", null, null);
+                timeZone = (TimeZone) ObjectType.simpleTypeOrObjectConvert(this.timeZoneFse.expand(methodContext.getEnvMap()), "TimeZone",
+                        null, null);
             }
             if (timeZone == null) {
                 timeZone = methodContext.getTimeZone();
@@ -198,7 +200,7 @@ public final class SetCalendar extends MethodOperation {
             }
             fromStamp = (Timestamp) MiniLangUtil.convertType(newValue, java.sql.Timestamp.class, locale, timeZone, UtilDateTime.getDateTimeFormat());
             if (!this.yearsFse.isEmpty()) {
-                years= parseInt(this.yearsFse.expandString(methodContext.getEnvMap()));
+                years = parseInt(this.yearsFse.expandString(methodContext.getEnvMap()));
             }
             if (!this.monthsFse.isEmpty()) {
                 months = parseInt(this.monthsFse.expandString(methodContext.getEnvMap()));
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
index 042c9e5..25f3859 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
@@ -90,7 +90,8 @@ public final class SetOperation extends MethodOperation {
         if (MiniLangValidate.validationOn()) {
             MiniLangValidate.deprecatedAttribute(simpleMethod, element, "from-field", "replace with \"from\"");
             MiniLangValidate.deprecatedAttribute(simpleMethod, element, "default-value", "replace with \"default\"");
-            MiniLangValidate.attributeNames(simpleMethod, element, "field", "from-field", "from", "value", "default-value", "default", "format", "type", "set-if-null", "set-if-empty");
+            MiniLangValidate.attributeNames(simpleMethod, element, "field", "from-field", "from", "value", "default-value", "default",
+                    "format", "type", "set-if-null", "set-if-empty");
             MiniLangValidate.requiredAttributes(simpleMethod, element, "field");
             MiniLangValidate.requireAnyAttribute(simpleMethod, element, "from-field", "from", "value");
             MiniLangValidate.constantPlusExpressionAttributes(simpleMethod, element, "value");
@@ -200,7 +201,7 @@ public final class SetOperation extends MethodOperation {
             }
         }
         if (Debug.verboseOn()) {
-             Debug.logVerbose("Setting field [" + this.fieldFma.toString() + "] to value: " + newValue, MODULE);
+            Debug.logVerbose("Setting field [" + this.fieldFma.toString() + "] to value: " + newValue, MODULE);
         }
         this.fieldFma.put(methodContext.getEnvMap(), newValue);
         return true;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
index 696ad0a..f42a567 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
@@ -94,7 +94,8 @@ public final class While extends MethodOperation {
 
     /**
      * A factory for the &lt;while&gt; element.
-     * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a>
+     * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">
+     *     Mini-language Referenc</a>
      */
     public static final class WhileFactory implements Factory<While> {
         @Override
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
index e577280..66dc295 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
@@ -201,7 +201,8 @@ public final class Calculate extends MethodOperation {
 
     /**
      * Implements the &lt;calcop&gt; element.
-     * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
+     * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">
+     *     Mini-language Reference</a>
      */
     public final class CalcOp extends MiniLangElement implements SubCalc {
         private static final int OPERATOR_ADD = 1;
@@ -270,15 +271,17 @@ public final class Calculate extends MethodOperation {
                 } else if (fieldObj instanceof BigDecimal) {
                     resultValue = (BigDecimal) fieldObj;
                 }
-                if (operator == OPERATOR_NEGATIVE)
+                if (operator == OPERATOR_NEGATIVE) {
                     resultValue = resultValue.negate();
+                }
                 isFirst = false;
             }
             for (SubCalc calcop : calcops) {
                 if (isFirst) {
                     resultValue = calcop.calcValue(methodContext, scale, roundingMode);
-                    if (operator == OPERATOR_NEGATIVE)
+                    if (operator == OPERATOR_NEGATIVE) {
                         resultValue = resultValue.negate();
+                    }
                     isFirst = false;
                 } else {
                     switch (operator) {
@@ -304,7 +307,8 @@ public final class Calculate extends MethodOperation {
 
     /**
      * Implements the &lt;number&gt; element.
-     * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
+     * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">
+     *     Mini-language Reference</a>
      */
     public final class NumberOp extends MiniLangElement implements SubCalc {
 
@@ -324,8 +328,9 @@ public final class Calculate extends MethodOperation {
         public BigDecimal calcValue(MethodContext methodContext, int scale, RoundingMode roundingMode) throws MiniLangException {
             String valueStr = valueFse.expandString(methodContext.getEnvMap());
             Locale locale = methodContext.getLocale();
-            if (locale == null)
+            if (locale == null) {
                 locale = Locale.getDefault();
+            }
             try {
                 BigDecimal parsedVal = (BigDecimal) MiniLangUtil.convertType(valueStr, java.math.BigDecimal.class, locale, null, null);
                 return parsedVal.setScale(scale, roundingMode);
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
index 997878e..a26ced5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
@@ -30,13 +30,14 @@ import org.w3c.dom.Element;
  */
 public abstract class BaseCompare extends SimpleMapOperation {
 
-    public static Boolean doRealCompare(Object value1, Object value2, String operator, String type, String format, List<Object> messages, Locale locale, ClassLoader loader, boolean value2InlineConstant) {
+    public static Boolean doRealCompare(Object value1, Object value2, String operator, String type, String format, List<Object>
+            messages, Locale locale, ClassLoader loader, boolean value2InlineConstant) {
         return ObjectType.doRealCompare(value1, value2, operator, type, format, messages, locale, loader, value2InlineConstant);
     }
 
-    String format;
-    String operator;
-    String type;
+    private String format;
+    private String operator;
+    private String type;
 
     public BaseCompare(Element element, SimpleMapProcess simpleMapProcess) {
         super(element, simpleMapProcess);
@@ -45,9 +46,19 @@ public abstract class BaseCompare extends SimpleMapOperation {
         this.format = element.getAttribute("format");
     }
 
+    /**
+     * Do compare.
+     * @param value1 the value 1
+     * @param value2 the value 2
+     * @param messages the messages
+     * @param locale the locale
+     * @param loader the loader
+     * @param value2InlineConstant the value 2 inline constant
+     */
     public void doCompare(Object value1, Object value2, List<Object> messages, Locale locale, ClassLoader loader, boolean value2InlineConstant) {
-        Boolean success = BaseCompare.doRealCompare(value1, value2, this.operator, this.type, this.format, messages, locale, loader, value2InlineConstant);
-        if (success != null && success == false) {
+        Boolean success = BaseCompare.doRealCompare(value1, value2, this.operator, this.type, this.format, messages, locale,
+                loader, value2InlineConstant);
+        if (success != null && !success) {
             addMessage(messages, loader, locale);
         }
     }
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java
index b92ae18..8a09465 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java
@@ -35,8 +35,8 @@ public class PropertyOper extends MakeInStringOperation {
 
     private static final String MODULE = PropertyOper.class.getName();
 
-    String property;
-    String resource;
+    private String property;
+    private String resource;
 
     public PropertyOper(Element element) {
         super(element);
@@ -49,7 +49,8 @@ public class PropertyOper extends MakeInStringOperation {
         String propStr = UtilProperties.getPropertyValue(UtilURL.fromResource(resource, loader), property);
 
         if (UtilValidate.isEmpty(propStr)) {
-            Debug.logWarning("[SimpleMapProcessor.PropertyOper.exec] Property " + property + " in resource " + resource + " not found, not appending anything", MODULE);
+            Debug.logWarning("[SimpleMapProcessor.PropertyOper.exec] Property " + property + " in resource " + resource
+                    + " not found, not appending anything", MODULE);
             return null;
         } else {
             return propStr;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java
index e72c5d1..f0f0f32 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java
@@ -73,10 +73,12 @@ public abstract class SimpleMapOperation {
             messages.add(new MessageString(message, fieldName, true));
             // if (Debug.infoOn()) Debug.logInfo("[SimpleMapOperation.addMessage] Adding message: " + message, MODULE);
         } else if (isProperty && propertyResource != null && message != null) {
-            // this one doesn't do the proper i18n: String propMsg = UtilProperties.getPropertyValue(UtilURL.fromResource(propertyResource, loader), message);
+            // this one doesn't do the proper i18n: String propMsg = UtilProperties.getPropertyValue(UtilURL
+            // .fromResource(propertyResource, loader), message);
             String propMsg = UtilProperties.getMessage(propertyResource, message, locale);
             if (UtilValidate.isEmpty(propMsg)) {
-                messages.add(new MessageString("Simple Map Processing error occurred, but no message was found, sorry.", fieldName, propertyResource, message, locale, true));
+                messages.add(new MessageString("Simple Map Processing error occurred, but no message was found, sorry.", fieldName,
+                        propertyResource, message, locale, true));
             } else {
                 messages.add(new MessageString(propMsg, fieldName, propertyResource, message, locale, true));
             }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java b/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java
index 4f5959a..05b5b89 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java
@@ -51,7 +51,8 @@ public class GeneralServiceException extends org.apache.ofbiz.base.util.GeneralE
         super(nested);
     }
 
-    public GeneralServiceException(String str, List<? extends Object> errorMsgList, Map<String, ? extends Object> errorMsgMap, Map<String, ? extends Object> nestedServiceResult, Throwable nested) {
+    public GeneralServiceException(String str, List<? extends Object> errorMsgList, Map<String, ? extends Object> errorMsgMap,
+                                   Map<String, ? extends Object> nestedServiceResult, Throwable nested) {
         super(str, nested);
         this.errorMsgList = UtilMisc.makeListWritable(errorMsgList);
         this.errorMsgMap = errorMsgMap;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
index 4761275..58e3377 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
@@ -1270,7 +1270,8 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
      * @param test The map to test its value types.
      * @param reverse Test the maps in reverse.
      */
-    public static void validate(Map<String, String> info, Map<String, ? extends Object> test, boolean reverse, ModelService model, String mode, Locale locale) throws ServiceValidationException {
+    public static void validate(Map<String, String> info, Map<String, ? extends Object> test, boolean reverse, ModelService model,
+                                String mode, Locale locale) throws ServiceValidationException {
         if (info == null || test == null) {
             throw new ServiceValidationException("Cannot validate NULL maps", model);
         }
@@ -1292,7 +1293,8 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
             for (String key: missing) {
                 String msg = model.getParam(key).getPrimaryFailMessage(locale);
                 if (msg == null) {
-                    String errMsg = UtilProperties.getMessage(ServiceUtil.getResource(), "ModelService.following_required_parameter_missing", locale);
+                    String errMsg = UtilProperties.getMessage(ServiceUtil.getResource(), "ModelService.following_required_parameter_missing",
+                            locale);
                     msg = errMsg + " [" + mode + "] [" + model.name + "." + key + "]";
                 }
                 missingMsgs.add(msg);
@@ -1586,7 +1588,8 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
                                 // no need to fail on type conversion; the validator will catch this
                                 value = ObjectType.simpleTypeOrObjectConvert(value, param.getType(), null, timeZone, locale, false);
                             } catch (GeneralException e) {
-                                String errMsg = "Type conversion of field [" + key + "] to type [" + param.getType() + "] failed for value \"" + value + "\": " + e.toString();
+                                String errMsg = "Type conversion of field [" + key + "] to type [" + param.getType() + "] failed for value \""
+                                        + value + "\": " + e.toString();
                                 Debug.logWarning("[ModelService.makeValid] : " + errMsg, MODULE);
                                 if (errorMessages != null) {
                                     errorMessages.add(errMsg);
@@ -1624,6 +1627,10 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
         return paramList;
     }
 
+    /**
+     * Contains permissions boolean.
+     * @return the boolean
+     */
     public boolean containsPermissions() {
         return (UtilValidate.isNotEmpty(this.permissionGroups));
     }
@@ -1767,8 +1774,10 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
                         for (ModelParam newParam: model.contextParamList) {
                             ModelParam existingParam = this.contextInfo.get(newParam.getName());
                             if (existingParam != null) {
-                                // if the existing param is not INOUT and the newParam.mode is different from existingParam.mode, make the existing param optional and INOUT
-                                // TODO: this is another case where having different optional/required settings for IN and OUT would be quite valuable...
+                                // if the existing param is not INOUT and the newParam.mode is different from existingParam.mode,
+                                // make the existing param optional and INOUT
+                                // TODO: this is another case where having different optional/required settings for IN and OUT
+                                //  would be quite valuable...
                                 if (!IN_OUT_PARAM.equals(existingParam.getMode()) && !existingParam.getMode().equals(newParam.getMode())) {
                                     existingParam.setMode(IN_OUT_PARAM);
                                     if (existingParam.isOptional() || newParam.isOptional()) {
@@ -2034,6 +2043,12 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
         def.addService(service);
     }
 
+    /**
+     * Gets types.
+     * @param document the document
+     * @param def the def
+     * @return the types
+     */
     public Types getTypes(Document document, Definition def) {
         Types types = def.createTypes();
         /* Schema */
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
index 708d016..ec19d1f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
@@ -181,7 +181,8 @@ public final class ServiceUtil {
         return getPartyIdCheckSecurity(userLogin, security, context, result, secEntity, secOperation, null, null);
     }
     public static String getPartyIdCheckSecurity(GenericValue userLogin, Security security, Map<String, ? extends Object> context,
-                                                 Map<String, Object> result, String secEntity, String secOperation, String adminSecEntity, String adminSecOperation) {
+                                                 Map<String, Object> result, String secEntity, String secOperation, String adminSecEntity,
+                                                 String adminSecOperation) {
         String partyId = (String) context.get("partyId");
         Locale locale = getLocale(context);
         if (UtilValidate.isEmpty(partyId)) {
@@ -459,8 +460,8 @@ public final class ServiceUtil {
      * @return filled Map or null on error
      * @throws GeneralServiceException
      */
-    public static Map<String, Object> setServiceFields(LocalDispatcher dispatcher, String serviceName, Map<String, Object> fromMap, GenericValue userLogin,
-            TimeZone timeZone, Locale locale) throws GeneralServiceException {
+    public static Map<String, Object> setServiceFields(LocalDispatcher dispatcher, String serviceName, Map<String, Object> fromMap,
+            GenericValue userLogin, TimeZone timeZone, Locale locale) throws GeneralServiceException {
         Map<String, Object> outMap = new HashMap<>();
 
         ModelService modelService = null;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java
index ea9c8e8..92573b5 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java
@@ -69,7 +69,8 @@ public class ServiceValidationException extends GenericServiceException {
         this.service = service;
     }
 
-    public ServiceValidationException(String str, Throwable nested, ModelService service, List<String> missingFields, List<String> extraFields, String errorMode) {
+    public ServiceValidationException(String str, Throwable nested, ModelService service, List<String> missingFields,
+                                      List<String> extraFields, String errorMode) {
         super(str, nested);
         this.service = service;
         this.errorMode = errorMode;
@@ -81,7 +82,8 @@ public class ServiceValidationException extends GenericServiceException {
         }
     }
 
-    public ServiceValidationException(List<String> messages, ModelService service, List<String> missingFields, List<String> extraFields, String errorMode) {
+    public ServiceValidationException(List<String> messages, ModelService service, List<String> missingFields, List<String>
+            extraFields, String errorMode) {
         super();
         this.messages = messages;
         this.service = service;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
index da5edad..3b98af7 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
@@ -38,7 +38,8 @@ public final class ThreadPool {
 
     public static final int FAILED_RETRY_MIN = 30;
     public static final int MIN_THREADS = 1; // Must be no less than one or the executor will shut down.
-    public static final int MAX_THREADS = Runtime.getRuntime().availableProcessors() + 1; // See https://stackoverflow.com/questions/13834692/threads-configuration-based-on-no-of-cpu-cores for more
+    public static final int MAX_THREADS = Runtime.getRuntime().availableProcessors() + 1;
+    // See https://stackoverflow.com/questions/13834692/threads-configuration-based-on-no-of-cpu-cores for more
     public static final int POLL_WAIT = 30000; // Database polling interval - 30 seconds.
     public static final int PURGE_JOBS_DAYS = 30;
     public static final int QUEUE_SIZE = 100;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
index b5bde68..bfdfafc 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
@@ -50,7 +50,8 @@ public final class ServiceEcaUtil {
 
     private static final String MODULE = ServiceEcaUtil.class.getName();
 
-    // using a cache is dangerous here because if someone clears it the ECAs won't run: public static UtilCache ecaCache = new UtilCache("service.ServiceECAs", 0, 0, false);
+    // using a cache is dangerous here because if someone clears it the ECAs won't run: public static UtilCache ecaCache =
+    // new UtilCache("service.ServiceECAs", 0, 0, false);
     private static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = new ConcurrentHashMap<>();
 
     private ServiceEcaUtil() { }
@@ -76,7 +77,8 @@ public final class ServiceEcaUtil {
             throw new RuntimeException(e.getMessage());
         }
         for (ServiceEcas serviceEcas : serviceEcasList) {
-            ResourceHandler handler = new MainResourceHandler(ServiceConfigUtil.getServiceEngineXmlFileName(), serviceEcas.getLoader(), serviceEcas.getLocation());
+            ResourceHandler handler = new MainResourceHandler(ServiceConfigUtil.getServiceEngineXmlFileName(), serviceEcas.getLoader(),
+                    serviceEcas.getLocation());
             futures.add(ExecutionPool.GLOBAL_FORK_JOIN.submit(createEcaLoaderCallable(handler)));
         }
 
@@ -173,7 +175,8 @@ public final class ServiceEcaUtil {
         return null;
     }
 
-    public static void evalRules(String serviceName, Map<String, List<ServiceEcaRule>> eventMap, String event, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result, boolean isError, boolean isFailure) throws GenericServiceException {
+    public static void evalRules(String serviceName, Map<String, List<ServiceEcaRule>> eventMap, String event, DispatchContext dctx,
+            Map<String, Object> context, Map<String, Object> result, boolean isError, boolean isFailure) throws GenericServiceException {
         // if the eventMap is passed we save a Map lookup, but if not that's okay we'll just look it up now
         if (eventMap == null) eventMap = getServiceEventMap(serviceName);
         if (UtilValidate.isEmpty(eventMap)) {
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java
index 8046c37..c7bd446 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java
@@ -247,7 +247,8 @@ public final class EntityAutoEngine extends GenericAsyncEngine {
              **** secondary sequenced primary key ****
              *
             <auto-attributes include="pk" mode="IN" optional="false"/>
-            <override name="exampleItemSeqId" mode="OUT"/> <!-- make this OUT rather than IN, we will automatically generate the next sub-sequence ID -->
+            <override name="exampleItemSeqId" mode="OUT"/> <!-- make this OUT rather than IN, we will automatically generate the
+            * next sub-sequence ID -->
              *
             <make-value entity-name="ExampleItem" value-name="newEntity"/>
             <set-pk-fields map-name="parameters" value-name="newEntity"/>
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java
index bcba366..4dc746e 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java
@@ -39,12 +39,13 @@ public class InterfaceEngine implements GenericEngine {
 
     @Override
     public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
-       throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service.");
+        throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service.");
     }
 
     @Override
-    public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist) throws GenericServiceException {
-       throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service.");
+    public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist)
+            throws GenericServiceException {
+        throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service.");
     }
 
     @Override
@@ -57,7 +58,8 @@ public class InterfaceEngine implements GenericEngine {
     }
 
     @Override
-    public void sendCallbacks(ModelService modelService, Map<String, Object> context, Map<String, Object> result, int mode) throws GenericServiceException {
+    public void sendCallbacks(ModelService modelService, Map<String, Object> context, Map<String, Object> result, int mode)
+            throws GenericServiceException {
     }
 
     @Override
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java
index 575239d..9b2833a 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java
@@ -54,7 +54,8 @@ public class RouteEngine extends GenericAsyncEngine {
     }
 
     @Override
-    public void sendCallbacks(ModelService modelService, Map<String, Object> context, Map<String, Object> result, int mode) throws GenericServiceException {
+    public void sendCallbacks(ModelService modelService, Map<String, Object> context, Map<String, Object> result, int mode)
+            throws GenericServiceException {
     }
 
     @Override
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java
index 6e04bdb..d441af2 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java
@@ -34,12 +34,12 @@ import org.xml.sax.SAXException;
 
 /**
  * A facade class used to connect SOAP code to the legacy XML serialization code.
- *
  */
 public class SoapSerializer {
     private static final String MODULE = SoapSerializer.class.getName();
 
-    public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException, IOException {
+    public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException,
+            IOException {
         Document document = UtilXml.readXmlDocument(content, false);
         if (document != null) {
             return XmlSerializer.deserialize(document, delegator);
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java
index a5c6acb..bbac8e0 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java
@@ -36,7 +36,8 @@ public class GroupServiceModel {
 
     private static final String MODULE = GroupServiceModel.class.getName();
 
-    private String serviceName, serviceMode;
+    private String serviceName;
+    private String serviceMode;
     private boolean resultToContext = false;
     private boolean optionalParams = false;
 
@@ -110,7 +111,8 @@ public class GroupServiceModel {
         if ("async".equals(getMode())) {
             List<String> requiredOut = model.getParameterNames(ModelService.OUT_PARAM, false);
             if (!requiredOut.isEmpty()) {
-                Debug.logWarning("Grouped service (" + getName() + ") requested 'async' invocation; running sync because of required OUT parameters.", MODULE);
+                Debug.logWarning("Grouped service (" + getName()
+                        + ") requested 'async' invocation; running sync because of required OUT parameters.", MODULE);
                 return dispatcher.runSync(localName, model, thisContext);
             }
             dispatcher.runAsync(localName, model, thisContext, false);
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java
index 2fff430..7c0eee2 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java
@@ -54,7 +54,8 @@ public final class ServiceGroupReader {
             throw new RuntimeException(e.getMessage());
         }
         for (ServiceGroups serviceGroup : serviceGroupsList) {
-            ResourceHandler handler = new MainResourceHandler(ServiceConfigUtil.getServiceEngineXmlFileName(), serviceGroup.getLoader(), serviceGroup.getLocation());
+            ResourceHandler handler = new MainResourceHandler(ServiceConfigUtil.getServiceEngineXmlFileName(), serviceGroup.getLoader(),
+                    serviceGroup.getLocation());
             addGroupDefinitions(handler);
         }
 
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java
index eccafeb..cf21cf0 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java
@@ -39,7 +39,8 @@ import org.xml.sax.SAXException;
 public class JmsSerializer {
     private static final String MODULE = JmsSerializer.class.getName();
 
-    public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException, IOException {
+    public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException,
+            IOException {
         Document document = UtilXml.readXmlDocument(content, false);
         if (document != null) {
             return XmlSerializer.deserialize(document, delegator);
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java
index 44b487b..4a459e8 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java
@@ -121,7 +121,8 @@ public class JobServices {
             if (limit == null) limit = ServiceConfigUtil.getServiceEngine().getThreadPool().getMaxThreads();
         } catch (GenericConfigException e) {
             Debug.logWarning(e, "Exception thrown while getting service configuration: ", MODULE);
-            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ServiceExceptionThrownWhileGettingServiceConfiguration", UtilMisc.toMap("errorString", e), locale));
+            return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ServiceExceptionThrownWhileGettingServiceConfiguration",
+                    UtilMisc.toMap("errorString", e), locale));
         }
         Delegator delegator = dctx.getDelegator();
         Timestamp purgeTime = Timestamp.from(Instant.now().minus(Duration.ofDays(daysToKeep)));
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java
index 59e2165..0960df5 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java
@@ -67,7 +67,8 @@ public class ServiceMcaRule implements java.io.Serializable {
      * @param userLogin the user login
      * @throws GenericServiceException the generic service exception
      */
-    public void eval(LocalDispatcher dispatcher, MimeMessageWrapper messageWrapper, Set<String> actionsRun, GenericValue userLogin) throws GenericServiceException {
+    public void eval(LocalDispatcher dispatcher, MimeMessageWrapper messageWrapper, Set<String> actionsRun, GenericValue userLogin)
+            throws GenericServiceException {
         if (!enabled) {
             Debug.logInfo("Service MCA [" + ruleName + "] is disabled; not running.", MODULE);
             return;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java
index 5f82eed..0246bac 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java
@@ -95,7 +95,8 @@ public interface RemoteDispatcher extends Remote {
      * @throws GenericServiceException
      * @throws RemoteException
      */
-    void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist) throws GenericServiceException, RemoteException;
+    void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist)
+            throws GenericServiceException, RemoteException;
 
     /**
      * Run the service asynchronously, passing an instance of GenericRequester that will receive the result.
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java
index bca50a4..49d6f05 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java
@@ -46,9 +46,9 @@ public class RmiServiceContainer implements Container {
 
     private static final String MODULE = RmiServiceContainer.class.getName();
 
-    protected RemoteDispatcherImpl remote = null;
-    protected String configFile = null;
-    protected String name = null;
+    private RemoteDispatcherImpl remote = null;
+    private String configFile = null;
+    private String name = null;
     private String containerName;
     // Container methods
 
@@ -148,7 +148,8 @@ public class RmiServiceContainer implements Container {
             try {
                 Naming.rebind("//" + host + ":" + port + "/" + name, remote);
             } catch (RemoteException e) {
-                throw new ContainerException("Unable to bind RMIDispatcher to RMI on " + "//host[" + host + "]:port[" + port + "]/name[" + name + "] - with remote=" + remote, e);
+                throw new ContainerException("Unable to bind RMIDispatcher to RMI on " + "//host[" + host + "]:port[" + port + "]/name["
+                        + name + "] - with remote=" + remote, e);
             } catch (java.net.MalformedURLException e) {
                 throw new ContainerException("Invalid URL for binding", e);
             }
diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java
index e0bdac4..6381ee2 100644
--- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java
+++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java
@@ -37,8 +37,7 @@ import junit.framework.TestSuite;
 public class JunitSuiteWrapper {
 
     private static final String MODULE = JunitSuiteWrapper.class.getName();
-
-    protected List<ModelTestSuite> modelTestSuiteList = new LinkedList<>();
+    private List<ModelTestSuite> modelTestSuiteList = new LinkedList<>();
 
     public JunitSuiteWrapper(String componentName, String suiteName, String testCase) {
         for (ComponentConfig.TestSuiteInfo testSuiteInfo: ComponentConfig.getAllTestSuiteInfos(componentName)) {
@@ -59,12 +58,17 @@ public class JunitSuiteWrapper {
                     this.modelTestSuiteList.add(modelTestSuite);
                 }
             } catch (GenericConfigException e) {
-                String errMsg = "Error reading XML document from ResourceHandler for loader [" + testSuiteResource.getLoaderName() + "] and location [" + testSuiteResource.getLocation() + "]";
+                String errMsg = "Error reading XML document from ResourceHandler for loader [" + testSuiteResource.getLoaderName()
+                        + "] and location [" + testSuiteResource.getLocation() + "]";
                 Debug.logError(e, errMsg, MODULE);
             }
         }
     }
 
+    /**
+     * Populate test suite.
+     * @param suite the suite
+     */
     @Deprecated
     public void populateTestSuite(TestSuite suite) {
         for (ModelTestSuite modelTestSuite: this.modelTestSuiteList) {
@@ -74,10 +78,18 @@ public class JunitSuiteWrapper {
         }
     }
 
+    /**
+     * Gets model test suites.
+     * @return the model test suites
+     */
     public List<ModelTestSuite> getModelTestSuites() {
         return this.modelTestSuiteList;
     }
 
+    /**
+     * Gets all test list.
+     * @return the all test list
+     */
     public List<Test> getAllTestList() {
         List<Test> allTestList = new LinkedList<>();
 
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
index a71580b..4a363c5 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
@@ -52,7 +52,7 @@ public class ContextFilter implements Filter {
 
     private static final String MODULE = ContextFilter.class.getName();
 
-    protected FilterConfig config = null;
+    private FilterConfig config = null;
 
     // default charset used to decode requests body data if no encoding is specified in the request
     private String defaultCharacterEncoding;
@@ -197,7 +197,8 @@ public class ContextFilter implements Filter {
             String initParamName = initParamEnum.nextElement();
             String initParamValue = config.getServletContext().getInitParameter(initParamName);
             if (Debug.verboseOn()) {
-                Debug.logVerbose("Adding web.xml context-param to application attribute with name [" + initParamName + "] and value [" + initParamValue + "]", MODULE);
+                Debug.logVerbose("Adding web.xml context-param to application attribute with name [" + initParamName + "] and value ["
+                        + initParamValue + "]", MODULE);
             }
             config.getServletContext().setAttribute(initParamName, initParamValue);
         }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
index 382b17a..d8198ef 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
@@ -47,8 +47,8 @@ public class ControlEventListener implements HttpSessionListener {
     // Debug MODULE name
     private static final String MODULE = ControlEventListener.class.getName();
 
-    protected static long totalActiveSessions = 0;
-    protected static long totalPassiveSessions = 0;
+    private static long totalActiveSessions = 0;
+    private static long totalPassiveSessions = 0;
 
     public ControlEventListener() { }
 
@@ -81,7 +81,8 @@ public class ControlEventListener implements HttpSessionListener {
         try {
             beganTransaction = TransactionUtil.begin();
 
-            // instead of using this message, get directly from session attribute so it won't create a new one: GenericValue visit = VisitHandler.getVisit(session);
+            // instead of using this message, get directly from session attribute so it won't create a new one: GenericValue
+            // visit = VisitHandler.getVisit(session);
             GenericValue visit = (GenericValue) session.getAttribute("visit");
             if (visit != null) {
                 Delegator delegator = visit.getDelegator();
@@ -91,7 +92,8 @@ public class ControlEventListener implements HttpSessionListener {
                     visit.store();
                 }
             } else {
-                Debug.logInfo("Could not find visit value object in session [" + ControlActivationEventListener.showSessionId(session) + "] that is being destroyed", MODULE);
+                Debug.logInfo("Could not find visit value object in session [" + ControlActivationEventListener.showSessionId(session)
+                        + "] that is being destroyed", MODULE);
             }
 
             // Store the UserLoginSession
@@ -133,6 +135,11 @@ public class ControlEventListener implements HttpSessionListener {
         }
     }
 
+    /**
+     * Log stats.
+     * @param session the session
+     * @param visit the visit
+     */
     public void logStats(HttpSession session, GenericValue visit) {
         if (Debug.verboseOn() || session.getAttribute("org.apache.ofbiz.log.session.stats") != null) {
             Debug.logInfo("<===================================================================>", MODULE);
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
index c86f4a8..d8f0682 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
@@ -157,7 +157,8 @@ public class JWTManager {
         LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
         Delegator delegator = (Delegator) request.getAttribute("delegator");
 
-        String username, password;
+        String username;
+        String password;
 
         if (UtilValidate.isNotEmpty(request.getAttribute("USERNAME"))) {
             username = (String) request.getAttribute("USERNAME");
@@ -177,7 +178,8 @@ public class JWTManager {
         }
         Map<String, Object> result;
         try {
-            result = dispatcher.runSync("userLogin", UtilMisc.toMap("login.username", username, "login.password", password, "locale", UtilHttp.getLocale(request)));
+            result = dispatcher.runSync("userLogin", UtilMisc.toMap("login.username", username, "login.password", password,
+                    "locale", UtilHttp.getLocale(request)));
         } catch (GenericServiceException e) {
             Debug.logError(e, "Error calling userLogin service", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
index 249a021..6a052fd 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
@@ -682,7 +682,8 @@ public final class LoginWorker {
         } catch (GenericServiceException e) {
             Debug.logError(e, "Error calling userImpersonate service", MODULE);
             Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.getMessage());
-            String errMsg = UtilProperties.getMessage(RESOURCE, "loginevents.following_error_occurred_during_login", messageMap, UtilHttp.getLocale(request));
+            String errMsg = UtilProperties.getMessage(RESOURCE, "loginevents.following_error_occurred_during_login", messageMap,
+                    UtilHttp.getLocale(request));
             request.setAttribute("_ERROR_MESSAGE_", errMsg);
             return "error";
         }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index 2aceed2..3de4b30 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -698,7 +698,8 @@ public class RequestHandler {
         if (eventReturnBasedRequestResponse != null) {
             //String eventReturnBasedResponse = requestResponse.value;
             if (Debug.verboseOn()) {
-                Debug.logVerbose("[Response Qualified]: " + eventReturnBasedRequestResponse.getName() + ", " + eventReturnBasedRequestResponse.getType()
+                Debug.logVerbose("[Response Qualified]: " + eventReturnBasedRequestResponse.getName() + ", "
+                        + eventReturnBasedRequestResponse.getType()
                         + ":" + eventReturnBasedRequestResponse.getValue() + showSessionId(request), MODULE);
             }
 
@@ -1050,7 +1051,8 @@ public class RequestHandler {
         return eventFactory;
     }
 
-    private void renderView(String view, boolean allowExtView, HttpServletRequest req, HttpServletResponse resp, String saveName) throws RequestHandlerException {
+    private void renderView(String view, boolean allowExtView, HttpServletRequest req, HttpServletResponse resp, String saveName)
+            throws RequestHandlerException {
         GenericValue userLogin = (GenericValue) req.getSession().getAttribute("userLogin");
         // workaround if we are in the root webapp
         String cname = UtilHttp.getApplicationName(req);
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java
index 5bebf35..7dbc3e5 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java
@@ -30,7 +30,12 @@ import org.apache.ofbiz.entity.util.EntityQuery;
 import org.apache.ofbiz.service.ModelService;
 import org.apache.ofbiz.webapp.WebAppUtil;
 
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -38,10 +43,10 @@ import java.io.IOException;
 import java.util.Locale;
 import java.util.Map;
 
-public class TokenFilter implements Filter  {
+public class TokenFilter implements Filter {
     private static final String MODULE = TokenFilter.class.getName();
 
-    protected FilterConfig config = null;
+    private FilterConfig config = null;
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -62,7 +67,8 @@ public class TokenFilter implements Filter  {
             String userLoginId = (String) result.get("userLoginId");
             if (UtilValidate.isNotEmpty(result.get(ModelService.ERROR_MESSAGE))) {
                 httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-                httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels", "loginservices.sorry_problem_processing_request_error", locale));
+                httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels",
+                        "loginservices.sorry_problem_processing_request_error", locale));
                 CommonEvents.jsonResponseFromRequestAttributes(httpRequest, httpResponse);
             } else if (UtilValidate.isNotEmpty(userLoginId)) {
                 try {
@@ -74,12 +80,14 @@ public class TokenFilter implements Filter  {
                         chain.doFilter(httpRequest, httpResponse);
                     } else {
                         httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-                        httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels", "loginservices.sorry_problem_processing_request_error", locale));
+                        httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels",
+                                "loginservices.sorry_problem_processing_request_error", locale));
                         CommonEvents.jsonResponseFromRequestAttributes(httpRequest, httpResponse);
                     }
                 } catch (GenericEntityException e) {
                     Debug.logError(e, MODULE);
-                    httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels", "loginservices.sorry_problem_processing_request_error_try_later", locale));
+                    httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels",
+                            "loginservices.sorry_problem_processing_request_error_try_later", locale));
                     CommonEvents.jsonResponseFromRequestAttributes(httpRequest, httpResponse);
                 }
             }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
index 22aa2e1..017d591 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
@@ -91,7 +91,8 @@ public class GroovyEventHandler implements EventHandler {
             context.put("locale", UtilHttp.getLocale(request));
             context.put("timeZone", UtilHttp.getTimeZone(request));
             context.put("userLogin", session.getAttribute("userLogin"));
-            context.put(ScriptUtil.PARAMETERS_KEY, UtilHttp.getCombinedMap(request, UtilMisc.toSet("delegator", "dispatcher", "security", "locale", "timeZone", "userLogin")));
+            context.put(ScriptUtil.PARAMETERS_KEY, UtilHttp.getCombinedMap(request, UtilMisc.toSet("delegator", "dispatcher", "security",
+                    "locale", "timeZone", "userLogin")));
             Object result = null;
             try {
                 ScriptContext scriptContext = ScriptUtil.createScriptContext(context, PROTECTED_KEYS);
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
index cf75819..11c4554 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
@@ -26,7 +26,8 @@ import javax.servlet.ServletRequest;
 import org.apache.ofbiz.base.lang.JSON;
 import org.apache.ofbiz.base.util.UtilGenerics;
 
-/** An implementation of <code>RequestBodyMapHandler</code> that can extract a <code>Map&lt;String, Object&gt;</code> from the JSON data in the request body */
+/** An implementation of <code>RequestBodyMapHandler</code> that can extract a <code>Map&lt;String, Object&gt;</code>
+ * from the JSON data in the request body */
 public class JSONRequestBodyMapHandler implements RequestBodyMapHandler {
 
     @Override
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
index 0c2f5a0..18f5e0e 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
@@ -65,7 +65,7 @@ public class OfbizCurrencyTransform implements TemplateTransformModel {
                     Debug.logError(e, "Template Exception", MODULE);
                 }
             } else {
-              result = o.toString();
+                result = o.toString();
             }
         }
         return result;
@@ -185,12 +185,15 @@ public class OfbizCurrencyTransform implements TemplateTransformModel {
                         BeanModel req = (BeanModel) env.getVariable("request");
                         if (req != null) {
                             HttpServletRequest request = (HttpServletRequest) req.getWrappedObject();
-                            out.write(UtilFormatOut.formatCurrency(amount, isoCode, UtilHttp.getLocale(request), rounding)); // we set the max to 10 digits as an hack to not round numbers in the ui
+                            out.write(UtilFormatOut.formatCurrency(amount, isoCode, UtilHttp.getLocale(request), rounding));
+                            // we set the max to 10 digits as an hack to not round numbers in the ui
                         } else {
-                            out.write(UtilFormatOut.formatCurrency(amount, isoCode, env.getLocale(), rounding)); // we set the max to 10 digits as an hack to not round numbers in the ui
+                            out.write(UtilFormatOut.formatCurrency(amount, isoCode, env.getLocale(), rounding));
+                            // we set the max to 10 digits as an hack to not round numbers in the ui
                         }
                     } else {
-                        out.write(UtilFormatOut.formatCurrency(amount, isoCode, new Locale(locale), rounding)); // we set the max to 10 digits as an hack to not round numbers in the ui
+                        out.write(UtilFormatOut.formatCurrency(amount, isoCode, new Locale(locale), rounding));
+                        // we set the max to 10 digits as an hack to not round numbers in the ui
                     }
                 } catch (TemplateModelException e) {
                     throw new IOException(e.getMessage());
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java
index 9fc80c9..70efec1 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java
@@ -46,7 +46,9 @@ public class ContentUrlTag {
 
     public static void appendContentPrefix(HttpServletRequest request, Appendable urlBuffer) throws IOException {
         if (request == null) {
-            Debug.logWarning("Request was null in appendContentPrefix; this probably means this was used where it shouldn't be, like using ofbizContentUrl in a screen rendered through a service; using best-bet behavior: standard prefix from url.properties (no WebSite or security setting known)", MODULE);
+            Debug.logWarning("Request was null in appendContentPrefix; this probably means this was used where it shouldn't be, like using "
+                    + "ofbizContentUrl in a screen rendered through a service; using best-bet behavior: standard prefix from url.properties (no "
+                    + "WebSite or security setting known)", MODULE);
             String prefix = UtilProperties.getPropertyValue("url", "content.url.prefix.standard");
             if (prefix != null) {
                 urlBuffer.append(prefix.trim());
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java
index fde7796..fc8ad69 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java
@@ -41,14 +41,17 @@ public class HttpViewHandler extends AbstractViewHandler {
     }
 
     @Override
-    public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
+    public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse
+            response) throws ViewHandlerException {
         // some containers call filters on EVERY request, even forwarded ones,
         // so let it know that it came from the control servlet
 
-        if (request == null)
+        if (request == null) {
             throw new ViewHandlerException("Null HttpServletRequest object");
-        if (UtilValidate.isEmpty(page))
+        }
+        if (UtilValidate.isEmpty(page)) {
             throw new ViewHandlerException("Null or empty source");
+        }
 
         if (Debug.infoOn()) {
             Debug.logInfo("Retreiving HTTP resource at: " + page, MODULE);
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java
index e6cef63..23c04aa 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java
@@ -37,8 +37,7 @@ import org.apache.ofbiz.webapp.control.ControlFilter;
 public class JspViewHandler extends AbstractViewHandler {
 
     private static final String MODULE = JspViewHandler.class.getName();
-
-    protected ServletContext context;
+    private ServletContext context;
 
     @Override
     public void init(ServletContext context) throws ViewHandlerException {
@@ -46,7 +45,8 @@ public class JspViewHandler extends AbstractViewHandler {
     }
 
     @Override
-    public void render(String name, String page, String contentType, String encoding, String info, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
+    public void render(String name, String page, String contentType, String encoding, String info, HttpServletRequest request, HttpServletResponse
+            response) throws ViewHandlerException {
         // some containers call filters on EVERY request, even forwarded ones,
         // so let it know that it came from the control servlet
 
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java
index dca66e3..6df8ec7 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java
@@ -57,5 +57,6 @@ public interface ViewHandler {
      * @param response The HttpServletResponse object to be used to present the page.
      * @throws ViewHandlerException
      */
-    void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException;
+    void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request,
+                HttpServletResponse response) throws ViewHandlerException;
 }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
index 3bdabcc..f3f6088 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
@@ -149,7 +149,8 @@ public final class WebSiteProperties {
             httpPortValue += Start.getInstance().getConfig().getPortOffset();
             httpPort = httpPortValue.toString();
             Integer httpsPortValue = Integer.valueOf(httpsPort);
-            httpsPortValue += Start.getInstance().getConfig().getPortOffset(); // Here unlike above we trust the user and don't rely on the request, no dontAddPortoffset.
+            httpsPortValue += Start.getInstance().getConfig().getPortOffset();
+            // Here unlike above we trust the user and don't rely on the request, no dontAddPortoffset.
             httpsPort = httpsPortValue.toString();
         }
         return new WebSiteProperties(httpPort, httpHost, httpsPort, httpsHost, webappPath, enableHttps);
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
index 69ecc9b..39b27fa 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
@@ -174,8 +174,10 @@ public class GenericWebEvent {
                     findByEntity.setString(field.getName(), fval);
                 } catch (Exception e) {
                     Map<String, String> messageMap = UtilMisc.toMap("fval", fval);
-                    errMsg = errMsg + "<li>" + field.getColName() + UtilProperties.getMessage(ERR_RESOURCE, "genericWebEvent.conversion_failed", messageMap, locale) + type.getJavaType() + ".";
-                    Debug.logWarning("[updateGeneric] " + field.getColName() + " conversion failed: \"" + fval + "\" is not a valid " + type.getJavaType() + "; entityName: " + entityName, MODULE);
+                    errMsg = errMsg + "<li>" + field.getColName() + UtilProperties.getMessage(ERR_RESOURCE, "genericWebEvent.conversion_failed",
+                            messageMap, locale) + type.getJavaType() + ".";
+                    Debug.logWarning("[updateGeneric] " + field.getColName() + " conversion failed: \"" + fval + "\" is not a valid "
+                            + type.getJavaType() + "; entityName: " + entityName, MODULE);
                 }
             }
         }
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
index 1c9847c..73299c0 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
@@ -102,10 +102,12 @@ public final class UtilCacheEvents {
 
             if (key != null) {
                 utilCache.remove(key);
-                errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.removeElementWithKey", UtilMisc.toMap("key", key.toString()), locale) + ".";
+                errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.removeElementWithKey", UtilMisc.toMap("key",
+                        key.toString()), locale) + ".";
                 request.setAttribute("_EVENT_MESSAGE_", errMsg);
             } else {
-                errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name", name, "numString", numString), locale) + ".";
+                errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name",
+                        name, "numString", numString), locale) + ".";
                 request.setAttribute("_ERROR_MESSAGE_", errMsg);
                 return "error";
             }
@@ -172,7 +174,7 @@ public final class UtilCacheEvents {
 
         UtilCache.clearAllCaches();
         errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.clearAllCaches", locale);
-        request.setAttribute("_EVENT_MESSAGE_", errMsg + " (" + UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss")  + ").");
+        request.setAttribute("_EVENT_MESSAGE_", errMsg + " (" + UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss") + ").");
         return "success";
     }
     /** An HTTP WebEvent handler that clears the selected caches
@@ -217,7 +219,8 @@ public final class UtilCacheEvents {
                 errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
                 eventList.add(errMsg);
             } else {
-                errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name), locale) + ".";
+                errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotClearCacheNotFoundName",
+                        UtilMisc.toMap("name", name), locale) + ".";
                 eventList.add(errMsg);
             }
         }
@@ -271,10 +274,12 @@ public final class UtilCacheEvents {
         UtilCache<?, ?> utilCache = UtilCache.findCache(name);
 
         if (utilCache != null) {
-            if (maxInMemory != null)
+            if (maxInMemory != null) {
                 utilCache.setMaxInMemory(maxInMemory);
-            if (expireTime != null)
+            }
+            if (expireTime != null) {
                 utilCache.setExpireTime(expireTime);
+            }
             if (useSoftReferenceStr != null) {
                 utilCache.setUseSoftReference("true".equals(useSoftReferenceStr));
             }
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java
index 8b90a9f..4dd7d39 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java
@@ -26,7 +26,16 @@ import java.net.URL;
  */
 public abstract class ArtifactInfoBase implements Comparable<ArtifactInfoBase> {
 
-    protected ArtifactInfoFactory aif;
+    private ArtifactInfoFactory aif;
+
+    /**
+     * Gets aif.
+     * @return the aif
+     */
+    public ArtifactInfoFactory getAif() {
+        return aif;
+    }
+
     private String fullName = null;
 
     public ArtifactInfoBase(ArtifactInfoFactory aif) {
@@ -54,15 +63,15 @@ public abstract class ArtifactInfoBase implements Comparable<ArtifactInfoBase> {
         }
     }
 
-    abstract public String getDisplayName();
+    public abstract String getDisplayName();
 
-    abstract public String getDisplayType();
+    public abstract String getDisplayType();
 
-    abstract public URL getLocationURL() throws MalformedURLException;
+    public abstract URL getLocationURL() throws MalformedURLException;
 
-    abstract public String getType();
+    public abstract String getType();
 
-    abstract public String getUniqueId();
+    public abstract String getUniqueId();
 
     @Override
     public int hashCode() {
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
index c901958..ccbf414 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
@@ -66,10 +66,11 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
         if (this.requestInfoMap.getEvent() != null && this.requestInfoMap.getEvent().getType() != null
                 && (this.requestInfoMap.getEvent().getType().indexOf("service") >= 0)) {
             String serviceName = this.requestInfoMap.getEvent().getInvoke();
-            this.serviceCalledByRequestEvent = this.aif.getServiceArtifactInfo(serviceName);
+            this.serviceCalledByRequestEvent = this.getAif().getServiceArtifactInfo(serviceName);
             if (this.serviceCalledByRequestEvent != null) {
                 // add the reverse association
-                UtilMisc.addToSortedSetInMap(this, aif.getAllRequestInfosReferringToServiceName(), this.serviceCalledByRequestEvent.getUniqueId());
+                UtilMisc.addToSortedSetInMap(this, getAif().getAllRequestInfosReferringToServiceName(),
+                        this.serviceCalledByRequestEvent.getUniqueId());
             }
         }
 
@@ -81,10 +82,10 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
                     viewUri = viewUri.substring(1);
                 }
                 try {
-                    ControllerViewArtifactInfo artInfo = this.aif.getControllerViewArtifactInfo(controllerXmlUrl, viewUri);
+                    ControllerViewArtifactInfo artInfo = this.getAif().getControllerViewArtifactInfo(controllerXmlUrl, viewUri);
                     this.viewsThatAreResponsesToThisRequest.add(artInfo);
                     // add the reverse association
-                    UtilMisc.addToSortedSetInMap(this, this.aif.getAllRequestInfosReferringToView(), artInfo.getUniqueId());
+                    UtilMisc.addToSortedSetInMap(this, this.getAif().getAllRequestInfosReferringToView(), artInfo.getUniqueId());
                 } catch (GeneralException e) {
                     Debug.logWarning(e.toString(), MODULE);
                 }
@@ -94,22 +95,22 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
                     otherRequestUri = otherRequestUri.substring(1);
                 }
                 try {
-                    ControllerRequestArtifactInfo artInfo = this.aif.getControllerRequestArtifactInfo(controllerXmlUrl, otherRequestUri);
+                    ControllerRequestArtifactInfo artInfo = this.getAif().getControllerRequestArtifactInfo(controllerXmlUrl, otherRequestUri);
                     this.requestsThatAreResponsesToThisRequest.add(artInfo);
-                    UtilMisc.addToSortedSetInMap(this, this.aif.getAllRequestInfosReferringToRequest(), artInfo.getUniqueId());
+                    UtilMisc.addToSortedSetInMap(this, this.getAif().getAllRequestInfosReferringToRequest(), artInfo.getUniqueId());
                 } catch (GeneralException e) {
                     Debug.logWarning(e.toString(), MODULE);
                 }
             } else if ("request-redirect".equals(response.getType())) {
                 String otherRequestUri = response.getValue();
-                ControllerRequestArtifactInfo artInfo = this.aif.getControllerRequestArtifactInfo(controllerXmlUrl, otherRequestUri);
+                ControllerRequestArtifactInfo artInfo = this.getAif().getControllerRequestArtifactInfo(controllerXmlUrl, otherRequestUri);
                 this.requestsThatAreResponsesToThisRequest.add(artInfo);
-                UtilMisc.addToSortedSetInMap(this, this.aif.getAllRequestInfosReferringToRequest(), artInfo.getUniqueId());
+                UtilMisc.addToSortedSetInMap(this, this.getAif().getAllRequestInfosReferringToRequest(), artInfo.getUniqueId());
             } else if ("request-redirect-noparam".equals(response.getType())) {
                 String otherRequestUri = response.getValue();
-                ControllerRequestArtifactInfo artInfo = this.aif.getControllerRequestArtifactInfo(controllerXmlUrl, otherRequestUri);
+                ControllerRequestArtifactInfo artInfo = this.getAif().getControllerRequestArtifactInfo(controllerXmlUrl, otherRequestUri);
                 this.requestsThatAreResponsesToThisRequest.add(artInfo);
-                UtilMisc.addToSortedSetInMap(this, this.aif.getAllRequestInfosReferringToRequest(), artInfo.getUniqueId());
+                UtilMisc.addToSortedSetInMap(this, this.getAif().getAllRequestInfosReferringToRequest(), artInfo.getUniqueId());
             }
         }
     }
@@ -122,6 +123,10 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
         return this.controllerXmlUrl;
     }
 
+    /**
+     * Gets request uri.
+     * @return the request uri
+     */
     public String getRequestUri() {
         return this.requestUri;
     }
@@ -175,7 +180,7 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
      * @return the form infos referring to request
      */
     public Set<FormWidgetArtifactInfo> getFormInfosReferringToRequest() {
-        return this.aif.getAllFormInfosReferringToRequest().get(this.getUniqueId());
+        return this.getAif().getAllFormInfosReferringToRequest().get(this.getUniqueId());
     }
 
     /**
@@ -183,7 +188,7 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
      * @return the form infos targeting request
      */
     public Set<FormWidgetArtifactInfo> getFormInfosTargetingRequest() {
-        return this.aif.getAllFormInfosTargetingRequest().get(this.getUniqueId());
+        return this.getAif().getAllFormInfosTargetingRequest().get(this.getUniqueId());
     }
 
     /**
@@ -191,7 +196,7 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
      * @return the screen infos referring to request
      */
     public Set<ScreenWidgetArtifactInfo> getScreenInfosReferringToRequest() {
-        return this.aif.getAllScreenInfosReferringToRequest().get(this.getUniqueId());
+        return this.getAif().getAllScreenInfosReferringToRequest().get(this.getUniqueId());
     }
 
     /**
@@ -207,7 +212,7 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase {
      * @return the requests that this request is respons to
      */
     public Set<ControllerRequestArtifactInfo> getRequestsThatThisRequestIsResponsTo() {
-        return this.aif.getAllRequestInfosReferringToRequest().get(this.getUniqueId());
+        return this.getAif().getAllRequestInfosReferringToRequest().get(this.getUniqueId());
     }
 
     /**
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java
index 075d70f..71b041c 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java
@@ -60,7 +60,7 @@ public class ControllerViewArtifactInfo extends ArtifactInfoBase {
             String fullScreenName = this.viewInfoMap.getPage();
             if (UtilValidate.isNotEmpty(fullScreenName)) {
                 int poundIndex = fullScreenName.indexOf('#');
-                this.screenCalledByThisView = this.aif.getScreenWidgetArtifactInfo(fullScreenName.substring(poundIndex + 1),
+                this.screenCalledByThisView = this.getAif().getScreenWidgetArtifactInfo(fullScreenName.substring(poundIndex + 1),
                         fullScreenName.substring(0, poundIndex));
                 if (this.screenCalledByThisView != null) {
                     // add the reverse association
@@ -131,7 +131,7 @@ public class ControllerViewArtifactInfo extends ArtifactInfoBase {
      * @return the requests that this view is response to
      */
     public Set<ControllerRequestArtifactInfo> getRequestsThatThisViewIsResponseTo() {
-        return this.aif.getAllRequestInfosReferringToView().get(this.getUniqueId());
+        return this.getAif().getAllRequestInfosReferringToView().get(this.getUniqueId());
     }
 
     /**
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
index 1e2db9b..b1eb49d 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
@@ -42,7 +42,7 @@ public class EntityArtifactInfo extends ArtifactInfoBase {
 
     public EntityArtifactInfo(String entityName, ArtifactInfoFactory aif) throws GenericEntityException {
         super(aif);
-        this.modelEntity = this.aif.getModelEntity(entityName);
+        this.modelEntity = this.getAif().getModelEntity(entityName);
     }
 
     /**
@@ -52,12 +52,12 @@ public class EntityArtifactInfo extends ArtifactInfoBase {
     public void populateAll() throws GeneralException {
         List<ModelRelation> relationOneList = modelEntity.getRelationsOneList();
         for (ModelRelation relationOne: relationOneList) {
-            this.entitiesRelatedOne.add(this.aif.getEntityArtifactInfo(relationOne.getRelEntityName()));
+            this.entitiesRelatedOne.add(this.getAif().getEntityArtifactInfo(relationOne.getRelEntityName()));
         }
 
         List<ModelRelation> relationManyList = modelEntity.getRelationsManyList();
         for (ModelRelation relationMany: relationManyList) {
-            this.entitiesRelatedMany.add(this.aif.getEntityArtifactInfo(relationMany.getRelEntityName()));
+            this.entitiesRelatedMany.add(this.getAif().getEntityArtifactInfo(relationMany.getRelEntityName()));
         }
     }
 
@@ -121,7 +121,7 @@ public class EntityArtifactInfo extends ArtifactInfoBase {
 
     /** Get the Services that use this Entity */
     public Set<ServiceArtifactInfo> getServicesUsingEntity() {
-        return this.aif.getAllServiceInfosReferringToEntityName().get(this.modelEntity.getEntityName());
+        return this.getAif().getAllServiceInfosReferringToEntityName().get(this.modelEntity.getEntityName());
     }
 
     /** Get the Services called by Entity ECA */
@@ -146,7 +146,7 @@ public class EntityArtifactInfo extends ArtifactInfoBase {
      * @return the forms using entity
      */
     public Set<FormWidgetArtifactInfo> getFormsUsingEntity() {
-        return this.aif.getAllFormInfosReferringToEntityName().get(this.modelEntity.getEntityName());
+        return this.getAif().getAllFormInfosReferringToEntityName().get(this.modelEntity.getEntityName());
     }
 
     /**
@@ -154,6 +154,6 @@ public class EntityArtifactInfo extends ArtifactInfoBase {
      * @return the screens using entity
      */
     public Set<ScreenWidgetArtifactInfo> getScreensUsingEntity() {
-        return this.aif.getAllScreenInfosReferringToEntityName().get(this.modelEntity.getEntityName());
+        return this.getAif().getAllScreenInfosReferringToEntityName().get(this.modelEntity.getEntityName());
     }
 }
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
index 689da8b..8405bd7 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
@@ -100,7 +100,7 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             try {
-                aif.getModelForm(formName);
+                getAif().getModelForm(formName);
             } catch (Exception e) {
                 Debug.logWarning("Form [" + formName + "] reference in form [" + this.formName + "] in resource [" + this.formLocation
                         + "] does not exist!", MODULE);
@@ -108,9 +108,9 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             // the forward reference
-            this.formThisFormExtends = aif.getFormWidgetArtifactInfo(formName);
+            this.formThisFormExtends = getAif().getFormWidgetArtifactInfo(formName);
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllFormInfosExtendingForm(), formName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllFormInfosExtendingForm(), formName);
         }
     }
 
@@ -124,16 +124,16 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
             if (entityName.contains("${")) {
                 continue;
             }
-            if (!aif.getEntityModelReader().getEntityNames().contains(entityName)) {
+            if (!getAif().getEntityModelReader().getEntityNames().contains(entityName)) {
                 Debug.logWarning("Entity [" + entityName + "] reference in form [" + this.formName + "] in resource [" + this.formLocation
                         + "] does not exist!", MODULE);
                 continue;
             }
 
             // the forward reference
-            this.entitiesUsedInThisForm.add(aif.getEntityArtifactInfo(entityName));
+            this.entitiesUsedInThisForm.add(getAif().getEntityArtifactInfo(entityName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllFormInfosReferringToEntityName(), entityName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllFormInfosReferringToEntityName(), entityName);
         }
     }
 
@@ -148,7 +148,7 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
                 continue;
             }
             try {
-                aif.getModelService(serviceName);
+                getAif().getModelService(serviceName);
             } catch (GeneralException e) {
                 Debug.logWarning("Service [" + serviceName + "] reference in form [" + this.formName + "] in resource [" + this.formLocation
                         + "] does not exist!", MODULE);
@@ -156,9 +156,9 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             // the forward reference
-            this.servicesUsedInThisForm.add(aif.getServiceArtifactInfo(serviceName));
+            this.servicesUsedInThisForm.add(getAif().getServiceArtifactInfo(serviceName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllFormInfosReferringToServiceName(), serviceName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllFormInfosReferringToServiceName(), serviceName);
         }
     }
 
@@ -176,9 +176,9 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
                 String controllerXmlUrl = requestUniqueId.substring(0, requestUniqueId.indexOf("#"));
                 String requestUri = requestUniqueId.substring(requestUniqueId.indexOf("#") + 1);
                 // the forward reference
-                this.requestsLinkedToInForm.add(aif.getControllerRequestArtifactInfo(UtilURL.fromUrlString(controllerXmlUrl), requestUri));
+                this.requestsLinkedToInForm.add(getAif().getControllerRequestArtifactInfo(UtilURL.fromUrlString(controllerXmlUrl), requestUri));
                 // the reverse reference
-                UtilMisc.addToSortedSetInMap(this, aif.getAllFormInfosReferringToRequest(), requestUniqueId);
+                UtilMisc.addToSortedSetInMap(this, getAif().getAllFormInfosReferringToRequest(), requestUniqueId);
             }
         }
     }
@@ -199,9 +199,9 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
                 String controllerXmlUrl = requestUniqueId.substring(0, requestUniqueId.indexOf("#"));
                 String requestUri = requestUniqueId.substring(requestUniqueId.indexOf("#") + 1);
                 // the forward reference
-                this.requestsTargetedByInForm.add(aif.getControllerRequestArtifactInfo(UtilURL.fromUrlString(controllerXmlUrl), requestUri));
+                this.requestsTargetedByInForm.add(getAif().getControllerRequestArtifactInfo(UtilURL.fromUrlString(controllerXmlUrl), requestUri));
                 // the reverse reference
-                UtilMisc.addToSortedSetInMap(this, aif.getAllFormInfosTargetingRequest(), requestUniqueId);
+                UtilMisc.addToSortedSetInMap(this, getAif().getAllFormInfosTargetingRequest(), requestUniqueId);
             }
         }
     }
@@ -271,7 +271,7 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
      * @return the forms extending this form
      */
     public Set<FormWidgetArtifactInfo> getFormsExtendingThisForm() {
-        return this.aif.getAllFormInfosExtendingForm().get(this.getUniqueId());
+        return this.getAif().getAllFormInfosExtendingForm().get(this.getUniqueId());
     }
 
     /**
@@ -279,7 +279,7 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase {
      * @return the screens including this form
      */
     public Set<ScreenWidgetArtifactInfo> getScreensIncludingThisForm() {
-        return this.aif.getAllScreenInfosReferringToForm().get(this.getUniqueId());
+        return this.getAif().getAllScreenInfosReferringToForm().get(this.getUniqueId());
     }
 
     /**
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
index b856cb7..1345e64 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
@@ -65,6 +65,10 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
 
     }
 
+    /**
+     * Populate all.
+     * @throws GeneralException the general exception
+     */
     public void populateAll() throws GeneralException {
         ArtifactInfoContext infoContext = new ArtifactInfoContext();
         ArtifactInfoGatherer infoGatherer = new ArtifactInfoGatherer(infoContext);
@@ -79,13 +83,18 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
         populateLinkedRequests(infoContext.getRequestLocations());
     }
 
+    /**
+     * Populate services from name set.
+     * @param allServiceNameSet the all service name set
+     * @throws GeneralException the general exception
+     */
     protected void populateServicesFromNameSet(Set<String> allServiceNameSet) throws GeneralException {
         for (String serviceName: allServiceNameSet) {
             if (serviceName.contains("${")) {
                 continue;
             }
             try {
-                aif.getModelService(serviceName);
+                getAif().getModelService(serviceName);
             } catch (GeneralException e) {
                 Debug.logWarning("Service [" + serviceName + "] reference in screen [" + this.screenName + "] in resource [" + this.screenLocation
                         + "] does not exist!", MODULE);
@@ -93,19 +102,24 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             // the forward reference
-            this.servicesUsedInThisScreen.add(aif.getServiceArtifactInfo(serviceName));
+            this.servicesUsedInThisScreen.add(getAif().getServiceArtifactInfo(serviceName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllScreenInfosReferringToServiceName(), serviceName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllScreenInfosReferringToServiceName(), serviceName);
         }
     }
 
+    /**
+     * Populate entities from name set.
+     * @param allEntityNameSet the all entity name set
+     * @throws GeneralException the general exception
+     */
     protected void populateEntitiesFromNameSet(Set<String> allEntityNameSet) throws GeneralException {
         for (String entityName: allEntityNameSet) {
             if (entityName.contains("${")) {
                 continue;
             }
             // attempt to convert relation names to entity names
-            entityName = aif.getEntityModelReader().validateEntityName(entityName);
+            entityName = getAif().getEntityModelReader().validateEntityName(entityName);
             if (entityName == null) {
                 Debug.logWarning("Entity [" + entityName + "] reference in screen [" + this.screenName + "] in resource [" + this.screenLocation
                         + "] does not exist!", MODULE);
@@ -113,12 +127,17 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             // the forward reference
-            this.entitiesUsedInThisScreen.add(aif.getEntityArtifactInfo(entityName));
+            this.entitiesUsedInThisScreen.add(getAif().getEntityArtifactInfo(entityName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllScreenInfosReferringToEntityName(), entityName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllScreenInfosReferringToEntityName(), entityName);
         }
     }
 
+    /**
+     * Populate forms from name set.
+     * @param allFormNameSet the all form name set
+     * @throws GeneralException the general exception
+     */
     protected void populateFormsFromNameSet(Set<String> allFormNameSet) throws GeneralException {
         for (String formName: allFormNameSet) {
             if (formName.contains("${")) {
@@ -126,7 +145,7 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             try {
-                aif.getModelForm(formName);
+                getAif().getModelForm(formName);
             } catch (Exception e) {
                 Debug.logWarning("Form [" + formName + "] reference in screen [" + this.screenName + "] in resource [" + this.screenLocation
                         + "] does not exist!", MODULE);
@@ -134,12 +153,17 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
             }
 
             // the forward reference
-            this.formsIncludedInThisScreen.add(aif.getFormWidgetArtifactInfo(formName));
+            this.formsIncludedInThisScreen.add(getAif().getFormWidgetArtifactInfo(formName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllScreenInfosReferringToForm(), formName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllScreenInfosReferringToForm(), formName);
         }
     }
 
+    /**
+     * Populate linked requests.
+     * @param allRequestUniqueId the all request unique id
+     * @throws GeneralException the general exception
+     */
     protected void populateLinkedRequests(Set<String> allRequestUniqueId) throws GeneralException {
 
         for (String requestUniqueId: allRequestUniqueId) {
@@ -151,9 +175,9 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
                 String controllerXmlUrl = requestUniqueId.substring(0, requestUniqueId.indexOf("#"));
                 String requestUri = requestUniqueId.substring(requestUniqueId.indexOf("#") + 1);
                 // the forward reference
-                this.requestsLinkedToInScreen.add(aif.getControllerRequestArtifactInfo(UtilURL.fromUrlString(controllerXmlUrl), requestUri));
+                this.requestsLinkedToInScreen.add(getAif().getControllerRequestArtifactInfo(UtilURL.fromUrlString(controllerXmlUrl), requestUri));
                 // the reverse reference
-                UtilMisc.addToSortedSetInMap(this, aif.getAllScreenInfosReferringToRequest(), requestUniqueId);
+                UtilMisc.addToSortedSetInMap(this, getAif().getAllScreenInfosReferringToRequest(), requestUniqueId);
             }
         }
     }
@@ -200,7 +224,7 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
      * @return the views referring to screen
      */
     public Set<ControllerViewArtifactInfo> getViewsReferringToScreen() {
-        return this.aif.getAllViewInfosReferringToScreen().get(this.getUniqueId());
+        return this.getAif().getAllViewInfosReferringToScreen().get(this.getUniqueId());
     }
 
     /**
@@ -241,7 +265,7 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase {
      * @return the screens including this screen
      */
     public Set<ScreenWidgetArtifactInfo> getScreensIncludingThisScreen() {
-        return this.aif.getAllScreenInfosReferringToScreen().get(this.getUniqueId());
+        return this.getAif().getAllScreenInfosReferringToScreen().get(this.getUniqueId());
     }
 
     /**
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
index dbcf442..cfedae8 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
@@ -65,7 +65,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
 
     public ServiceArtifactInfo(String serviceName, ArtifactInfoFactory aif) throws GeneralException {
         super(aif);
-        this.modelService = this.aif.getModelService(serviceName);
+        this.modelService = this.getAif().getModelService(serviceName);
     }
 
     /**
@@ -137,16 +137,16 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
                 continue;
             }
             // attempt to convert relation names to entity names
-            String validEntityName = aif.getEntityModelReader().validateEntityName(entityName);
+            String validEntityName = getAif().getEntityModelReader().validateEntityName(entityName);
             if (validEntityName == null) {
                 Debug.logWarning("Entity [" + entityName + "] reference in service [" + this.modelService.getName() + "] does not exist!", MODULE);
                 continue;
             }
 
             // the forward reference
-            this.entitiesUsedByThisService.add(aif.getEntityArtifactInfo(validEntityName));
+            this.entitiesUsedByThisService.add(getAif().getEntityArtifactInfo(validEntityName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllServiceInfosReferringToEntityName(), validEntityName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllServiceInfosReferringToEntityName(), validEntityName);
         }
     }
 
@@ -221,15 +221,15 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
             if (serviceName.contains("${")) {
                 continue;
             }
-            if (!aif.getDispatchContext().getAllServiceNames().contains(serviceName)) {
+            if (!getAif().getDispatchContext().getAllServiceNames().contains(serviceName)) {
                 Debug.logWarning("Service [" + serviceName + "] reference in service [" + this.modelService.getName() + "] does not exist!", MODULE);
                 continue;
             }
 
             // the forward reference
-            this.servicesCalledByThisService.add(aif.getServiceArtifactInfo(serviceName));
+            this.servicesCalledByThisService.add(getAif().getServiceArtifactInfo(serviceName));
             // the reverse reference
-            UtilMisc.addToSortedSetInMap(this, aif.getAllServiceInfosReferringToServiceName(), serviceName);
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllServiceInfosReferringToServiceName(), serviceName);
         }
     }
 
@@ -243,9 +243,9 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
         if (serviceEventMap == null) return;
         for (List<ServiceEcaRule> ecaRuleList: serviceEventMap.values()) {
             for (ServiceEcaRule ecaRule: ecaRuleList) {
-                this.serviceEcasTriggeredByThisService.add(aif.getServiceEcaArtifactInfo(ecaRule));
+                this.serviceEcasTriggeredByThisService.add(getAif().getServiceEcaArtifactInfo(ecaRule));
                 // the reverse reference
-                UtilMisc.addToSortedSetInMap(this, aif.getAllServiceInfosReferringToServiceEcaRule(), ecaRule);
+                UtilMisc.addToSortedSetInMap(this, getAif().getAllServiceInfosReferringToServiceEcaRule(), ecaRule);
             }
         }
     }
@@ -321,7 +321,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
      * @return the services calling service
      */
     public Set<ServiceArtifactInfo> getServicesCallingService() {
-        return aif.getAllServiceInfosReferringToServiceName().get(this.modelService.getName());
+        return getAif().getAllServiceInfosReferringToServiceName().get(this.modelService.getName());
     }
 
     /**
@@ -363,7 +363,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
      * @return the service eca rules calling service
      */
     public Set<ServiceEcaArtifactInfo> getServiceEcaRulesCallingService() {
-        return this.aif.getAllServiceEcaInfosReferringToServiceName().get(this.modelService.getName());
+        return this.getAif().getAllServiceEcaInfosReferringToServiceName().get(this.modelService.getName());
     }
 
     /**
@@ -371,7 +371,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
      * @return the forms calling service
      */
     public Set<FormWidgetArtifactInfo> getFormsCallingService() {
-        return this.aif.getAllFormInfosReferringToServiceName().get(this.modelService.getName());
+        return this.getAif().getAllFormInfosReferringToServiceName().get(this.modelService.getName());
     }
 
     /**
@@ -379,7 +379,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
      * @return the forms based on service
      */
     public Set<FormWidgetArtifactInfo> getFormsBasedOnService() {
-        return this.aif.getAllFormInfosBasedOnServiceName().get(this.modelService.getName());
+        return this.getAif().getAllFormInfosBasedOnServiceName().get(this.modelService.getName());
     }
 
     /**
@@ -387,7 +387,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
      * @return the screens calling service
      */
     public Set<ScreenWidgetArtifactInfo> getScreensCallingService() {
-        return this.aif.getAllScreenInfosReferringToServiceName().get(this.modelService.getName());
+        return this.getAif().getAllScreenInfosReferringToServiceName().get(this.modelService.getName());
     }
 
     /**
@@ -395,7 +395,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase {
      * @return the requests with event calling service
      */
     public Set<ControllerRequestArtifactInfo> getRequestsWithEventCallingService() {
-        return this.aif.getAllRequestInfosReferringToServiceName().get(this.modelService.getName());
+        return this.getAif().getAllRequestInfosReferringToServiceName().get(this.modelService.getName());
     }
 
     /**
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
index c3a0f6d..bcb191c1 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
@@ -64,8 +64,8 @@ public class ServiceEcaArtifactInfo extends ArtifactInfoBase {
     public void populateAll() throws GeneralException {
         // populate the services called Set
         for (ServiceEcaAction ecaAction: serviceEcaRule.getEcaActionList()) {
-            servicesCalledByThisServiceEca.add(aif.getServiceArtifactInfo(ecaAction.getServiceName()));
-            UtilMisc.addToSortedSetInMap(this, aif.getAllServiceEcaInfosReferringToServiceName(), ecaAction.getServiceName());
+            servicesCalledByThisServiceEca.add(getAif().getServiceArtifactInfo(ecaAction.getServiceName()));
+            UtilMisc.addToSortedSetInMap(this, getAif().getAllServiceEcaInfosReferringToServiceName(), ecaAction.getServiceName());
         }
     }
 
@@ -140,7 +140,7 @@ public class ServiceEcaArtifactInfo extends ArtifactInfoBase {
      * @return the services triggering service eca
      */
     public Set<ServiceArtifactInfo> getServicesTriggeringServiceEca() {
-        return aif.getAllServiceInfosReferringToServiceEcaRule().get(this.serviceEcaRule);
+        return getAif().getAllServiceInfosReferringToServiceEcaRule().get(this.serviceEcaRule);
     }
 
     /**
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java
index 5ddd6d3..285d0b7 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java
@@ -23,27 +23,43 @@ import java.io.File;
 public class LabelFile {
     private static final String MODULE = LabelFile.class.getName();
 
-    protected final boolean fileLoaded = false;
-    protected final File file;
-    protected final String componentName;
+    private final boolean fileLoaded = false;
+    private final File file;
+    private final String componentName;
 
     protected LabelFile(File file, String componentName) {
         this.file = file;
         this.componentName = componentName;
     }
 
+    /**
+     * Gets file.
+     * @return the file
+     */
     public File getFile() {
         return this.file;
     }
 
+    /**
+     * Gets file name.
+     * @return the file name
+     */
     public String getFileName() {
         return this.file.getName();
     }
 
+    /**
+     * Gets file path.
+     * @return the file path
+     */
     public String getFilePath() {
         return this.file.getPath();
     }
 
+    /**
+     * Gets component name.
+     * @return the component name
+     */
     public String getComponentName() {
         return componentName;
     }
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
index 5c2dde7..13dc861 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
@@ -99,7 +99,7 @@ public class LabelManagerFactory {
             return;
         }
         for (LabelFile fileInfo : filesFound.values()) {
-            if (UtilValidate.isNotEmpty(component) && !component.equals(fileInfo.componentName)) {
+            if (UtilValidate.isNotEmpty(component) && !component.equals(fileInfo.getComponentName())) {
                 continue;
             }
             if (UtilValidate.isNotEmpty(fileName) && !fileName.equals(fileInfo.getFileName())) {
@@ -108,7 +108,7 @@ public class LabelManagerFactory {
             if (Debug.infoOn()) {
                 Debug.logInfo("Current file : " + fileInfo.getFileName(), MODULE);
             }
-            Document resourceDocument = UtilXml.readXmlDocument(fileInfo.file.toURI().toURL(), false);
+            Document resourceDocument = UtilXml.readXmlDocument(fileInfo.getFile().toURI().toURL(), false);
             Element resourceElem = resourceDocument.getDocumentElement();
             String labelKeyComment = "";
             for (Node propertyNode : UtilXml.childNodeList(resourceElem.getFirstChild())) {
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
index 8ff1a6c..1d96ec3 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
@@ -74,7 +74,8 @@ public class SaveLabelsToXmlFile {
             LabelFile labelFile = factory.getLabelFile(fileName);
             if (labelFile == null) {
                 Debug.logError("Invalid file name: " + fileName, MODULE);
-                return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "saveLabelsToXmlFile.exceptionDuringSaveLabelsToXmlFile", locale));
+                return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "saveLabelsToXmlFile.exceptionDuringSaveLabelsToXmlFile",
+                        locale));
             }
             synchronized (SaveLabelsToXmlFile.class) {
                 factory.findMatchingLabels(null, fileName, null, null, false);
@@ -103,7 +104,8 @@ public class SaveLabelsToXmlFile {
                             if (UtilValidate.isEmpty(key)) {
                                 return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "WebtoolsLabelManagerNewLabelEmptyKey", locale));
                             } else {
-                                int notEmptyLabels = factory.updateLabelValue(localeNames, localeValues, localeComments, null, key, keyComment, fileName);
+                                int notEmptyLabels = factory.updateLabelValue(localeNames, localeValues, localeComments, null, key,
+                                        keyComment, fileName);
                                 if (notEmptyLabels == 0) {
                                     return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "WebtoolsLabelManagerNewLabelEmpty", locale));
                                 }
@@ -144,7 +146,7 @@ public class SaveLabelsToXmlFile {
                             }
                         }
                     }
-                    try (FileOutputStream fos = new FileOutputStream(labelFile.file)) {
+                    try (FileOutputStream fos = new FileOutputStream(labelFile.getFile())) {
                         if (apacheLicenseText != null) {
                             fos.write(apacheLicenseText.getBytes());
                         }
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 aed24af..e6df9a7 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
@@ -28,6 +28,12 @@ public class ScreenCache extends AbstractCache {
         super("screen");
     }
 
+    /**
+     * Get generic widget output.
+     * @param screenName the screen name
+     * @param wcck the wcck
+     * @return the generic widget output
+     */
     public GenericWidgetOutput get(String screenName, WidgetContextCacheKey wcck) {
         UtilCache<WidgetContextCacheKey, GenericWidgetOutput> screenCache = getCache(screenName);
         if (screenCache == null) {
@@ -36,15 +42,29 @@ public class ScreenCache extends AbstractCache {
         return screenCache.get(wcck);
     }
 
+    /**
+     * Put generic widget output.
+     * @param screenName the screen name
+     * @param wcck the wcck
+     * @param output the output
+     * @return the generic widget output
+     */
     public GenericWidgetOutput put(String screenName, WidgetContextCacheKey wcck, GenericWidgetOutput output) {
         UtilCache<WidgetContextCacheKey, GenericWidgetOutput> screenCache = getOrCreateCache(screenName);
         return screenCache.put(wcck, output);
     }
 
+    /**
+     * Remove generic widget output.
+     * @param screenName the screen name
+     * @param wcck the wcck
+     * @return the generic widget output
+     */
     public GenericWidgetOutput remove(String screenName, WidgetContextCacheKey wcck) {
         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);
+            Debug.logVerbose("Removing from ScreenCache with key [" + wcck + "], will remove from this cache: "
+                    + (screenCache == null ? "[No cache found to remove from]" : screenCache.getName()), MODULE);
         }
         if (screenCache == null) {
             return null;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java
index aa7312a..839f7f8 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java
@@ -31,12 +31,13 @@ public final class WidgetDataResourceWorker {
         try {
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
             // note: loadClass is necessary for these since this class doesn't know anything about them at compile time
-            dataresourceWorker = (DataResourceWorkerInterface) loader.loadClass("org.apache.ofbiz.content.data.DataResourceWorker").getDeclaredConstructor().newInstance();
+            dataresourceWorker = (DataResourceWorkerInterface) loader.loadClass("org.apache.ofbiz.content.data.DataResourceWorker")
+                    .getDeclaredConstructor().newInstance();
         } catch (ReflectiveOperationException e) {
             Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", MODULE);
         }
     }
     public static DataResourceWorkerInterface getDataresourceWorker() {
-       return dataresourceWorker;
+        return dataresourceWorker;
     }
 }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelActionUtil.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelActionUtil.java
index 329986d..15d3d4a 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelActionUtil.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelActionUtil.java
@@ -30,7 +30,8 @@ public class ModelActionUtil {
      * @param result
      * @param resultMapNameAcsr
      */
-    protected static void contextPutQueryStringOrAllResult(Map<String, Object> context, Map<String, Object> result, FlexibleMapAccessor<Map<String, Object>> resultMapNameAcsr) {
+    protected static void contextPutQueryStringOrAllResult(Map<String, Object> context, Map<String, Object> result,
+                                                           FlexibleMapAccessor<Map<String, Object>> resultMapNameAcsr) {
         if (!resultMapNameAcsr.isEmpty()) {
             resultMapNameAcsr.put(context, result);
             String queryString = (String) result.get("queryString");
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
index 5bdca22..d70f6f2 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
@@ -126,16 +126,16 @@ public class ModelFormField {
     private final FlexibleMapAccessor<Object> entryAcsr;
     private final String event;
     private final FieldInfo fieldInfo;
-    protected final String fieldName;
+    private final String fieldName;
     private final String headerLink;
     private final String headerLinkStyle;
     private final String idName;
     private final FlexibleMapAccessor<Map<String, ? extends Object>> mapAcsr;
-    protected final ModelForm modelForm;
-    protected final String name;
+    private final ModelForm modelForm;
+    private final String name;
     private final List<UpdateArea> onChangeUpdateAreas;
     private final List<UpdateArea> onClickUpdateAreas;
-    protected final FlexibleStringExpander parameterName;
+    private final FlexibleStringExpander parameterName;
     private final Integer position;
     private final String redWhen;
     private final Boolean requiredField;
@@ -336,7 +336,8 @@ public class ModelFormField {
                     if (genEnt.getModelEntity().isField(this.entryAcsr.getOriginalName())) {
                         retVal = genEnt.get(this.entryAcsr.getOriginalName(), locale);
                     // } else {
-                        //TODO: this may never come up, but if necessary use the FlexibleStringExander to eval the name first:String evaled = this.entryAcsr
+                        //TODO: this may never come up, but if necessary use the FlexibleStringExander
+                        // to eval the name first:String evaled = this.entryAcsr
                     }
                 } else {
                     retVal = this.entryAcsr.get(dataMap, locale);
@@ -1194,10 +1195,19 @@ public class ModelFormField {
             return new DateFindField(this, modelFormField);
         }
 
+        /**
+         * Gets default option from.
+         * @return the default option from
+         */
         public String getDefaultOptionFrom() {
             return this.defaultOptionFrom;
         }
 
+        /**
+         * Gets default option from.
+         * @param context the context
+         * @return the default option from
+         */
         public String getDefaultOptionFrom(Map<String, Object> context) {
             String defaultOption = getDefaultOptionFrom();
 
@@ -1467,6 +1477,10 @@ public class ModelFormField {
             return new DisplayEntityField(this, modelFormField);
         }
 
+        /**
+         * Gets cache.
+         * @return the cache
+         */
         public boolean getCache() {
             return cache;
         }
@@ -1715,7 +1729,8 @@ public class ModelFormField {
             if (UtilValidate.isEmpty(retVal)) {
                 retVal = this.getDefaultValue(context);
             } else if ("currency".equals(type)) {
-                retVal = retVal.replaceAll("&nbsp;", " "); // FIXME : encoding currency is a problem for some locale, we should not have any &nbsp; in retVal other case may arise in future...
+                retVal = retVal.replaceAll("&nbsp;", " ");
+                // FIXME : encoding currency is a problem for some locale, we should not have any &nbsp; in retVal other case may arise in future...
                 Locale locale = (Locale) context.get("locale");
                 if (locale == null) {
                     locale = Locale.getDefault();
@@ -1728,7 +1743,8 @@ public class ModelFormField {
                 try {
                     BigDecimal parsedRetVal = (BigDecimal) ObjectType.simpleTypeOrObjectConvert(retVal, "BigDecimal", null, null, locale,
                             true);
-                    retVal = UtilFormatOut.formatCurrency(parsedRetVal, isoCode, locale, 10); // we set the max to 10 digits as an hack to not round numbers in the ui
+                    retVal = UtilFormatOut.formatCurrency(parsedRetVal, isoCode, locale, 10);
+                    // we set the max to 10 digits as an hack to not round numbers in the ui
                 } catch (GeneralException e) {
                     String errMsg = "Error formatting currency value [" + retVal + "]: " + e.toString();
                     Debug.logError(e, errMsg, MODULE);
@@ -2220,7 +2236,8 @@ public class ModelFormField {
                 }
 
                 for (GenericValue value : values) {
-                    // add key and description with string expansion, ie expanding ${} stuff, passing locale explicitly to expand value string because it won't be found in the Entity
+                    // add key and description with string expansion, ie expanding ${} stuff, passing locale explicitly to
+                    // expand value string because it won't be found in the Entity
                     MapStack<String> localContext = MapStack.create(context);
                     // Rendering code might try to modify the GenericEntity instance,
                     // so we make a copy of it.
@@ -2707,10 +2724,19 @@ public class ModelFormField {
             return new HiddenField(this, modelFormField);
         }
 
+        /**
+         * Gets value.
+         * @return the value
+         */
         public FlexibleStringExpander getValue() {
             return value;
         }
 
+        /**
+         * Gets value.
+         * @param context the context
+         * @return the value
+         */
         public String getValue(Map<String, Object> context) {
             if (UtilValidate.isNotEmpty(this.value)) {
                 String valueEnc = this.value.expandString(context);
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java
index bcbbb69..0537f62 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java
@@ -46,6 +46,16 @@ public class PortalPageWorker {
 
     public PortalPageWorker() { }
 
+    /**
+     * Render portal page as text ext string.
+     * @param delegator the delegator
+     * @param portalPageId the portal page id
+     * @param templateContext the template context
+     * @param cache the cache
+     * @return the string
+     * @throws GeneralException the general exception
+     * @throws IOException the io exception
+     */
     public String renderPortalPageAsTextExt(Delegator delegator, String portalPageId, Map<String, Object> templateContext,
             boolean cache) throws GeneralException, IOException {
         return "success";
@@ -62,7 +72,7 @@ public class PortalPageWorker {
             try {
                 // first get public pages
                 EntityCondition cond =
-                    EntityCondition.makeCondition(UtilMisc.toList(
+                        EntityCondition.makeCondition(UtilMisc.toList(
                         EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_"),
                         EntityCondition.makeCondition(UtilMisc.toList(
                                 EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parentPortalPageId),
@@ -75,10 +85,9 @@ public class PortalPageWorker {
                     String userLoginId = ((GenericValue) context.get("userLogin")).getString("userLoginId");
                     // replace with private pages
                     for (GenericValue portalPage : portalPages) {
-                        List<GenericValue> privatePortalPages = EntityQuery.use(delegator)
-                                                                           .from("PortalPage")
-                                                                           .where("ownerUserLoginId", userLoginId, "originalPortalPageId", portalPage.getString("portalPageId"))
-                                                                           .queryList();
+                        List<GenericValue> privatePortalPages = EntityQuery.use(delegator).from("PortalPage")
+                                .where("ownerUserLoginId", userLoginId, "originalPortalPageId", portalPage.getString("portalPageId"))
+                                .queryList();
                         if (UtilValidate.isNotEmpty(privatePortalPages)) {
                             userPortalPages.add(privatePortalPages.get(0));
                         } else {
@@ -86,10 +95,9 @@ public class PortalPageWorker {
                         }
                     }
                     // add any other created private pages
-                    userPortalPages.addAll(EntityQuery.use(delegator)
-                                                      .from("PortalPage")
-                                                      .where("ownerUserLoginId", userLoginId, "originalPortalPageId", null, "parentPortalPageId", parentPortalPageId)
-                                                      .queryList());
+                    userPortalPages.addAll(EntityQuery.use(delegator).from("PortalPage")
+                            .where("ownerUserLoginId", userLoginId, "originalPortalPageId", null, "parentPortalPageId", parentPortalPageId)
+                            .queryList());
                 }
                 portalPages = EntityUtil.orderBy(userPortalPages, UtilMisc.toList("sequenceNum"));
             } catch (GenericEntityException e) {
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 f2dbe37..e1dc1af 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
@@ -121,6 +121,10 @@ public class FormRenderer {
     private static Collector<ModelFormField, ?, Map<Integer, List<ModelFormField>>> groupingByPosition =
             Collectors.groupingBy(ModelFormField::getPosition, TreeMap::new, Collectors.toList());
 
+    /**
+     * Gets focus field name.
+     * @return the focus field name
+     */
     public String getFocusFieldName() {
         return focusFieldName;
     }
@@ -275,7 +279,7 @@ public class FormRenderer {
     }
 
     // Return a stateful predicate that satisfies only the first time a field name is encountered.
-    static private Predicate<ModelFormField> filteringDuplicateNames() {
+    private static Predicate<ModelFormField> filteringDuplicateNames() {
         Set<String> seenFieldNames = new HashSet<>();
         return field -> seenFieldNames.add(field.getName());
     }
@@ -677,7 +681,7 @@ public class FormRenderer {
         Object obj = context.get(lookupName);
         if (obj == null) {
             if (Debug.verboseOn()) {
-                 Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not rendering rows.", MODULE);
+                Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not rendering rows.", MODULE);
             }
             return;
         }
@@ -803,7 +807,8 @@ public class FormRenderer {
                             break;
                         }
 
-                        // if this is a list or multi form don't skip here because we don't want to skip the table cell, will skip the actual field later
+                        // if this is a list or multi form don't skip here because we don't want to skip the table cell,
+                        // will skip the actual field later
                         if (!"list".equals(modelForm.getType()) && !"multi".equals(modelForm.getType())
                                 && !modelFormField.shouldUse(localContext)) {
                             continue;
@@ -827,7 +832,8 @@ public class FormRenderer {
                             continue;
                         }
 
-                        // if this is a list or multi form don't skip here because we don't want to skip the table cell, will skip the actual field later
+                        // if this is a list or multi form don't skip here because we don't want to skip the table cell,
+                        // will skip the actual field later
                         if (!"list".equals(modelForm.getType()) && !"multi".equals(modelForm.getType())
                                 && !modelFormField.shouldUse(localContext)) {
                             continue;
@@ -850,7 +856,8 @@ public class FormRenderer {
                             continue;
                         }
 
-                        // if this is a list or multi form don't skip here because we don't want to skip the table cell, will skip the actual field later
+                        // if this is a list or multi form don't skip here because we don't want to skip the table cell,
+                        // will skip the actual field later
                         if (!"list".equals(modelForm.getType()) && !"multi".equals(modelForm.getType())
                                 && !modelFormField.shouldUse(localContext)) {
                             continue;
@@ -965,8 +972,7 @@ public class FormRenderer {
         }
 
         // render all hidden & ignored fields
-        List<ModelFormField> hiddenIgnoredFieldList =
-        getHiddenIgnoredFields(context, alreadyRendered, tempFieldList, -1);
+        List<ModelFormField> hiddenIgnoredFieldList = getHiddenIgnoredFields(context, alreadyRendered, tempFieldList, -1);
         renderHiddenIgnoredFields(writer, context, formStringRenderer, hiddenIgnoredFieldList);
 
         // render formatting wrapper open
@@ -1186,8 +1192,9 @@ public class FormRenderer {
         String lookupName = modelForm.getListName();
         Object obj = context.get(lookupName);
         if (obj == null) {
-            if (Debug.verboseOn())
+            if (Debug.verboseOn()) {
                 Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not rendering rows.", MODULE);
+            }
             return true;
         }
         // if list is empty, do not render rows
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java
index 61b246f..f874dfe 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java
@@ -73,7 +73,8 @@ public final class UtilHelpText {
         if (fieldDescription.equals(messageId)) {
             messageId = "FieldDescription." + fieldName;
             if (Debug.verboseOn()) {
-                Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: " + messageId, MODULE);
+                Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: "
+                        + messageId, MODULE);
             }
             fieldDescription = UtilProperties.getMessage(entityResourceName, messageId, locale);
             if (fieldDescription.equals(messageId)) {
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 2f7bb22..1d05630 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
@@ -636,9 +636,13 @@ public final class MacroFormRenderer implements FormStringRenderer {
         String classString = "";
         boolean isTwelveHour = false;
         String timeHourName = "";
-        int hour2 = 0, hour1 = 0, minutes = 0;
+        int hour2 = 0;
+        int hour1 = 0;
+        int minutes = 0;
         String timeMinutesName = "";
-        String amSelected = "", pmSelected = "", ampmName = "";
+        String amSelected = "";
+        String pmSelected = "";
+        String ampmName = "";
         String compositeType = "";
         // search for a localized label for the icon
         if (uiLabelMap != null) {
@@ -927,7 +931,8 @@ public final class MacroFormRenderer implements FormStringRenderer {
         }
         options.append("]");
         String noCurrentSelectedKey = dropDownField.getNoCurrentSelectedKey(context);
-        String otherValue = "", fieldName = "";
+        String otherValue = "";
+        String fieldName = "";
         // Adapted from work by Yucca Korpela
         // http://www.cs.tut.fi/~jkorpela/forms/combo.html
         if (otherFieldSize > 0) {
@@ -1206,7 +1211,8 @@ public final class MacroFormRenderer implements FormStringRenderer {
             }
             updateAreas.add(new ModelForm.UpdateArea("submit", formId, backgroundSubmitRefreshTarget));
         }
-        boolean ajaxEnabled = (UtilValidate.isNotEmpty(updateAreas) || UtilValidate.isNotEmpty(backgroundSubmitRefreshTarget)) && this.javaScriptEnabled;
+        boolean ajaxEnabled = (UtilValidate.isNotEmpty(updateAreas) || UtilValidate.isNotEmpty(backgroundSubmitRefreshTarget))
+                && this.javaScriptEnabled;
         String ajaxUrl = "";
         if (ajaxEnabled) {
             ajaxUrl = createAjaxParamsFromUpdateAreas(updateAreas, "", context);
@@ -3212,8 +3218,8 @@ public final class MacroFormRenderer implements FormStringRenderer {
     }
 
     public void makeHyperlinkByType(Appendable writer, String linkType, String linkStyle, String targetType, String target, Map<String,
-            String> parameterMap, String description, String targetWindow, String confirmation, ModelFormField modelFormField, HttpServletRequest request,
-                                    HttpServletResponse response, Map<String, Object> context) throws IOException {
+            String> parameterMap, String description, String targetWindow, String confirmation, ModelFormField modelFormField,
+            HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
         String realLinkType = WidgetWorker.determineAutoLinkType(linkType, target, targetType, request);
         String encodedDescription = encode(description, modelFormField, context);
         // get the parameterized pagination index and size fields
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
index 38d70f7..99d3f9b 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
@@ -63,7 +63,8 @@ public class MacroMenuRenderer implements MenuStringRenderer {
     private final HttpServletResponse response;
     private final VisualTheme visualTheme;
 
-    public MacroMenuRenderer(String macroLibraryPath, HttpServletRequest request, HttpServletResponse response) throws TemplateException, IOException {
+    public MacroMenuRenderer(String macroLibraryPath, HttpServletRequest request, HttpServletResponse response)
+            throws TemplateException, IOException {
         this.macroLibrary = FreeMarkerWorker.getTemplate(macroLibraryPath);
         this.request = request;
         this.response = response;
@@ -212,7 +213,8 @@ public class MacroMenuRenderer implements MenuStringRenderer {
         parameters.put("width", link.getWidth());
         parameters.put("targetWindow", link.getTargetWindow(context));
         StringBuffer uniqueItemName = new StringBuffer(menuItem.getModelMenu().getName());
-        uniqueItemName.append("_").append(menuItem.getName()).append("_LF_").append(UtilMisc.<String> addToBigDecimalInMap(context, "menuUniqueItemIndex", BigDecimal.ONE));
+        uniqueItemName.append("_").append(menuItem.getName()).append("_LF_").append(UtilMisc.<String>addToBigDecimalInMap(context,
+                "menuUniqueItemIndex", BigDecimal.ONE));
         if (menuItem.getModelMenu().getExtraIndex(context) != null) {
             uniqueItemName.append("_").append(menuItem.getModelMenu().getExtraIndex(context));
         }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
index 3c40787..23b5990 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
@@ -693,7 +693,7 @@ public class MacroScreenRenderer implements ScreenStringRenderer {
 
     @Override
     public void renderScreenletSubWidget(Appendable writer, Map<String, Object> context, ModelScreenWidget subWidget,
-                                         ModelScreenWidget.Screenlet screenlet) throws GeneralException, IOException  {
+                                         ModelScreenWidget.Screenlet screenlet) throws GeneralException, IOException {
         if (subWidget.equals(screenlet.getNavigationForm())) {
             HttpServletRequest request = (HttpServletRequest) context.get("request");
             HttpServletResponse response = (HttpServletResponse) context.get("response");
@@ -1049,7 +1049,8 @@ public class MacroScreenRenderer implements ScreenStringRenderer {
     }
 
     @Override
-    public void renderPortalPagePortletEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException {
+    public void renderPortalPagePortletEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage,
+                                           GenericValue portalPortlet) throws GeneralException, IOException {
         String confMode = portalPage.getConfMode(context);
 
         StringWriter sr = new StringWriter();
@@ -1061,7 +1062,8 @@ public class MacroScreenRenderer implements ScreenStringRenderer {
     }
 
     @Override
-    public void renderPortalPagePortletBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage, GenericValue portalPortlet) throws GeneralException, IOException {
+    public void renderPortalPagePortletBody(Appendable writer, Map<String, Object> context, ModelScreenWidget.PortalPage portalPage,
+                                            GenericValue portalPortlet) throws GeneralException, IOException {
         String portalPortletId = portalPortlet.getString("portalPortletId");
         String screenName = portalPortlet.getString("screenName");
         String screenLocation = portalPortlet.getString("screenLocation");
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
index 1a1b41e..6972238 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
@@ -51,7 +51,7 @@ public class MacroScreenViewHandler extends AbstractViewHandler {
 
     private static final String MODULE = MacroScreenViewHandler.class.getName();
 
-    protected ServletContext servletContext = null;
+    private ServletContext servletContext = null;
 
     @Override
     public void init(ServletContext context) throws ViewHandlerException {
@@ -84,7 +84,8 @@ public class MacroScreenViewHandler extends AbstractViewHandler {
     }
 
     @Override
-    public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
+    public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request,
+                       HttpServletResponse response) throws ViewHandlerException {
         try {
             Writer writer = response.getWriter();
             VisualTheme visualTheme = UtilHttp.getVisualTheme(request);
@@ -111,7 +112,7 @@ public class MacroScreenViewHandler extends AbstractViewHandler {
             ScreenRenderer screens = new ScreenRenderer(writer, context, screenStringRenderer);
             context.put("screens", screens);
             context.put("simpleEncoder", UtilCodec.getEncoder(visualTheme.getModelTheme().getEncoder(getName())));
-             screenStringRenderer.renderScreenBegin(writer, context);
+            screenStringRenderer.renderScreenBegin(writer, context);
             screens.render(page);
             screenStringRenderer.renderScreenEnd(writer, context);
             writer.flush();
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java
index 02f060a..197f9e1 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java
@@ -68,7 +68,8 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
         assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "text/html;charset=UTF-8", http.getResponseContentType());
 
         //Test if a ftl macro error is present
-        assertFalse("Html Screen contains Macro on error : see " + screenUrl + " for more detail", screenOutString.contains("FreeMarker template error:"));
+        assertFalse("Html Screen contains Macro on error : see " + screenUrl + " for more detail",
+                screenOutString.contains("FreeMarker template error:"));
     }
 
     /**
@@ -84,7 +85,8 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
         assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "text/html;charset=UTF-8", http.getResponseContentType());
 
         //Test if a ftl macro error is present
-        assertFalse("Text Screen contains Macro on error : see " + screentextUrl + " for more detail", screenOutString.contains("FreeMarker template error:"));
+        assertFalse("Text Screen contains Macro on error : see " + screentextUrl + " for more detail",
+                screenOutString.contains("FreeMarker template error:"));
     }
 
     /**
@@ -100,7 +102,8 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
         assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "text/xml;charset=UTF-8", http.getResponseContentType());
 
         //Test if a ftl macro error is present
-        assertFalse("Xml Screen contains Macro on error : see " + screenxmlUrl + " for more detail", screenOutString.contains("FreeMarker template error:"));
+        assertFalse("Xml Screen contains Macro on error : see " + screenxmlUrl + " for more detail",
+                screenOutString.contains("FreeMarker template error:"));
     }
 
     /**
@@ -116,7 +119,8 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
         assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "text/csv;charset=UTF-8", http.getResponseContentType());
 
         //Test if a ftl macro error is present
-        assertFalse("Csv Screen contains Macro on error : see " + screencsvUrl + " for more detail", screenOutString.contains("FreeMarker template error:"));
+        assertFalse("Csv Screen contains Macro on error : see " + screencsvUrl + " for more detail",
+                screenOutString.contains("FreeMarker template error:"));
     }
 
     /**
@@ -129,10 +133,12 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
         http.setUrl(screenxlsUrl.concat(authentificationQuery));
         String screenOutString = http.post();
         assertNotNull("Response failed from ofbiz", screenOutString);
-        assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "application/vnd.ms-excel;charset=UTF-8", http.getResponseContentType());
+        assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "application/vnd.ms-excel;charset=UTF-8",
+                http.getResponseContentType());
 
         //Test if a ftl macro error is present
-        assertFalse("Csv Screen contains Macro on error : see " + screenxlsUrl + " for more detail", screenOutString.contains("FreeMarker template error:"));
+        assertFalse("Csv Screen contains Macro on error : see " + screenxlsUrl + " for more detail",
+                screenOutString.contains("FreeMarker template error:"));
     }
 
     /**
@@ -146,7 +152,8 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
         //FIXME need to check if the stream is an application-pdf that don't contains ftl stack trace
         InputStream screenInputStream = http.postStream();
         assertNotNull("Response failed from ofbiz", screenInputStream);
-        assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "application/pdf;charset=UTF-8", http.getResponseContentType());
+        assertEquals("Response contentType isn't good : " + http.getResponseContentType(), "application/pdf;charset=UTF-8",
+                http.getResponseContentType());
 
         String screenOutString = "";
         try {
@@ -158,6 +165,7 @@ public class WidgetMacroLibraryTests extends OFBizTestCase {
             screenInputStream.close();
         }
         //Test if a ftl macro error is present
-        assertFalse("Fop Screen contains Macro on error : see " + screentextUrl + " for more detail", screenOutString.contains("FreeMarker template error:"));
+        assertFalse("Fop Screen contains Macro on error : see " + screentextUrl + " for more detail",
+                screenOutString.contains("FreeMarker template error:"));
     }
 }


Mime
View raw message