[ofbiz-framework] branch trunk updated: Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed). (OFBIZ-11947) Also fixed some other checkstyle issues that requires re-factoring. Thanks Jacques for review.

[surajk]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new f98f5eb  Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed). (OFBIZ-11947) Also fixed some other checkstyle issues that requires re-factoring. Thanks Jacques for review.
f98f5eb is described below

commit f98f5ebb860c7e08b53ecf2e684c8c09a2b7d854
Author: Suraj Khurana <[hidden email]>
AuthorDate: Fri Aug 28 16:54:15 2020 +0530

    Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed).
    (OFBIZ-11947)
    Also fixed some other checkstyle issues that requires re-factoring.
    Thanks Jacques for review.
---
 .../accounting/thirdparty/eway/GatewayRequest.java | 179 ++++++++-
 .../thirdparty/eway/GatewayResponse.java           |  44 ++-
 .../ofbiz/content/content/ContentSearch.java       |  44 ++-
 .../ofbiz/party/content/PartyContentWrapper.java   |  26 +-
 .../ofbiz/product/config/ProductConfigWrapper.java | 142 +++++++-
 .../ofbiz/product/product/ProductSearch.java       |  32 +-
 .../shipment/verify/VerifyPickSessionRow.java      |  97 ++++-
 .../weightPackage/WeightPackageSession.java        | 215 +++++++++--
 .../org/apache/ofbiz/base/util/HttpClient.java     |  21 +-
 .../ofbiz/base/util/HttpRequestFileUpload.java     |  34 ++
 .../apache/ofbiz/base/util/IndentingWriter.java    |  22 ++
 .../org/apache/ofbiz/base/util/MessageString.java  |  15 +-
 .../apache/ofbiz/base/util/MultiTrustManager.java  |  22 +-
 .../ofbiz/common/JsLanguageFilesMapping.java       |  10 +-
 .../java/org/apache/ofbiz/datafile/DataFile.java   |  36 ++
 .../org/apache/ofbiz/entity/GenericEntity.java     | 290 ++++++++++++---
 .../apache/ofbiz/entity/cache/AbstractCache.java   |  43 ++-
 .../entity/cache/AbstractEntityConditionCache.java | 108 +++++-
 .../org/apache/ofbiz/entity/cache/EntityCache.java |  37 +-
 .../apache/ofbiz/entity/cache/EntityListCache.java |  37 +-
 .../ofbiz/entity/condition/EntityClause.java       |  90 ++++-
 .../entity/condition/EntityComparisonOperator.java |  43 ++-
 .../ofbiz/entity/condition/EntityJoinOperator.java |  72 +++-
 .../apache/ofbiz/entity/condition/OrderByList.java |  46 ++-
 .../ofbiz/entity/finder/EntityFinderUtil.java      |  31 +-
 .../ofbiz/entity/jdbc/AbstractCursorHandler.java   |  32 +-
 .../apache/ofbiz/entity/jdbc/CursorConnection.java |   8 +-
 .../apache/ofbiz/entity/jdbc/CursorResultSet.java  |  17 +-
 .../apache/ofbiz/entity/jdbc/CursorStatement.java  |   6 +-
 .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java |  93 ++++-
 .../org/apache/ofbiz/entity/model/ModelEntity.java | 400 +++++++++++++++++++--
 .../ofbiz/entity/test/EntityCryptoTestSuite.java   |  61 +++-
 .../ofbiz/entity/test/EntityQueryTestSuite.java    | 180 ++++++----
 .../ofbiz/entity/test/EntityUtilTestSuite.java     |  15 +-
 .../ofbiz/entity/transaction/DebugXaResource.java  |   4 +-
 .../entity/transaction/GenericXaResource.java      |  47 ++-
 .../org/apache/ofbiz/entity/util/ByteWrapper.java  |  15 +-
 .../ofbiz/entity/util/EntityListIterator.java      |  51 +--
 .../org/apache/ofbiz/entity/util/EntityQuery.java  |  35 +-
 .../apache/ofbiz/entity/util/EntitySaxReader.java  |  95 ++++-
 .../ofbiz/entityext/cache/EntityCacheServices.java |  46 ++-
 .../apache/ofbiz/service/ModelNotification.java    | 103 +++++-
 .../org/apache/ofbiz/service/ModelService.java     |  22 +-
 .../apache/ofbiz/service/ModelServiceIface.java    |  20 +-
 .../apache/ofbiz/service/ModelServiceReader.java   |  16 +-
 .../org/apache/ofbiz/service/RunningService.java   |  33 +-
 .../org/apache/ofbiz/service/ServiceXaWrapper.java |  40 +--
 .../apache/ofbiz/service/eca/ServiceEcaAction.java |  65 +++-
 .../apache/ofbiz/service/eca/ServiceEcaRule.java   |  29 +-
 .../ofbiz/service/eca/ServiceEcaSetField.java      |  20 +-
 .../ofbiz/service/mail/JavaMailContainer.java      |  48 ++-
 .../ofbiz/service/mail/MimeMessageWrapper.java     | 160 ++++++++-
 .../apache/ofbiz/service/mail/ServiceMcaRule.java  |  24 +-
 .../rmi/socket/ssl/SSLServerSocketFactory.java     |  24 +-
 .../apache/ofbiz/webapp/webdav/PropFindHelper.java |  30 +-
 .../apache/ofbiz/webapp/webdav/ResponseHelper.java |  46 ++-
 .../webtools/artifactinfo/ArtifactInfoFactory.java |  49 +++
 .../artifactinfo/ControllerViewArtifactInfo.java   |  16 +
 .../apache/ofbiz/widget/cache/AbstractCache.java   |  30 +-
 .../ofbiz/widget/model/AbstractModelAction.java    | 164 ++++++++-
 .../ofbiz/widget/model/IterateSectionWidget.java   |  60 +++-
 .../apache/ofbiz/widget/model/ModelFormAction.java |  28 ++
 .../apache/ofbiz/widget/model/ModelFormField.java  | 100 +++++-
 .../org/apache/ofbiz/widget/model/ModelMenu.java   | 171 +++++++++
 .../apache/ofbiz/widget/model/ModelMenuAction.java |  49 ++-
 .../org/apache/ofbiz/widget/model/ModelScreen.java |  47 ++-
 .../org/apache/ofbiz/widget/model/ModelTheme.java  | 148 +++++++-
 .../org/apache/ofbiz/widget/model/ModelTree.java   | 356 +++++++++++++++++-
 .../apache/ofbiz/widget/model/ModelTreeAction.java |  64 +++-
 .../widget/renderer/html/HtmlMenuWrapper.java      |  32 +-
 .../widget/renderer/macro/MacroScreenRenderer.java |  54 ++-
 71 files changed, 4391 insertions(+), 498 deletions(-)

diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
index 5682ed6..9d7daf1 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
@@ -148,183 +148,354 @@ public class GatewayRequest {
             return REQUEST_URL_RT;
         }
     }
-
-    /*
-     * Getters and setters follow for each defined field of the request.
+    /**
+     * Gets customer id.
+     * @return the customer id
      */
-
     public String getCustomerID() {
         return txCustomerID;
     }
 
+    /**
+     * Sets customer id.
+     * @param value the value
+     */
     public void setCustomerID(String value) {
         txCustomerID = value;
     }
 
+    /**
+     * Gets refund password.
+     * @return the refund password
+     */
     public String getRefundPassword() {
         return txRefundPassword;
     }
 
+    /**
+     * Sets refund password.
+     * @param value the value
+     */
     public void setRefundPassword(String value) {
         txRefundPassword = value;
     }
 
+    /**
+     * Gets total amount.
+     * @return the total amount
+     */
     public BigDecimal getTotalAmount() {
         return txTotalAmount;
     }
 
+    /**
+     * Sets total amount.
+     * @param value the value
+     */
     public void setTotalAmount(BigDecimal value) {
         txTotalAmount = value;
     }
 
+    /**
+     * Gets card holders name.
+     * @return the card holders name
+     */
     public String getCardHoldersName() {
         return txCardHoldersName;
     }
 
+    /**
+     * Sets card holders name.
+     * @param value the value
+     */
     public void setCardHoldersName(String value) {
         txCardHoldersName = value;
     }
 
+    /**
+     * Gets card number.
+     * @return the card number
+     */
     public String getCardNumber() {
         return txCardNumber;
     }
 
+    /**
+     * Sets card number.
+     * @param value the value
+     */
     public void setCardNumber(String value) {
         txCardNumber = value;
     }
 
+    /**
+     * Gets card expiry month.
+     * @return the card expiry month
+     */
     public String getCardExpiryMonth() {
         return txCardExpiryMonth;
     }
 
+    /**
+     * Sets card expiry month.
+     * @param value the value
+     */
     public void setCardExpiryMonth(String value) {
         txCardExpiryMonth = value;
     }
 
+    /**
+     * Gets card expiry year.
+     * @return the card expiry year
+     */
     public String getCardExpiryYear() {
         return txCardExpiryYear;
     }
 
+    /**
+     * Sets card expiry year.
+     * @param value the value
+     */
     public void setCardExpiryYear(String value) {
         txCardExpiryYear = value;
     }
 
+    /**
+     * Gets trxn number.
+     * @return the trxn number
+     */
     public String getTrxnNumber() {
         return txTrxnNumber;
     }
 
+    /**
+     * Sets trxn number.
+     * @param value the value
+     */
     public void setTrxnNumber(String value) {
         txTrxnNumber = value;
     }
 
+    /**
+     * Gets customer first name.
+     * @return the customer first name
+     */
     public String getCustomerFirstName() {
         return txCustomerFirstName;
     }
 
+    /**
+     * Sets customer first name.
+     * @param value the value
+     */
     public void setCustomerFirstName(String value) {
         txCustomerFirstName = value;
     }
 
+    /**
+     * Gets customer last name.
+     * @return the customer last name
+     */
     public String getCustomerLastName() {
         return txCustomerLastName;
     }
 
+    /**
+     * Sets customer last name.
+     * @param value the value
+     */
     public void setCustomerLastName(String value) {
         txCustomerLastName = value;
     }
 
+    /**
+     * Gets customer email address.
+     * @return the customer email address
+     */
     public String getCustomerEmailAddress() {
         return txCustomerEmailAddress;
     }
 
+    /**
+     * Sets customer email address.
+     * @param value the value
+     */
     public void setCustomerEmailAddress(String value) {
         txCustomerEmailAddress = value;
     }
 
+    /**
+     * Gets customer address.
+     * @return the customer address
+     */
     public String getCustomerAddress() {
         return txCustomerAddress;
     }
 
+    /**
+     * Sets customer address.
+     * @param value the value
+     */
     public void setCustomerAddress(String value) {
         txCustomerAddress = value;
     }
 
+    /**
+     * Gets customer postcode.
+     * @return the customer postcode
+     */
     public String getCustomerPostcode() {
         return txCustomerPostcode;
     }
 
+    /**
+     * Sets customer postcode.
+     * @param value the value
+     */
     public void setCustomerPostcode(String value) {
         txCustomerPostcode = value;
     }
 
+    /**
+     * Gets customer invoice ref.
+     * @return the customer invoice ref
+     */
     public String getCustomerInvoiceRef() {
         return txCustomerInvoiceRef;
     }
 
+    /**
+     * Sets customer invoice ref.
+     * @param value the value
+     */
     public void setCustomerInvoiceRef(String value) {
         txCustomerInvoiceRef = value;
     }
 
+    /**
+     * Gets customer invoice description.
+     * @return the customer invoice description
+     */
     public String getCustomerInvoiceDescription() {
         return txCustomerInvoiceDescription;
     }
 
+    /**
+     * Sets customer invoice description.
+     * @param value the value
+     */
     public void setCustomerInvoiceDescription(String value) {
         txCustomerInvoiceDescription = value;
     }
 
+    /**
+     * Gets cvn.
+     * @return the cvn
+     */
     public String getCVN() {
         return txCVN;
     }
 
+    /**
+     * Sets cvn.
+     * @param value the value
+     */
     public void setCVN(String value) {
         txCVN = value;
     }
 
+    /**
+     * Gets option 1.
+     * @return the option 1
+     */
     public String getOption1() {
         return txOption1;
     }
 
+    /**
+     * Sets option 1.
+     * @param value the value
+     */
     public void setOption1(String value) {
         txOption1 = value;
     }
 
+    /**
+     * Gets option 2.
+     * @return the option 2
+     */
     public String getOption2() {
         return txOption2;
     }
 
+    /**
+     * Sets option 2.
+     * @param value the value
+     */
     public void setOption2(String value) {
         txOption2 = value;
     }
 
+    /**
+     * Gets option 3.
+     * @return the option 3
+     */
     public String getOption3() {
         return txOption3;
     }
 
+    /**
+     * Sets option 3.
+     * @param value the value
+     */
     public void setOption3(String value) {
         txOption3 = value;
     }
 
+    /**
+     * Gets customer ip address.
+     * @return the customer ip address
+     */
     public String getCustomerIPAddress() {
         return txCustomerIPAddress;
     }
 
+    /**
+     * Sets customer ip address.
+     * @param value the value
+     */
     public void setCustomerIPAddress(String value) {
         txCustomerIPAddress = value;
     }
 
+    /**
+     * Gets customer billing country.
+     * @return the customer billing country
+     */
     public String getCustomerBillingCountry() {
         return txCustomerBillingCountry;
     }
 
+    /**
+     * Sets customer billing country.
+     * @param value the value
+     */
     public void setCustomerBillingCountry(String value) {
         txCustomerBillingCountry = value;
     }
 
+    /**
+     * Is test mode boolean.
+     * @return the boolean
+     */
     public boolean isTestMode() {
         return isTestMode;
     }
 
+    /**
+     * Sets test mode.
+     * @param b the b
+     */
     public void setTestMode(boolean b) {
         isTestMode = b;
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
index 7c5078d..4f1cd8f 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
@@ -61,51 +61,91 @@ public class GatewayResponse {
 
     // getter methods for the response fields
 
+    /**
+     * Gets trxn number.
+     * @return the trxn number
+     */
     public String getTrxnNumber() {
         return txTrxnNumber;
     }
 
+    /**
+     * Gets trxn reference.
+     * @return the trxn reference
+     */
     public String getTrxnReference() {
         return txTrxnReference;
     }
 
+    /**
+     * Gets trxn option 1.
+     * @return the trxn option 1
+     */
     public String getTrxnOption1() {
         return txTrxnOption1;
     }
 
+    /**
+     * Gets trxn option 2.
+     * @return the trxn option 2
+     */
     public String getTrxnOption2() {
         return txTrxnOption2;
     }
 
+    /**
+     * Gets trxn option 3.
+     * @return the trxn option 3
+     */
     public String getTrxnOption3() {
         return txTrxnOption3;
     }
 
+    /**
+     * Gets auth code.
+     * @return the auth code
+     */
     public String getAuthCode() {
         return txAuthCode;
     }
 
+    /**
+     * Gets trxn error.
+     * @return the trxn error
+     */
     public String getTrxnError() {
         return txTrxnError;
     }
 
+    /**
+     * Gets return amount.
+     * @return the return amount
+     */
     public int getReturnAmount() {
         return txReturnAmount;
     }
 
+    /**
+     * Gets transaction amount.
+     * @return the transaction amount
+     */
     public BigDecimal getTransactionAmount() {
         BigDecimal amt = new BigDecimal(getReturnAmount());
         amt = amt.divide(new BigDecimal(100));
         return amt.setScale(2, RoundingMode.HALF_UP);
     }
 
+    /**
+     * Gets trxn status.
+     * @return the trxn status
+     */
     public boolean getTrxnStatus() {
         return txTrxnStatus;
     }
 
     /**
-     * Gets the beagle score. Defaults to -1 in case of non-Beagle payment methods
-     * or if the response does not contain this field.
+     * Gets the beagle score. Defaults to -1 in case of non-Beagle payment methods or if the response does not contain
+     * this field.
      * @return The beagle score or -1 if it was not defined in the response
      */
     public double getBeagleScore() {
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
index 13e28df..b75b971 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
@@ -57,7 +57,8 @@ public class ContentSearch {
     private static final String MODULE = ContentSearch.class.getName();
     private static final String RESOURCE = "ContentUiLabels";
 
-    public static ArrayList<String> searchContents(List<? extends ContentSearchConstraint> contentSearchConstraintList, ResultSortOrder resultSortOrder, Delegator delegator, String visitId) {
+    public static ArrayList<String> searchContents(List<? extends ContentSearchConstraint> contentSearchConstraintList,
+                                                   ResultSortOrder resultSortOrder, Delegator delegator, String visitId) {
         ContentSearchContext contentSearchContext = new ContentSearchContext(delegator, visitId);
 
         contentSearchContext.addContentSearchConstraints(contentSearchConstraintList);
@@ -215,6 +216,9 @@ public class ContentSearch {
             return contentIds;
         }
 
+        /**
+         * Finish keyword constraints.
+         */
         public void finishKeywordConstraints() {
             if (orKeywordFixedSet.isEmpty() && andKeywordFixedSet.isEmpty() && keywordFixedOrSetAndList.isEmpty()) {
                 return;
@@ -261,7 +265,8 @@ public class ContentSearch {
                     dynamicViewEntity.addViewLink("CNT", entityAlias, Boolean.FALSE, ModelKeyMap.makeKeyMapList("contentId"));
                     entityConditionList.add(EntityCondition.makeCondition(prefix + "Keyword", EntityOperator.LIKE, keyword));
 
-                    //don't add an alias for this, will be part of a complex alias: dynamicViewEntity.addAlias(entityAlias, prefix + "RelevancyWeight", "relevancyWeight", null, null, null, null);
+                    //don't add an alias for this, will be part of a complex alias: dynamicViewEntity.addAlias(entityAlias,
+                    // prefix + "RelevancyWeight", "relevancyWeight", null, null, null, null);
                     relevancyComplexAlias.addComplexAliasMember(new ComplexAliasField(entityAlias, "relevancyWeight", null, null));
                 }
 
@@ -335,6 +340,11 @@ public class ContentSearch {
             return eli;
         }
 
+        /**
+         * Make content id list array list.
+         * @param eli the eli
+         * @return the array list
+         */
         public ArrayList<String> makeContentIdList(EntityListIterator eli) {
             ArrayList<String> contentIds = new ArrayList<>(maxResults == null ? 100 : maxResults);
             if (eli == null) {
@@ -417,6 +427,11 @@ public class ContentSearch {
             return contentIds;
         }
 
+        /**
+         * Save search result info.
+         * @param numResults the num results
+         * @param secondsTotal the seconds total
+         */
         public void saveSearchResultInfo(Long numResults, Double secondsTotal) {
             // uses entities: ContentSearchResult and ContentSearchConstraint
 
@@ -521,7 +536,9 @@ public class ContentSearch {
             if (UtilValidate.isNotEmpty(contentAssocTypeId)) {
                 assocConditionFromTo.add(EntityCondition.makeCondition(prefix + "ContentAssocTypeId", EntityOperator.EQUALS, contentAssocTypeId));
             }
-            assocConditionFromTo.add(EntityCondition.makeCondition(EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.GREATER_THAN, contentSearchContext.nowTimestamp)));
+            assocConditionFromTo.add(EntityCondition.makeCondition(EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.EQUALS, null),
+                    EntityOperator.OR, EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.GREATER_THAN,
+                            contentSearchContext.nowTimestamp)));
             assocConditionFromTo.add(EntityCondition.makeCondition(prefix + "FromDate", EntityOperator.LESS_THAN, contentSearchContext.nowTimestamp));
 
             // do contentId = contentIdTo, contentIdFrom IN contentIdSet
@@ -535,22 +552,27 @@ public class ContentSearch {
             contentSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "ContentAssocTypeId", "contentAssocTypeId", null, null, null, null);
             contentSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "FromDate", "fromDate", null, null, null, null);
             contentSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "ThruDate", "thruDate", null, null, null, null);
-            contentSearchContext.dynamicViewEntity.addViewLink("CNT", entityAlias, Boolean.TRUE, ModelKeyMap.makeKeyMapList("contentId", "contentIdTo"));
+            contentSearchContext.dynamicViewEntity.addViewLink("CNT", entityAlias, Boolean.TRUE,
+                    ModelKeyMap.makeKeyMapList("contentId", "contentIdTo"));
 
             List<EntityExpr> assocConditionToFrom = new LinkedList<>();
             assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "ContentIdFrom", EntityOperator.IN, contentIdSet));
             if (UtilValidate.isNotEmpty(contentAssocTypeId)) {
                 assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "ContentAssocTypeId", EntityOperator.EQUALS, contentAssocTypeId));
             }
-            assocConditionToFrom.add(EntityCondition.makeCondition(EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.GREATER_THAN, contentSearchContext.nowTimestamp)));
+            assocConditionToFrom.add(EntityCondition.makeCondition(EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.EQUALS, null),
+                    EntityOperator.OR, EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.GREATER_THAN,
+                            contentSearchContext.nowTimestamp)));
             assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "FromDate", EntityOperator.LESS_THAN, contentSearchContext.nowTimestamp));
 
             // now create and add the combined constraint
-            contentSearchContext.entityConditionList.add(EntityCondition.makeCondition(EntityCondition.makeCondition(assocConditionFromTo, EntityOperator.AND), EntityOperator.OR, EntityCondition.makeCondition(assocConditionToFrom, EntityOperator.AND)));
+            contentSearchContext.entityConditionList.add(EntityCondition.makeCondition(EntityCondition.makeCondition(assocConditionFromTo,
+                    EntityOperator.AND), EntityOperator.OR, EntityCondition.makeCondition(assocConditionToFrom, EntityOperator.AND)));
 
 
             // add in contentSearchConstraint, don't worry about the contentSearchResultId or constraintSeqId, those will be fill in later
-            contentSearchContext.contentSearchConstraintList.add(contentSearchContext.getDelegator().makeValue("ContentSearchConstraint", UtilMisc.toMap("constraintName", CONSTRAINT_NAME, "infoString", this.contentId + "," + this.contentAssocTypeId)));
+            contentSearchContext.contentSearchConstraintList.add(contentSearchContext.getDelegator().makeValue("ContentSearchConstraint",
+                    UtilMisc.toMap("constraintName", CONSTRAINT_NAME, "infoString", this.contentId + "," + this.contentAssocTypeId)));
         }
 
 
@@ -561,7 +583,8 @@ public class ContentSearch {
             GenericValue contentAssocType = null;
             try {
                 content = EntityQuery.use(delegator).from("Content").where("contentId", this.contentId).cache().queryOne();
-                contentAssocType = EntityQuery.use(delegator).from("ContentAssocType").where("contentAssocTypeId", this.contentAssocTypeId).cache().queryOne();
+                contentAssocType = EntityQuery.use(delegator).from("ContentAssocType").where("contentAssocTypeId",
+                        this.contentAssocTypeId).cache().queryOne();
             } catch (GenericEntityException e) {
                 Debug.logError(e, "Error looking up ContentAssocConstraint pretty print info: " + e.toString(), MODULE);
             }
@@ -657,6 +680,11 @@ public class ContentSearch {
             }
         }
 
+        /**
+         * Make full keyword set set.
+         * @param delegator the delegator
+         * @return the set
+         */
         public Set<String> makeFullKeywordSet(Delegator delegator) {
             Set<String> keywordSet = KeywordSearchUtil.makeKeywordSet(this.keywordsString, null, true);
             Set<String> fullKeywordSet = new TreeSet<>();
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
index a1b5671..4d43003 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
@@ -79,7 +79,13 @@ public class PartyContentWrapper implements ContentWrapper {
                 (Delegator) request.getAttribute("delegator"));
     }
 
-    // interface implementation
+    /**
+     * Get string.
+     * @param contentTypeId the content type id
+     * @param useCache the use cache
+     * @param encoderType the encoder type
+     * @return the string
+     */
     public String get(String contentTypeId, boolean useCache, String encoderType) {
         return getPartyContentAsText(party, contentTypeId, locale, mimeTypeId, party.getDelegator(), dispatcher, useCache, encoderType);
     }
@@ -89,6 +95,11 @@ public class PartyContentWrapper implements ContentWrapper {
         return StringUtil.makeStringWrapper(get(contentTypeId, true, encoderType));
     }
 
+    /**
+     * Gets id.
+     * @param contentTypeId the content type id
+     * @return the id
+     */
     public String getId(String contentTypeId) {
         GenericValue partyContent = getFirstPartyContentByType(null, party, contentTypeId, party.getDelegator());
         if (partyContent != null) {
@@ -112,10 +123,23 @@ public class PartyContentWrapper implements ContentWrapper {
         }
     }
 
+    /**
+     * Gets content.
+     * @param contentId the content id
+     * @param useCache the use cache
+     * @param encoderType the encoder type
+     * @return the content
+     */
     public String getContent(String contentId, boolean useCache, String encoderType) {
         return getPartyContentAsText(party, contentId, null, locale, mimeTypeId, party.getDelegator(), dispatcher, useCache, encoderType);
     }
 
+    /**
+     * Gets content.
+     * @param contentId the content id
+     * @param encoderType the encoder type
+     * @return the content
+     */
     public String getContent(String contentId, String encoderType) {
         return getContent(contentId, true, encoderType);
     }
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
index 47fd48a..9ec5040 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
@@ -164,6 +164,12 @@ public class ProductConfigWrapper implements Serializable {
         }
     }
 
+    /**
+     * Load config.
+     * @param delegator the delegator
+     * @param configId the config id
+     * @throws Exception the exception
+     */
     public void loadConfig(Delegator delegator, String configId) throws Exception {
         //configure ProductConfigWrapper according to ProductConfigConfig entity
         if (UtilValidate.isNotEmpty(configId)) {
@@ -181,6 +187,14 @@ public class ProductConfigWrapper implements Serializable {
         }
     }
 
+    /**
+     * Sets selected.
+     * @param configItemId the config item id
+     * @param sequenceNum the sequence num
+     * @param configOptionId the config option id
+     * @param comments the comments
+     * @throws Exception the exception
+     */
     public void setSelected(String configItemId, Long sequenceNum, String configOptionId, String comments) throws Exception {
         for (int i = 0; i < questions.size(); i++) {
             ConfigItem ci = questions.get(i);
@@ -197,6 +211,9 @@ public class ProductConfigWrapper implements Serializable {
         }
     }
 
+    /**
+     * Reset config.
+     */
     public void resetConfig() {
         for (ConfigItem ci: questions) {
             if (!ci.isStandard()) {
@@ -209,6 +226,9 @@ public class ProductConfigWrapper implements Serializable {
         }
     }
 
+    /**
+     * Sets default config.
+     */
     public void setDefaultConfig() {
         resetConfig();
         for (ConfigItem ci: questions) {
@@ -291,14 +311,29 @@ public class ProductConfigWrapper implements Serializable {
         return questions.toString();
     }
 
+    /**
+     * Gets questions.
+     * @return the questions
+     */
     public List<ConfigItem> getQuestions() {
         return questions;
     }
 
+    /**
+     * Gets product.
+     * @return the product
+     */
     public GenericValue getProduct() {
         return product;
     }
 
+    /**
+     * Sets selected.
+     * @param question the question
+     * @param option the option
+     * @param comments the comments
+     * @throws Exception the exception
+     */
     public void setSelected(int question, int option, String comments) throws Exception {
         ConfigItem ci = questions.get(question);
         List<ConfigOption> avalOptions = ci.getOptions();
@@ -319,6 +354,14 @@ public class ProductConfigWrapper implements Serializable {
         }
     }
 
+    /**
+     * Sets selected.
+     * @param question the question
+     * @param option the option
+     * @param component the component
+     * @param componentOption the component option
+     * @throws Exception the exception
+     */
     public void setSelected(int question, int option, int component, String componentOption) throws Exception {
         //  set variant products
         ConfigOption theOption = getItemOtion(question, option);
@@ -335,6 +378,10 @@ public class ProductConfigWrapper implements Serializable {
         }
     }
 
+    /**
+     * Gets selected options.
+     * @return the selected options
+     */
     public List<ConfigOption> getSelectedOptions() {
         List<ConfigOption> selectedOptions = new LinkedList<>();
         for (ConfigItem ci: questions) {
@@ -351,6 +398,10 @@ public class ProductConfigWrapper implements Serializable {
         return selectedOptions;
     }
 
+    /**
+     * Gets default options.
+     * @return the default options
+     */
     public List<ConfigOption> getDefaultOptions() {
         List<ConfigOption> defaultOptions = new LinkedList<>();
         for (ConfigItem ci: questions) {
@@ -362,6 +413,10 @@ public class ProductConfigWrapper implements Serializable {
         return defaultOptions;
     }
 
+    /**
+     * Gets total list price.
+     * @return the total list price
+     */
     public BigDecimal getTotalListPrice() {
         BigDecimal totalListPrice = listPrice;
         List<ConfigOption> options = getSelectedOptions();
@@ -371,6 +426,10 @@ public class ProductConfigWrapper implements Serializable {
         return totalListPrice;
     }
 
+    /**
+     * Gets total price.
+     * @return the total price
+     */
     public BigDecimal getTotalPrice() {
         BigDecimal totalPrice = basePrice;
         List<ConfigOption> options = getSelectedOptions();
@@ -389,10 +448,18 @@ public class ProductConfigWrapper implements Serializable {
         defaultPrice = totalPrice;
     }
 
+    /**
+     * Gets default price.
+     * @return the default price
+     */
     public BigDecimal getDefaultPrice() {
         return defaultPrice;
     }
 
+    /**
+     * Is completed boolean.
+     * @return the boolean
+     */
     public boolean isCompleted() {
         boolean completed = true;
         for (ConfigItem ci: questions) {
@@ -413,6 +480,12 @@ public class ProductConfigWrapper implements Serializable {
         return completed;
     }
 
+    /**
+     * Gets item otion.
+     * @param itemIndex the item index
+     * @param optionIndex the option index
+     * @return the item otion
+     */
     public ConfigOption getItemOtion(int itemIndex, int optionIndex) {
         if (questions.size() > itemIndex) {
             ConfigItem ci = questions.get(itemIndex);
@@ -557,6 +630,10 @@ public class ProductConfigWrapper implements Serializable {
             return question;
         }
 
+        /**
+         * Gets description.
+         * @return the description
+         */
         public String getDescription() {
             String description = "";
             if (UtilValidate.isNotEmpty(configItemAssoc.getString("longDescription"))) {
@@ -571,6 +648,10 @@ public class ProductConfigWrapper implements Serializable {
             return description;
         }
 
+        /**
+         * Is selected boolean.
+         * @return the boolean
+         */
         public boolean isSelected() {
             if (isStandard()) {
                 return true;
@@ -583,6 +664,10 @@ public class ProductConfigWrapper implements Serializable {
             return false;
         }
 
+        /**
+         * Gets selected.
+         * @return the selected
+         */
         public ConfigOption getSelected() {
             for (ConfigOption oneOption: getOptions()) {
                 if (oneOption.isSelected()) {
@@ -592,6 +677,10 @@ public class ProductConfigWrapper implements Serializable {
             return null;
         }
 
+        /**
+         * Gets default.
+         * @return the default
+         */
         public ConfigOption getDefault() {
             String defaultConfigOptionId = configItemAssoc.getString("defaultConfigOptionId");
             if (UtilValidate.isNotEmpty(defaultConfigOptionId)) {
@@ -650,7 +739,8 @@ public class ProductConfigWrapper implements Serializable {
             return configOption;
         }
 
-        public ConfigOption(Delegator delegator, LocalDispatcher dispatcher, GenericValue option, ConfigItem configItem, String catalogId, String webSiteId, String currencyUomId, GenericValue autoUserLogin) throws Exception {
+        public ConfigOption(Delegator delegator, LocalDispatcher dispatcher, GenericValue option, ConfigItem configItem, String catalogId,
+                            String webSiteId, String currencyUomId, GenericValue autoUserLogin) throws Exception {
             configOption = option;
             parentConfigItem = configItem;
             componentList = option.getRelated("ConfigOptionProductConfigProduct", null, null, false);
@@ -658,7 +748,9 @@ public class ProductConfigWrapper implements Serializable {
                 BigDecimal listPrice = BigDecimal.ZERO;
                 BigDecimal price = BigDecimal.ZERO;
                 // Get the component's price
-                Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct", false), "prodCatalogId", catalogId, "webSiteId", webSiteId, "currencyUomId", currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", autoUserLogin, "productStoreId", productStoreId);
+                Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct", false),
+                        "prodCatalogId", catalogId, "webSiteId", webSiteId, "currencyUomId", currencyUomId, "productPricePurposeId",
+                        "COMPONENT_PRICE", "autoUserLogin", autoUserLogin, "productStoreId", productStoreId);
                 Map<String, Object> priceMap = dispatcher.runSync("calculateProductPrice", fieldMap);
                 if (ServiceUtil.isError(priceMap)) {
                     String errorMessage = ServiceUtil.getErrorMessage(priceMap);
@@ -718,6 +810,11 @@ public class ProductConfigWrapper implements Serializable {
             comments = co.getComments();
         }
 
+        /**
+         * Recalculate option price.
+         * @param pcw the pcw
+         * @throws Exception the exception
+         */
         public void recalculateOptionPrice(ProductConfigWrapper pcw) throws Exception {
             optionListPrice = BigDecimal.ZERO;
             optionPrice = BigDecimal.ZERO;
@@ -732,7 +829,9 @@ public class ProductConfigWrapper implements Serializable {
                 }
 
                 // Get the component's price
-                Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId", pcw.webSiteId, "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", pcw.autoUserLogin, "productStoreId", productStoreId);
+                Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId",
+                        pcw.webSiteId, "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin",
+                        pcw.autoUserLogin, "productStoreId", productStoreId);
                 Map<String, Object> priceMap = pcw.getDispatcher().runSync("calculateProductPrice", fieldMap);
                 Map<String, Object> purchasePriceResultMap = dispatcher.runSync("calculateProductPrice", fieldMap);
                 if (ServiceUtil.isError(purchasePriceResultMap)) {
@@ -777,19 +876,37 @@ public class ProductConfigWrapper implements Serializable {
             }
         }
 
+        /**
+         * Gets option name.
+         * @return the option name
+         */
         public String getOptionName() {
             return (configOption.getString("configOptionName") != null ? configOption.getString("configOptionName") : "no option name");
         }
 
+        /**
+         * Gets option name.
+         * @param locale the locale
+         * @return the option name
+         */
         public String getOptionName(Locale locale) {
 
             return (configOption.getString("configOptionName") != null ? (String) configOption.get("configOptionName", locale) : "no option name");
         }
 
+        /**
+         * Gets description.
+         * @return the description
+         */
         public String getDescription() {
             return (configOption.getString("description") != null ? configOption.getString("description") : "no description");
         }
 
+        /**
+         * Gets description.
+         * @param locale the locale
+         * @return the description
+         */
         public String getDescription(Locale locale) {
             return (configOption.getString("description") != null ? (String) configOption.get("description", locale) : "no description");
         }
@@ -847,6 +964,10 @@ public class ProductConfigWrapper implements Serializable {
             return optionListPrice;
         }
 
+        /**
+         * Gets offset price.
+         * @return the offset price
+         */
         public BigDecimal getOffsetPrice() {
             ConfigOption defaultConfigOption = parentConfigItem.getDefault();
             if (parentConfigItem.isSingleChoice() && UtilValidate.isNotEmpty(defaultConfigOption)) {
@@ -856,11 +977,19 @@ public class ProductConfigWrapper implements Serializable {
             return optionPrice;
         }
 
+        /**
+         * Is default boolean.
+         * @return the boolean
+         */
         public boolean isDefault() {
             ConfigOption defaultConfigOption = parentConfigItem.getDefault();
             return this.equals(defaultConfigOption);
         }
 
+        /**
+         * Has virtual component boolean.
+         * @return the boolean
+         */
         public boolean hasVirtualComponent() {
             List<GenericValue> components = getComponents();
             if (UtilValidate.isNotEmpty(components)) {
@@ -874,6 +1003,11 @@ public class ProductConfigWrapper implements Serializable {
             return false;
         }
 
+        /**
+         * Is virtual component boolean.
+         * @param component the component
+         * @return the boolean
+         */
         public boolean isVirtualComponent(GenericValue component) {
             int index = getComponents().indexOf(component);
             if (index != -1) {
@@ -953,7 +1087,7 @@ public class ProductConfigWrapper implements Serializable {
 
         @Override
         public String toString() {
-            return configOption.getString("configItemId") + "/" + configOption.getString("configOptionId") + (isSelected()? "*": "");
+            return configOption.getString("configItemId") + "/" + configOption.getString("configOptionId") + (isSelected() ? "*" : "");
         }
 
     }
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java
index f286a0f..41a4b29 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java
@@ -71,7 +71,8 @@ public class ProductSearch {
     private static final String RESOURCE = "ProductUiLabels";
     private static final String RES_COMMON = "CommonUiLabels";
 
-    public static ArrayList<String> parametricKeywordSearch(Map<?, String> featureIdByType, String keywordsString, Delegator delegator, String productCategoryId, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+    public static ArrayList<String> parametricKeywordSearch(Map<?, String> featureIdByType, String keywordsString, Delegator delegator,
+            String productCategoryId, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
         Set<String> featureIdSet = new HashSet<>();
         if (featureIdByType != null) {
             featureIdSet.addAll(featureIdByType.values());
@@ -80,7 +81,8 @@ public class ProductSearch {
         return parametricKeywordSearch(featureIdSet, keywordsString, delegator, productCategoryId, true, visitId, anyPrefix, anySuffix, isAnd);
     }
 
-    public static ArrayList<String> parametricKeywordSearch(Set<String> featureIdSet, String keywordsString, Delegator delegator, String productCategoryId, boolean includeSubCategories, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+    public static ArrayList<String> parametricKeywordSearch(Set<String> featureIdSet, String keywordsString, Delegator delegator, String
+            productCategoryId, boolean includeSubCategories, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
         List<ProductSearchConstraint> productSearchConstraintList = new LinkedList<>();
 
         if (UtilValidate.isNotEmpty(productCategoryId)) {
@@ -201,10 +203,18 @@ public class ProductSearch {
             return dynamicViewEntity;
         }
 
+        /**
+         * Gets order by list.
+         * @return the order by list
+         */
         public List<String> getOrderByList() {
             return orderByList;
         }
 
+        /**
+         * Gets now timestamp.
+         * @return the now timestamp
+         */
         public Timestamp getNowTimestamp() {
             return nowTimestamp;
         }
@@ -272,14 +282,26 @@ public class ProductSearch {
             this.resultOffset = resultOffset;
         }
 
+        /**
+         * Sets max results.
+         * @param maxResults the max results
+         */
         public void setMaxResults(Integer maxResults) {
             this.maxResults = maxResults;
         }
 
+        /**
+         * Gets total results.
+         * @return the total results
+         */
         public Integer getTotalResults() {
             return this.totalResults;
         }
 
+        /**
+         * Do search array list.
+         * @return the array list
+         */
         public ArrayList<String> doSearch() {
             long startMillis = System.currentTimeMillis();
 
@@ -301,6 +323,9 @@ public class ProductSearch {
             return productIds;
         }
 
+        /**
+         * Finish keyword constraints.
+         */
         public void finishKeywordConstraints() {
             if (orKeywordFixedSet.isEmpty() && andKeywordFixedSet.isEmpty() && keywordFixedOrSetAndList.isEmpty()) {
                 return;
@@ -415,6 +440,9 @@ public class ProductSearch {
             }
         }
 
+        /**
+         * Finish category and feature constraints.
+         */
         public void finishCategoryAndFeatureConstraints() {
             if (includeCategoryIds.isEmpty() && excludeCategoryIds.isEmpty() && alwaysIncludeCategoryIds.isEmpty()
                     && includeCategoryIdOrSetAndList.isEmpty() && alwaysIncludeCategoryIdOrSetAndList.isEmpty()
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
index 882646a..e540c4b 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
@@ -37,21 +37,22 @@ import org.apache.ofbiz.service.ServiceUtil;
 @SuppressWarnings("serial")
 public class VerifyPickSessionRow implements Serializable {
 
-    protected String orderId = null;
-    protected String orderItemSeqId = null;
-    protected String shipGroupSeqId = null;
-    protected String productId = null;
-    protected String originGeoId = null;
-    protected String inventoryItemId = null;
-    protected BigDecimal readyToVerifyQty = BigDecimal.ZERO;
-    protected GenericValue orderItem = null;
-    protected String shipmentItemSeqId = null;
-    protected String invoiceItemSeqId = null;
+    private String orderId = null;
+    private String orderItemSeqId = null;
+    private String shipGroupSeqId = null;
+    private String productId = null;
+    private String originGeoId = null;
+    private String inventoryItemId = null;
+    private BigDecimal readyToVerifyQty = BigDecimal.ZERO;
+    private GenericValue orderItem = null;
+    private String shipmentItemSeqId = null;
+    private String invoiceItemSeqId = null;
 
     public VerifyPickSessionRow() {
     }
 
-    public VerifyPickSessionRow(String orderId, String orderItemSeqId, String shipGroupSeqId, String productId, String originGeoId, String inventoryItemId, BigDecimal quantity) {
+    public VerifyPickSessionRow(String orderId, String orderItemSeqId, String shipGroupSeqId, String productId, String originGeoId,
+                                String inventoryItemId, BigDecimal quantity) {
         this.orderId = orderId;
         this.orderItemSeqId = orderItemSeqId;
         this.shipGroupSeqId = shipGroupSeqId;
@@ -63,64 +64,132 @@ public class VerifyPickSessionRow implements Serializable {
         this.invoiceItemSeqId = null;
     }
 
+    /**
+     * Gets order id.
+     * @return the order id
+     */
     public String getOrderId() {
         return this.orderId;
     }
 
+    /**
+     * Gets order item seq id.
+     * @return the order item seq id
+     */
     public String getOrderItemSeqId() {
         return this.orderItemSeqId;
     }
 
+    /**
+     * Gets ship group seq id.
+     * @return the ship group seq id
+     */
     public String getShipGroupSeqId() {
         return this.shipGroupSeqId;
     }
 
+    /**
+     * Gets product id.
+     * @return the product id
+     */
     public String getProductId() {
         return this.productId;
     }
 
+    /**
+     * Gets origin geo id.
+     * @return the origin geo id
+     */
     public String getOriginGeoId() {
         return this.originGeoId;
     }
 
+    /**
+     * Gets inventory item id.
+     * @return the inventory item id
+     */
     public String getInventoryItemId() {
         return this.inventoryItemId;
     }
 
+    /**
+     * Gets ready to verify qty.
+     * @return the ready to verify qty
+     */
     public BigDecimal getReadyToVerifyQty() {
         return this.readyToVerifyQty;
     }
 
+    /**
+     * Sets ready to verify qty.
+     * @param readyToVerifyQty the ready to verify qty
+     */
     public void setReadyToVerifyQty(BigDecimal readyToVerifyQty) {
         this.readyToVerifyQty = readyToVerifyQty;
     }
 
+    /**
+     * Sets shipment item seq id.
+     * @param shipmentItemSeqId the shipment item seq id
+     */
     public void setShipmentItemSeqId(String shipmentItemSeqId) {
         this.shipmentItemSeqId = shipmentItemSeqId;
     }
 
+    /**
+     * Gets shipment item seq id.
+     * @return the shipment item seq id
+     */
     public String getShipmentItemSeqId() {
         return this.shipmentItemSeqId;
     }
 
+    /**
+     * Sets invoice item seq id.
+     * @param invoiceItemSeqId the invoice item seq id
+     */
     public void setInvoiceItemSeqId(String invoiceItemSeqId) {
         this.invoiceItemSeqId = invoiceItemSeqId;
     }
 
+    /**
+     * Gets invoice item seq id.
+     * @return the invoice item seq id
+     */
     public String getInvoiceItemSeqId() {
         return this.invoiceItemSeqId;
     }
 
+    /**
+     * Gets order item.
+     * @return the order item
+     */
     public GenericValue getOrderItem() {
         return this.orderItem;
     }
 
+    /**
+     * Is same item boolean.
+     * @param line the line
+     * @return the boolean
+     */
     public boolean isSameItem(VerifyPickSessionRow line) {
         return this.getInventoryItemId().equals(line.getInventoryItemId()) && this.getOrderItemSeqId().equals(line.getOrderItemSeqId())
                 && this.getOrderId().equals(line.getOrderId()) && this.getShipGroupSeqId().equals(line.getShipGroupSeqId());
     }
 
-    protected void issueItemToShipment(String shipmentId, String picklistBinId, GenericValue userLogin, BigDecimal quantity, LocalDispatcher dispatcher, Locale locale) throws GeneralException {
+    /**
+     * Issue item to shipment.
+     * @param shipmentId the shipment id
+     * @param picklistBinId the picklist bin id
+     * @param userLogin the user login
+     * @param quantity the quantity
+     * @param dispatcher the dispatcher
+     * @param locale the locale
+     * @throws GeneralException the general exception
+     */
+    protected void issueItemToShipment(String shipmentId, String picklistBinId, GenericValue userLogin, BigDecimal quantity,
+                                       LocalDispatcher dispatcher, Locale locale) throws GeneralException {
 
         if (quantity == null) {
             quantity = this.getReadyToVerifyQty();
@@ -142,7 +211,8 @@ public class VerifyPickSessionRow implements Serializable {
 
         String shipmentItemSeqId = (String) issueOrderItemResp.get("shipmentItemSeqId");
         if (shipmentItemSeqId == null) {
-            throw new GeneralException(UtilProperties.getMessage("ProductErrorUiLabels", "ProductErrorIssueItemDidNotReturnAValidShipmentItemSeqId", locale));
+            throw new GeneralException(UtilProperties.getMessage("ProductErrorUiLabels",
+                    "ProductErrorIssueItemDidNotReturnAValidShipmentItemSeqId", locale));
         } else {
             this.setShipmentItemSeqId(shipmentItemSeqId);
         }
@@ -174,5 +244,4 @@ public class VerifyPickSessionRow implements Serializable {
             }
         }
     }
-
 }
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
index 5812ef4..e16e634 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
@@ -75,7 +75,8 @@ public class WeightPackageSession implements Serializable {
     public WeightPackageSession() {
     }
 
-    public WeightPackageSession(LocalDispatcher dispatcher, GenericValue userLogin, String facilityId, String picklistBinId, String orderId, String shipGrpSeqId) {
+    public WeightPackageSession(LocalDispatcher dispatcher, GenericValue userLogin, String facilityId, String picklistBinId,
+                                String orderId, String shipGrpSeqId) {
         this.dispatcher = dispatcher;
         this.dispatcherName = dispatcher.getName();
 
@@ -120,8 +121,20 @@ public class WeightPackageSession implements Serializable {
         return delegator;
     }
 
-    public void createWeightPackageLine(String orderId, BigDecimal packageWeight, BigDecimal packageLength, BigDecimal packageWidth, BigDecimal packageHeight, String shipmentBoxTypeId) throws GeneralException {
-        weightPackageLines.add(new WeightPackageSessionLine(orderId, packageWeight, packageLength, packageWidth, packageHeight, shipmentBoxTypeId, this.weightPackageSeqId));
+    /**
+     * Create weight package line.
+     * @param orderId the order id
+     * @param packageWeight the package weight
+     * @param packageLength the package length
+     * @param packageWidth the package width
+     * @param packageHeight the package height
+     * @param shipmentBoxTypeId the shipment box type id
+     * @throws GeneralException the general exception
+     */
+    public void createWeightPackageLine(String orderId, BigDecimal packageWeight, BigDecimal packageLength, BigDecimal packageWidth,
+                                        BigDecimal packageHeight, String shipmentBoxTypeId) throws GeneralException {
+        weightPackageLines.add(new WeightPackageSessionLine(orderId, packageWeight, packageLength, packageWidth, packageHeight, shipmentBoxTypeId,
+                this.weightPackageSeqId));
         this.weightPackageSeqId++;
     }
 
@@ -314,72 +327,122 @@ public class WeightPackageSession implements Serializable {
         return shippableWeight;
     }
 
+    /**
+     * Gets packed lines.
+     * @return the packed lines
+     */
     public List<WeightPackageSessionLine> getPackedLines() {
         return this.weightPackageLines;
     }
 
+    /**
+     * Gets packed lines.
+     * @param orderId the order id
+     * @return the packed lines
+     */
     public List<WeightPackageSessionLine> getPackedLines(String orderId) {
         List<WeightPackageSessionLine> packedLines = new LinkedList<>();
         if (UtilValidate.isNotEmpty(orderId)) {
             for (WeightPackageSessionLine packedLine: this.getPackedLines()) {
-               if (orderId.equals(packedLine.getOrderId()))
+                if (orderId.equals(packedLine.getOrderId())) {
                     packedLines.add(packedLine);
+                }
             }
         }
         return packedLines;
     }
 
+    /**
+     * Gets packed line.
+     * @param weightPackageSeqId the weight package seq id
+     * @return the packed line
+     */
     public WeightPackageSessionLine getPackedLine(int weightPackageSeqId) {
         WeightPackageSessionLine packedLine = null;
         if (weightPackageSeqId > 0) {
             for (WeightPackageSessionLine line : this.getPackedLines()) {
-                if ((line.getWeightPackageSeqId()) == weightPackageSeqId)
+                if ((line.getWeightPackageSeqId()) == weightPackageSeqId) {
                     packedLine = line;
+                }
             }
         }
         return packedLine;
     }
 
+    /**
+     * Sets package weight.
+     * @param packageWeight the package weight
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void setPackageWeight(BigDecimal packageWeight, int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
-            if (UtilValidate.isNotEmpty(packedLine))
+            if (UtilValidate.isNotEmpty(packedLine)) {
                 packedLine.setPackageWeight(packageWeight);
+            }
         }
     }
 
+    /**
+     * Sets package length.
+     * @param packageLength the package length
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void setPackageLength(BigDecimal packageLength, int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
-            if (UtilValidate.isNotEmpty(packedLine))
+            if (UtilValidate.isNotEmpty(packedLine)) {
                 packedLine.setPackageLength(packageLength);
+            }
         }
     }
 
+    /**
+     * Sets package width.
+     * @param packageWidth the package width
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void setPackageWidth(BigDecimal packageWidth, int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
-            if (UtilValidate.isNotEmpty(packedLine))
+            if (UtilValidate.isNotEmpty(packedLine)) {
                 packedLine.setPackageWidth(packageWidth);
+            }
         }
     }
 
+    /**
+     * Sets package height.
+     * @param packageHeight the package height
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void setPackageHeight(BigDecimal packageHeight, int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
-            if (UtilValidate.isNotEmpty(packedLine))
+            if (UtilValidate.isNotEmpty(packedLine)) {
                 packedLine.setPackageHeight(packageHeight);
+            }
         }
     }
 
+    /**
+     * Sets shipment box type id.
+     * @param shipmentBoxTypeId the shipment box type id
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void setShipmentBoxTypeId(String shipmentBoxTypeId, int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
-            if (UtilValidate.isNotEmpty(packedLine))
+            if (UtilValidate.isNotEmpty(packedLine)) {
                 packedLine.setShipmentBoxTypeId(shipmentBoxTypeId);
+            }
         }
     }
 
+    /**
+     * Delete packed line.
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void deletePackedLine(int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
@@ -387,6 +450,10 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Sets dimension and shipment box type.
+     * @param weightPackageSeqId the weight package seq id
+     */
     public void setDimensionAndShipmentBoxType(int weightPackageSeqId) {
         if (weightPackageSeqId > 0) {
             WeightPackageSessionLine packedLine = this.getPackedLine(weightPackageSeqId);
@@ -397,12 +464,24 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Clear packed lines.
+     * @param orderId the order id
+     */
     public void clearPackedLines(String orderId) {
         for (WeightPackageSessionLine packedLine : this.getPackedLines(orderId)) {
             this.weightPackageLines.remove(packedLine);
         }
     }
 
+    /**
+     * Complete string.
+     * @param orderId the order id
+     * @param locale the locale
+     * @param calculateOnlineShippingRateFromUps the calculate online shipping rate from ups
+     * @return the string
+     * @throws GeneralException the general exception
+     */
     public String complete(String orderId, Locale locale, String calculateOnlineShippingRateFromUps) throws GeneralException {
         //create the package(s)
         this.createPackages(orderId);
@@ -410,7 +489,8 @@ public class WeightPackageSession implements Serializable {
         BigDecimal actualShippingCost;
         // Check if UPS integration is done
         if ("UPS".equals(this.carrierPartyId) && "Y".equals(calculateOnlineShippingRateFromUps)) {
-            // call upsShipmentConfirm service, it will calculate the online shipping rate from UPS and save in ShipmentRouteSegment entity in actualCost field
+            // call upsShipmentConfirm service, it will calculate the online shipping rate from UPS
+            // and save in ShipmentRouteSegment entity in actualCost field
             actualShippingCost = this.upsShipmentConfirm();
         } else {
             // calculate the shipping charges manually
@@ -435,6 +515,13 @@ public class WeightPackageSession implements Serializable {
         return "success";
     }
 
+    /**
+     * Complete shipment boolean.
+     * @param orderId the order id
+     * @param calculateOnlineShippingRateFromUps the calculate online shipping rate from ups
+     * @return the boolean
+     * @throws GeneralException the general exception
+     */
     public boolean completeShipment(String orderId, String calculateOnlineShippingRateFromUps) throws GeneralException {
         // Check if UPS integration is done
         if ("UPS".equals(this.carrierPartyId) && "Y".equals(calculateOnlineShippingRateFromUps)) {
@@ -453,10 +540,16 @@ public class WeightPackageSession implements Serializable {
         return true;
     }
 
+    /**
+     * Ups shipment confirm big decimal.
+     * @return the big decimal
+     * @throws GeneralException the general exception
+     */
     protected BigDecimal upsShipmentConfirm() throws GeneralException {
         Delegator delegator = this.getDelegator();
         BigDecimal actualCost = BigDecimal.ZERO;
-        List<GenericValue> shipmentRouteSegments = EntityQuery.use(delegator).from("ShipmentRouteSegment").where("shipmentId", shipmentId).queryList();
+        List<GenericValue> shipmentRouteSegments = EntityQuery.use(delegator).from("ShipmentRouteSegment")
+                .where("shipmentId", shipmentId).queryList();
         if (UtilValidate.isNotEmpty(shipmentRouteSegments)) {
             for (GenericValue shipmentRouteSegment : shipmentRouteSegments) {
                 Map<String, Object> shipmentRouteSegmentMap = new HashMap<>();
@@ -467,15 +560,22 @@ public class WeightPackageSession implements Serializable {
                 if (ServiceUtil.isError(shipmentRouteSegmentResult)) {
                     throw new GeneralException(ServiceUtil.getErrorMessage(shipmentRouteSegmentResult));
                 }
-                GenericValue shipRouteSeg = EntityQuery.use(delegator).from("ShipmentRouteSegment").where("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegment.getString("shipmentRouteSegmentId")).queryOne();
+                GenericValue shipRouteSeg = EntityQuery.use(delegator).from("ShipmentRouteSegment")
+                        .where("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegment.getString("shipmentRouteSegmentId"))
+                        .queryOne();
                 actualCost = actualCost.add(shipRouteSeg.getBigDecimal("actualCost"));
             }
         }
         return actualCost;
     }
 
+    /**
+     * Ups shipment accept.
+     * @throws GeneralException the general exception
+     */
     protected void upsShipmentAccept() throws GeneralException {
-        List<GenericValue> shipmentRouteSegments = this.getDelegator().findByAnd("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId), null, false);
+        List<GenericValue> shipmentRouteSegments = this.getDelegator().findByAnd("ShipmentRouteSegment",
+                UtilMisc.toMap("shipmentId", shipmentId), null, false);
         if (UtilValidate.isNotEmpty(shipmentRouteSegments)) {
             for (GenericValue shipmentRouteSegment : shipmentRouteSegments) {
                 Map<String, Object> shipmentRouteSegmentMap = new HashMap<>();
@@ -490,18 +590,31 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Diff in ship cost boolean.
+     * @param actualShippingCost the actual shipping cost
+     * @return the boolean
+     * @throws GeneralException the general exception
+     */
     protected boolean diffInShipCost(BigDecimal actualShippingCost) throws GeneralException {
         BigDecimal estimatedShipCost = this.getEstimatedShipCost();
-        BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment", "shipment.default.cost_actual_over_estimated_percent_allowed", "10"));
+        BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment",
+                "shipment.default.cost_actual_over_estimated_percent_allowed", "10"));
         BigDecimal diffInShipCostInPerc;
         if (estimatedShipCost.compareTo(BigDecimal.ZERO) == 0) {
             diffInShipCostInPerc = actualShippingCost;
         } else {
-            diffInShipCostInPerc = (((actualShippingCost.subtract(estimatedShipCost)).divide(estimatedShipCost, 2, ROUNDING_MODE)).multiply(new BigDecimal(100))).abs();
+            diffInShipCostInPerc = (((actualShippingCost.subtract(estimatedShipCost)).divide(estimatedShipCost, 2, ROUNDING_MODE))
+                    .multiply(new BigDecimal(100))).abs();
         }
         return doEstimates.compareTo(diffInShipCostInPerc) == -1;
     }
 
+    /**
+     * Create packages.
+     * @param orderId the order id
+     * @throws GeneralException the general exception
+     */
     protected void createPackages(String orderId) throws GeneralException {
         int shipPackSeqId = 0;
         for (WeightPackageSessionLine packedLine : this.getPackedLines(orderId)) {
@@ -520,7 +633,8 @@ public class WeightPackageSession implements Serializable {
             shipmentPackageMap.put("userLogin", userLogin);
 
             Map<String, Object> shipmentPackageResult;
-            GenericValue shipmentPackage = this.getDelegator().findOne("ShipmentPackage", UtilMisc.toMap("shipmentId", shipmentId, "shipmentPackageSeqId", shipmentPackageSeqId), false);
+            GenericValue shipmentPackage = this.getDelegator().findOne("ShipmentPackage", UtilMisc.toMap("shipmentId", shipmentId,
+                    "shipmentPackageSeqId", shipmentPackageSeqId), false);
             if (UtilValidate.isEmpty(shipmentPackage)) {
                 shipmentPackageResult = this.getDispatcher().runSync("createShipmentPackage", shipmentPackageMap);
             } else {
@@ -532,6 +646,11 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Change order item status.
+     * @param orderId the order id
+     * @throws GeneralException the general exception
+     */
     protected void changeOrderItemStatus(String orderId) throws GeneralException {
         List<GenericValue> shipmentItems = this.getDelegator().findByAnd("ShipmentItem", UtilMisc.toMap("shipmentId", shipmentId), null, false);
         for (GenericValue shipmentItem : shipmentItems) {
@@ -539,7 +658,8 @@ public class WeightPackageSession implements Serializable {
                 packedLine.setShipmentItemSeqId(shipmentItem.getString("shipmentItemSeqId"));
             }
         }
-        List<GenericValue> orderItems = this.getDelegator().findByAnd("OrderItem", UtilMisc.toMap("orderId", orderId, "statusId", "ITEM_APPROVED"), null, false);
+        List<GenericValue> orderItems = this.getDelegator().findByAnd("OrderItem", UtilMisc.toMap("orderId", orderId, "statusId", "ITEM_APPROVED"),
+                null, false);
         for (GenericValue orderItem : orderItems) {
             List<GenericValue> orderItemShipGrpInvReserves = orderItem.getRelated("OrderItemShipGrpInvRes", null, null, false);
             if (UtilValidate.isEmpty(orderItemShipGrpInvReserves)) {
@@ -556,6 +676,11 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Apply items to packages.
+     * @param orderId the order id
+     * @throws GeneralException the general exception
+     */
     protected void applyItemsToPackages(String orderId) throws GeneralException {
         if (UtilValidate.isNotEmpty(orderId) && UtilValidate.isNotEmpty(this.getPackedLines(orderId))) {
             int shipPackSeqId = 0;
@@ -565,11 +690,17 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Update shipment route segments.
+     * @param orderId the order id
+     * @throws GeneralException the general exception
+     */
     protected void updateShipmentRouteSegments(String orderId) throws GeneralException {
         if (UtilValidate.isNotEmpty(orderId)) {
             BigDecimal shipmentWeight = getShippableWeight(orderId);
             if (UtilValidate.isNotEmpty(shipmentWeight) && shipmentWeight.compareTo(BigDecimal.ZERO) <= 0) return;
-            List<GenericValue> shipmentRouteSegments = getDelegator().findByAnd("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", this.getShipmentId()), null, false);
+            List<GenericValue> shipmentRouteSegments = getDelegator().findByAnd("ShipmentRouteSegment",
+                    UtilMisc.toMap("shipmentId", this.getShipmentId()), null, false);
             if (UtilValidate.isNotEmpty(shipmentRouteSegments)) {
                 for (GenericValue shipmentRouteSegment : shipmentRouteSegments) {
                     shipmentRouteSegment.set("billingWeight", shipmentWeight);
@@ -580,6 +711,10 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Sets shipment to packed.
+     * @throws GeneralException the general exception
+     */
     protected void setShipmentToPacked() throws GeneralException {
         Map<String, Object> shipmentMap = new HashMap<>();
         shipmentMap.put("shipmentId", shipmentId);
@@ -591,6 +726,17 @@ public class WeightPackageSession implements Serializable {
         }
     }
 
+    /**
+     * Gets shipment cost estimate.
+     * @param orderItemShipGroup the order item ship group
+     * @param orderId the order id
+     * @param productStoreId the product store id
+     * @param shippableItemInfo the shippable item info
+     * @param shippableTotal the shippable total
+     * @param shippableWeight the shippable weight
+     * @param shippableQuantity the shippable quantity
+     * @return the shipment cost estimate
+     */
     public BigDecimal getShipmentCostEstimate(GenericValue orderItemShipGroup, String orderId, String productStoreId, List<GenericValue>
             shippableItemInfo, BigDecimal shippableTotal, BigDecimal shippableWeight, BigDecimal shippableQuantity) {
         return getShipmentCostEstimate(orderItemShipGroup.getString("contactMechId"), orderItemShipGroup.getString("shipmentMethodTypeId"),
@@ -598,6 +744,20 @@ public class WeightPackageSession implements Serializable {
                                        orderId, productStoreId, shippableItemInfo, shippableTotal, shippableWeight, shippableQuantity);
     }
 
+    /**
+     * Gets shipment cost estimate.
+     * @param shippingContactMechId the shipping contact mech id
+     * @param shipmentMethodTypeId the shipment method type id
+     * @param carrierPartyId the carrier party id
+     * @param carrierRoleTypeId the carrier role type id
+     * @param orderId the order id
+     * @param productStoreId the product store id
+     * @param shippableItemInfo the shippable item info
+     * @param shippableTotal the shippable total
+     * @param shippableWeight the shippable weight
+     * @param shippableQuantity the shippable quantity
+     * @return the shipment cost estimate
+     */
     public BigDecimal getShipmentCostEstimate(String shippingContactMechId, String shipmentMethodTypeId, String carrierPartyId,
             String carrierRoleTypeId, String orderId, String productStoreId, List<GenericValue> shippableItemInfo, BigDecimal shippableTotal,
                                               BigDecimal shippableWeight, BigDecimal shippableQuantity) {
@@ -633,20 +793,33 @@ public class WeightPackageSession implements Serializable {
         return shipmentCostEstimate;
     }
 
+    /**
+     * Save packages info.
+     * @param orderId the order id
+     * @param calculateOnlineShippingRateFromUps the calculate online shipping rate from ups
+     * @throws GeneralException the general exception
+     */
     protected void savePackagesInfo(String orderId, String calculateOnlineShippingRateFromUps) throws GeneralException {
         //create the package(s)
         this.createPackages(orderId);
         // Check if UPS integration is done
         if ("UPS".equals(this.carrierPartyId) && "Y".equals(calculateOnlineShippingRateFromUps)) {
-            // call upsShipmentConfirm service, it will calculate the online shipping rate from UPS and save in ShipmentRouteSegment entity in actualCost field
+            // call upsShipmentConfirm service, it will calculate the online shipping rate from UPS and save in
+            // ShipmentRouteSegment entity in actualCost field
             this.upsShipmentConfirm();
         }
     }
 
+    /**
+     * Gets ordered quantity.
+     * @param orderId the order id
+     * @return the ordered quantity
+     */
     protected Integer getOrderedQuantity(String orderId) {
         BigDecimal orderedQuantity = BigDecimal.ZERO;
         try {
-            List<GenericValue> orderItems = getDelegator().findByAnd("OrderItem", UtilMisc.toMap("orderId", orderId, "statusId", "ITEM_APPROVED"), null, false);
+            List<GenericValue> orderItems = getDelegator().findByAnd("OrderItem",
+                    UtilMisc.toMap("orderId", orderId, "statusId", "ITEM_APPROVED"), null, false);
             for (GenericValue orderItem : orderItems) {
                 orderedQuantity = orderedQuantity.add(orderItem.getBigDecimal("quantity"));
             }
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
index 680fa7f..b6fc841 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
@@ -115,7 +115,7 @@ public class HttpClient {
     }
 
     /** Enables this request to follow redirect 3xx codes (default true) */
-     public void followRedirects(boolean followRedirects) {
+    public void followRedirects(boolean followRedirects) {
         this.followRedirects = followRedirects;
     }
 
@@ -240,6 +240,11 @@ public class HttpClient {
         return this.trustAny;
     }
 
+    /**
+     * Sets basic auth info.
+     * @param basicAuthUsername the basic auth username
+     * @param basicAuthPassword the basic auth password
+     */
     public void setBasicAuthInfo(String basicAuthUsername, String basicAuthPassword) {
         this.basicAuthUsername = basicAuthUsername;
         this.basicAuthPassword = basicAuthPassword;
@@ -327,6 +332,11 @@ public class HttpClient {
         return con.getContentEncoding();
     }
 
+    /**
+     * Gets response code.
+     * @return the response code
+     * @throws HttpClientException the http client exception
+     */
     public int getResponseCode() throws HttpClientException {
         if (con == null) {
             throw new HttpClientException("Connection not yet established");
@@ -342,6 +352,12 @@ public class HttpClient {
         }
     }
 
+    /**
+     * Send http request string.
+     * @param method the method
+     * @return the string
+     * @throws HttpClientException the http client exception
+     */
     public String sendHttpRequest(String method) throws HttpClientException {
         InputStream in = sendHttpRequestStream(method);
         if (in == null) {
@@ -488,7 +504,8 @@ public class HttpClient {
 
             // if there is basicAuth info set the request property for it
             if (basicAuthUsername != null) {
-                String basicAuthString = "Basic " + Base64.getMimeEncoder().encodeToString((basicAuthUsername + ":" + (basicAuthPassword == null ? "" : basicAuthPassword)).getBytes(StandardCharsets.UTF_8));
+                String basicAuthString = "Basic " + Base64.getMimeEncoder().encodeToString((basicAuthUsername + ":" + (basicAuthPassword == null
+                        ? "" : basicAuthPassword)).getBytes(StandardCharsets.UTF_8));
                 con.setRequestProperty("Authorization", basicAuthString);
                 if (Debug.verboseOn() || debug) {
                     Debug.logVerbose("Header - Authorization: " + basicAuthString, MODULE);
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
index 239cdd1..2611188 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
@@ -49,30 +49,59 @@ public class HttpRequestFileUpload {
     private String overrideFilename = null;
     private Map<String, String> fields;
 
+    /**
+     * Gets override filename.
+     * @return the override filename
+     */
     public String getOverrideFilename() {
         return overrideFilename;
     }
 
+    /**
+     * Sets override filename.
+     * @param ofName the of name
+     */
     public void setOverrideFilename(String ofName) {
         overrideFilename = ofName;
     }
 
+    /**
+     * Gets filename.
+     * @return the filename
+     */
     public String getFilename() {
         return filename;
     }
 
+    /**
+     * Gets filepath.
+     * @return the filepath
+     */
     public String getFilepath() {
         return filepath;
     }
 
+    /**
+     * Sets save path.
+     * @param savePath the save path
+     */
     public void setSavePath(String savePath) {
         this.savePath = savePath;
     }
 
+    /**
+     * Gets content type.
+     * @return the content type
+     */
     public String getContentType() {
         return contentType;
     }
 
+    /**
+     * Gets field value.
+     * @param fieldName the field name
+     * @return the field value
+     */
     public String getFieldValue(String fieldName) {
         if (fields == null || fieldName == null) {
             return null;
@@ -113,6 +142,11 @@ public class HttpRequestFileUpload {
         }
     }
 
+    /**
+     * Do upload.
+     * @param request the request
+     * @throws IOException the io exception
+     */
     public void doUpload(HttpServletRequest request) throws IOException {
         ServletInputStream in = request.getInputStream();
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
index 7441c3d..4fbee03 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
@@ -45,6 +45,11 @@ public class IndentingWriter extends FilterWriter {
         this(out, true, true);
     }
 
+    /**
+     * Newline indenting writer.
+     * @return the indenting writer
+     * @throws IOException the io exception
+     */
     public IndentingWriter newline() throws IOException {
         lastWasNewline = true;
         if (doNewline) {
@@ -53,6 +58,10 @@ public class IndentingWriter extends FilterWriter {
         return this;
     }
 
+    /**
+     * Check after newline.
+     * @throws IOException the io exception
+     */
     protected void checkAfterNewline() throws IOException {
         if (lastWasNewline) {
             if (doSpace) {
@@ -66,16 +75,29 @@ public class IndentingWriter extends FilterWriter {
         }
     }
 
+    /**
+     * Push indenting writer.
+     * @return the indenting writer
+     */
     public IndentingWriter push() {
         indent.append(' ');
         return this;
     }
 
+    /**
+     * Pop indenting writer.
+     * @return the indenting writer
+     */
     public IndentingWriter pop() {
         indent.setLength(indent.length() - 1);
         return this;
     }
 
+    /**
+     * Space indenting writer.
+     * @return the indenting writer
+     * @throws IOException the io exception
+     */
     public IndentingWriter space() throws IOException {
         checkAfterNewline();
         if (doSpace) {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java
index 6352190..ebf1bb6 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java
@@ -52,7 +52,8 @@ public class MessageString implements Serializable {
         fieldSet.add(fieldName);
         return getMessagesForField(fieldSet, convertToStrings, messageStringList);
     }
-    public static List<Object> getMessagesForField(String fieldName1, String fieldName2, String fieldName3, String fieldName4, boolean convertToStrings, List<Object> messageStringList) {
+    public static List<Object> getMessagesForField(String fieldName1, String fieldName2, String fieldName3, String fieldName4,
+                                                   boolean convertToStrings, List<Object> messageStringList) {
         Set<String> fieldSet = new TreeSet<>();
         if (UtilValidate.isNotEmpty(fieldName1)) {
             fieldSet.add(fieldName1);
@@ -150,9 +151,21 @@ public class MessageString implements Serializable {
     public void setFieldName(String fieldName) {
         this.fieldName = fieldName;
     }
+
+    /**
+     * Is for field boolean.
+     * @param fieldNameSet the field name set
+     * @return the boolean
+     */
     public boolean isForField(Set<String> fieldNameSet) {
         return fieldNameSet == null || fieldNameSet.contains(this.fieldName);
     }
+
+    /**
+     * Is for field boolean.
+     * @param fieldName the field name
+     * @return the boolean
+     */
     public boolean isForField(String fieldName) {
         if (this.fieldName == null) {
             return fieldName == null;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java
index 71f5b02..eb12d9d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java
@@ -36,8 +36,7 @@ import javax.net.ssl.X509TrustManager;
 public class MultiTrustManager implements X509TrustManager {
 
     private static final String MODULE = MultiTrustManager.class.getName();
-
-    protected List<KeyStore> keystores;
+    private List<KeyStore> keystores;
 
     public MultiTrustManager(KeyStore ks) {
         this();
@@ -48,12 +47,20 @@ public class MultiTrustManager implements X509TrustManager {
         keystores = new LinkedList<>();
     }
 
+    /**
+     * Add.
+     * @param ks the ks
+     */
     public void add(KeyStore ks) {
         if (ks != null) {
             keystores.add(ks);
         }
     }
 
+    /**
+     * Gets number of key stores.
+     * @return the number of key stores
+     */
     public int getNumberOfKeyStores() {
         return keystores.size();
     }
@@ -91,7 +98,8 @@ public class MultiTrustManager implements X509TrustManager {
                         for (Certificate cert: chain) {
                             if (cert instanceof X509Certificate) {
                                 if (Debug.verboseOn()) {
-                                    Debug.logVerbose("Read certificate (chain) : " + ((X509Certificate) cert).getSubjectX500Principal().getName(), MODULE);
+                                    Debug.logVerbose("Read certificate (chain) : " + ((X509Certificate) cert).getSubjectX500Principal().getName(),
+                                            MODULE);
                                 }
                                 issuers.add((X509Certificate) cert);
                             }
@@ -114,6 +122,11 @@ public class MultiTrustManager implements X509TrustManager {
         return issuers.toArray(new X509Certificate[issuers.size()]);
     }
 
+    /**
+     * Is trusted boolean.
+     * @param cert the cert
+     * @return the boolean
+     */
     protected boolean isTrusted(X509Certificate[] cert) {
         if (cert != null) {
             X509Certificate[] issuers = this.getAcceptedIssuers();
@@ -124,7 +137,8 @@ public class MultiTrustManager implements X509TrustManager {
                     }
                     if (issuer.equals(c)) {
                         if (Debug.verboseOn()) {
-                            Debug.logVerbose("--- Found trusted cert: " + issuer.getSerialNumber().toString(16) + " : " + issuer.getSubjectX500Principal(), MODULE);
+                            Debug.logVerbose("--- Found trusted cert: " + issuer.getSerialNumber().toString(16) + " : "
+                                    + issuer.getSubjectX500Principal(), MODULE);
                         }
                         return true;
                     }
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
index 5fcf8c6..2d6b06b 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
@@ -31,7 +31,7 @@ public final class JsLanguageFilesMapping {
 
     public static class DateJs {
 
-        private static Map<String, String> localeFiles = new HashMap<>();
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
         private static String defaultDateJs = "/common/js/jquery/plugins/datejs/date-en-US.js";
 
         static {
@@ -206,7 +206,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class JQuery {
-        private static Map<String, String> localeFiles = new HashMap<>();
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
         private static String defaultDateJs = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
 
         static {
@@ -381,7 +381,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class Validation {
-        private static Map<String, String> localeFiles = new HashMap<>();
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
         private static String defaultValidation = "/common/js/jquery/plugins/validate/localization/messages_en.js";
 
         static {
@@ -555,7 +555,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class DateTime {
-        private static Map<String, String> localeFiles = new HashMap<>();
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
         private static String defaultDateTime = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
 
         static {
@@ -729,7 +729,7 @@ public final class JsLanguageFilesMapping {
     }
 
     public static class Select2 {
-        private static Map<String, String> localeFiles = new HashMap<>();
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
         private static String defaultSelect2 = "/common/js/jquery/plugins/select2/js/i18n/en.js";
 
         static {
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
index 4b21708..709534b 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
@@ -94,18 +94,35 @@ public class DataFile {
     protected DataFile() {
     }
 
+    /**
+     * Gets model data file.
+     * @return the model data file
+     */
     public ModelDataFile getModelDataFile() {
         return modelDataFile;
     }
 
+    /**
+     * Gets records.
+     * @return the records
+     */
     public List<Record> getRecords() {
         return records;
     }
 
+    /**
+     * Add record.
+     * @param record the record
+     */
     public void addRecord(Record record) {
         records.add(record);
     }
 
+    /**
+     * Make record record.
+     * @param recordName the record name
+     * @return the record
+     */
     public Record makeRecord(String recordName) {
         ModelRecord modelRecord = getModelDataFile().getModelRecord(recordName);
         return new Record(modelRecord);
@@ -161,10 +178,23 @@ public class DataFile {
         // no need to manually close the stream since we are reading to the end of the file: recordIterator.close();
     }
 
+    /**
+     * Make record iterator record iterator.
+     * @param fileUrl the file url
+     * @return the record iterator
+     * @throws DataFileException the data file exception
+     */
     public RecordIterator makeRecordIterator(URL fileUrl) throws DataFileException {
         return new RecordIterator(fileUrl, this.modelDataFile);
     }
 
+    /**
+     * Make record iterator record iterator.
+     * @param dataFileStream the data file stream
+     * @param locationInfo the location info
+     * @return the record iterator
+     * @throws DataFileException the data file exception
+     */
     public RecordIterator makeRecordIterator(InputStream dataFileStream, String locationInfo) throws DataFileException {
         return new RecordIterator(dataFileStream, this.modelDataFile, locationInfo);
     }
@@ -211,6 +241,12 @@ public class DataFile {
         writeRecords(outStream, this.records);
     }
 
+    /**
+     * Write records.
+     * @param outStream the out stream
+     * @param records the records
+     * @throws DataFileException the data file exception
+     */
     protected void writeRecords(OutputStream outStream, List<Record> records) throws DataFileException {
         for (Record record : records) {
             String line = record.writeLineString(modelDataFile);
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
index 2d76ea0..1c6e0c1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
@@ -63,6 +63,7 @@ import org.apache.ofbiz.entity.model.ModelViewEntity;
 import org.apache.ofbiz.entity.model.ModelViewEntity.ModelAlias;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+
 /**
  * Generic Entity Value Object - Handles persistence for any defined entity.
  * <p>Note that this class extends <code>Observable</code> to achieve change notification for
@@ -71,7 +72,6 @@ import org.w3c.dom.Element;
  * <code>Observer</code>.</p>
  * <p>This class is not thread-safe. If an instance of this class is shared between threads,
  * then it should be made immutable by calling the <code>setImmutable()</code> method.</p>
- *
  */
 @SuppressWarnings("serial")
 public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>, Serializable, Comparable<GenericEntity>, Cloneable {
@@ -86,7 +86,9 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
     /** Name of the GenericDelegator, used to re-get the GenericDelegator when deserialized */
     private String delegatorName = null;
 
-    /** Reference to an instance of GenericDelegator used to do some basic operations on this entity value. If null various methods in this class will fail. This is automatically set by the GenericDelegator for all GenericValue objects instantiated through it. You may set this manually for objects you instantiate manually, but it is optional. */
+    /** Reference to an instance of GenericDelegator used to do some basic operations on this entity value.
+     * If null various methods in this class will fail. This is automatically set by the GenericDelegator for all
+     * GenericValue objects instantiated through it. You may set this manually for objects you instantiate manually, but it is optional. */
     private transient Delegator internalDelegator = null;
 
     /** A Map containing the original field values from the database.
@@ -153,9 +155,13 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return newEntity;
     }
 
+    /**
+     * Assert is mutable.
+     */
     protected void assertIsMutable() {
         if (!this.mutable) {
-            String msg = "This object has been flagged as immutable (unchangeable), probably because it came from an Entity Engine cache. Cannot modify an immutable entity object. Use the clone method to create a mutable copy of this object.";
+            String msg = "This object has been flagged as immutable (unchangeable), probably because it came from an Entity Engine cache. "
+                    + "Cannot modify an immutable entity object. Use the clone method to create a mutable copy of this object.";
             IllegalStateException toBeThrown = new IllegalStateException(msg);
             Debug.logError(toBeThrown, MODULE);
             throw toBeThrown;
@@ -234,7 +240,8 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
             throw new IllegalArgumentException("Cannot create a GenericEntity with a null entityName in the modelEntity parameter");
         }
         this.entityName = value.getEntityName();
-        // NOTE: could call getModelEntity to insure we have a value, just in case the value passed in has been serialized, but might as well leave it null to keep the object light if it isn't there
+        // NOTE: could call getModelEntity to insure we have a value, just in case the value passed in has been serialized
+        // but might as well leave it null to keep the object light if it isn't there
         this.modelEntity = value.modelEntity;
         if (value.fields != null) {
             this.fields.putAll(value.fields);
@@ -244,6 +251,9 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.observable = new Observable(value.observable);
     }
 
+    /**
+     * Reset.
+     */
     public void reset() {
         assertIsMutable();
         // from GenericEntity
@@ -260,6 +270,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.observable = new Observable();
     }
 
+    /**
+     * Refresh from value.
+     * @param newValue the new value
+     * @throws GenericEntityException the generic entity exception
+     */
     public void refreshFromValue(GenericEntity newValue) throws GenericEntityException {
         assertIsMutable();
         if (newValue == null) {
@@ -268,7 +283,8 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         GenericPK thisPK = this.getPrimaryKey();
         GenericPK newPK = newValue.getPrimaryKey();
         if (!thisPK.equals(newPK)) {
-            throw new GenericEntityException("Could not refresh value, new value did not have the same primary key; this PK=" + thisPK + ", new value PK=" + newPK);
+            throw new GenericEntityException("Could not refresh value, new value did not have the same primary key; this PK="
+                    + thisPK + ", new value PK=" + newPK);
         }
         this.fields = new HashMap<>(newValue.fields);
         this.setDelegator(newValue.getDelegator());
@@ -308,10 +324,17 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.setImmutable();
     }
 
+    /**
+     * Is mutable boolean.
+     * @return the boolean
+     */
     public boolean isMutable() {
         return this.mutable;
     }
 
+    /**
+     * Sets immutable.
+     */
     public void setImmutable() {
         if (this.mutable) {
             this.mutable = false;
@@ -320,6 +343,7 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
     }
 
     /**
+     * Gets is from entity sync.
      * @return Returns the isFromEntitySync.
      */
     public boolean getIsFromEntitySync() {
@@ -327,6 +351,7 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
     }
 
     /**
+     * Sets is from entity sync.
      * @param isFromEntitySync The isFromEntitySync to set.
      */
     public void setIsFromEntitySync(boolean isFromEntitySync) {
@@ -334,10 +359,18 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.isFromEntitySync = isFromEntitySync;
     }
 
+    /**
+     * Gets entity name.
+     * @return the entity name
+     */
     public String getEntityName() {
         return entityName;
     }
 
+    /**
+     * Gets model entity.
+     * @return the model entity
+     */
     public ModelEntity getModelEntity() {
         if (modelEntity == null) {
             if (entityName != null) {
@@ -350,8 +383,9 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return modelEntity;
     }
 
-    /** Get the GenericDelegator instance that created this value object and that is responsible for it.
-     *@return GenericDelegator object
+    /**
+     * Get the GenericDelegator instance that created this value object and that is responsible for it.
+     * @return GenericDelegator object
      */
     public Delegator getDelegator() {
         if (internalDelegator == null) {
@@ -366,7 +400,10 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return internalDelegator;
     }
 
-    /** Set the GenericDelegator instance that created this value object and that is responsible for it. */
+    /**
+     * Set the GenericDelegator instance that created this value object and that is responsible for it.  @param
+     * internalDelegator the internal delegator
+     */
     public void setDelegator(Delegator internalDelegator) {
         assertIsMutable();
         if (internalDelegator == null) {
@@ -376,6 +413,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.internalDelegator = internalDelegator;
     }
 
+    /**
+     * Get object.
+     * @param name the name
+     * @return the object
+     */
     public Object get(String name) {
         if (getModelEntity().getField(name) == null) {
             throw new IllegalArgumentException("The field name (or key) [" + name + "] is not valid for entity [" + this.getEntityName() + "].");
@@ -387,6 +429,12 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
     public boolean isPrimaryKey() {
         return isPrimaryKey(false);
     }
+
+    /**
+     * Is primary key boolean.
+     * @param requireValue the require value
+     * @return the boolean
+     */
     public boolean isPrimaryKey(boolean requireValue) {
         TreeSet<String> fieldKeys = new TreeSet<>(this.fields.keySet());
         for (ModelField curPk: this.getModelEntity().getPkFieldsUnmodifiable()) {
@@ -409,6 +457,12 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
     public boolean containsPrimaryKey() {
         return containsPrimaryKey(false);
     }
+
+    /**
+     * Contains primary key boolean.
+     * @param requireValue the require value
+     * @return the boolean
+     */
     public boolean containsPrimaryKey(boolean requireValue) {
         for (ModelField curPk: this.getModelEntity().getPkFieldsUnmodifiable()) {
             String fieldName = curPk.getName();
@@ -425,6 +479,10 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return true;
     }
 
+    /**
+     * Gets pk short value string.
+     * @return the pk short value string
+     */
     public String getPkShortValueString() {
         StringBuilder sb = new StringBuilder();
         for (ModelField curPk: this.getModelEntity().getPkFieldsUnmodifiable()) {
@@ -457,7 +515,8 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         assertIsMutable();
         ModelField modelField = getModelEntity().getField(name);
         if (modelField == null) {
-            throw new IllegalArgumentException("[GenericEntity.set] \"" + name + "\" is not a field of " + entityName + ", must be one of: " + getModelEntity().fieldNameString());
+            throw new IllegalArgumentException("[GenericEntity.set] \"" + name + "\" is not a field of " + entityName + ", must be one of: "
+                    + getModelEntity().fieldNameString());
         }
         if (value != null || setIfNull) {
             ModelFieldType type = null;
@@ -467,7 +526,9 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
                 Debug.logWarning(e, MODULE);
             }
             if (type == null) {
-                throw new IllegalArgumentException("Type " + modelField.getType() + " not found for entity [" + this.getEntityName() + "]; probably because there is no datasource (helper) setup for the entity group that this entity is in: [" + this.getDelegator().getEntityGroupName(this.getEntityName()) + "]");
+                throw new IllegalArgumentException("Type " + modelField.getType() + " not found for entity [" + this.getEntityName()
+                        + "]; probably because there is no datasource (helper) setup for the entity group that this entity is in: ["
+                        + this.getDelegator().getEntityGroupName(this.getEntityName()) + "]");
             }
 
             if (value instanceof Boolean) {
@@ -488,9 +549,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
                     try {
                         value = ObjectType.simpleTypeOrObjectConvert(value, type.getJavaType(), null, null);
                     } catch (GeneralException e) {
-                        String errMsg = "In entity field [" + this.getEntityName() + "." + name + "] set the value passed in [" + value.getClass().getName() + "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
+                        String errMsg = "In entity field [" + this.getEntityName() + "." + name + "] set the value passed in ["
+                                + value.getClass().getName() + "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
                         // eventually we should do this, but for now we'll do a "soft" failure: throw new IllegalArgumentException(errMsg);
-                        Debug.logWarning(new Exception("Location of database type warning"), "=-=-=-=-=-=-=-=-= Database type warning GenericEntity.set =-=-=-=-=-=-=-=-= " + errMsg, MODULE);
+                        Debug.logWarning(new Exception("Location of database type warning"),
+                                "=-=-=-=-=-=-=-=-= Database type warning GenericEntity.set =-=-=-=-=-=-=-=-= " + errMsg, MODULE);
                     }
                 }
             }
@@ -504,6 +567,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return fields.get(name);
     }
 
+    /**
+     * Dangerous set no check but fast.
+     * @param modelField the model field
+     * @param value the value
+     */
     public void dangerousSetNoCheckButFast(ModelField modelField, Object value) {
         assertIsMutable();
         if (modelField == null) {
@@ -515,6 +583,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.notifyObservers(modelField.getName());
     }
 
+    /**
+     * Dangerous get no check but fast object.
+     * @param modelField the model field
+     * @return the object
+     */
     public Object dangerousGetNoCheckButFast(ModelField modelField) {
         if (modelField == null) {
             throw new IllegalArgumentException("Cannot get field with a null modelField");
@@ -539,8 +612,7 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         }
 
         ModelField field = getModelEntity().getField(name);
-        if (field == null)
-         {
+        if (field == null) {
             set(name, value); // this will get an error in the set() method...
         }
 
@@ -635,21 +707,31 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         this.set(name, bytes);
     }
 
+    /**
+     * Sets next seq id.
+     */
     public void setNextSeqId() {
         List<String> pkFieldNameList = this.modelEntity.getPkFieldNames();
         if (pkFieldNameList.size() != 1) {
-            throw new IllegalArgumentException("Cannot setNextSeqId for entity [" + this.getEntityName() + "] that does not have a single primary key field, instead has [" + pkFieldNameList.size() + "]");
+            throw new IllegalArgumentException("Cannot setNextSeqId for entity [" + this.getEntityName()
+                    + "] that does not have a single primary key field, instead has [" + pkFieldNameList.size() + "]");
         }
 
         String pkFieldName = pkFieldNameList.get(0);
-        if (this.get(pkFieldName) != null) {
-            // don't throw exception, too much of a pain and usually intended: throw new IllegalArgumentException("Cannot setNextSeqId, pk field [" + pkFieldName + "] of entity [" + this.getEntityName() + "] already has a value [" + this.get(pkFieldName) + "]");
-        }
+        //if (this.get(pkFieldName) != null) {
+            // don't throw exception, too much of a pain and usually intended: throw new IllegalArgumentException("Cannot setNextSeqId, pk field ["
+        // + pkFieldName + "] of entity [" + this.getEntityName() + "] already has a value [" + this.get(pkFieldName) + "]");
+        //}
 
         String sequencedValue = this.getDelegator().getNextSeqId(this.getEntityName());
         this.set(pkFieldName, sequencedValue);
     }
 
+    /**
+     * Gets boolean.
+     * @param name the name
+     * @return the boolean
+     */
     public Boolean getBoolean(String name) {
         Object obj = get(name);
 
@@ -669,7 +751,8 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
                 throw new IllegalArgumentException("getBoolean could not map the String '" + value + "' to Boolean type");
             }
         } else {
-            throw new IllegalArgumentException("getBoolean could not map the object '" + obj.toString() + "' to Boolean type, unknown object type: " + obj.getClass().getName());
+            throw new IllegalArgumentException("getBoolean could not map the object '" + obj.toString()
+                    + "' to Boolean type, unknown object type: " + obj.getClass().getName());
         }
     }
 
@@ -699,38 +782,79 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
             Debug.logError(e, MODULE);
         }
 
-        throw new IllegalArgumentException("getDuration could not map the object '" + obj.toString() + "' to TimeDuration type, incompatible object type: " + obj.getClass().getName());
+        throw new IllegalArgumentException("getDuration could not map the object '" + obj.toString()
+                + "' to TimeDuration type, incompatible object type: " + obj.getClass().getName());
     }
 
+    /**
+     * Gets string.
+     * @param name the name
+     * @return the string
+     */
     public String getString(String name) {
         Object object = get(name);
         return object == null ? null : object.toString();
     }
 
+    /**
+     * Gets timestamp.
+     * @param name the name
+     * @return the timestamp
+     */
     public java.sql.Timestamp getTimestamp(String name) {
         return (java.sql.Timestamp) get(name);
     }
 
+    /**
+     * Gets time.
+     * @param name the name
+     * @return the time
+     */
     public java.sql.Time getTime(String name) {
         return (java.sql.Time) get(name);
     }
 
+    /**
+     * Gets date.
+     * @param name the name
+     * @return the date
+     */
     public java.sql.Date getDate(String name) {
         return (java.sql.Date) get(name);
     }
 
+    /**
+     * Gets integer.
+     * @param name the name
+     * @return the integer
+     */
     public Integer getInteger(String name) {
         return (Integer) get(name);
     }
 
+    /**
+     * Gets long.
+     * @param name the name
+     * @return the long
+     */
     public Long getLong(String name) {
         return (Long) get(name);
     }
 
+    /**
+     * Gets float.
+     * @param name the name
+     * @return the float
+     */
     public Float getFloat(String name) {
         return (Float) get(name);
     }
 
+    /**
+     * Gets double.
+     * @param name the name
+     * @return the double
+     */
     public Double getDouble(String name) {
         // this "hack" is needed for now until the Double/BigDecimal issues are all resolved
         Object value = get(name);
@@ -740,6 +864,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return (Double) value;
     }
 
+    /**
+     * Gets big decimal.
+     * @param name the name
+     * @return the big decimal
+     */
     public BigDecimal getBigDecimal(String name) {
         // this "hack" is needed for now until the Double/BigDecimal issues are all resolved
         // NOTE: for things to generally work properly BigDecimal should really be used as the java-type in the field type def XML files
@@ -750,6 +879,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return (BigDecimal) value;
     }
 
+    /**
+     * Get bytes byte [ ].
+     * @param name the name
+     * @return the byte [ ]
+     */
     @SuppressWarnings("deprecation")
     public byte[] getBytes(String name) {
         Object value = get(name);
@@ -771,12 +905,15 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         }
         if (value instanceof org.apache.ofbiz.entity.util.ByteWrapper) {
             // NOTE DEJ20071022: the use of ByteWrapper is not recommended and is deprecated, only old data should be stored that way
-            Debug.logWarning("Found a ByteWrapper object in the database for field [" + this.getEntityName() + "." + name + "]; converting to byte[] and returning, but note that you need to update your database to unwrap these objects for future compatibility", MODULE);
+            Debug.logWarning("Found a ByteWrapper object in the database for field [" + this.getEntityName() + "." + name
+                    + "]; converting to byte[] and returning, but note that you need to update your database to unwrap these objects for future "
+                    + "compatibility", MODULE);
             org.apache.ofbiz.entity.util.ByteWrapper wrapper = (org.apache.ofbiz.entity.util.ByteWrapper) value;
             return wrapper.getBytes();
         }
         // uh-oh, this shouldn't happen...
-        throw new IllegalArgumentException("In call to getBytes the value is not a supported type, should be byte[] or ByteWrapper, is: " + value.getClass().getName());
+        throw new IllegalArgumentException("In call to getBytes the value is not a supported type, should be byte[] or ByteWrapper, is: "
+                + value.getClass().getName());
     }
 
     /** Checks a resource bundle for a value for this field using the entity name, the field name
@@ -926,35 +1063,48 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return resourceValue;
     }
 
+    /**
+     * Gets primary key.
+     * @return the primary key
+     */
     public GenericPK getPrimaryKey() {
         return GenericPK.create(this.getDelegator(), getModelEntity(), getFields(getModelEntity().getPkFieldNames()));
     }
 
-    /** go through the pks and for each one see if there is an entry in fields to set */
+    /** go through the pks and for each one see if there is an entry in fields to set  @param fields the fields */
     public void setPKFields(Map<? extends Object, ? extends Object> fields) {
         setAllFields(fields, true, null, Boolean.TRUE);
     }
 
-    /** go through the pks and for each one see if there is an entry in fields to set */
+    /**
+     * go through the pks and for each one see if there is an entry in fields to set  @param fields the fields
+     * @param setIfEmpty the set if empty
+     */
     public void setPKFields(Map<? extends Object, ? extends Object> fields, boolean setIfEmpty) {
         setAllFields(fields, setIfEmpty, null, Boolean.TRUE);
     }
 
-    /** go through the non-pks and for each one see if there is an entry in fields to set */
+    /** go through the non-pks and for each one see if there is an entry in fields to set  @param fields the fields */
     public void setNonPKFields(Map<? extends Object, ? extends Object> fields) {
         setAllFields(fields, true, null, Boolean.FALSE);
     }
 
-    /** go through the non-pks and for each one see if there is an entry in fields to set */
+    /**
+     * go through the non-pks and for each one see if there is an entry in fields to set  @param fields the fields
+     * @param setIfEmpty the set if empty
+     */
     public void setNonPKFields(Map<? extends Object, ? extends Object> fields, boolean setIfEmpty) {
         setAllFields(fields, setIfEmpty, null, Boolean.FALSE);
     }
 
 
-    /** Intelligently sets fields on this entity from the Map of fields passed in
+    /**
+     * Intelligently sets fields on this entity from the Map of fields passed in
      * @param fields The fields Map to get the values from
-     * @param setIfEmpty Used to specify whether empty/null values in the field Map should over-write non-empty values in this entity
-     * @param namePrefix If not null or empty will be pre-pended to each field name (upper-casing the first letter of the field name first), and that will be used as the fields Map lookup name instead of the field-name
+     * @param setIfEmpty Used to specify whether empty/null values in the field Map should over-write non-empty values
+     * in this entity
+     * @param namePrefix If not null or empty will be pre-pended to each field name (upper-casing the first letter of
+     * the field name first), and that will be used as the fields Map lookup name instead of the field-name
      * @param pks If null, get all values, if TRUE just get PKs, if FALSE just get non-PKs
      */
     public void setAllFields(Map<? extends Object, ? extends Object> fields, boolean setIfEmpty, String namePrefix, Boolean pks) {
@@ -1011,23 +1161,26 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         }
     }
 
-    /** Returns keys of entity fields
-     * @return java.util.Collection
+    /**
+     * Returns keys of entity fields
+     * @return java.util.Collection all keys
      */
     public Collection<String> getAllKeys() {
         return fields.keySet();
     }
 
-    /** Returns key/value pairs of entity fields
-     * @return java.util.Map
+    /**
+     * Returns key/value pairs of entity fields
+     * @return java.util.Map all fields
      */
     public Map<String, Object> getAllFields() {
         return new HashMap<>(this.fields);
     }
 
-    /** Used by clients to specify exactly the fields they are interested in
+    /**
+     * Used by clients to specify exactly the fields they are interested in
      * @param keysofFields the name of the fields the client is interested in
-     * @return java.util.Map
+     * @return java.util.Map fields
      */
     public Map<String, Object> getFields(Collection<String> keysofFields) {
         if (keysofFields == null) {
@@ -1041,7 +1194,8 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return aMap;
     }
 
-    /** Used by clients to update particular fields in the entity
+    /**
+     * Used by clients to update particular fields in the entity
      * @param keyValuePairs java.util.Map
      */
     public void setFields(Map<? extends String, ? extends Object> keyValuePairs) {
@@ -1054,6 +1208,11 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         }
     }
 
+    /**
+     * Matches fields boolean.
+     * @param keyValuePairs the key value pairs
+     * @return the boolean
+     */
     public boolean matchesFields(Map<String, ? extends Object> keyValuePairs) {
         if (fields == null) {
             return true;
@@ -1258,14 +1417,17 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
                             break;
                         default:
                             if (curChar < 0x20) {
-                                // if it is less that 0x20 at this point it is invalid because the only valid values < 0x20 are 0x9, 0xA, 0xD as caught above
-                                Debug.logInfo("Removing invalid character [" + curChar + "] numeric value [" + (int) curChar + "] for field " + name + " of entity with PK: " + this.getPrimaryKey().toString(), MODULE);
+                                // if it is less that 0x20 at this point it is invalid because the only valid values
+                                // < 0x20 are 0x9, 0xA, 0xD as caught above
+                                Debug.logInfo("Removing invalid character [" + curChar + "] numeric value [" + (int) curChar + "] for field "
+                                        + name + " of entity with PK: " + this.getPrimaryKey().toString(), MODULE);
                                 value.deleteCharAt(i);
                             } else if (curChar > 0x7F) {
                                 // Replace each char which is out of the ASCII range with a XML entity
                                 String replacement = "&#" + (int) curChar + ";";
                                 if (Debug.verboseOn()) {
-                                    Debug.logVerbose("Entity: " + this.getEntityName() + ", PK: " + this.getPrimaryKey().toString() + " -> char [" + curChar + "] replaced with [" + replacement + "]", MODULE);
+                                    Debug.logVerbose("Entity: " + this.getEntityName() + ", PK: " + this.getPrimaryKey().toString() + " -> char ["
+                                            + curChar + "] replaced with [" + replacement + "]", MODULE);
                                 }
                                 value.replace(i, i + 1, replacement);
                             }
@@ -1405,6 +1567,12 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return theString.toString();
     }
 
+    /**
+     * Compare to fields int.
+     * @param that the that
+     * @param name the name
+     * @return the int
+     */
     protected int compareToFields(GenericEntity that, String name) {
         Comparable<Object> thisVal = UtilGenerics.cast(this.fields.get(name));
         Object thatVal = that.fields.get(name);
@@ -1418,7 +1586,7 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         }
         // if thatVal is null, put the other earlier in the list
         if (thatVal == null) {
-            return  -1;
+            return -1;
         }
         return thisVal.compareTo(thatVal);
     }
@@ -1539,46 +1707,88 @@ public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>,
         return this.fields.size();
     }
 
+    /**
+     * Matches boolean.
+     * @param condition the condition
+     * @return the boolean
+     */
     public boolean matches(EntityCondition condition) {
         return condition.entityMatches(this);
     }
 
+    /**
+     * Add observer.
+     * @param observer the observer
+     */
     public void addObserver(Observer observer) {
         getObservable().addObserver(observer);
     }
 
+    /**
+     * Clear changed.
+     */
     public void clearChanged() {
         getObservable().clearChanged();
     }
 
+    /**
+     * Delete observer.
+     * @param observer the observer
+     */
     public void deleteObserver(Observer observer) {
         getObservable().deleteObserver(observer);
     }
 
+    /**
+     * Delete observers.
+     */
     public void deleteObservers() {
         getObservable().deleteObservers();
     }
 
+    /**
+     * Has changed boolean.
+     * @return the boolean
+     */
     public boolean hasChanged() {
         return getObservable().hasChanged();
     }
 
+    /**
+     * Notify observers.
+     */
     public void notifyObservers() {
         getObservable().notifyObservers();
     }
 
+    /**
+     * Notify observers.
+     * @param arg the arg
+     */
     public void notifyObservers(Object arg) {
         getObservable().notifyObservers(arg);
     }
 
+    /**
+     * Sets changed.
+     */
     public void setChanged() {
         getObservable().setChanged();
     }
 
+    /**
+     * Original db values available boolean.
+     * @return the boolean
+     */
     public boolean originalDbValuesAvailable() {
         return this.originalDbValues != null ? true : false;
     }
 
+    /**
+     * Gets original db value.
+     * @param name the name
+     * @return the original db value
+     */
     public Object getOriginalDbValue(String name) {
         if (getModelEntity().getField(name) == null) {
             throw new IllegalArgumentException("[GenericEntity.get] \"" + name + "\" is not a field of " + getEntityName());
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java
index 10036e3..32bbe5a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java
@@ -24,7 +24,9 @@ import org.apache.ofbiz.entity.DelegatorFactory;
 
 public abstract class AbstractCache<K, V> {
 
-    protected final String delegatorName, id, cacheNamePrefix;
+    private final String delegatorName;
+    private final String id;
+    private final String cacheNamePrefix;
 
     protected AbstractCache(String delegatorName, String id) {
         this.delegatorName = delegatorName;
@@ -32,22 +34,41 @@ public abstract class AbstractCache<K, V> {
         this.cacheNamePrefix = "entitycache.".concat(id).concat(".").concat(delegatorName).concat(".");
     }
 
+    /**
+     * Gets delegator.
+     * @return the delegator
+     */
     public Delegator getDelegator() {
         return DelegatorFactory.getDelegator(this.delegatorName);
     }
 
+    /**
+     * Remove.
+     * @param entityName the entity name
+     */
     public void remove(String entityName) {
         UtilCache.clearCache(getCacheName(entityName));
     }
 
+    /**
+     * Clear.
+     */
     public void clear() {
         UtilCache.clearCachesThatStartWith(getCacheNamePrefix());
     }
 
+    /**
+     * Gets cache name prefix.
+     * @return the cache name prefix
+     */
     public String getCacheNamePrefix() {
         return cacheNamePrefix;
     }
 
+    /**
+     * Get cache name prefixes string [ ].
+     * @return the string [ ]
+     */
     public String[] getCacheNamePrefixes() {
         return new String[] {
             "entitycache." + id + ".${delegator-name}.",
@@ -55,10 +76,20 @@ public abstract class AbstractCache<K, V> {
         };
     }
 
+    /**
+     * Gets cache name.
+     * @param entityName the entity name
+     * @return the cache name
+     */
     public String getCacheName(String entityName) {
         return getCacheNamePrefix() + entityName;
     }
 
+    /**
+     * Get cache names string [ ].
+     * @param entityName the entity name
+     * @return the string [ ]
+     */
     public String[] getCacheNames(String entityName) {
         String[] prefixes = getCacheNamePrefixes();
         String[] names = new String[prefixes.length * 2];
@@ -71,10 +102,20 @@ public abstract class AbstractCache<K, V> {
         return names;
     }
 
+    /**
+     * Gets cache.
+     * @param entityName the entity name
+     * @return the cache
+     */
     protected UtilCache<K, V> getCache(String entityName) {
         return UtilCache.findCache(getCacheName(entityName));
     }
 
+    /**
+     * Gets or create cache.
+     * @param entityName the entity name
+     * @return the or create cache
+     */
     protected UtilCache<K, V> getOrCreateCache(String entityName) {
         String name = getCacheName(entityName);
         return UtilCache.getOrCreateUtilCache(name, 0, 0, 0, true, getCacheNames(entityName));
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
index 424e53f..a884c62 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
@@ -33,6 +33,11 @@ import org.apache.ofbiz.entity.GenericValue;
 import org.apache.ofbiz.entity.condition.EntityCondition;
 import org.apache.ofbiz.entity.model.ModelEntity;
 
+/**
+ * The type AbstractEntityConditionCache.
+ * @param <K> the type parameter
+ * @param <V> the type parameter
+ */
 public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<EntityCondition, ConcurrentMap<K, V>> {
 
     private static final String MODULE = AbstractEntityConditionCache.class.getName();
@@ -41,6 +46,13 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         super(delegatorName, id);
     }
 
+    /**
+     * Get v.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param key the key
+     * @return the v
+     */
     protected V get(String entityName, EntityCondition condition, K key) {
         ConcurrentMap<K, V> conditionCache = getConditionCache(entityName, condition);
         if (conditionCache == null) {
@@ -49,10 +61,19 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return conditionCache.get(key);
     }
 
+    /**
+     * Put v.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param key the key
+     * @param value the value
+     * @return the v
+     */
     protected V put(String entityName, EntityCondition condition, K key, V value) {
         ModelEntity entity = this.getDelegator().getModelEntity(entityName);
         if (entity.getNeverCache()) {
-            Debug.logWarning("Tried to put a value of the " + entityName + " entity in the cache but this entity has never-cache set to true, not caching.", MODULE);
+            Debug.logWarning("Tried to put a value of the " + entityName
+                    + " entity in the cache but this entity has never-cache set to true, not caching.", MODULE);
             return null;
         }
 
@@ -73,6 +94,11 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         }
     }
 
+    /**
+     * Remove.
+     * @param entityName the entity name
+     * @param condition the condition
+     */
     public void remove(String entityName, EntityCondition condition) {
         UtilCache<EntityCondition, ConcurrentMap<K, V>> cache = getCache(entityName);
         if (cache == null) {
@@ -81,6 +107,13 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         cache.remove(condition);
     }
 
+    /**
+     * Remove v.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param key the key
+     * @return the v
+     */
     protected V remove(String entityName, EntityCondition condition, K key) {
         ConcurrentMap<K, V> conditionCache = getConditionCache(entityName, condition);
         if (conditionCache == null) {
@@ -98,6 +131,12 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return frozenCondition;
     }
 
+    /**
+     * Gets condition cache.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @return the condition cache
+     */
     protected ConcurrentMap<K, V> getConditionCache(String entityName, EntityCondition condition) {
         UtilCache<EntityCondition, ConcurrentMap<K, V>> cache = getCache(entityName);
         if (cache == null) {
@@ -106,6 +145,12 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return cache.get(getConditionKey(condition));
     }
 
+    /**
+     * Gets or create condition cache.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @return the or create condition cache
+     */
     protected Map<K, V> getOrCreateConditionCache(String entityName, EntityCondition condition) {
         UtilCache<EntityCondition, ConcurrentMap<K, V>> utilCache = getOrCreateCache(entityName);
         EntityCondition conditionKey = getConditionKey(condition);
@@ -121,13 +166,20 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return value == null || value == GenericEntity.NULL_ENTITY || value == GenericValue.NULL_VALUE;
     }
 
+    /**
+     * Gets model check valid.
+     * @param oldEntity the old entity
+     * @param newEntity the new entity
+     * @return the model check valid
+     */
     protected ModelEntity getModelCheckValid(GenericEntity oldEntity, GenericEntity newEntity) {
         ModelEntity model;
         if (!isNull(newEntity)) {
             model = newEntity.getModelEntity();
             String entityName = model.getEntityName();
             if (oldEntity != null && !entityName.equals(oldEntity.getEntityName())) {
-                throw new IllegalArgumentException("internal error: storeHook called with 2 different entities(old=" + oldEntity.getEntityName() + ", new=" + entityName + ")");
+                throw new IllegalArgumentException("internal error: storeHook called with 2 different entities(old=" + oldEntity.getEntityName()
+                        + ", new=" + entityName + ")");
             }
         } else {
             if (!isNull(oldEntity)) {
@@ -139,22 +191,42 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return model;
     }
 
+    /**
+     * Store hook.
+     * @param newEntity the new entity
+     */
     public void storeHook(GenericEntity newEntity) {
         storeHook(null, newEntity);
     }
 
-    // if oldValue == null, then this is a new entity
-    // if newValue == null, then
+    /**
+     * Store hook.
+     * @param oldEntity the old entity
+     * @param newEntity the new entity
+     * if oldValue == null, then this is a new entity
+     * if newValue == null, then
+     */
     public void storeHook(GenericEntity oldEntity, GenericEntity newEntity) {
         storeHook(false, oldEntity, newEntity);
     }
 
-    // if oldValue == null, then this is a new entity
-    // if newValue == null, then
+    /**
+     * Store hook.
+     * @param oldPK the old pk
+     * @param newEntity the new entity
+     * if oldValue == null, then this is a new entity
+     * if newValue == null, then
+     */
     public void storeHook(GenericPK oldPK, GenericEntity newEntity) {
         storeHook(true, oldPK, newEntity);
     }
 
+    /**
+     * Convert list.
+     * @param targetEntityName the target entity name
+     * @param entity the entity
+     * @return the list
+     */
     protected List<? extends Map<String, Object>> convert(String targetEntityName, GenericEntity entity) {
         if (isNull(entity)) {
             return null;
@@ -162,6 +234,12 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         return entity.getModelEntity().convertToViewValues(targetEntityName, entity);
     }
 
+    /**
+     * Store hook.
+     * @param isPK the is pk
+     * @param oldEntity the old entity
+     * @param newEntity the new entity
+     */
     public void storeHook(boolean isPK, GenericEntity oldEntity, GenericEntity newEntity) {
         ModelEntity model = getModelCheckValid(oldEntity, newEntity);
         String entityName = model.getEntityName();
@@ -174,7 +252,17 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
         }
     }
 
-    protected <T1 extends Map<String, Object>, T2 extends Map<String, Object>> void storeHook(String entityName, boolean isPK, List<T1> oldValues, List<T2> newValues) {
+    /**
+     * Store hook.
+     * @param <T1> the type parameter
+     * @param <T2> the type parameter
+     * @param entityName the entity name
+     * @param isPK the is pk
+     * @param oldValues the old values
+     * @param newValues the new values
+     */
+    protected <T1 extends Map<String, Object>, T2 extends Map<String, Object>> void storeHook(String entityName, boolean isPK,
+                                                                                              List<T1> oldValues, List<T2> newValues) {
         UtilCache<EntityCondition, Map<K, V>> entityCache = UtilCache.findCache(getCacheName(entityName));
         // for info about cache clearing
         if (entityCache == null) {
@@ -215,9 +303,11 @@ public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<E
             }
             if (shouldRemove) {
                 if (Debug.verboseOn()) {
-                    Debug.logVerbose("In storeHook, matched condition, removing from cache for entityName [" + entityName + "] in cache with name [" + entityCache.getName() + "] entry with condition: " + condition, MODULE);
+                    Debug.logVerbose("In storeHook, matched condition, removing from cache for entityName [" + entityName
+                            + "] in cache with name [" + entityCache.getName() + "] entry with condition: " + condition, MODULE);
                 }
-                // doesn't work anymore since this is a copy of the cache keySet, can call remove directly though with a concurrent mod exception: cacheKeyIter.remove();
+                // doesn't work anymore since this is a copy of the cache keySet, can call remove directly though with a concurrent mod
+                // exception: cacheKeyIter.remove();
                 entityCache.remove(condition);
             }
         }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java
index a287b6d..b491911 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java
@@ -34,6 +34,11 @@ public class EntityCache extends AbstractCache<GenericPK, GenericValue> {
         super(delegatorName, "entity");
     }
 
+    /**
+     * Get generic value.
+     * @param pk the pk
+     * @return the generic value
+     */
     public GenericValue get(GenericPK pk) {
         UtilCache<GenericPK, GenericValue> entityCache = getCache(pk.getEntityName());
         if (entityCache == null) {
@@ -42,6 +47,11 @@ public class EntityCache extends AbstractCache<GenericPK, GenericValue> {
         return entityCache.get(pk);
     }
 
+    /**
+     * Put generic value.
+     * @param entity the entity
+     * @return the generic value
+     */
     public GenericValue put(GenericValue entity) {
         if (entity == null) {
             return null;
@@ -49,9 +59,16 @@ public class EntityCache extends AbstractCache<GenericPK, GenericValue> {
         return put(entity.getPrimaryKey(), entity);
     }
 
+    /**
+     * Put generic value.
+     * @param pk the pk
+     * @param entity the entity
+     * @return the generic value
+     */
     public GenericValue put(GenericPK pk, GenericValue entity) {
         if (pk.getModelEntity().getNeverCache()) {
-            Debug.logWarning("Tried to put a value of the " + pk.getEntityName() + " entity in the BY PRIMARY KEY cache but this entity has never-cache set to true, not caching.", MODULE);
+            Debug.logWarning("Tried to put a value of the " + pk.getEntityName()
+                    + " entity in the BY PRIMARY KEY cache but this entity has never-cache set to true, not caching.", MODULE);
             return null;
         }
 
@@ -65,6 +82,11 @@ public class EntityCache extends AbstractCache<GenericPK, GenericValue> {
         return entityCache.put(pk, entity);
     }
 
+    /**
+     * Remove.
+     * @param entityName the entity name
+     * @param condition the condition
+     */
     public void remove(String entityName, EntityCondition condition) {
         UtilCache<GenericPK, GenericValue> entityCache = getCache(entityName);
         if (entityCache == null) {
@@ -81,14 +103,25 @@ public class EntityCache extends AbstractCache<GenericPK, GenericValue> {
         }
     }
 
+    /**
+     * Remove generic value.
+     * @param entity the entity
+     * @return the generic value
+     */
     public GenericValue remove(GenericValue entity) {
         return remove(entity.getPrimaryKey());
     }
 
+    /**
+     * Remove generic value.
+     * @param pk the pk
+     * @return the generic value
+     */
     public GenericValue remove(GenericPK pk) {
         UtilCache<GenericPK, GenericValue> entityCache = getCache(pk.getEntityName());
         if (Debug.verboseOn()) {
-            Debug.logVerbose("Removing from EntityCache with PK [" + pk + "], will remove from this cache: " + (entityCache == null ? "[No cache found to remove from]" : entityCache.getName()), MODULE);
+            Debug.logVerbose("Removing from EntityCache with PK [" + pk + "], will remove from this cache: "
+                    + (entityCache == null ? "[No cache found to remove from]" : entityCache.getName()), MODULE);
         }
         if (entityCache == null) {
             return null;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java
index b099f3e..aaf4d9a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java
@@ -38,10 +38,23 @@ public class EntityListCache extends AbstractEntityConditionCache<Object, List<G
         super(delegatorName, "entity-list");
     }
 
+    /**
+     * Get list.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @return the list
+     */
     public List<GenericValue> get(String entityName, EntityCondition condition) {
         return this.get(entityName, condition, null);
     }
 
+    /**
+     * Get list.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param orderBy the order by
+     * @return the list
+     */
     public List<GenericValue> get(String entityName, EntityCondition condition, List<String> orderBy) {
         ConcurrentMap<Object, List<GenericValue>> conditionCache = getConditionCache(entityName, condition);
         if (conditionCache == null) {
@@ -67,14 +80,29 @@ public class EntityListCache extends AbstractEntityConditionCache<Object, List<G
         return valueList;
     }
 
+    /**
+     * Put.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param entities the entities
+     */
     public void put(String entityName, EntityCondition condition, List<GenericValue> entities) {
         this.put(entityName, condition, null, entities);
     }
 
+    /**
+     * Put list.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param orderBy the order by
+     * @param entities the entities
+     * @return the list
+     */
     public List<GenericValue> put(String entityName, EntityCondition condition, List<String> orderBy, List<GenericValue> entities) {
         ModelEntity entity = this.getDelegator().getModelEntity(entityName);
         if (entity.getNeverCache()) {
-            Debug.logWarning("Tried to put a value of the " + entityName + " entity in the cache but this entity has never-cache set to true, not caching.", MODULE);
+            Debug.logWarning("Tried to put a value of the " + entityName
+                    + " entity in the cache but this entity has never-cache set to true, not caching.", MODULE);
             return null;
         }
         for (GenericValue memberValue : entities) {
@@ -84,6 +112,13 @@ public class EntityListCache extends AbstractEntityConditionCache<Object, List<G
         return conditionCache.put(getOrderByKey(orderBy), entities);
     }
 
+    /**
+     * Remove list.
+     * @param entityName the entity name
+     * @param condition the condition
+     * @param orderBy the order by
+     * @return the list
+     */
     public List<GenericValue> remove(String entityName, EntityCondition condition, List<String> orderBy) {
         return super.remove(entityName, condition, getOrderByKey(orderBy));
     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
index 00de3ac..d095e95 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
@@ -43,7 +43,8 @@ public class EntityClause {
     private Object value = null;
     public EntityClause() { }
 
-    public EntityClause(String firstEntity, String secondEntity, String firstField, String secondField, EntityOperator<?, ?> interFieldOperation, EntityOperator<?, ?> intraFieldOperation) {
+    public EntityClause(String firstEntity, String secondEntity, String firstField, String secondField, EntityOperator<?, ?> interFieldOperation,
+                        EntityOperator<?, ?> intraFieldOperation) {
         this.firstEntity = firstEntity;
         this.secondEntity = secondEntity;
         this.firstField = firstField;
@@ -52,7 +53,8 @@ public class EntityClause {
         this.intraFieldOperation = intraFieldOperation;
     }
 
-    public EntityClause(String firstEntity, String firstField, Object value, EntityOperator<?, ?> interFieldOperation, EntityOperator<?, ?> intraFieldOperation) {
+    public EntityClause(String firstEntity, String firstField, Object value, EntityOperator<?, ?> interFieldOperation,
+                        EntityOperator<?, ?> intraFieldOperation) {
         this.firstEntity = firstEntity;
         this.firstField = firstField;
         this.value = value;
@@ -60,22 +62,42 @@ public class EntityClause {
         this.intraFieldOperation = intraFieldOperation;
     }
 
+    /**
+     * Gets first entity.
+     * @return the first entity
+     */
     public String getFirstEntity() {
         return firstEntity;
     }
 
+    /**
+     * Gets second entity.
+     * @return the second entity
+     */
     public String getSecondEntity() {
         return secondEntity;
     }
 
+    /**
+     * Gets first field.
+     * @return the first field
+     */
     public String getFirstField() {
         return firstField;
     }
 
+    /**
+     * Gets second field.
+     * @return the second field
+     */
     public String getSecondField() {
         return secondField;
     }
 
+    /**
+     * Gets value.
+     * @return the value
+     */
     public Object getValue() {
         if (value == null) {
             value = new Object();
@@ -83,39 +105,83 @@ public class EntityClause {
         return value;
     }
 
+    /**
+     * Gets inter field operation.
+     * @param <L> the type parameter
+     * @param <R> the type parameter
+     * @return the inter field operation
+     */
     public <L, R> EntityOperator<L, R> getInterFieldOperation() {
         return UtilGenerics.cast(interFieldOperation);
     }
 
+    /**
+     * Gets intra field operation.
+     * @param <L> the type parameter
+     * @param <R> the type parameter
+     * @return the intra field operation
+     */
     public <L, R> EntityOperator<L, R> getIntraFieldOperation() {
         return UtilGenerics.cast(intraFieldOperation);
     }
 
+    /**
+     * Sets first entity.
+     * @param firstEntity the first entity
+     */
     public void setFirstEntity(String firstEntity) {
         this.firstEntity = firstEntity;
     }
 
+    /**
+     * Sets second entity.
+     * @param secondEntity the second entity
+     */
     public void setSecondEntity(String secondEntity) {
         this.secondEntity = secondEntity;
     }
 
+    /**
+     * Sets first field.
+     * @param firstField the first field
+     */
     public void setFirstField(String firstField) {
         this.firstField = firstField;
     }
 
+    /**
+     * Sets second field.
+     * @param secondField the second field
+     */
     public void setSecondField(String secondField) {
         this.secondField = secondField;
     }
 
+    /**
+     * Sets inter field operation.
+     * @param <L> the type parameter
+     * @param <R> the type parameter
+     * @param interFieldOperation the inter field operation
+     */
     public <L, R> void setInterFieldOperation(EntityOperator<L, R> interFieldOperation) {
         this.interFieldOperation = interFieldOperation;
     }
 
+    /**
+     * Sets intra field operation.
+     * @param <L> the type parameter
+     * @param <R> the type parameter
+     * @param intraFieldOperation the intra field operation
+     */
     public <L, R> void setIntraFieldOperation(EntityOperator<L, R> intraFieldOperation) {
         this.intraFieldOperation = intraFieldOperation;
     }
 
-    // --  Protected Methods  - for internal use only --//
+    /**
+     * Sets model entities.
+     * @param modelReader the model reader
+     * @throws GenericEntityException the generic entity exception
+     */
     protected void setModelEntities(ModelReader modelReader) throws GenericEntityException {
         firstModelEntity = modelReader.getModelEntity(firstEntity);
         if (secondEntity != null && !secondEntity.equals("")) {
@@ -123,10 +189,18 @@ public class EntityClause {
         }
     }
 
+    /**
+     * Gets first model entity.
+     * @return the first model entity
+     */
     protected ModelEntity getFirstModelEntity() {
         return firstModelEntity;
     }
 
+    /**
+     * Gets second model entity.
+     * @return the second model entity
+     */
     protected ModelEntity getSecondModelEntity() {
         return secondModelEntity;
     }
@@ -139,12 +213,14 @@ public class EntityClause {
         outputBuffer.append("[secondEntity,").append(secondEntity == null ? "null" : secondEntity).append("]");
         outputBuffer.append("[firstField,").append(firstField == null ? "null" : firstField).append("]");
         outputBuffer.append("[secondField,").append(secondField == null ? "null" : secondField).append("]");
-        outputBuffer.append("[firstModelEntity,").append(firstModelEntity == null ? "null" : (firstModelEntity.getEntityName() == null ? "null" : firstModelEntity.getEntityName())).append("]");
-        outputBuffer.append("[secondModelEntity,").append(secondModelEntity == null ? "null" : (secondModelEntity.getEntityName() == null ? "null" : secondModelEntity.getEntityName())).append("]");
+        outputBuffer.append("[firstModelEntity,").append(firstModelEntity == null ? "null" : (firstModelEntity.getEntityName() == null ? "null"
+                : firstModelEntity.getEntityName())).append("]");
+        outputBuffer.append("[secondModelEntity,").append(secondModelEntity == null ? "null" : (secondModelEntity.getEntityName() == null ? "null"
+                : secondModelEntity.getEntityName())).append("]");
         outputBuffer.append("[interFieldOperation,").append(interFieldOperation == null ? "null" : (interFieldOperation.getCode())).append("]");
-        outputBuffer.append("[intraFieldOperation,").append(intraFieldOperation == null ? "null" : (intraFieldOperation.getCode() == null ? "null" : intraFieldOperation.getCode())).append("]");
+        outputBuffer.append("[intraFieldOperation,").append(intraFieldOperation == null ? "null" : (intraFieldOperation.getCode() == null ? "null"
+                : intraFieldOperation.getCode())).append("]");
         outputBuffer.append("[value,").append(getValue().toString()).append("]");
         return outputBuffer.toString();
     }
-
 }
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 0a7547b..ca8af65 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
@@ -79,9 +79,11 @@ public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R
     }
 
     @Override
-    public void addSqlValue(StringBuilder sql, ModelEntity entity, List<EntityConditionParam> entityConditionParams, boolean compat, L lhs, R rhs, Datasource datasourceInfo) {
+    public void addSqlValue(StringBuilder sql, ModelEntity entity, List<EntityConditionParam> entityConditionParams,
+                            boolean compat, L lhs, R rhs, Datasource datasourceInfo) {
 
-        // 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 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)) {
             sql.append("1=0");
             return;
@@ -112,12 +114,32 @@ public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R
         return false;
     }
 
-    protected void makeRHSWhereString(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sql, ModelField field, R rhs, Datasource datasourceInfo) {
+    /**
+     * Make rhs where string.
+     * @param entity the entity
+     * @param entityConditionParams the entity condition params
+     * @param sql the sql
+     * @param field the field
+     * @param rhs the rhs
+     * @param datasourceInfo the datasource info
+     */
+    protected void makeRHSWhereString(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sql,
+                                      ModelField field, R rhs, Datasource datasourceInfo) {
         sql.append(' ').append(getCode()).append(' ');
         makeRHSWhereStringValue(entity, entityConditionParams, sql, field, rhs, datasourceInfo);
     }
 
-    protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sql, ModelField field, R rhs, Datasource datasourceInfo) {
+    /**
+     * Make rhs where string value.
+     * @param entity the entity
+     * @param entityConditionParams the entity condition params
+     * @param sql the sql
+     * @param field the field
+     * @param rhs the rhs
+     * @param datasourceInfo the datasource info
+     */
+    protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sql,
+                                           ModelField field, R rhs, Datasource datasourceInfo) {
         if (rhs instanceof EntityConditionValue) {
             EntityConditionValue ecv = (EntityConditionValue) rhs;
             if (ecv.getModelField(entity) == null) {
@@ -131,6 +153,14 @@ public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R
 
     public abstract boolean compare(L lhs, R rhs);
 
+    /**
+     * Eval boolean.
+     * @param delegator the delegator
+     * @param map the map
+     * @param lhs the lhs
+     * @param rhs the rhs
+     * @return the boolean
+     */
     public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, L lhs, R rhs) {
         return mapMatches(delegator, map, lhs, rhs);
     }
@@ -163,6 +193,11 @@ public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R
         return EntityCondition.makeCondition(freeze(lhs), this, freeze(rhs));
     }
 
+    /**
+     * Freeze object.
+     * @param item the item
+     * @return the object
+     */
     protected Object freeze(Object item) {
         if (item instanceof EntityConditionValue) {
             EntityConditionValue ecv = (EntityConditionValue) item;
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
index fa2dc67..9cc6036 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
@@ -39,7 +39,7 @@ import org.apache.ofbiz.entity.model.ModelEntity;
 @SuppressWarnings("serial")
 public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCondition> {
 
-    protected boolean shortCircuitValue;
+    private boolean shortCircuitValue;
 
     protected EntityJoinOperator(int id, String code, boolean shortCircuitValue) {
         super(id, code);
@@ -47,14 +47,24 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
     }
 
     @Override
-    public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean compat, EntityCondition lhs, EntityCondition rhs, Datasource datasourceInfo) {
+    public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean compat,
+                            EntityCondition lhs, EntityCondition rhs, Datasource datasourceInfo) {
         List<EntityCondition> conditions = new LinkedList<>();
         conditions.add(lhs);
         conditions.add(rhs);
         addSqlValue(sql, modelEntity, entityConditionParams, conditions, datasourceInfo);
     }
 
-    public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, List<? extends EntityCondition> conditionList, Datasource datasourceInfo) {
+    /**
+     * Add sql value.
+     * @param sql the sql
+     * @param modelEntity the model entity
+     * @param entityConditionParams the entity condition params
+     * @param conditionList the condition list
+     * @param datasourceInfo the datasource info
+     */
+    public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams,
+                            List<? extends EntityCondition> conditionList, Datasource datasourceInfo) {
         if (UtilValidate.isNotEmpty(conditionList)) {
             boolean hadSomething = false;
             Iterator<? extends EntityCondition> conditionIter = conditionList.iterator();
@@ -79,6 +89,11 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         }
     }
 
+    /**
+     * Freeze entity condition.
+     * @param item the item
+     * @return the entity condition
+     */
     protected EntityCondition freeze(Object item) {
         return ((EntityCondition) item).freeze();
     }
@@ -88,6 +103,11 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         return EntityCondition.makeCondition(freeze(lhs), this, freeze(rhs));
     }
 
+    /**
+     * Freeze entity condition.
+     * @param conditionList the condition list
+     * @return the entity condition
+     */
     public EntityCondition freeze(List<? extends EntityCondition> conditionList) {
         List<EntityCondition> newList = new ArrayList<>(conditionList.size());
         for (EntityCondition condition: conditionList) {
@@ -96,6 +116,13 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         return EntityCondition.makeCondition(newList, this);
     }
 
+    /**
+     * Eval boolean.
+     * @param entity the entity
+     * @param lhs the lhs
+     * @param rhs the rhs
+     * @return the boolean
+     */
     public Boolean eval(GenericEntity entity, EntityCondition lhs, EntityCondition rhs) {
         return entityMatches(entity, lhs, rhs) ? Boolean.TRUE : Boolean.FALSE;
     }
@@ -105,6 +132,11 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         return lhs.isEmpty() && rhs.isEmpty();
     }
 
+    /**
+     * Is empty boolean.
+     * @param conditionList the condition list
+     * @return the boolean
+     */
     public boolean isEmpty(List<? extends EntityCondition> conditionList) {
         for (EntityCondition condition: conditionList) {
             if (!condition.isEmpty()) {
@@ -122,10 +154,24 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         return !shortCircuitValue;
     }
 
+    /**
+     * Entity matches boolean.
+     * @param entity the entity
+     * @param conditionList the condition list
+     * @return the boolean
+     */
     public boolean entityMatches(GenericEntity entity, List<? extends EntityCondition> conditionList) {
         return mapMatches(entity.getDelegator(), entity, conditionList);
     }
 
+    /**
+     * Eval boolean.
+     * @param delegator the delegator
+     * @param map the map
+     * @param lhs the lhs
+     * @param rhs the rhs
+     * @return the boolean
+     */
     public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, EntityCondition lhs, EntityCondition rhs) {
         return mapMatches(delegator, map, lhs, rhs);
     }
@@ -138,10 +184,24 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         return !shortCircuitValue;
     }
 
+    /**
+     * Eval boolean.
+     * @param delegator the delegator
+     * @param map the map
+     * @param conditionList the condition list
+     * @return the boolean
+     */
     public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, List<? extends EntityCondition> conditionList) {
         return mapMatches(delegator, map, conditionList);
     }
 
+    /**
+     * Map matches boolean.
+     * @param delegator the delegator
+     * @param map the map
+     * @param conditionList the condition list
+     * @return the boolean
+     */
     public boolean mapMatches(Delegator delegator, Map<String, ? extends Object> map, List<? extends EntityCondition> conditionList) {
         if (UtilValidate.isNotEmpty(conditionList)) {
             for (EntityCondition condition: conditionList) {
@@ -159,6 +219,12 @@ public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCo
         rhs.checkCondition(modelEntity);
     }
 
+    /**
+     * Validate sql.
+     * @param modelEntity the model entity
+     * @param conditionList the condition list
+     * @throws GenericModelException the generic model exception
+     */
     public void validateSql(ModelEntity modelEntity, List<? extends EntityCondition> conditionList) throws GenericModelException {
         if (conditionList == null) {
             throw new GenericModelException("Condition list is null");
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java
index 3953ffa..531dbf4 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java
@@ -30,7 +30,7 @@ import org.apache.ofbiz.entity.config.model.Datasource;
 import org.apache.ofbiz.entity.model.ModelEntity;
 
 public class OrderByList implements Comparator<GenericEntity> {
-    protected List<OrderByItem> orderByList = new ArrayList<>();
+    private List<OrderByItem> orderByList = new ArrayList<>();
 
     public OrderByList() {
     }
@@ -43,46 +43,90 @@ public class OrderByList implements Comparator<GenericEntity> {
         addOrderBy(orderByList);
     }
 
+    /**
+     * Add order by.
+     * @param orderByList the order by list
+     */
     public void addOrderBy(String... orderByList) {
         for (String orderByItem: orderByList) {
             addOrderBy(orderByItem);
         }
     }
 
+    /**
+     * Add order by.
+     * @param orderByList the order by list
+     */
     public void addOrderBy(Collection<String> orderByList) {
         for (String orderByItem: orderByList) {
             addOrderBy(orderByItem);
         }
     }
 
+    /**
+     * Add order by.
+     * @param text the text
+     */
     public void addOrderBy(String text) {
         addOrderBy(OrderByItem.parse(text));
     }
 
+    /**
+     * Add order by.
+     * @param value the value
+     */
     public void addOrderBy(EntityConditionValue value) {
         addOrderBy(value, false);
     }
 
+    /**
+     * Add order by.
+     * @param value the value
+     * @param descending the descending
+     */
     public void addOrderBy(EntityConditionValue value, boolean descending) {
         addOrderBy(new OrderByItem(value, descending));
     }
 
+    /**
+     * Add order by.
+     * @param orderByItem the order by item
+     */
     public void addOrderBy(OrderByItem orderByItem) {
         orderByList.add(orderByItem);
     }
 
+    /**
+     * Check order by.
+     * @param modelEntity the model entity
+     * @throws GenericModelException the generic model exception
+     */
     public void checkOrderBy(ModelEntity modelEntity) throws GenericModelException {
         for (OrderByItem orderByItem: orderByList) {
             orderByItem.checkOrderBy(modelEntity);
         }
     }
 
+    /**
+     * Make order by string string.
+     * @param modelEntity the model entity
+     * @param includeTablenamePrefix the include tablename prefix
+     * @param datasourceInfo the datasource info
+     * @return the string
+     */
     public String makeOrderByString(ModelEntity modelEntity, boolean includeTablenamePrefix, Datasource datasourceInfo) {
         StringBuilder sb = new StringBuilder();
         makeOrderByString(sb, modelEntity, includeTablenamePrefix, datasourceInfo);
         return sb.toString();
     }
 
+    /**
+     * Make order by string.
+     * @param sb the sb
+     * @param modelEntity the model entity
+     * @param includeTablenamePrefix the include tablename prefix
+     * @param datasourceInfo the datasource info
+     */
     public void makeOrderByString(StringBuilder sb, ModelEntity modelEntity, boolean includeTablenamePrefix, Datasource datasourceInfo) {
         if (!orderByList.isEmpty()) {
             sb.append(" ORDER BY ");
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
index b950a10..5c46338 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
@@ -344,14 +344,19 @@ public final class EntityFinderUtil {
 
     @SuppressWarnings("serial")
     public static class LimitRange implements OutputHandler {
-        FlexibleStringExpander startExdr;
-        FlexibleStringExpander sizeExdr;
+        private FlexibleStringExpander startExdr;
+        private FlexibleStringExpander sizeExdr;
 
         public LimitRange(Element limitRangeElement) {
             this.startExdr = FlexibleStringExpander.getInstance(limitRangeElement.getAttribute("start"));
             this.sizeExdr = FlexibleStringExpander.getInstance(limitRangeElement.getAttribute("size"));
         }
 
+        /**
+         * Gets start.
+         * @param context the context
+         * @return the start
+         */
         int getStart(Map<String, Object> context) {
             String startStr = this.startExdr.expandString(context);
             try {
@@ -363,6 +368,11 @@ public final class EntityFinderUtil {
             }
         }
 
+        /**
+         * Gets size.
+         * @param context the context
+         * @return the size
+         */
         int getSize(Map<String, Object> context) {
             String sizeStr = this.sizeExdr.expandString(context);
             try {
@@ -408,14 +418,19 @@ public final class EntityFinderUtil {
 
     @SuppressWarnings("serial")
     public static class LimitView implements OutputHandler {
-        FlexibleStringExpander viewIndexExdr;
-        FlexibleStringExpander viewSizeExdr;
+        private FlexibleStringExpander viewIndexExdr;
+        private FlexibleStringExpander viewSizeExdr;
 
         public LimitView(Element limitViewElement) {
             this.viewIndexExdr = FlexibleStringExpander.getInstance(limitViewElement.getAttribute("view-index"));
             this.viewSizeExdr = FlexibleStringExpander.getInstance(limitViewElement.getAttribute("view-size"));
         }
 
+        /**
+         * Gets index.
+         * @param context the context
+         * @return the index
+         */
         int getIndex(Map<String, Object> context) {
             String viewIndexStr = this.viewIndexExdr.expandString(context);
             try {
@@ -427,6 +442,11 @@ public final class EntityFinderUtil {
             }
         }
 
+        /**
+         * Gets size.
+         * @param context the context
+         * @return the size
+         */
         int getSize(Map<String, Object> context) {
             String viewSizeStr = this.viewSizeExdr.expandString(context);
             try {
@@ -484,7 +504,8 @@ public final class EntityFinderUtil {
 
         @Override
         public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
-            throw new IllegalArgumentException("Cannot handle output with use-iterator when the query is cached, or the result in general is not an EntityListIterator");
+            throw new IllegalArgumentException("Cannot handle output with use-iterator when the query is cached, "
+                    + "or the result in general is not an EntityListIterator");
         }
     }
     @SuppressWarnings("serial")
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java
index 4578b16..79c7602 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java
@@ -25,30 +25,55 @@ import java.lang.reflect.Proxy;
 
 public abstract class AbstractCursorHandler implements InvocationHandler {
 
-    protected String cursorName;
-    protected int fetchSize;
+    private String cursorName;
+    private int fetchSize;
 
     protected AbstractCursorHandler(String cursorName, int fetchSize) {
         this.cursorName = cursorName;
         this.fetchSize = fetchSize;
     }
 
+    /**
+     * Sets cursor name.
+     * @param cursorName the cursor name
+     */
     public void setCursorName(String cursorName) {
         this.cursorName = cursorName;
     }
 
+    /**
+     * Gets cursor name.
+     * @return the cursor name
+     */
     public String getCursorName() {
         return cursorName;
     }
 
+    /**
+     * Sets fetch size.
+     * @param fetchSize the fetch size
+     */
     public void setFetchSize(int fetchSize) {
         this.fetchSize = fetchSize;
     }
 
+    /**
+     * Gets fetch size.
+     * @return the fetch size
+     */
     public int getFetchSize() {
         return fetchSize;
     }
 
+    /**
+     * Invoke object.
+     * @param obj the obj
+     * @param proxy the proxy
+     * @param method the method
+     * @param args the args
+     * @return the object
+     * @throws Throwable the throwable
+     */
     protected Object invoke(Object obj, Object proxy, Method method, Object... args) throws Throwable {
         if ("toString".equals(method.getName())) {
             String str = obj.toString();
@@ -57,7 +82,8 @@ public abstract class AbstractCursorHandler implements InvocationHandler {
         return method.invoke(obj, args);
     }
 
-    protected static <T> T newHandler(InvocationHandler handler, Class<T> implClass) throws IllegalAccessException, IllegalArgumentException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException {
+    protected static <T> T newHandler(InvocationHandler handler, Class<T> implClass) throws IllegalAccessException, IllegalArgumentException,
+            InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException {
         ClassLoader loader = implClass.getClassLoader();
         if (loader == null) {
             loader = ClassLoader.getSystemClassLoader();
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java
index 3d710f9..7b036e3 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java
@@ -33,7 +33,7 @@ public class CursorConnection extends AbstractCursorHandler {
         return newHandler(new CursorConnection(con, cursorName, pageSize), Connection.class);
     }
 
-    protected Connection con;
+    private Connection con;
 
     protected CursorConnection(Connection con, String cursorName, int fetchSize) {
         super(cursorName, fetchSize);
@@ -44,13 +44,13 @@ public class CursorConnection extends AbstractCursorHandler {
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if ("prepareStatement".equals(method.getName())) {
             Debug.logInfo("prepareStatement", MODULE);
-            args[0] = "DECLARE " + cursorName + " CURSOR FOR " + args[0];
+            args[0] = "DECLARE " + getCursorName() + " CURSOR FOR " + args[0];
             PreparedStatement pstmt = (PreparedStatement) method.invoke(con, args);
-            return CursorStatement.newCursorPreparedStatement(pstmt, cursorName, fetchSize);
+            return CursorStatement.newCursorPreparedStatement(pstmt, getCursorName(), getFetchSize());
         } else if ("createStatement".equals(method.getName())) {
             Debug.logInfo("createStatement", MODULE);
             Statement stmt = (Statement) method.invoke(con, args);
-            return CursorStatement.newCursorStatement(stmt, cursorName, fetchSize);
+            return CursorStatement.newCursorStatement(stmt, getCursorName(), getFetchSize());
         }
         return super.invoke(con, proxy, method, args);
     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java
index c9bf72b..ceaf2f4 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java
@@ -29,9 +29,9 @@ import org.apache.ofbiz.base.util.Debug;
 public class CursorResultSet extends AbstractCursorHandler {
 
     private static final String MODULE = CursorResultSet.class.getName();
-    protected ResultSet rs;
-    protected Statement stmt;
-    protected String query;
+    private ResultSet rs;
+    private Statement stmt;
+    private String query;
 
     protected CursorResultSet(Statement stmt, String cursorName, int fetchSize) throws SQLException {
         super(cursorName, fetchSize);
@@ -52,6 +52,11 @@ public class CursorResultSet extends AbstractCursorHandler {
         return super.invoke(rs, proxy, method, args);
     }
 
+    /**
+     * Next boolean.
+     * @return the boolean
+     * @throws SQLException the sql exception
+     */
     protected boolean next() throws SQLException {
         if (rs.next()) return true;
         Debug.logInfo("executing page fetch(2)", MODULE);
@@ -59,8 +64,12 @@ public class CursorResultSet extends AbstractCursorHandler {
         return rs.next();
     }
 
+    /**
+     * Close.
+     * @throws SQLException the sql exception
+     */
     protected void close() throws SQLException {
-        stmt.executeUpdate("CLOSE " + cursorName);
+        stmt.executeUpdate("CLOSE " + getCursorName());
         rs.close();
     }
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java
index 8bc6a86..1196eab 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java
@@ -57,15 +57,15 @@ public class CursorStatement extends AbstractCursorHandler {
         } else if ("executeQuery".equals(method.getName()) && args == null) {
             PreparedStatement pstmt = (PreparedStatement) stmt;
             pstmt.executeUpdate();
-            currentResultSet = CursorResultSet.newCursorResultSet(stmt, cursorName, fetchSize);
+            currentResultSet = CursorResultSet.newCursorResultSet(stmt, getCursorName(), getFetchSize());
             return currentResultSet;
         } else if ("executeQuery".equals(method.getName()) && args != null) {
-            args[0] = "DECLARE " + cursorName + " CURSOR FOR " + args[0];
+            args[0] = "DECLARE " + getCursorName() + " CURSOR FOR " + args[0];
             Debug.logInfo("query=" + args[0], MODULE);
             if (stmt.execute((String) args[0])) {
                 throw new SQLException("DECLARE returned a ResultSet");
             }
-            currentResultSet = CursorResultSet.newCursorResultSet(stmt, cursorName, fetchSize);
+            currentResultSet = CursorResultSet.newCursorResultSet(stmt, getCursorName(), getFetchSize());
             return currentResultSet;
         } else if ("getMoreResults".equals(method.getName())) {
             boolean hasMoreResults = stmt.getMoreResults();
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
index a6d9c1e..d4f87ff 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
@@ -900,6 +900,12 @@ public class DatabaseUtil {
         return isCaseSensitive;
     }
 
+    /**
+     * Gets database meta data.
+     * @param connection the connection
+     * @param messages the messages
+     * @return the database meta data
+     */
     public DatabaseMetaData getDatabaseMetaData(Connection connection, Collection<String> messages) {
         DatabaseMetaData dbData = null;
         try {
@@ -977,6 +983,11 @@ public class DatabaseUtil {
         }
     }
 
+    /**
+     * Gets table names.
+     * @param messages the messages
+     * @return the table names
+     */
     public TreeSet<String> getTableNames(Collection<String> messages) {
         Connection connection = getConnectionLogged(messages);
 
@@ -1261,6 +1272,16 @@ public class DatabaseUtil {
         }
     }
 
+    /**
+     * Check primary key info int.
+     * @param rsPks the rs pks
+     * @param lookupSchemaName the lookup schema name
+     * @param needsUpperCase the needs upper case
+     * @param colInfo the col info
+     * @param messages the messages
+     * @return the int
+     * @throws SQLException the sql exception
+     */
     public int checkPrimaryKeyInfo(ResultSet rsPks, String lookupSchemaName, boolean needsUpperCase,
                                    Map<String, Map<String, ColumnCheckInfo>> colInfo, Collection<String> messages) throws SQLException {
         int pkCount = 0;
@@ -1302,6 +1323,12 @@ public class DatabaseUtil {
         return pkCount;
     }
 
+    /**
+     * Gets reference info.
+     * @param tableNames the table names
+     * @param messages the messages
+     * @return the reference info
+     */
     public Map<String, Map<String, ReferenceCheckInfo>> getReferenceInfo(Set<String> tableNames, Collection<String> messages) {
         Connection connection = getConnectionLogged(messages);
         if (connection == null) {
@@ -1595,6 +1622,13 @@ public class DatabaseUtil {
         return indexInfo;
     }
 
+    /**
+     * Create table string.
+     * @param entity the entity
+     * @param modelEntities the model entities
+     * @param addFks the add fks
+     * @return the string
+     */
     public String createTable(ModelEntity entity, Map<String, ModelEntity> modelEntities, boolean addFks) {
         if (entity == null) {
             return "ModelEntity was null and is required to create a table";
@@ -1667,7 +1701,8 @@ public class DatabaseUtil {
                         continue;
                     }
                     if (relModelEntity instanceof ModelViewEntity) {
-                        Debug.logError("Error adding foreign key: related entity is a view entity for related entity name " + modelRelation.getRelEntityName(), MODULE);
+                        Debug.logError("Error adding foreign key: related entity is a view entity for related entity name "
+                                + modelRelation.getRelEntityName(), MODULE);
                         continue;
                     }
 
@@ -1727,6 +1762,11 @@ public class DatabaseUtil {
         return null;
     }
 
+    /**
+     * Delete table.
+     * @param entity the entity
+     * @param messages the messages
+     */
     public void deleteTable(ModelEntity entity, List<String> messages) {
         if (entity == null) {
             String errMsg = "ModelEntity was null and is required to delete a table";
@@ -1766,8 +1806,9 @@ public class DatabaseUtil {
      * @return the string
      */
     public String addColumn(ModelEntity entity, ModelField field) {
-        if (entity == null || field == null)
+        if (entity == null || field == null) {
             return "ModelEntity or ModelField where null, cannot add column";
+        }
         if (entity instanceof ModelViewEntity) {
             return "ERROR: Cannot add column for a view entity";
         }
@@ -1853,6 +1894,13 @@ public class DatabaseUtil {
         return null;
     }
 
+    /**
+     * Rename column string.
+     * @param entity the entity
+     * @param field the field
+     * @param newName the new name
+     * @return the string
+     */
     public String renameColumn(ModelEntity entity, ModelField field, String newName) {
         if (entity == null || field == null) {
             return "ModelEntity or ModelField where null, cannot rename column";
@@ -1894,6 +1942,12 @@ public class DatabaseUtil {
         return null;
     }
 
+    /**
+     * Repair column size.
+     * @param entity the entity
+     * @param field the field
+     * @param messages the messages
+     */
     public void repairColumnSize(ModelEntity entity, ModelField field, List<String> messages) {
         // first rename the column
         String tempName = makeTempFieldName(field);
@@ -1931,8 +1985,9 @@ public class DatabaseUtil {
             }
         } catch (SQLException e) {
             String thisMsg = "SQL Exception while executing the following:\n" + sql1 + "\nError was: " + e.toString();
-            if (messages != null)
+            if (messages != null) {
                 messages.add(thisMsg);
+            }
             Debug.logError(thisMsg, MODULE);
             return;
         }
@@ -1951,8 +2006,9 @@ public class DatabaseUtil {
             stmt.executeUpdate(sql2);
         } catch (SQLException e) {
             String thisMsg = "SQL Exception while executing the following:\n" + sql2 + "\nError was: " + e.toString();
-            if (messages != null)
+            if (messages != null) {
                 messages.add(thisMsg);
+            }
             Debug.logError(thisMsg, MODULE);
             return;
         }
@@ -2190,7 +2246,8 @@ public class DatabaseUtil {
 
             ModelField relField = relModelEntity.getField(keyMap.getRelFieldName());
             if (relField == null) {
-                Debug.logError("The field '" + keyMap.getRelFieldName() + "' was not found at related entity - check relations at entity '" + entity.getEntityName() + "'!", MODULE);
+                Debug.logError("The field '" + keyMap.getRelFieldName() + "' was not found at related entity - check relations at entity '"
+                        + entity.getEntityName() + "'!", MODULE);
             }
 
             if (relCols.length() > 0) {
@@ -2308,6 +2365,14 @@ public class DatabaseUtil {
         }
     }
 
+    /**
+     * Delete foreign key string.
+     * @param entity the entity
+     * @param modelRelation the model relation
+     * @param relModelEntity the rel model entity
+     * @param constraintNameClipLength the constraint name clip length
+     * @return the string
+     */
     public String deleteForeignKey(ModelEntity entity, ModelRelation modelRelation, ModelEntity relModelEntity, int constraintNameClipLength) {
         String relConstraintName = makeFkConstraintName(modelRelation, constraintNameClipLength);
 
@@ -2353,14 +2418,32 @@ public class DatabaseUtil {
         }
     }
 
+    /**
+     * Create primary key.
+     * @param entity the entity
+     * @param usePkConstraintNames the use pk constraint names
+     * @param messages the messages
+     */
     public void createPrimaryKey(ModelEntity entity, boolean usePkConstraintNames, List<String> messages) {
         createPrimaryKey(entity, usePkConstraintNames, datasourceInfo.getConstraintNameClipLength(), messages);
     }
 
+    /**
+     * Create primary key.
+     * @param entity the entity
+     * @param messages the messages
+     */
     public void createPrimaryKey(ModelEntity entity, List<String> messages) {
         createPrimaryKey(entity, datasourceInfo.getUsePkConstraintNames(), messages);
     }
 
+    /**
+     * Create primary key string.
+     * @param entity the entity
+     * @param usePkConstraintNames the use pk constraint names
+     * @param constraintNameClipLength the constraint name clip length
+     * @return the string
+     */
     public String createPrimaryKey(ModelEntity entity, boolean usePkConstraintNames, int constraintNameClipLength) {
         if (entity == null) {
             return "ModelEntity was null and is required to create the primary key for a table";
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
index 24dab21..0ccddbd 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
@@ -196,11 +196,13 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
         // if applicable automatically add the CREATE_STAMP_FIELD and CREATE_STAMP_TX_FIELD fields
         if ((this.doLock || !this.noAutoStamp) && !fieldsMap.containsKey(CREATE_STAMP_FIELD)) {
-            ModelField newField = ModelField.create(this, "", CREATE_STAMP_FIELD, "date-time", null, null, null, false, false, false, true, false, null);
+            ModelField newField = ModelField.create(this, "", CREATE_STAMP_FIELD, "date-time", null, null, null, false, false, false, true,
+                    false, null);
             internalAddField(newField, pkFieldNames);
         }
         if (!this.noAutoStamp && !fieldsMap.containsKey(CREATE_STAMP_TX_FIELD)) {
-            ModelField newField = ModelField.create(this, "", CREATE_STAMP_TX_FIELD, "date-time", null, null, null, false, false, false, true, false, null);
+            ModelField newField = ModelField.create(this, "", CREATE_STAMP_TX_FIELD, "date-time", null, null, null, false, false, false, true,
+                    false, null);
             internalAddField(newField, pkFieldNames);
             // also add an index for this field
             String indexName = ModelUtil.shortenDbName(this.tableName + "_TXCRTS", 18);
@@ -227,7 +229,8 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
     }
 
     /** DB Names Constructor */
-    public ModelEntity(String tableName, Map<String, DatabaseUtil.ColumnCheckInfo> colMap, ModelFieldTypeReader modelFieldTypeReader, boolean isCaseSensitive) {
+    public ModelEntity(String tableName, Map<String, DatabaseUtil.ColumnCheckInfo> colMap, ModelFieldTypeReader modelFieldTypeReader,
+                       boolean isCaseSensitive) {
         // if there is a dot in the name, remove it and everything before it, should be the schema name
         this.modelReader = null;
         this.modelInfo = ModelInfo.DEFAULT;
@@ -244,6 +247,10 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
     }
 
+    /**
+     * Populate basic info.
+     * @param entityElement the entity element
+     */
     protected void populateBasicInfo(Element entityElement) {
         this.entityName = UtilXml.checkEmpty(entityElement.getAttribute("entity-name")).intern();
         this.tableName = UtilXml.checkEmpty(entityElement.getAttribute("table-name"), ModelUtil.javaNameToDbName(this.entityName)).intern();
@@ -273,6 +280,11 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         this.fieldsMap.put(newField.getName(), newField);
     }
 
+    /**
+     * Populate related.
+     * @param reader the reader
+     * @param entityElement the entity element
+     */
     protected void populateRelated(ModelReader reader, Element entityElement) {
         List<ModelRelation> tempList = new ArrayList<>(this.relations);
         for (Element relationElement: UtilXml.childElementList(entityElement, "relation")) {
@@ -285,6 +297,10 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
     }
 
 
+    /**
+     * Populate indexes.
+     * @param entityElement the entity element
+     */
     protected void populateIndexes(Element entityElement) {
         List<ModelIndex> tempList = new ArrayList<>(this.indexes);
         for (Element indexElement: UtilXml.childElementList(entityElement, "index")) {
@@ -294,6 +310,11 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         this.indexes = new CopyOnWriteArrayList<>(tempList);
     }
 
+    /**
+     * Contains all pk field names boolean.
+     * @param fieldNames the field names
+     * @return the boolean
+     */
     public boolean containsAllPkFieldNames(Set<String> fieldNames) {
         Iterator<ModelField> pksIter = this.getPksIterator();
         while (pksIter.hasNext()) {
@@ -306,6 +327,11 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
     }
 
 
+    /**
+     * Add extend entity.
+     * @param reader the reader
+     * @param extendEntityElement the extend entity element
+     */
     public void addExtendEntity(ModelReader reader, Element extendEntityElement) {
         if (extendEntityElement.hasAttribute("enable-lock")) {
             this.doLock = UtilXml.checkBoolean(extendEntityElement.getAttribute("enable-lock"), false);
@@ -329,7 +355,8 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
                 try {
                     this.sequenceBankSize = Integer.valueOf(sequenceBankSizeStr);
                 } catch (NumberFormatException e) {
-                    Debug.logError("Error parsing sequence-bank-size value [" + sequenceBankSizeStr + "] for entity [" + this.entityName + "]", MODULE);
+                    Debug.logError("Error parsing sequence-bank-size value [" + sequenceBankSizeStr + "] for entity [" + this.entityName
+                            + "]", MODULE);
                 }
             }
         }
@@ -356,9 +383,9 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
                 if (UtilValidate.isNotEmpty(fieldElement.getAttribute("enable-audit-log"))) {
                     enableAuditLog = "true".equals(fieldElement.getAttribute("enable-audit-log"));
                 }
-                newField = ModelField.create(this, description, existingField.getName(), type, colName, existingField.getColValue(), existingField.getFieldSet(),
-                        existingField.getIsNotNull(), existingField.getIsPk(), existingField.getEncryptMethod(), existingField.getIsAutoCreatedInternal(),
-                        enableAuditLog, existingField.getValidators());
+                newField = ModelField.create(this, description, existingField.getName(), type, colName, existingField.getColValue(),
+                        existingField.getFieldSet(), existingField.getIsNotNull(), existingField.getIsPk(), existingField.getEncryptMethod(),
+                        existingField.getIsAutoCreatedInternal(), enableAuditLog, existingField.getValidators());
             }
             // add to the entity as a new field
             synchronized (fieldsLock) {
@@ -675,18 +702,30 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return getNopksCopy().iterator();
     }
 
+    /**
+     * Gets nopks copy.
+     * @return the nopks copy
+     */
     public List<ModelField> getNopksCopy() {
         synchronized (fieldsLock) {
             return new ArrayList<>(this.nopks);
         }
     }
 
+    /**
+     * Gets fields size.
+     * @return the fields size
+     */
     public int getFieldsSize() {
         synchronized (fieldsLock) {
             return this.fieldsList.size();
         }
     }
 
+    /**
+     * Gets fields iterator.
+     * @return the fields iterator
+     */
     public Iterator<ModelField> getFieldsIterator() {
         synchronized (fieldsLock) {
             List<ModelField> newList = new ArrayList<>(this.fieldsList);
@@ -694,6 +733,10 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
     }
 
+    /**
+     * Gets fields unmodifiable.
+     * @return the fields unmodifiable
+     */
     public List<ModelField> getFieldsUnmodifiable() {
         synchronized (fieldsLock) {
             List<ModelField> newList = new ArrayList<>(this.fieldsList);
@@ -701,13 +744,21 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
     }
 
-    /** The col-name of the Field, the alias of the field if this is on a view-entity */
+    /**
+     * The col-name of the Field, the alias of the field if this is on a view-entity  @param fieldName the field name
+     * @return the col name or alias
+     */
     public String getColNameOrAlias(String fieldName) {
         ModelField modelField = this.getField(fieldName);
         String fieldString = modelField.getColName();
         return fieldString;
     }
 
+    /**
+     * Gets field.
+     * @param fieldName the field name
+     * @return the field
+     */
     public ModelField getField(String fieldName) {
         if (fieldName == null) return null;
         synchronized (fieldsLock) {
@@ -715,9 +766,14 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
     }
 
+    /**
+     * Add field.
+     * @param field the field
+     */
     public void addField(ModelField field) {
-        if (field == null)
+        if (field == null) {
             return;
+        }
         synchronized (fieldsLock) {
             this.fieldsList.add(field);
             fieldsMap.put(field.getName(), field);
@@ -732,9 +788,15 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
     }
 
+    /**
+     * Remove field model field.
+     * @param fieldName the field name
+     * @return the model field
+     */
     public ModelField removeField(String fieldName) {
-        if (fieldName == null)
+        if (fieldName == null) {
             return null;
+        }
         synchronized (fieldsLock) {
             ModelField field = fieldsMap.remove(fieldName);
             if (field != null) {
@@ -750,18 +812,30 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         }
     }
 
+    /**
+     * Gets all field names.
+     * @return the all field names
+     */
     public List<String> getAllFieldNames() {
         synchronized (fieldsLock) {
             return new ArrayList<>(this.fieldsMap.keySet());
         }
     }
 
+    /**
+     * Gets pk field names.
+     * @return the pk field names
+     */
     public List<String> getPkFieldNames() {
         synchronized (fieldsLock) {
             return new ArrayList<>(pkFieldNames);
         }
     }
 
+    /**
+     * Gets no pk field names.
+     * @return the no pk field names
+     */
     public List<String> getNoPkFieldNames() {
         return getFieldNamesFromFieldVector(getNopksCopy());
     }
@@ -788,10 +862,18 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return nameList;
     }
 
+    /**
+     * Gets relations size.
+     * @return the relations size
+     */
     public int getRelationsSize() {
         return this.relations.size();
     }
 
+    /**
+     * Gets relations one size.
+     * @return the relations one size
+     */
     public int getRelationsOneSize() {
         int numRels = 0;
         Iterator<ModelRelation> relationsIter = this.getRelationsIterator();
@@ -804,14 +886,30 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return numRels;
     }
 
+    /**
+     * Gets relation.
+     * @param index the index
+     * @return the relation
+     */
     public ModelRelation getRelation(int index) {
         return this.relations.get(index);
     }
 
+    /**
+     * Gets relations iterator.
+     * @return the relations iterator
+     */
     public Iterator<ModelRelation> getRelationsIterator() {
         return this.relations.iterator();
     }
 
+    /**
+     * Gets relations list.
+     * @param includeOne the include one
+     * @param includeOneNoFk the include one no fk
+     * @param includeMany the include many
+     * @return the relations list
+     */
     public List<ModelRelation> getRelationsList(boolean includeOne, boolean includeOneNoFk, boolean includeMany) {
         List<ModelRelation> relationsList = new LinkedList<>();
         Iterator<ModelRelation> allIter = this.getRelationsIterator();
@@ -828,14 +926,27 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return relationsList;
     }
 
+    /**
+     * Gets relations one list.
+     * @return the relations one list
+     */
     public List<ModelRelation> getRelationsOneList() {
         return getRelationsList(true, true, false);
     }
 
+    /**
+     * Gets relations many list.
+     * @return the relations many list
+     */
     public List<ModelRelation> getRelationsManyList() {
         return getRelationsList(false, false, true);
     }
 
+    /**
+     * Gets relation.
+     * @param relationName the relation name
+     * @return the relation
+     */
     public ModelRelation getRelation(String relationName) {
         if (relationName == null) return null;
         for (ModelRelation relation: relations) {
@@ -844,26 +955,53 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return null;
     }
 
+    /**
+     * Add relation.
+     * @param relation the relation
+     */
     public void addRelation(ModelRelation relation) {
         this.relations.add(relation);
     }
 
+    /**
+     * Remove relation model relation.
+     * @param index the index
+     * @return the model relation
+     */
     public ModelRelation removeRelation(int index) {
         return this.relations.remove(index);
     }
 
+    /**
+     * Gets indexes size.
+     * @return the indexes size
+     */
     public int getIndexesSize() {
         return this.indexes.size();
     }
 
+    /**
+     * Gets index.
+     * @param index the index
+     * @return the index
+     */
     public ModelIndex getIndex(int index) {
         return this.indexes.get(index);
     }
 
+    /**
+     * Gets indexes iterator.
+     * @return the indexes iterator
+     */
     public Iterator<ModelIndex> getIndexesIterator() {
         return this.indexes.iterator();
     }
 
+    /**
+     * Gets index.
+     * @param indexName the index name
+     * @return the index
+     */
     public ModelIndex getIndex(String indexName) {
         if (indexName == null) return null;
         for (ModelIndex index: indexes) {
@@ -872,26 +1010,47 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return null;
     }
 
+    /**
+     * Add index.
+     * @param index the index
+     */
     public void addIndex(ModelIndex index) {
         this.indexes.add(index);
     }
 
+    /**
+     * Remove index model index.
+     * @param index the index
+     * @return the model index
+     */
     public ModelIndex removeIndex(int index) {
         return this.indexes.remove(index);
     }
 
+    /**
+     * Gets view entities size.
+     * @return the view entities size
+     */
     public int getViewEntitiesSize() {
         synchronized (viewEntities) {
             return this.viewEntities.size();
         }
     }
 
+    /**
+     * Gets view convertors iterator.
+     * @return the view convertors iterator
+     */
     public Iterator<String> getViewConvertorsIterator() {
         synchronized (viewEntities) {
             return new HashSet<>(this.viewEntities).iterator();
         }
     }
 
+    /**
+     * Add view entity.
+     * @param view the view
+     */
     public void addViewEntity(ModelViewEntity view) {
         synchronized (viewEntities) {
             this.viewEntities.add(view.getEntityName());
@@ -964,10 +1123,20 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Type name string string.
+     * @param flds the flds
+     * @return the string
+     */
     public String typeNameString(ModelField... flds) {
         return typeNameString(Arrays.asList(flds));
     }
 
+    /**
+     * Type name string string.
+     * @param flds the flds
+     * @return the string
+     */
     public String typeNameString(List<ModelField> flds) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1051,6 +1220,13 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return fieldsStringList(getFieldsUnmodifiable(), "null", ", ", false, true);
     }
 
+    /**
+     * Fields string list string.
+     * @param eachString the each string
+     * @param separator the separator
+     * @param flds the flds
+     * @return the string
+     */
     @Deprecated
     public String fieldsStringList(String eachString, String separator, ModelField... flds) {
         return fieldsStringList(Arrays.asList(flds), eachString, separator, false, false);
@@ -1158,16 +1334,47 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return fieldsStringList(Arrays.asList(flds), eachString, separator, appendIndex, onlyNonPK);
     }
 
-    public StringBuilder fieldsStringList(StringBuilder sb, String eachString, String separator, boolean appendIndex, boolean onlyNonPK, ModelField... flds) {
+    /**
+     * Fields string list string builder.
+     * @param sb the sb
+     * @param eachString the each string
+     * @param separator the separator
+     * @param appendIndex the append index
+     * @param onlyNonPK the only non pk
+     * @param flds the flds
+     * @return the string builder
+     */
+    public StringBuilder fieldsStringList(StringBuilder sb, String eachString, String separator, boolean appendIndex, boolean onlyNonPK,
+                                          ModelField... flds) {
         return fieldsStringList(Arrays.asList(flds), sb, eachString, separator, appendIndex, onlyNonPK);
     }
 
+    /**
+     * Fields string list string.
+     * @param flds the flds
+     * @param eachString the each string
+     * @param separator the separator
+     * @param appendIndex the append index
+     * @param onlyNonPK the only non pk
+     * @return the string
+     */
     @Deprecated
     public String fieldsStringList(List<ModelField> flds, String eachString, String separator, boolean appendIndex, boolean onlyNonPK) {
         return fieldsStringList(flds, new StringBuilder(), eachString, separator, appendIndex, onlyNonPK).toString();
     }
 
-    public StringBuilder fieldsStringList(List<ModelField> flds, StringBuilder sb, String eachString, String separator, boolean appendIndex, boolean onlyNonPK) {
+    /**
+     * Fields string list string builder.
+     * @param flds the flds
+     * @param sb the sb
+     * @param eachString the each string
+     * @param separator the separator
+     * @param appendIndex the append index
+     * @param onlyNonPK the only non pk
+     * @return the string builder
+     */
+    public StringBuilder fieldsStringList(List<ModelField> flds, StringBuilder sb, String eachString, String separator, boolean appendIndex,
+                                          boolean onlyNonPK) {
         if (flds.size() < 1) {
             return sb;
         }
@@ -1294,18 +1501,42 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return sb;
     }
 
+    /**
+     * Class name string string.
+     * @param flds the flds
+     * @return the string
+     */
     public String classNameString(ModelField... flds) {
         return classNameString(Arrays.asList(flds));
     }
 
+    /**
+     * Class name string string.
+     * @param flds the flds
+     * @return the string
+     */
     public String classNameString(List<ModelField> flds) {
         return classNameString(flds, ", ", "");
     }
 
+    /**
+     * Class name string string.
+     * @param separator the separator
+     * @param afterLast the after last
+     * @param flds the flds
+     * @return the string
+     */
     public String classNameString(String separator, String afterLast, ModelField... flds) {
         return classNameString(Arrays.asList(flds), separator, afterLast);
     }
 
+    /**
+     * Class name string string.
+     * @param flds the flds
+     * @param separator the separator
+     * @param afterLast the after last
+     * @return the string
+     */
     public String classNameString(List<ModelField> flds, String separator, String afterLast) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1324,10 +1555,20 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Finder query string string.
+     * @param flds the flds
+     * @return the string
+     */
     public String finderQueryString(ModelField... flds) {
         return finderQueryString(Arrays.asList(flds));
     }
 
+    /**
+     * Finder query string string.
+     * @param flds the flds
+     * @return the string
+     */
     public String finderQueryString(List<ModelField> flds) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1349,10 +1590,20 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Http arg list string.
+     * @param flds the flds
+     * @return the string
+     */
     public String httpArgList(ModelField... flds) {
         return httpArgList(Arrays.asList(flds));
     }
 
+    /**
+     * Http arg list string.
+     * @param flds the flds
+     * @return the string
+     */
     public String httpArgList(List<ModelField> flds) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1379,10 +1630,20 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Http arg list from class string.
+     * @param flds the flds
+     * @return the string
+     */
     public String httpArgListFromClass(ModelField... flds) {
         return httpArgListFromClass(Arrays.asList(flds));
     }
 
+    /**
+     * Http arg list from class string.
+     * @param flds the flds
+     * @return the string
+     */
     public String httpArgListFromClass(List<ModelField> flds) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1415,10 +1676,22 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Http arg list from class string.
+     * @param entityNameSuffix the entity name suffix
+     * @param flds the flds
+     * @return the string
+     */
     public String httpArgListFromClass(String entityNameSuffix, ModelField... flds) {
         return httpArgListFromClass(Arrays.asList(flds), entityNameSuffix);
     }
 
+    /**
+     * Http arg list from class string.
+     * @param flds the flds
+     * @param entityNameSuffix the entity name suffix
+     * @return the string
+     */
     public String httpArgListFromClass(List<ModelField> flds, String entityNameSuffix) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1453,10 +1726,22 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Http relation arg list string.
+     * @param relation the relation
+     * @param flds the flds
+     * @return the string
+     */
     public String httpRelationArgList(ModelRelation relation, ModelField... flds) {
         return httpRelationArgList(Arrays.asList(flds), relation);
     }
 
+    /**
+     * Http relation arg list string.
+     * @param flds the flds
+     * @param relation the relation
+     * @return the string
+     */
     public String httpRelationArgList(List<ModelField> flds, ModelRelation relation) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1480,7 +1765,9 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
                 returnString.append(ModelUtil.upperFirstChar(keyMap.getFieldName()));
                 returnString.append("() + \"&\" + ");
             } else {
-                Debug.logWarning("-- -- ENTITYGEN ERROR:httpRelationArgList: Related Key in Key Map not found for name: " + flds.get(i).getName() + " related entity: " + relation.getRelEntityName() + " main entity: " + relation.getModelEntity().entityName + " type: " + relation.getType(), MODULE);
+                Debug.logWarning("-- -- ENTITYGEN ERROR:httpRelationArgList: Related Key in Key Map not found for name: "
+                        + flds.get(i).getName() + " related entity: " + relation.getRelEntityName() + " main entity: "
+                        + relation.getModelEntity().entityName + " type: " + relation.getType(), MODULE);
             }
         }
         ModelKeyMap keyMap = relation.findKeyMapByRelated(flds.get(i).getName());
@@ -1496,7 +1783,9 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
             returnString.append(ModelUtil.upperFirstChar(keyMap.getFieldName()));
             returnString.append("()");
         } else {
-            Debug.logWarning("-- -- ENTITYGEN ERROR:httpRelationArgList: Related Key in Key Map not found for name: " + flds.get(i).getName() + " related entity: " + relation.getRelEntityName() + " main entity: " + relation.getModelEntity().entityName + " type: " + relation.getType(), MODULE);
+            Debug.logWarning("-- -- ENTITYGEN ERROR:httpRelationArgList: Related Key in Key Map not found for name: " + flds.get(i).getName()
+                    + " related entity: " + relation.getRelEntityName() + " main entity: " + relation.getModelEntity().entityName + " type: "
+                    + relation.getType(), MODULE);
         }
         return returnString.toString();
     }
@@ -1510,17 +1799,32 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
      for (; i < relation.keyMaps.size() - 1; i++) {
      ModelKeyMap keyMap = (ModelKeyMap)relation.keyMaps.get(i);
      if (keyMap != null)
-     returnString = returnString + "\"" + tableName + "_" + keyMap.relColName + "=\" + " + ModelUtil.lowerFirstChar(relation.mainEntity.entityName) + ".get" + ModelUtil.upperFirstChar(keyMap.fieldName) + "() + \"&\" + ";
+     returnString = returnString + "\"" + tableName + "_" + keyMap.relColName + "=\" + " + ModelUtil.lowerFirstChar(relation.mainEntity.entityName)
+     + ".get" + ModelUtil.upperFirstChar(keyMap.fieldName) + "() + \"&\" + ";
      }
      ModelKeyMap keyMap = (ModelKeyMap)relation.keyMaps.get(i);
-     returnString = returnString + "\"" + tableName + "_" + keyMap.relColName + "=\" + " + ModelUtil.lowerFirstChar(relation.mainEntity.entityName) + ".get" + ModelUtil.upperFirstChar(keyMap.fieldName) + "()";
+     returnString = returnString + "\"" + tableName + "_" + keyMap.relColName + "=\" + " + ModelUtil.lowerFirstChar(relation.mainEntity.entityName)
+     + ".get" + ModelUtil.upperFirstChar(keyMap.fieldName) + "()";
      return returnString;
      }
      */
+
+    /**
+     * Type name string related no mapped string.
+     * @param relation the relation
+     * @param flds the flds
+     * @return the string
+     */
     public String typeNameStringRelatedNoMapped(ModelRelation relation, ModelField... flds) {
         return typeNameStringRelatedNoMapped(Arrays.asList(flds), relation);
     }
 
+    /**
+     * Type name string related no mapped string.
+     * @param flds the flds
+     * @param relation the relation
+     * @return the string
+     */
     public String typeNameStringRelatedNoMapped(List<ModelField> flds, ModelRelation relation) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1547,10 +1851,22 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return returnString.toString();
     }
 
+    /**
+     * Type name string related and main string.
+     * @param relation the relation
+     * @param flds the flds
+     * @return the string
+     */
     public String typeNameStringRelatedAndMain(ModelRelation relation, ModelField... flds) {
         return typeNameStringRelatedAndMain(Arrays.asList(flds), relation);
     }
 
+    /**
+     * Type name string related and main string.
+     * @param flds the flds
+     * @param relation the relation
+     * @return the string
+     */
     public String typeNameStringRelatedAndMain(List<ModelField> flds, ModelRelation relation) {
         StringBuilder returnString = new StringBuilder();
 
@@ -1652,7 +1968,8 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
     public Object convertFieldValue(String fieldName, Object value, Delegator delegator) {
         ModelField modelField = this.getField(fieldName);
         if (modelField == null) {
-            String errMsg = "Could not convert field value: could not find an entity field for the name: [" + fieldName + "] on the [" + this.getEntityName() + "] entity.";
+            String errMsg = "Could not convert field value: could not find an entity field for the name: [" + fieldName + "] on the ["
+                    + this.getEntityName() + "] entity.";
             throw new IllegalArgumentException(errMsg);
         }
         return convertFieldValue(modelField, value, delegator);
@@ -1673,14 +1990,16 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         try {
             fieldJavaType = delegator.getEntityFieldType(this, modelField.getType()).getJavaType();
         } catch (GenericEntityException e) {
-            String errMsg = "Could not convert field value: could not find Java type for the field: [" + modelField.getName() + "] on the [" + this.getEntityName() + "] entity: " + e.toString();
+            String errMsg = "Could not convert field value: could not find Java type for the field: [" + modelField.getName() + "] on the ["
+                    + this.getEntityName() + "] entity: " + e.toString();
             Debug.logError(e, errMsg, MODULE);
             throw new IllegalArgumentException(errMsg);
         }
         try {
             return ObjectType.simpleTypeOrObjectConvert(value, fieldJavaType, null, null, false);
         } catch (GeneralException e) {
-            String errMsg = "Could not convert field value for the field: [" + modelField.getName() + "] on the [" + this.getEntityName() + "] entity to the [" + fieldJavaType + "] type for the value [" + value + "]: " + e.toString();
+            String errMsg = "Could not convert field value for the field: [" + modelField.getName() + "] on the [" + this.getEntityName()
+                    + "] entity to the [" + fieldJavaType + "] type for the value [" + value + "]: " + e.toString();
             Debug.logError(e, errMsg, MODULE);
             throw new IllegalArgumentException(errMsg);
         }
@@ -1700,15 +2019,18 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
      * require them).
      * @return the converted value
      */
-    public Object convertFieldValue(ModelField modelField, Object value, ModelFieldTypeReader modelFieldTypeReader, Map<String, ? extends Object> context) {
+    public Object convertFieldValue(ModelField modelField, Object value, ModelFieldTypeReader modelFieldTypeReader,
+                                    Map<String, ? extends Object> context) {
         if (value == null || value == GenericEntity.NULL_FIELD) {
             return null;
         }
         String fieldJavaType = modelFieldTypeReader.getModelFieldType(modelField.getType()).getJavaType();
         try {
-            return ObjectType.simpleTypeOrObjectConvert(value, fieldJavaType, null, (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
+            return ObjectType.simpleTypeOrObjectConvert(value, fieldJavaType, null, (TimeZone) context.get("timeZone"), (Locale)
+                    context.get("locale"), true);
         } catch (GeneralException e) {
-            String errMsg = "Could not convert field value for the field: [" + modelField.getName() + "] on the [" + this.getEntityName() + "] entity to the [" + fieldJavaType + "] type for the value [" + value + "]: " + e.toString();
+            String errMsg = "Could not convert field value for the field: [" + modelField.getName() + "] on the [" + this.getEntityName()
+                    + "] entity to the [" + fieldJavaType + "] type for the value [" + value + "]: " + e.toString();
             Debug.logError(e, errMsg, MODULE);
             throw new IllegalArgumentException(errMsg);
         }
@@ -1733,6 +2055,12 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return "ModelEntity[" + getEntityName() + "]";
     }
 
+    /**
+     * To xml element element.
+     * @param document the document
+     * @param packageName the package name
+     * @return the element
+     */
     public Element toXmlElement(Document document, String packageName) {
         if (UtilValidate.isNotEmpty(this.getPackageName()) && !packageName.equals(this.getPackageName())) {
             Debug.logWarning("Export EntityModel XML Element [" + this.getEntityName() + "] with a NEW package - " + packageName, MODULE);
@@ -1742,7 +2070,7 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         root.setAttribute("entity-name", this.getEntityName());
         if (!this.getEntityName().equals(ModelUtil.dbNameToClassName(this.getPlainTableName()))
                 || !ModelUtil.javaNameToDbName(this.getEntityName()).equals(this.getPlainTableName())) {
-                root.setAttribute("table-name", this.getPlainTableName());
+            root.setAttribute("table-name", this.getPlainTableName());
         }
         root.setAttribute("package-name", packageName);
 
@@ -1836,20 +2164,28 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
         return root;
     }
 
+    /**
+     * To xml element element.
+     * @param document the document
+     * @return the element
+     */
     public Element toXmlElement(Document document) {
         return this.toXmlElement(document, this.getPackageName());
     }
 
     /**
      * Writes entity model information in the Apple EOModelBundle format.
-     * For document structure and definition see: http://developer.apple.com/documentation/InternetWeb/Reference/WO_BundleReference/Articles/EOModelBundle.html
-     * For examples see the JavaRealEstate.framework and JavaBusinessLogic.framework packages which are in the /Library/Frameworks directory after installing the WebObjects Examples package (get latest version of WebObjects download for this).
+     * For document structure and definition see: http://developer.apple.com/documentation/InternetWeb/Reference/WO_BundleReference/
+     * Articles/EOModelBundle.html
+     * For examples see the JavaRealEstate.framework and JavaBusinessLogic.framework packages which are in the /Library/Frameworks
+     * directory after installing the WebObjects Examples package (get latest version of WebObjects download for this).
      * This is based on examples and documentation from WebObjects 5.4, downloaded 20080221.
      * @param writer
      * @param entityPrefix
      * @param helperName
      */
-    public void writeEoModelText(PrintWriter writer, String entityPrefix, String helperName, Set<String> entityNameIncludeSet, ModelReader entityModelReader) throws GenericEntityException {
+    public void writeEoModelText(PrintWriter writer, String entityPrefix, String helperName, Set<String> entityNameIncludeSet,
+                                 ModelReader entityModelReader) throws GenericEntityException {
         if (entityPrefix == null) entityPrefix = "";
         if (helperName == null) helperName = "localderby";
 
@@ -1857,7 +2193,17 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
     }
 
 
-    public Map<String, Object> createEoModelMap(String entityPrefix, String helperName, Set<String> entityNameIncludeSet, ModelReader entityModelReader) throws GenericEntityException {
+    /**
+     * Create eo model map map.
+     * @param entityPrefix the entity prefix
+     * @param helperName the helper name
+     * @param entityNameIncludeSet the entity name include set
+     * @param entityModelReader the entity model reader
+     * @return the map
+     * @throws GenericEntityException the generic entity exception
+     */
+    public Map<String, Object> createEoModelMap(String entityPrefix, String helperName, Set<String> entityNameIncludeSet,
+                                                ModelReader entityModelReader) throws GenericEntityException {
         final boolean useRelationshipNames = false;
         ModelFieldTypeReader modelFieldTypeReader = ModelFieldTypeReader.getModelFieldTypeReader(helperName);
 
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java
index b0eabbe..fa993e7 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java
@@ -28,11 +28,18 @@ import org.apache.ofbiz.entity.condition.EntityOperator;
 import org.apache.ofbiz.entity.testtools.EntityTestCase;
 import org.apache.ofbiz.entity.util.EntityQuery;
 
+/**
+ * The type EntityCryptoTestSuite.
+ */
 public class EntityCryptoTestSuite extends EntityTestCase {
     public EntityCryptoTestSuite(String name) {
         super(name);
     }
 
+    /**
+     * Test crypto.
+     * @throws Exception the exception
+     */
     public void testCrypto() throws Exception {
         String nanoTime = "" + System.nanoTime();
         delegator.removeByAnd("TestingCrypto", UtilMisc.toMap("testingCryptoTypeId", "BASIC"));
@@ -53,6 +60,10 @@ public class EntityCryptoTestSuite extends EntityTestCase {
         assertEquals(nanoTime, entity.getString("saltedEncryptedValue"));
     }
 
+    /**
+     * Test crypto encryption.
+     * @throws Exception the exception
+     */
     public void testCryptoEncryption() throws Exception {
         // clear out all values
         delegator.removeByAnd("TestingCrypto", UtilMisc.toMap("testingCryptoTypeId", "BASIC"));
@@ -110,22 +121,37 @@ public class EntityCryptoTestSuite extends EntityTestCase {
         assertFalse(initialSaltedValue.equals(updatedSaltedValue));
     }
 
+    /**
+     * Test crypto lookup.
+     * @throws Exception the exception
+     */
     public void testCryptoLookup() throws Exception {
         String nanoTime = "" + System.nanoTime();
 
         delegator.removeByAnd("TestingCrypto", UtilMisc.toMap("testingCryptoTypeId", "LOOKUP"));
         delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "lookup-null", "testingCryptoTypeId", "LOOKUP"));
-        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "lookup-value", "testingCryptoTypeId", "LOOKUP", "encryptedValue", nanoTime, "saltedEncryptedValue", nanoTime));
+        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "lookup-value", "testingCryptoTypeId", "LOOKUP",
+                "encryptedValue", nanoTime, "saltedEncryptedValue", nanoTime));
 
         // This ends up using EntityExpr contained in EntityConditionList
-        assertEquals(1, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP", "encryptedValue", null).queryList()).size());
-        assertEquals(1, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP", "saltedEncryptedValue", null).queryList()).size());
-        assertEquals(1, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP", "encryptedValue", nanoTime).queryList()).size());
-        assertEquals(0, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP", "saltedEncryptedValue", nanoTime).queryList()).size());
-
-        assertEquals(1, EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP", "encryptedValue", nanoTime).queryList().size());
+        assertEquals(1, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP",
+                "encryptedValue", null).queryList()).size());
+        assertEquals(1, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP",
+                "saltedEncryptedValue", null).queryList()).size());
+        assertEquals(1, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP",
+                "encryptedValue", nanoTime).queryList()).size());
+        assertEquals(0, (EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP",
+                "saltedEncryptedValue", nanoTime).queryList()).size());
+
+        assertEquals(1, EntityQuery.use(delegator).from("TestingCrypto").where("testingCryptoTypeId", "LOOKUP",
+                "encryptedValue", nanoTime).queryList().size());
     }
 
+    /**
+     * Make sub select condition entity condition.
+     * @param nanoTime the nano time
+     * @return the entity condition
+     */
     protected EntityCondition makeSubSelectCondition(String nanoTime) {
         return EntityCondition.makeCondition(
             EntityCondition.makeCondition("testingCryptoTypeId", EntityOperator.IN, UtilMisc.toList("SUB_SELECT_1", "SUB_SELECT_3")),
@@ -133,11 +159,20 @@ public class EntityCryptoTestSuite extends EntityTestCase {
             EntityCondition.makeCondition("encryptedValue", EntityOperator.EQUALS, nanoTime));
     }
 
+    /**
+     * Make sub select entity condition sub select.
+     * @param nanoTime the nano time
+     * @return the entity condition sub select
+     */
     protected EntityConditionSubSelect makeSubSelect(String nanoTime) {
         EntityCondition subCondition = makeSubSelectCondition(nanoTime);
         return new EntityConditionSubSelect("TestingCrypto", "testingCryptoId", subCondition, true, delegator);
     }
 
+    /**
+     * Test crypto sub select.
+     * @throws Exception the exception
+     */
     public void testCryptoSubSelect() throws Exception {
         String nanoTime = "" + System.nanoTime();
         EntityCondition condition;
@@ -147,16 +182,20 @@ public class EntityCryptoTestSuite extends EntityTestCase {
         delegator.removeByAnd("TestingCrypto", UtilMisc.toMap("testingCryptoTypeId", "SUB_SELECT_2"));
         delegator.removeByAnd("TestingCrypto", UtilMisc.toMap("testingCryptoTypeId", "SUB_SELECT_3"));
 
-        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "SUB_1", "testingCryptoTypeId", "SUB_SELECT_1", "encryptedValue", nanoTime));
-        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "SUB_2", "testingCryptoTypeId", "SUB_SELECT_2", "encryptedValue", nanoTime));
-        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "SUB_3", "testingCryptoTypeId", "SUB_SELECT_3", "encryptedValue", "constant"));
+        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "SUB_1", "testingCryptoTypeId", "SUB_SELECT_1",
+                "encryptedValue", nanoTime));
+        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "SUB_2", "testingCryptoTypeId", "SUB_SELECT_2",
+                "encryptedValue", nanoTime));
+        delegator.create("TestingCrypto", UtilMisc.toMap("testingCryptoId", "SUB_3", "testingCryptoTypeId", "SUB_SELECT_3",
+                "encryptedValue", "constant"));
 
         results = EntityQuery.use(delegator).from("TestingCrypto").where("encryptedValue", nanoTime).orderBy("testingCryptoId").queryList();
         assertEquals(2, results.size());
         assertEquals("SUB_1", results.get(0).get("testingCryptoId"));
         assertEquals("SUB_2", results.get(1).get("testingCryptoId"));
 
-        results = EntityQuery.use(delegator).from("TestingCrypto").where(EntityCondition.makeCondition("testingCryptoTypeId", EntityOperator.IN, UtilMisc.toList("SUB_SELECT_1", "SUB_SELECT_3"))).orderBy("testingCryptoId").queryList();
+        results = EntityQuery.use(delegator).from("TestingCrypto").where(EntityCondition.makeCondition("testingCryptoTypeId",
+                EntityOperator.IN, UtilMisc.toList("SUB_SELECT_1", "SUB_SELECT_3"))).orderBy("testingCryptoId").queryList();
         assertEquals(2, results.size());
         assertEquals("SUB_1", results.get(0).get("testingCryptoId"));
         assertEquals("SUB_3", results.get(1).get("testingCryptoId"));
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java
index 21d2740..10385bf 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java
@@ -41,7 +41,7 @@ public class EntityQueryTestSuite extends EntityTestCase {
         super(name);
     }
 
-    /*
+    /**
      * queryCount(): This method returns number of records found for the particular query.
      * assert: Compared count of number of records found by Entity Engine method with count of number of records found by EntityQuery method.
      */
@@ -58,7 +58,7 @@ public class EntityQueryTestSuite extends EntityTestCase {
         assertEquals("queryCount(): Total Number of Records matched", totalRecordsByEntityEngine.size(), numberOfRecordsByEntityQuery);
     }
 
-    /*
+    /**
      * where(): This method is used for setting condition of which records to fetch from entity.
      * assert 1: Compared size of the list returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'testingTypeId' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -71,15 +71,20 @@ public class EntityQueryTestSuite extends EntityTestCase {
         testingTypes.add(delegator.makeValue("TestingType", "testingTypeId", "where-3", "description", "find me"));
         delegator.storeAll(testingTypes);
 
-        List<GenericValue> listByEntityEngine = delegator.findList("TestingType", EntityCondition.makeCondition("description", EntityOperator.EQUALS, "find me"), null, UtilMisc.toList("description"), null, false);
-        List<GenericValue> listByEntityQuery = EntityQuery.use(delegator).from("TestingType").where("description", "find me").orderBy("description").queryList();
-
-        assertEquals("where(): Number of records fetched by Entity Engine and by EntityQuery matched", listByEntityEngine.size(), listByEntityQuery.size());
-        assertEquals("where(): Record matched = testingTypeId", listByEntityEngine.get(0).getString("testingTypeId"), listByEntityQuery.get(0).getString("testingTypeId"));
-        assertEquals("where(): Record matched = description", listByEntityEngine.get(0).getString("description"), listByEntityQuery.get(0).getString("description"));
+        List<GenericValue> listByEntityEngine = delegator.findList("TestingType", EntityCondition.makeCondition("description",
+                EntityOperator.EQUALS, "find me"), null, UtilMisc.toList("description"), null, false);
+        List<GenericValue> listByEntityQuery = EntityQuery.use(delegator).from("TestingType").where("description", "find me")
+                .orderBy("description").queryList();
+
+        assertEquals("where(): Number of records fetched by Entity Engine and by EntityQuery matched", listByEntityEngine.size(),
+                listByEntityQuery.size());
+        assertEquals("where(): Record matched = testingTypeId", listByEntityEngine.get(0).getString("testingTypeId"),
+                listByEntityQuery.get(0).getString("testingTypeId"));
+        assertEquals("where(): Record matched = description", listByEntityEngine.get(0).getString("description"),
+                listByEntityQuery.get(0).getString("description"));
     }
 
-    /*
+    /**
      * queryList(): Returns all records from the given entity.
      * assert 1: Compared size of the list returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'testingTypeId' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -95,12 +100,15 @@ public class EntityQueryTestSuite extends EntityTestCase {
         List<GenericValue> listByEntityEngine = delegator.findList("TestingType", null, null, UtilMisc.toList("description"), null, false);
         List<GenericValue> listByEntityQuery = EntityQuery.use(delegator).from("TestingType").orderBy("description").queryList();
 
-        assertEquals("queryList(): Number of records fetched by Entity Engine and by EntityQuery matched", listByEntityEngine.size(), listByEntityQuery.size());
-        assertEquals("queryList(): Record matched = testingTypeId", listByEntityEngine.get(0).getString("testingTypeId"), listByEntityQuery.get(0).getString("testingTypeId"));
-        assertEquals("queryList(): Record matched = description", listByEntityEngine.get(0).getString("description"), listByEntityQuery.get(0).getString("description"));
+        assertEquals("queryList(): Number of records fetched by Entity Engine and by EntityQuery matched", listByEntityEngine.size(),
+                listByEntityQuery.size());
+        assertEquals("queryList(): Record matched = testingTypeId", listByEntityEngine.get(0).getString("testingTypeId"),
+                listByEntityQuery.get(0).getString("testingTypeId"));
+        assertEquals("queryList(): Record matched = description", listByEntityEngine.get(0).getString("description"),
+                listByEntityQuery.get(0).getString("description"));
     }
 
-    /*
+    /**
      * queryFirst(): Returns first record from result of query.
      * assert 1: Compared 'testingTypeId' field of record fetched by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'description' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -115,11 +123,13 @@ public class EntityQueryTestSuite extends EntityTestCase {
         GenericValue firstRecordByEntityEngine = EntityUtil.getFirst(delegator.findList("TestingType", null, null, null, null, false));
         GenericValue firstRecordByEntityQuery = EntityQuery.use(delegator).from("TestingType").queryFirst();
 
-        assertEquals("queryFirst(): Record matched = testingTypeId", firstRecordByEntityEngine.getString("testingTypeId"), firstRecordByEntityQuery.getString("testingTypeId"));
-        assertEquals("queryFirst(): Record matched = description", firstRecordByEntityEngine.getString("description"), firstRecordByEntityQuery.getString("description"));
+        assertEquals("queryFirst(): Record matched = testingTypeId", firstRecordByEntityEngine.getString("testingTypeId"),
+                firstRecordByEntityQuery.getString("testingTypeId"));
+        assertEquals("queryFirst(): Record matched = description", firstRecordByEntityEngine.getString("description"),
+                firstRecordByEntityQuery.getString("description"));
     }
 
-    /*
+    /**
      * queryOne(): This method returns only one record based on the conditions given.
      * assert 1: Compared 'testingTypeId' field of record fetched by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'description' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -134,11 +144,13 @@ public class EntityQueryTestSuite extends EntityTestCase {
         GenericValue findOneByEntityEngine = EntityQuery.use(delegator).from("TestingType").where("testingTypeId", "queryOne-2").queryOne();
         GenericValue queryOneByEntityQuery = EntityQuery.use(delegator).from("TestingType").where("testingTypeId", "queryOne-2").queryOne();
 
-        assertEquals("queryOne(): Record matched = testingTypeId", findOneByEntityEngine.getString("testingTypeId"), queryOneByEntityQuery.getString("testingTypeId"));
-        assertEquals("queryOne(): Record matched = description", findOneByEntityEngine.getString("description"), queryOneByEntityQuery.getString("description"));
+        assertEquals("queryOne(): Record matched = testingTypeId", findOneByEntityEngine.getString("testingTypeId"),
+                queryOneByEntityQuery.getString("testingTypeId"));
+        assertEquals("queryOne(): Record matched = description", findOneByEntityEngine.getString("description"),
+                queryOneByEntityQuery.getString("description"));
     }
 
-    /*
+    /**
      * queryOne(): This method returns only one record based on the conditions given, resolve from a context Map.
      * assert 1: Check the TestingType entity queryOneMap-2 has been resolve
      * assert 2: Check the TestingType entity queryOneMap-3 has been resolve with the parameters map present in context
@@ -158,10 +170,11 @@ public class EntityQueryTestSuite extends EntityTestCase {
                 "parameters", UtilMisc.toMap("testingTypeId", "queryOneMap-3", "description", "query three by map", "otherField", "otherValue"));
         GenericValue queryOneByEntityQueryAndParameters = EntityQuery.use(delegator).from("TestingType").where(context).queryOne();
         assertNotNull("queryOne() with parameters: Record found", queryOneByEntityQueryAndParameters);
-        assertEquals("queryOne() with parameters: Record is queryOneMap-3 ", "queryOneMap-3", queryOneByEntityQueryAndParameters.getString("testingTypeId"));
+        assertEquals("queryOne() with parameters: Record is queryOneMap-3 ", "queryOneMap-3",
+                queryOneByEntityQueryAndParameters.getString("testingTypeId"));
     }
 
-    /*
+    /**
      * select(): This method is used to select particular fields only from the entity.
      * assert 1: Compared value of first record of selected 'description' field by both EntityEngine method and EntityQuery method.
      * assert 2: Compared 'testingTypeId' field for null which is fetched by EntityQuery method.
@@ -173,15 +186,19 @@ public class EntityQueryTestSuite extends EntityTestCase {
         testingTypes.add(delegator.makeValue("TestingType", "testingTypeId", "select-3", "description", "description three"));
         delegator.storeAll(testingTypes);
 
-        List<GenericValue> selectByEntityEngine = delegator.findList("TestingType", null, UtilMisc.toSet("description"), UtilMisc.toList("description"), null, false);
-        List<GenericValue> selectByEntityQuery = EntityQuery.use(delegator).select("description").from("TestingType").orderBy("description").queryList();
+        List<GenericValue> selectByEntityEngine = delegator.findList("TestingType", null, UtilMisc.toSet("description"),
+                UtilMisc.toList("description"), null, false);
+        List<GenericValue> selectByEntityQuery = EntityQuery.use(delegator).select("description").from("TestingType")
+                .orderBy("description").queryList();
 
-        assertEquals("select(): Record matched = description", selectByEntityEngine.get(0).getString("description"), selectByEntityQuery.get(0).getString("description"));
+        assertEquals("select(): Record matched = description", selectByEntityEngine.get(0).getString("description"),
+                selectByEntityQuery.get(0).getString("description"));
         assertNull(selectByEntityQuery.get(0).getString("testingTypeId"));
     }
 
-    /*
-     * distinct(): This method is used to get distinct values of records from entity field. (Note: Distinct method is generally used with select method)
+    /**
+     * distinct(): This method is used to get distinct values of records from entity field.
+     * (Note: Distinct method is generally used with select method)
      * assert 1: Compared size of the list returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared value of first record of selected 'description' field by both EntityEngine method and EntityQuery method.
      * assert 3: Compared 'testingTypeId' field for null which is fetched by EntityQuery method.
@@ -195,15 +212,19 @@ public class EntityQueryTestSuite extends EntityTestCase {
 
         EntityFindOptions findOptions = new EntityFindOptions();
         findOptions.setDistinct(true);
-        List<GenericValue> distinctByEntityEngine = delegator.findList("TestingType", null, UtilMisc.toSet("description"), UtilMisc.toList("description"), findOptions, false);
-        List<GenericValue> distinctByEntityQuery = EntityQuery.use(delegator).select("description").from("TestingType").distinct().orderBy("description").queryList();
-
-        assertEquals("distinct(): Number of records found by EntityEngine method are matching with records found by EntityQuery distinct method", distinctByEntityEngine.size(), distinctByEntityQuery.size());
-        assertEquals("distinct(): Record matched = description", distinctByEntityEngine.get(0).getString("description"), distinctByEntityQuery.get(0).getString("description"));
+        List<GenericValue> distinctByEntityEngine = delegator.findList("TestingType", null, UtilMisc.toSet("description"),
+                UtilMisc.toList("description"), findOptions, false);
+        List<GenericValue> distinctByEntityQuery = EntityQuery.use(delegator).select("description").from("TestingType")
+                .distinct().orderBy("description").queryList();
+
+        assertEquals("distinct(): Number of records found by EntityEngine method are matching with records found by EntityQuery distinct method",
+                distinctByEntityEngine.size(), distinctByEntityQuery.size());
+        assertEquals("distinct(): Record matched = description", distinctByEntityEngine.get(0).getString("description"),
+                distinctByEntityQuery.get(0).getString("description"));
         assertNull(distinctByEntityQuery.get(0).getString("testingTypeId"));
     }
 
-    /*
+    /**
      * orderBy(): This method sorts the records found according to the given field or combination of fields.
      * assert 1: Compared number of records returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'testingTypeId' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -216,15 +237,19 @@ public class EntityQueryTestSuite extends EntityTestCase {
         testingTypes.add(delegator.makeValue("TestingType", "testingTypeId", "orderBy-3", "description", "A"));
         delegator.storeAll(testingTypes);
 
-        List<GenericValue> orderedByEntityEngine = delegator.findList("TestingType", EntityCondition.makeCondition("testingTypeId", EntityOperator.LIKE, "orderBy-%"), null, UtilMisc.toList("description"), null, false);
-        List<GenericValue> orderedByEntityQuery = EntityQuery.use(delegator).from("TestingType").where(EntityCondition.makeCondition("testingTypeId", EntityOperator.LIKE, "orderBy-%")).orderBy("description").queryList();
+        List<GenericValue> orderedByEntityEngine = delegator.findList("TestingType", EntityCondition.makeCondition("testingTypeId",
+                EntityOperator.LIKE, "orderBy-%"), null, UtilMisc.toList("description"), null, false);
+        List<GenericValue> orderedByEntityQuery = EntityQuery.use(delegator).from("TestingType").where(EntityCondition.makeCondition("testingTypeId",
+                EntityOperator.LIKE, "orderBy-%")).orderBy("description").queryList();
 
         assertEquals("orderBy(): Number of records found by both the methods matched", orderedByEntityEngine.size(), orderedByEntityQuery.size());
-        assertEquals("orderBy(): Record matched = testingTypeId", orderedByEntityEngine.get(0).getString("testingTypeId"), orderedByEntityQuery.get(0).getString("testingTypeId"));
-        assertEquals("orderBy(): Record matched = description", orderedByEntityEngine.get(0).getString("description"), orderedByEntityQuery.get(0).getString("description"));
+        assertEquals("orderBy(): Record matched = testingTypeId", orderedByEntityEngine.get(0).getString("testingTypeId"),
+                orderedByEntityQuery.get(0).getString("testingTypeId"));
+        assertEquals("orderBy(): Record matched = description", orderedByEntityEngine.get(0).getString("description"),
+                orderedByEntityQuery.get(0).getString("description"));
     }
 
-    /*
+    /**
      * filteByDate(): This method return only values that are currently active using from/thruDate fields.
      * assert 1: Compared number of records returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'testingNodeId' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -245,22 +270,33 @@ public class EntityQueryTestSuite extends EntityTestCase {
         delegator.create("TestingNode", "testingNodeId", "testingNode-3");
         delegator.create("TestingNode", "testingNodeId", "testingNode-4");
 
-        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-1", "testingId", "testing-1", "fromDate", UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()));
-        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-2", "testingId", "testing-2", "fromDate", UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()));
-        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-3", "testingId", "testing-3", "fromDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getWeekEnd(UtilDateTime.nowTimestamp()));
-        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-4", "testingId", "testing-4", "fromDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()));
-
-        List<GenericValue> filteredByEntityUtil = EntityUtil.filterByDate(delegator.findList("TestingNodeMember", null, null, UtilMisc.toList("testingNodeId"), null, false));
-        List<GenericValue> filteredByEntityQuery = EntityQuery.use(delegator).from("TestingNodeMember").filterByDate().orderBy("testingNodeId").queryList();
-
-        assertEquals("filterByDate(): Number of records found by both the methods matched", filteredByEntityUtil.size(), filteredByEntityQuery.size());
-        assertEquals("filterByDate(): Record matched = testingNodeId", filteredByEntityUtil.get(0).getString("testingNodeId"), filteredByEntityQuery.get(0).getString("testingNodeId"));
-        assertEquals("filterByDate(): Record matched = testingId", filteredByEntityUtil.get(0).getString("testingId"), filteredByEntityQuery.get(0).getString("testingId"));
-        assertEquals("filterByDate(): Record matched = fromDate", filteredByEntityUtil.get(0).getString("fromDate"), filteredByEntityQuery.get(0).getString("fromDate"));
-        assertEquals("filterByDate(): Record matched = thruDate", filteredByEntityUtil.get(0).getString("thruDate"), filteredByEntityQuery.get(0).getString("thruDate"));
+        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-1", "testingId", "testing-1", "fromDate",
+                UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()));
+        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-2", "testingId", "testing-2", "fromDate",
+                UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()));
+        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-3", "testingId", "testing-3", "fromDate",
+                UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getWeekEnd(UtilDateTime.nowTimestamp()));
+        delegator.create("TestingNodeMember", "testingNodeId", "testingNode-4", "testingId", "testing-4", "fromDate",
+                UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()));
+
+        List<GenericValue> filteredByEntityUtil = EntityUtil.filterByDate(delegator.findList("TestingNodeMember", null, null,
+                UtilMisc.toList("testingNodeId"), null, false));
+        List<GenericValue> filteredByEntityQuery = EntityQuery.use(delegator).from("TestingNodeMember").filterByDate()
+                .orderBy("testingNodeId").queryList();
+
+        assertEquals("filterByDate(): Number of records found by both the methods matched", filteredByEntityUtil.size(),
+                filteredByEntityQuery.size());
+        assertEquals("filterByDate(): Record matched = testingNodeId", filteredByEntityUtil.get(0).getString("testingNodeId"),
+                filteredByEntityQuery.get(0).getString("testingNodeId"));
+        assertEquals("filterByDate(): Record matched = testingId", filteredByEntityUtil.get(0).getString("testingId"),
+                filteredByEntityQuery.get(0).getString("testingId"));
+        assertEquals("filterByDate(): Record matched = fromDate", filteredByEntityUtil.get(0).getString("fromDate"),
+                filteredByEntityQuery.get(0).getString("fromDate"));
+        assertEquals("filterByDate(): Record matched = thruDate", filteredByEntityUtil.get(0).getString("thruDate"),
+                filteredByEntityQuery.get(0).getString("thruDate"));
     }
 
-    /*
+    /**
      * maxRows(): This method sets the maximum number of records to be fetched by the query.
      * assert 1: Compared number of records returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'testingTypeId' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -279,11 +315,13 @@ public class EntityQueryTestSuite extends EntityTestCase {
         List<GenericValue> maxRowsByEntityQuery = EntityQuery.use(delegator).from("TestingType").maxRows(2).orderBy("description").queryList();
 
         assertEquals("maxRows(): Number of records found by both the methods matched", maxRowsByEntityEngine.size(), maxRowsByEntityQuery.size());
-        assertEquals("maxRows(): Record matched = testingTypeId", maxRowsByEntityEngine.get(0).getString("testingTypeId"), maxRowsByEntityQuery.get(0).getString("testingTypeId"));
-        assertEquals("maxRows(): Record matched = description", maxRowsByEntityEngine.get(0).getString("description"), maxRowsByEntityQuery.get(0).getString("description"));
+        assertEquals("maxRows(): Record matched = testingTypeId", maxRowsByEntityEngine.get(0).getString("testingTypeId"),
+                maxRowsByEntityQuery.get(0).getString("testingTypeId"));
+        assertEquals("maxRows(): Record matched = description", maxRowsByEntityEngine.get(0).getString("description"),
+                maxRowsByEntityQuery.get(0).getString("description"));
     }
 
-    /*
+    /**
      * fetchSize(): This method sets the fetch size for the records to be fetched from the entity.
      * assert 1: Compared number of records returned by Entity Engine method and by EntityQuery method.
      * assert 2: Compared 'testingTypeId' field of first record fetched by Entity Engine method and by EntityQuery method.
@@ -298,15 +336,19 @@ public class EntityQueryTestSuite extends EntityTestCase {
 
         EntityFindOptions findOptions = new EntityFindOptions();
         findOptions.setFetchSize(2);
-        List<GenericValue> fetchSizeByEntityEngine = delegator.findList("TestingType", null, null, UtilMisc.toList("description"), findOptions, false);
+        List<GenericValue> fetchSizeByEntityEngine = delegator.findList("TestingType", null, null,
+                UtilMisc.toList("description"), findOptions, false);
         List<GenericValue> fetchSizeByEntityQuery = EntityQuery.use(delegator).from("TestingType").fetchSize(2).orderBy("description").queryList();
 
-        assertEquals("fetchSize(): Number of records found by both the methods matched", fetchSizeByEntityEngine.size(), fetchSizeByEntityQuery.size());
-        assertEquals("fetchSize(): Record matched = testingTypeId", fetchSizeByEntityEngine.get(0).getString("testingTypeId"), fetchSizeByEntityQuery.get(0).getString("testingTypeId"));
-        assertEquals("fetchSize(): Record matched = description", fetchSizeByEntityEngine.get(0).getString("description"), fetchSizeByEntityQuery.get(0).getString("description"));
+        assertEquals("fetchSize(): Number of records found by both the methods matched", fetchSizeByEntityEngine.size(),
+                fetchSizeByEntityQuery.size());
+        assertEquals("fetchSize(): Record matched = testingTypeId", fetchSizeByEntityEngine.get(0).getString("testingTypeId"),
+                fetchSizeByEntityQuery.get(0).getString("testingTypeId"));
+        assertEquals("fetchSize(): Record matched = description", fetchSizeByEntityEngine.get(0).getString("description"),
+                fetchSizeByEntityQuery.get(0).getString("description"));
     }
 
-    /*
+    /**
      * queryIterator(): This method is used to get iterator object over the entity.
      * assert: Compared first record of both the iterator.
      */
@@ -339,7 +381,7 @@ public class EntityQueryTestSuite extends EntityTestCase {
         }
     }
 
-    /*
+    /**
      * cursorForwardOnly(): Indicate that the ResultSet object's cursor may move only forward
      * assert: Compared first record found by both the iterator.
      */
@@ -364,7 +406,8 @@ public class EntityQueryTestSuite extends EntityTestCase {
             GenericValue nextRecordByEntityEngine = eliByEntityEngine.next();
             GenericValue nextRecordByEntityQuery = eliByEntityQuery.next();
 
-            assertEquals("cursorForwardOnly(): Value of first record pointed by both iterators matched", nextRecordByEntityEngine, nextRecordByEntityQuery);
+            assertEquals("cursorForwardOnly(): Value of first record pointed by both iterators matched", nextRecordByEntityEngine,
+                    nextRecordByEntityQuery);
             eliByEntityEngine.close();
             eliByEntityQuery.close();
 
@@ -374,7 +417,7 @@ public class EntityQueryTestSuite extends EntityTestCase {
         }
     }
 
-    /*
+    /**
      * cursorScrollSensitive(): ResultSet object's cursor is scrollable but generally sensitive to changes to the data that underlies the ResultSet.
      * assert: Compared first record found by both the iterators.
      */
@@ -399,7 +442,8 @@ public class EntityQueryTestSuite extends EntityTestCase {
             GenericValue nextRecordByDelegator = eliByEntityEngine.next();
             GenericValue nextRecordByEntityQuery = eliByEntityQuery.next();
 
-            assertEquals("cursorScrollSensitive(): Records by delegator method and by EntityQuery method matched", nextRecordByDelegator, nextRecordByEntityQuery);
+            assertEquals("cursorScrollSensitive(): Records by delegator method and by EntityQuery method matched", nextRecordByDelegator,
+                    nextRecordByEntityQuery);
             eliByEntityEngine.close();
             eliByEntityQuery.close();
 
@@ -409,8 +453,9 @@ public class EntityQueryTestSuite extends EntityTestCase {
         }
     }
 
-    /*
-     * cursorScrollInSensitive(): ResultSet object's cursor is scrollable but generally not sensitive to changes to the data that underlies the ResultSet.
+    /**
+     * cursorScrollInSensitive(): ResultSet object's cursor is scrollable but generally not sensitive to changes to the data that
+     * underlies the ResultSet.
      * assert: Compared first record found by both the iterators.
      */
     public void testCursorScrollInSensitive() throws GenericEntityException {
@@ -434,7 +479,8 @@ public class EntityQueryTestSuite extends EntityTestCase {
             GenericValue nextRecordByDelegator = eliByEntityEngine.next();
             GenericValue nextRecordByEntityQuery = eliByEntityQuery.next();
 
-            assertEquals("cursorScrollInSensitive(): Records by delegator method and by EntityQuery method matched", nextRecordByDelegator, nextRecordByEntityQuery);
+            assertEquals("cursorScrollInSensitive(): Records by delegator method and by EntityQuery method matched",
+                    nextRecordByDelegator, nextRecordByEntityQuery);
             eliByEntityEngine.close();
             eliByEntityQuery.close();
 
@@ -443,4 +489,4 @@ public class EntityQueryTestSuite extends EntityTestCase {
             TransactionUtil.rollback(transactionStarted, "Transaction is Rolled Back", e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java
index c0bd469..86b1145 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java
@@ -43,11 +43,15 @@ public class EntityUtilTestSuite extends EntityTestCase {
     private List<GenericValue> prepareGenericValueList() {
         List<GenericValue> newValues = new ArrayList<>();
         for (int i = 0; i < TEST_COUNT; i++) {
-            newValues.add(delegator.makeValue("Testing", "testingId", StringUtil.padNumberString(String.valueOf(i), 5), "description", "Description " + i % 10));
+            newValues.add(delegator.makeValue("Testing", "testingId", StringUtil.padNumberString(String.valueOf(i), 5),
+                    "description", "Description " + i % 10));
         }
         return newValues;
     }
 
+    /**
+     * Test get field list from entity list.
+     */
     public void testGetFieldListFromEntityList() {
         List<GenericValue> newValues = prepareGenericValueList();
         List<String> descriptionList = EntityUtil.getFieldListFromEntityList(newValues, "description", false);
@@ -60,6 +64,9 @@ public class EntityUtilTestSuite extends EntityTestCase {
         assertEquals("Get first description value", "Description 0", descriptionList.get(0));
     }
 
+    /**
+     * Test filter by condition.
+     */
     public void testFilterByCondition() {
         List<GenericValue> newValues = prepareGenericValueList();
         EntityExpr condition = EntityCondition.makeCondition("description", "Description 0");
@@ -72,6 +79,9 @@ public class EntityUtilTestSuite extends EntityTestCase {
         assertEquals("Get first description value", "Description 1", filteredValues.get(0).get("description"));
     }
 
+    /**
+     * Test filter by and.
+     */
     public void testFilterByAnd() {
         List<GenericValue> newValues = prepareGenericValueList();
         List<EntityExpr> condition = UtilMisc.toList(EntityCondition.makeCondition("description", "Description 0"),
@@ -89,6 +99,9 @@ public class EntityUtilTestSuite extends EntityTestCase {
                         "Description 0", genericValue.get("description")));
     }
 
+    /**
+     * Test filter by or.
+     */
     public void testFilterByOr() {
         List<GenericValue> newValues = prepareGenericValueList();
         List<EntityExpr> condition = UtilMisc.toList(EntityCondition.makeCondition("description", "Description 0"),
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
index c3a0e8b..48270e7 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
@@ -55,14 +55,14 @@ public class DebugXaResource extends GenericXaResource {
     @Override
     public void enlist() throws XAException {
         super.enlist();
-        TransactionUtil.DEBUG_RES_MAP.put(xid, this);
+        TransactionUtil.DEBUG_RES_MAP.put(getXid(), this);
     }
 
     /**
      * Log.
      */
     public void log() {
-        Debug.logInfo("Xid : " + xid, MODULE);
+        Debug.logInfo("Xid : " + getXid(), MODULE);
         Debug.logInfo(ex, MODULE);
     }
 }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
index 3730512..b4bc096 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
@@ -36,11 +36,12 @@ public abstract class GenericXaResource extends Thread implements XAResource {
 
     private static final String MODULE = GenericXaResource.class.getName();
 
-    protected Transaction trans = null;
-    protected boolean active = false;
-    /** timeout is an Integer and defaults to null so that we know if it is set on this object; if it isn't set we won't worry about the warning message, etc because we don't know what the real timeout is */
-    protected Integer timeout = null;
-    protected Xid xid = null;
+    private Transaction trans = null;
+    private boolean active = false;
+    /** timeout is an Integer and defaults to null so that we know if it is set on this object; if it isn't set we won't worry
+     * about the warning message, etc because we don't know what the real timeout is */
+    private Integer timeout = null;
+    private Xid xid = null;
 
     /**
      * Enlists this resource in the current transaction
@@ -154,14 +155,50 @@ public abstract class GenericXaResource extends Thread implements XAResource {
         return true;
     }
 
+    /**
+     * Gets transaction.
+     * @return the transaction
+     */
     public Transaction getTransaction() {
         return this.trans;
     }
 
+    /**
+     * Sets transaction.
+     * @param t the t
+     */
     public void setTransaction(Transaction t) {
         this.trans = t;
     }
 
+    /**
+     * Sets active.
+     * @param active the active
+     */
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    /**
+     * Is active boolean.
+     * @return the boolean
+     */
+    public boolean isActive() {
+        return active;
+    }
+
+    /**
+     * Sets xid.
+     * @param xid the xid
+     */
+    public void setXid(Xid xid) {
+        this.xid = xid;
+    }
+
+    /**
+     * Gets xid.
+     * @return the xid
+     */
     public Xid getXid() {
         return this.xid;
     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/ByteWrapper.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/ByteWrapper.java
index d64d4d8..27639d8 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/ByteWrapper.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/ByteWrapper.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
 @SuppressWarnings("serial")
 @Deprecated
 public class ByteWrapper implements Serializable {
-    protected byte[] bytes;
+    private byte[] bytes;
 
     protected ByteWrapper() { }
 
@@ -38,14 +38,27 @@ public class ByteWrapper implements Serializable {
         this.bytes = bytes;
     }
 
+    /**
+     * Get bytes byte [ ].
+     * @return the byte [ ]
+     */
     public byte[] getBytes() {
         return bytes;
     }
 
+    /**
+     * Gets byte.
+     * @param pos the pos
+     * @return the byte
+     */
     public byte getByte(int pos) {
         return bytes[pos];
     }
 
+    /**
+     * Gets length.
+     * @return the length
+     */
     public int getLength() {
         return bytes.length;
     }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
index 2a373bf..bebb3ef 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
@@ -47,18 +47,18 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
     /** Module Name Used for debugging */
     private static final String MODULE = EntityListIterator.class.getName();
 
-    protected SQLProcessor sqlp;
-    protected ResultSet resultSet;
-    protected ModelEntity modelEntity;
-    protected List<ModelField> selectFields;
-    protected ModelFieldTypeReader modelFieldTypeReader;
-    protected boolean closed = false;
-    protected boolean haveMadeValue = false;
-    protected Delegator delegator = null;
-    protected GenericDAO genericDAO = null;
-    protected EntityCondition whereCondition = null;
-    protected EntityCondition havingCondition = null;
-    protected boolean distinctQuery = false;
+    private SQLProcessor sqlp;
+    private ResultSet resultSet;
+    private ModelEntity modelEntity;
+    private List<ModelField> selectFields;
+    private ModelFieldTypeReader modelFieldTypeReader;
+    private boolean closed = false;
+    private boolean haveMadeValue = false;
+    private Delegator delegator = null;
+    private GenericDAO genericDAO = null;
+    private EntityCondition whereCondition = null;
+    private EntityCondition havingCondition = null;
+    private boolean distinctQuery = false;
 
     private boolean haveShowHasNextWarning = false;
     private Integer resultSize = null;
@@ -67,8 +67,8 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
         this(sqlp, modelEntity, selectFields, modelFieldTypeReader, null, null, null, false);
     }
 
-    public EntityListIterator(SQLProcessor sqlp, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader, GenericDAO genericDAO,
-            EntityCondition whereCondition, EntityCondition havingCondition, boolean distinctQuery) {
+    public EntityListIterator(SQLProcessor sqlp, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader,
+                              GenericDAO genericDAO, EntityCondition whereCondition, EntityCondition havingCondition, boolean distinctQuery) {
         this(sqlp.getResultSet(), modelEntity, selectFields, modelFieldTypeReader);
         this.sqlp = sqlp;
         this.genericDAO = genericDAO;
@@ -77,7 +77,8 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
         this.distinctQuery = distinctQuery;
     }
 
-    public EntityListIterator(ResultSet resultSet, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader) {
+    public EntityListIterator(ResultSet resultSet, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader
+            modelFieldTypeReader) {
         this.sqlp = null;
         this.resultSet = resultSet;
         this.modelEntity = modelEntity;
@@ -85,6 +86,10 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
         this.modelFieldTypeReader = modelFieldTypeReader;
     }
 
+    /**
+     * Sets delegator.
+     * @param delegator the delegator
+     */
     public void setDelegator(Delegator delegator) {
         this.delegator = delegator;
     }
@@ -277,8 +282,8 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
             // DEJ20050207 To further discourage use of this, and to find existing use, always log a big warning showing where it is used:
             Exception whereAreWe = new Exception();
             Debug.logWarning(whereAreWe,
-                    "For performance reasons do not use the EntityListIterator.hasNext() method, just call next() until it returns null; see JavaDoc comments in the EntityListIterator class for details and an example",
-                    MODULE);
+                    "For performance reasons do not use the EntityListIterator.hasNext() method, just call next() until it returns null; "
+                            + "see JavaDoc comments in the EntityListIterator class for details and an example", MODULE);
 
             haveShowHasNextWarning = true;
         }
@@ -312,7 +317,8 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
     }
 
     /**
-     * Moves the cursor to the next position and returns the value for that position; For example, you could use the following to iterate through the results in an
+     * Moves the cursor to the next position and returns the value for that position; For example, you could use the following
+     * to iterate through the results in an
      * EntityListIterator:
      * GenericValue nextValue = null; while ((nextValue = (GenericValue) this.next()) != null) { ... }
      * @return the next element or null, if there is no next element.
@@ -432,8 +438,9 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
      */
     public List<GenericValue> getPartialList(int start, int number) throws GenericEntityException {
         try {
-            if (number == 0)
+            if (number == 0) {
                 return new ArrayList<>(0);
+            }
 
             // just in case the caller missed the 1 based thingy
             if (start == 0) start = 1;
@@ -534,7 +541,8 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
 
     /**
      * Tries to close the {@link EntityListIterator} and logs a warning if it isn't already closed.
-     * Catches the {@link GenericEntityException} thrown by {@link #close()} and logs it. If you want to handle the exception yourself, use {@link #closeWithWarning()}.
+     * Catches the {@link GenericEntityException} thrown by {@link #close()} and logs it. If you want to handle the exception
+     * yourself, use {@link #closeWithWarning()}.
      * @param warningMessage
      *            the warning to be logged.
      */
@@ -543,7 +551,8 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa
             try {
                 this.close();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Error auto-closing EntityListIterator on error, so info below for more info on original error; close error: %s", MODULE, e.toString());
+                Debug.logError(e, "Error auto-closing EntityListIterator on error, so info below for more info on original error; close error: %s",
+                        MODULE, e.toString());
             }
             Debug.logWarning(warningMessage, MODULE);
         }
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
index 6d9222d..8a63d31 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
@@ -256,20 +256,38 @@ public class EntityQuery {
         return this;
     }
 
+    /**
+     * Offset entity query.
+     * @param offset the offset
+     * @return the entity query
+     */
     public EntityQuery offset(int offset) {
         this.offset = offset;
         return this;
     }
 
+    /**
+     * Gets offset.
+     * @return the offset
+     */
     public Integer getOffset() {
         return this.offset;
     }
 
+    /**
+     * Limit entity query.
+     * @param limit the limit
+     * @return the entity query
+     */
     public EntityQuery limit(int limit) {
         this.limit = limit;
         return this;
     }
 
+    /**
+     * Gets limit.
+     * @return the limit
+     */
     public Integer getLimit() {
         return this.limit;
     }
@@ -346,23 +364,27 @@ public class EntityQuery {
     }
 
     /** Specifies whether the query should return only values that are currently active using the specified from/thru field name pairs.
-     * @param filterByFieldName - String pairs representing the from/thru date field names e.g. "fromDate", "thruDate", "contactFromDate", "contactThruDate"
+     * @param filterByFieldName - String pairs representing the from/thru date field names e.g. "fromDate", "thruDate",
+     * "contactFromDate", "contactThruDate"
      * @return this EntityQuery object, to enable chaining
      */
     public EntityQuery filterByDate(String... filterByFieldName) {
         return this.filterByDate(null, filterByFieldName);
     }
 
-    /** Specifies whether the query should return only values that are active during the specified moment using the specified from/thru field name pairs.
+    /** Specifies whether the query should return only values that are active during the specified moment using the specified
+     * from/thru field name pairs.
      * @param moment - Timestamp representing the moment in time that the values should be active during
-     * @param filterByFieldName - String pairs representing the from/thru date field names e.g. "fromDate", "thruDate", "contactFromDate", "contactThruDate"
+     * @param filterByFieldName - String pairs representing the from/thru date field names e.g. "fromDate", "thruDate",
+     * "contactFromDate", "contactThruDate"
      * @return this EntityQuery object, to enable chaining
      */
     public EntityQuery filterByDate(Timestamp moment, String... filterByFieldName) {
         this.filterByDate = true;
         this.filterByDateMoment = moment;
         if (filterByFieldName.length % 2 != 0) {
-            throw new IllegalArgumentException("You must pass an even sized array to this method, each pair should represent a from date field name and a thru date field name");
+            throw new IllegalArgumentException("You must pass an even sized array to this method, "
+                    + "each pair should represent a from date field name and a thru date field name");
         }
         this.filterByFieldNames = Arrays.asList(filterByFieldName);
         return this;
@@ -443,7 +465,8 @@ public class EntityQuery {
         }
         List<GenericValue> result = null;
         if (dynamicViewEntity == null) {
-            result = delegator.findList(entityName, makeWhereCondition(useCache), havingEntityCondition, fieldsToSelect, orderBy, findOptions, useCache);
+            result = delegator.findList(entityName, makeWhereCondition(useCache), havingEntityCondition, fieldsToSelect, orderBy,
+                    findOptions, useCache);
         } else {
             try (EntityListIterator it = queryIterator()) {
                 result = it.getCompleteList();
@@ -528,7 +551,7 @@ public class EntityQuery {
      * @return list with field values
      * @throws GenericEntityException
      */
-    public <T> List<T> getFieldList(final String fieldName) throws GenericEntityException {select(fieldName);
+    public <T> List<T> getFieldList(final String fieldName) throws GenericEntityException {
         select(fieldName);
         cache(false);
         try (EntityListIterator genericValueEli = queryIterator()) {
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
index 4f4fd63..41bb10c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
@@ -97,7 +97,7 @@ public class EntitySaxReader extends DefaultHandler {
     private boolean createDummyFks = false;
     private boolean checkDataOnly = false;
     private boolean continueOnFail = false;
-    private enum Action {CREATE, CREATE_UPDATE, CREATE_REPLACE, DELETE}
+    private enum Action { CREATE, CREATE_UPDATE, CREATE_REPLACE, DELETE }
     private List<String> actionTags = UtilMisc.toList("create", "create-update", "create-replace", "delete");
     private Action currentAction = Action.CREATE_UPDATE;
     private List<Object> messageList = null;
@@ -110,7 +110,8 @@ public class EntitySaxReader extends DefaultHandler {
     private Node rootNodeForTemplate = null;
     private Node currentNodeForTemplate = null;
     private Document documentForTemplate = null;
-    private Map<String, Object> placeholderValues = null; //contains map of values for corresponding placeholders (eg. ${key}) in the entity xml data file.
+    private Map<String, Object> placeholderValues = null;
+    //contains map of values for corresponding placeholders (eg. ${key}) in the entity xml data file.
 
     protected EntitySaxReader() { }
 
@@ -124,14 +125,27 @@ public class EntitySaxReader extends DefaultHandler {
         this(delegator, DEFAULT_TX_TIMEOUT);
     }
 
+    /**
+     * Gets transaction timeout.
+     * @return the transaction timeout
+     */
     public int getTransactionTimeout() {
         return this.transactionTimeout;
     }
 
+    /**
+     * Sets use try insert method.
+     * @param value the value
+     */
     public void setUseTryInsertMethod(boolean value) {
         this.useTryInsertMethod = value;
     }
 
+    /**
+     * Sets transaction timeout.
+     * @param transactionTimeout the transaction timeout
+     * @throws GenericTransactionException the generic transaction exception
+     */
     public void setTransactionTimeout(int transactionTimeout) throws GenericTransactionException {
         if (this.transactionTimeout != transactionTimeout) {
             TransactionUtil.setTransactionTimeout(transactionTimeout);
@@ -139,26 +153,50 @@ public class EntitySaxReader extends DefaultHandler {
         }
     }
 
+    /**
+     * Sets maintain tx stamps.
+     * @param maintainTxStamps the maintain tx stamps
+     */
     public void setMaintainTxStamps(boolean maintainTxStamps) {
         this.maintainTxStamps = maintainTxStamps;
     }
 
+    /**
+     * Sets create dummy fks.
+     * @param createDummyFks the create dummy fks
+     */
     public void setCreateDummyFks(boolean createDummyFks) {
         this.createDummyFks = createDummyFks;
     }
 
+    /**
+     * Sets check data only.
+     * @param checkDataOnly the check data only
+     */
     public void setCheckDataOnly(boolean checkDataOnly) {
         this.checkDataOnly = checkDataOnly;
     }
 
+    /**
+     * Sets continue on fail.
+     * @param continueOnFail the continue on fail
+     */
     public void setContinueOnFail(boolean continueOnFail) {
         this.continueOnFail = continueOnFail;
     }
 
+    /**
+     * Sets placeholder values.
+     * @param placeholderValues the placeholder values
+     */
     public void setPlaceholderValues(Map<String, Object> placeholderValues) {
         this.placeholderValues = placeholderValues;
     }
 
+    /**
+     * Gets message list.
+     * @return the message list
+     */
     public List<Object> getMessageList() {
         if (this.checkDataOnly && this.messageList == null) {
             messageList = new LinkedList<>();
@@ -166,6 +204,10 @@ public class EntitySaxReader extends DefaultHandler {
         return this.messageList;
     }
 
+    /**
+     * Sets disable eeca.
+     * @param disableEeca the disable eeca
+     */
     public void setDisableEeca(boolean disableEeca) {
         if (disableEeca) {
             if (this.ecaHandler == null) {
@@ -183,6 +225,13 @@ public class EntitySaxReader extends DefaultHandler {
         this.currentAction = action;
     }
 
+    /**
+     * Parse long.
+     * @param content the content
+     * @return the long
+     * @throws SAXException the sax exception
+     * @throws IOException the io exception
+     */
     public long parse(String content) throws SAXException, java.io.IOException {
         if (content == null) {
             Debug.logWarning("content was null, doing nothing", MODULE);
@@ -190,10 +239,17 @@ public class EntitySaxReader extends DefaultHandler {
         }
 
         try (ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes("UTF-8"))) {
-        return this.parse(bis, "Internal Content");
+            return this.parse(bis, "Internal Content");
         }
     }
 
+    /**
+     * Parse long.
+     * @param location the location
+     * @return the long
+     * @throws SAXException the sax exception
+     * @throws IOException the io exception
+     */
     public long parse(URL location) throws SAXException, java.io.IOException {
         if (location == null) {
             Debug.logWarning("location URL was null, doing nothing", MODULE);
@@ -260,11 +316,17 @@ public class EntitySaxReader extends DefaultHandler {
     }
 
     private void countValue(boolean skip, boolean exist) {
-        if (skip) numberSkipped++;
-        else if (Action.DELETE == currentAction) numberDeleted++;
-        else if (Action.CREATE == currentAction || !exist) numberCreated++;
-        else if (Action.CREATE_REPLACE == currentAction) numberReplaced++;
-        else numberUpdated++;
+        if (skip) {
+            numberSkipped++;
+        } else if (Action.DELETE == currentAction) {
+            numberDeleted++;
+        } else if (Action.CREATE == currentAction || !exist) {
+            numberCreated++;
+        } else if (Action.CREATE_REPLACE == currentAction) {
+            numberReplaced++;
+        } else {
+            numberUpdated++;
+        }
     }
 
     // ======== ContentHandler interface implementation ========
@@ -386,7 +448,8 @@ public class EntitySaxReader extends DefaultHandler {
                 }
                 currentFieldName = null;
             } else {
-                // before we write currentValue check to see if PK is there, if not and it is one field, generate it from a sequence using the entity name
+                // before we write currentValue check to see if PK is there, if not and it is one field, generate it
+                // from a sequence using the entity name
                 if (!currentValue.containsPrimaryKey()) {
                     if (currentValue.getModelEntity().getPksSize() == 1) {
                         ModelField modelField = currentValue.getModelEntity().getOnlyPk();
@@ -407,10 +470,15 @@ public class EntitySaxReader extends DefaultHandler {
                         if (currentValue.containsPrimaryKey()) {
                             try {
                                 helper.findByPrimaryKey(currentValue.getPrimaryKey());
-                            } catch (GenericEntityNotFoundException e) {exist = false;}
+                            } catch (GenericEntityNotFoundException e) {
+                                exist = false;
+                            }
+                        }
+                        if (Action.CREATE == currentAction && exist) {
+                            skip = true;
+                        } else if (Action.DELETE == currentAction && !exist) {
+                            skip = true;
                         }
-                        if (Action.CREATE == currentAction && exist) { skip = true; }
-                        else if (Action.DELETE == currentAction && !exist) { skip = true; }
                     }
                     if (!skip) {
                         if (this.useTryInsertMethod && !this.checkDataOnly) {
@@ -576,7 +644,8 @@ public class EntitySaxReader extends DefaultHandler {
                                 currentValue.setString(name.toString(), valueString);
                                 if (Action.CREATE_REPLACE == currentAction && absentFields != null) absentFields.remove(name);
                             } else {
-                                Debug.logWarning("Ignoring invalid field name [" + name + "] found for the entity: " + currentValue.getEntityName() + " with value=" + value, MODULE);
+                                Debug.logWarning("Ignoring invalid field name [" + name + "] found for the entity: " + currentValue.getEntityName()
+                                        + " with value=" + value, MODULE);
                             }
                         }
                     } catch (Exception e) {
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
index bbd9337..cf38361 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
@@ -43,9 +43,9 @@ public class EntityCacheServices implements DistributedCacheClear {
 
     private static final String MODULE = EntityCacheServices.class.getName();
 
-    protected Delegator delegator = null;
-    protected LocalDispatcher dispatcher = null;
-    protected String userLoginId = null;
+    private Delegator delegator = null;
+    private LocalDispatcher dispatcher = null;
+    private String userLoginId = null;
 
     public EntityCacheServices() { }
 
@@ -56,6 +56,10 @@ public class EntityCacheServices implements DistributedCacheClear {
         this.userLoginId = userLoginId;
     }
 
+    /**
+     * Gets auth user login.
+     * @return the auth user login
+     */
     public GenericValue getAuthUserLogin() {
         GenericValue userLogin = null;
         try {
@@ -70,13 +74,15 @@ public class EntityCacheServices implements DistributedCacheClear {
     public void distributedClearCacheLine(GenericValue value) {
         // Debug.logInfo("running distributedClearCacheLine for value: " + value, MODULE);
         if (this.dispatcher == null) {
-            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, not running distributed cache clear", MODULE);
+            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called,"
+                    + " not running distributed cache clear", MODULE);
             return;
         }
 
         GenericValue userLogin = getAuthUserLogin();
         if (userLogin == null) {
-            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId + "], not clearing remote caches.", MODULE);
+            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId
+                    + "], not clearing remote caches.", MODULE);
             return;
         }
 
@@ -91,13 +97,15 @@ public class EntityCacheServices implements DistributedCacheClear {
     public void distributedClearCacheLineFlexible(GenericEntity dummyPK) {
         // Debug.logInfo("running distributedClearCacheLineFlexible for dummyPK: " + dummyPK, MODULE);
         if (this.dispatcher == null) {
-            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, not running distributed cache clear", MODULE);
+            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, "
+                    + "not running distributed cache clear", MODULE);
             return;
         }
 
         GenericValue userLogin = getAuthUserLogin();
         if (userLogin == null) {
-            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId + "], not clearing remote caches.", MODULE);
+            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId
+                    + "], not clearing remote caches.", MODULE);
             return;
         }
 
@@ -112,18 +120,21 @@ public class EntityCacheServices implements DistributedCacheClear {
     public void distributedClearCacheLineByCondition(String entityName, EntityCondition condition) {
         // Debug.logInfo("running distributedClearCacheLineByCondition for (name, condition): " + entityName + ", " + condition + ")", MODULE);
         if (this.dispatcher == null) {
-            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, not running distributed cache clear", MODULE);
+            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) "
+                    + "was not called, not running distributed cache clear", MODULE);
             return;
         }
 
         GenericValue userLogin = getAuthUserLogin();
         if (userLogin == null) {
-            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId + "], not clearing remote caches.", MODULE);
+            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId
+                    + "], not clearing remote caches.", MODULE);
             return;
         }
 
         try {
-            this.dispatcher.runAsync("distributedClearCacheLineByCondition", UtilMisc.toMap("entityName", entityName, "condition", condition, "userLogin", userLogin), false);
+            this.dispatcher.runAsync("distributedClearCacheLineByCondition", UtilMisc.toMap("entityName", entityName, "condition",
+                    condition, "userLogin", userLogin), false);
         } catch (GenericServiceException e) {
             Debug.logError(e, "Error running the distributedClearCacheLineByCondition service", MODULE);
         }
@@ -133,18 +144,21 @@ public class EntityCacheServices implements DistributedCacheClear {
     public void distributedClearCacheLine(GenericPK primaryKey) {
         // Debug.logInfo("running distributedClearCacheLine for primaryKey: " + primaryKey, MODULE);
         if (this.dispatcher == null) {
-            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, not running distributed cache clear", MODULE);
+            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, "
+                    + "not running distributed cache clear", MODULE);
             return;
         }
 
         GenericValue userLogin = getAuthUserLogin();
         if (userLogin == null) {
-            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId + "], not clearing remote caches.", MODULE);
+            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId
+                    + "], not clearing remote caches.", MODULE);
             return;
         }
 
         try {
-            this.dispatcher.runAsync("distributedClearCacheLineByPrimaryKey", UtilMisc.toMap("primaryKey", primaryKey, "userLogin", userLogin), false);
+            this.dispatcher.runAsync("distributedClearCacheLineByPrimaryKey", UtilMisc.toMap("primaryKey",
+                    primaryKey, "userLogin", userLogin), false);
         } catch (GenericServiceException e) {
             Debug.logError(e, "Error running the distributedClearCacheLineByPrimaryKey service", MODULE);
         }
@@ -153,13 +167,15 @@ public class EntityCacheServices implements DistributedCacheClear {
     @Override
     public void clearAllCaches() {
         if (this.dispatcher == null) {
-            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) was not called, not running distributed clear all caches", MODULE);
+            Debug.logWarning("No dispatcher is available, somehow the setDelegator (which also creates a dispatcher) "
+                    + "was not called, not running distributed clear all caches", MODULE);
             return;
         }
 
         GenericValue userLogin = getAuthUserLogin();
         if (userLogin == null) {
-            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId + "], not clearing remote caches.", MODULE);
+            Debug.logWarning("The userLogin for distributed cache clear was not found with userLoginId [" + userLoginId
+                    + "], not clearing remote caches.", MODULE);
             return;
         }
 
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
index 0fc163d..1e63412 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
@@ -40,10 +40,65 @@ public class ModelNotification {
 
     private static final String MODULE = ModelNotification.class.getName();
 
-    public String notificationGroupName;
-    public String notificationEvent;
-    public String notificationMode;
+    private String notificationGroupName;
+    private String notificationEvent;
+    private String notificationMode;
 
+    /**
+     * Gets notification group name.
+     * @return the notification group name
+     */
+    public String getNotificationGroupName() {
+        return notificationGroupName;
+    }
+
+    /**
+     * Sets notification group name.
+     * @param notificationGroupName the notification group name
+     */
+    public void setNotificationGroupName(String notificationGroupName) {
+        this.notificationGroupName = notificationGroupName;
+    }
+
+    /**
+     * Gets notification event.
+     * @return the notification event
+     */
+    public String getNotificationEvent() {
+        return notificationEvent;
+    }
+
+    /**
+     * Sets notification event.
+     * @param notificationEvent the notification event
+     */
+    public void setNotificationEvent(String notificationEvent) {
+        this.notificationEvent = notificationEvent;
+    }
+
+    /**
+     * Gets notification mode.
+     * @return the notification mode
+     */
+    public String getNotificationMode() {
+        return notificationMode;
+    }
+
+    /**
+     * Sets notification mode.
+     * @param notificationMode the notification mode
+     */
+    public void setNotificationMode(String notificationMode) {
+        this.notificationMode = notificationMode;
+    }
+
+    /**
+     * Call notify.
+     * @param dctx the dctx
+     * @param model the model
+     * @param context the context
+     * @param result the result
+     */
     public void callNotify(DispatchContext dctx, ModelService model, Map<String, ? extends Object> context, Map<String, Object> result) {
         String thisEvent = (String) result.get(ModelService.RESPONSE_MESSAGE);
         if (notificationEvent.equals(thisEvent)) {
@@ -59,7 +114,16 @@ public class ModelNotification {
         }
     }
 
-    public Map<String, Object> buildContext(Map<String, ? extends Object> context, Map<String, Object> result, ModelService model) throws GenericServiceException {
+    /**
+     * Build context map.
+     * @param context the context
+     * @param result the result
+     * @param model the model
+     * @return the map
+     * @throws GenericServiceException the generic service exception
+     */
+    public Map<String, Object> buildContext(Map<String, ? extends Object> context, Map<String, Object> result, ModelService model)
+            throws GenericServiceException {
         Map<String, Object> userLogin = UtilGenerics.cast(context.get("userLogin"));
         String partyId = null;
         if (userLogin != null) {
@@ -68,7 +132,8 @@ public class ModelNotification {
 
         String screen = getScreen();
         if (screen == null) {
-            throw new GenericServiceException("SCREEN is a required attribute; check serviceengine.xml group definition; cannot generate notification");
+            throw new GenericServiceException("SCREEN is a required attribute; check serviceengine.xml group definition;"
+                    + "cannot generate notification");
         }
 
         String subject = getSubject();
@@ -102,18 +167,34 @@ public class ModelNotification {
         return notifyContext;
     }
 
+    /**
+     * Build to string.
+     * @return the string
+     */
     public String buildTo() {
         return getCommaSeparatedAddressList("to");
     }
 
+    /**
+     * Build cc string.
+     * @return the string
+     */
     public String buildCc() {
         return getCommaSeparatedAddressList("cc");
     }
 
+    /**
+     * Build bcc string.
+     * @return the string
+     */
     public String buildBcc() {
         return getCommaSeparatedAddressList("bcc");
     }
 
+    /**
+     * Build from string.
+     * @return the string
+     */
     public String buildFrom() {
         return getCommaSeparatedAddressList("from");
     }
@@ -148,6 +229,10 @@ public class ModelNotification {
         return l;
     }
 
+    /**
+     * Gets subject.
+     * @return the subject
+     */
     public String getSubject() {
         try {
             NotificationGroup group = getNotificationGroup(notificationGroupName);
@@ -160,6 +245,10 @@ public class ModelNotification {
         return null;
     }
 
+    /**
+     * Gets screen.
+     * @return the screen
+     */
     public String getScreen() {
         try {
             NotificationGroup group = getNotificationGroup(notificationGroupName);
@@ -172,6 +261,10 @@ public class ModelNotification {
         return null;
     }
 
+    /**
+     * Gets service.
+     * @return the service
+     */
     public String getService() {
         try {
             NotificationGroup group = getNotificationGroup(notificationGroupName);
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 e00a525..4761275 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
@@ -1008,6 +1008,10 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
         }
     }
 
+    /**
+     * Gets all param names.
+     * @return the all param names
+     */
     public Set<String> getAllParamNames() {
         Set<String> nameList = new TreeSet<>();
         for (ModelParam p: this.contextParamList) {
@@ -1016,6 +1020,10 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
         return nameList;
     }
 
+    /**
+     * Gets in param names.
+     * @return the in param names
+     */
     public Set<String> getInParamNames() {
         Set<String> nameList = new TreeSet<>();
         for (ModelParam p: this.contextParamList) {
@@ -1048,7 +1056,10 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
                 .collect(Collectors.toMap(ModelParam::getName, param -> param.getType()));
     }
 
-    // only returns number of defined parameters (not internal)
+    /**
+     * Gets defined in count.
+     * @return the defined in count
+     */
     public int getDefinedInCount() {
         int count = 0;
 
@@ -1174,7 +1185,8 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
             for (String missingKey: requiredButNull) {
                 String message = this.getParam(missingKey).getPrimaryFailMessage(locale);
                 if (message == 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);
                     message = errMsg + " [" + this.name + "." + missingKey + "]";
                 }
                 missingMsg.add(message);
@@ -1216,8 +1228,10 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali
             List<String> errorMessageList = new LinkedList<>();
             for (ModelParam modelParam : this.contextInfo.values()) {
                 // the param is a String, allow-html is not any, and we are looking at an IN parameter during input parameter validation
-                if (context.get(modelParam.getName()) != null && ("String".equals(modelParam.getType()) || "java.lang.String".equals(modelParam.getType()))
-                        && !"any".equals(modelParam.getAllowHtml()) && (IN_OUT_PARAM.equals(modelParam.getMode()) || IN_PARAM.equals(modelParam.getMode()))) {
+                if (context.get(modelParam.getName()) != null && ("String".equals(modelParam.getType())
+                        || "java.lang.String".equals(modelParam.getType()))
+                        && !"any".equals(modelParam.getAllowHtml()) && (IN_OUT_PARAM.equals(modelParam.getMode())
+                        || IN_PARAM.equals(modelParam.getMode()))) {
                     String value = (String) context.get(modelParam.getName());
                     if ("none".equals(modelParam.getAllowHtml())) {
                         UtilCodec.checkStringForHtmlStrictNone(modelParam.getName(), value, errorMessageList, (Locale) context.get("locale"));
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java
index 87b63d7..d714896 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java
@@ -24,26 +24,42 @@ package org.apache.ofbiz.service;
  */
 public class ModelServiceIface {
 
-    protected String service;
-    protected boolean optional;
+    private String service;
+    private boolean optional;
 
     public ModelServiceIface(String service, boolean optional) {
         this.service = service;
         this.optional = optional;
     }
 
+    /**
+     * Gets service.
+     * @return the service
+     */
     public String getService() {
         return this.service;
     }
 
+    /**
+     * Sets service.
+     * @param service the service
+     */
     public void setService(String service) {
         this.service = service;
     }
 
+    /**
+     * Is optional boolean.
+     * @return the boolean
+     */
     public boolean isOptional() {
         return this.optional;
     }
 
+    /**
+     * Is optional.
+     * @param optional the optional
+     */
     public void isOptional(boolean optional) {
         this.optional = optional;
     }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
index 98bd955..76cdf41 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
@@ -284,25 +284,25 @@ public class ModelServiceReader implements Serializable {
         List<? extends Element> n = UtilXml.childElementList(baseElement, "notification");
         // default notification groups
         ModelNotification nSuccess = new ModelNotification();
-        nSuccess.notificationEvent = "success";
-        nSuccess.notificationGroupName = "default.success." + model.getFromLoader();
+        nSuccess.setNotificationEvent("success");
+        nSuccess.setNotificationGroupName("default.success." + model.getFromLoader());
         model.getNotifications().add(nSuccess);
 
         ModelNotification nFail = new ModelNotification();
-        nFail.notificationEvent = "fail";
-        nFail.notificationGroupName = "default.fail." + model.getFromLoader();
+        nFail.setNotificationEvent("fail");
+        nFail.setNotificationGroupName("default.fail." + model.getFromLoader());
         model.getNotifications().add(nFail);
 
         ModelNotification nError = new ModelNotification();
-        nError.notificationEvent = "error";
-        nError.notificationGroupName = "default.error." + model.getFromLoader();
+        nError.setNotificationEvent("error");
+        nError.setNotificationGroupName("default.error." + model.getFromLoader());
         model.getNotifications().add(nError);
 
         if (n != null) {
             for (Element e: n) {
                 ModelNotification notify = new ModelNotification();
-                notify.notificationEvent = e.getAttribute("event");
-                notify.notificationGroupName = e.getAttribute("group");
+                notify.setNotificationEvent(e.getAttribute("event"));
+                notify.setNotificationGroupName(e.getAttribute("group"));
                 model.getNotifications().add(notify);
             }
         }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java b/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java
index cf9c897..33fc150 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java
@@ -24,12 +24,12 @@ import org.apache.ofbiz.base.util.UtilDateTime;
 
 public class RunningService {
 
-    protected ModelService model;
-    protected String name;
-    protected int mode;
+    private ModelService model;
+    private String name;
+    private int mode;
 
-    protected Timestamp startStamp;
-    protected Timestamp endStamp;
+    private Timestamp startStamp;
+    private Timestamp endStamp;
 
     private RunningService() {
         this.startStamp = UtilDateTime.nowTimestamp();
@@ -43,26 +43,49 @@ public class RunningService {
         this.mode = mode;
     }
 
+    /**
+     * Gets model service.
+     * @return the model service
+     */
     public ModelService getModelService() {
         return this.model;
     }
 
+    /**
+     * Gets local name.
+     * @return the local name
+     */
     public String getLocalName() {
         return this.name;
     }
 
+    /**
+     * Gets mode.
+     * @return the mode
+     */
     public int getMode() {
         return mode;
     }
 
+    /**
+     * Gets start stamp.
+     * @return the start stamp
+     */
     public Timestamp getStartStamp() {
         return (Timestamp) this.startStamp.clone();
     }
 
+    /**
+     * Gets end stamp.
+     * @return the end stamp
+     */
     public Timestamp getEndStamp() {
         return (Timestamp) this.endStamp.clone();
     }
 
+    /**
+     * Sets end stamp.
+     */
     public void setEndStamp() {
         this.endStamp = UtilDateTime.nowTimestamp();
     }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java
index 2167f5b..b86b9ab 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java
@@ -45,16 +45,16 @@ public class ServiceXaWrapper extends GenericXaResource {
     public static final int MODE_ASYNC = 100;
     public static final int MODE_SYNC = 200;
 
-    protected DispatchContext dctx = null;
-    protected String rollbackService = null;
-    protected String commitService = null;
-    protected String runAsUser = null;
-    protected Map<String, ? extends Object> rollbackContext = null;
-    protected Map<String, ? extends Object> commitContext = null;
-    protected boolean rollbackAsync = true;
-    protected boolean rollbackAsyncPersist = true;
-    protected boolean commitAsync = false;
-    protected boolean commitAsyncPersist = false;
+    private DispatchContext dctx = null;
+    private String rollbackService = null;
+    private String commitService = null;
+    private String runAsUser = null;
+    private Map<String, ? extends Object> rollbackContext = null;
+    private Map<String, ? extends Object> commitContext = null;
+    private boolean rollbackAsync = true;
+    private boolean rollbackAsyncPersist = true;
+    private boolean commitAsync = false;
+    private boolean commitAsyncPersist = false;
 
     protected ServiceXaWrapper() { }
     public ServiceXaWrapper(DispatchContext dctx) {
@@ -176,10 +176,10 @@ public class ServiceXaWrapper extends GenericXaResource {
             Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), MODULE);
         }
         // the commit listener
-        if (this.active) {
+        if (this.isActive()) {
             Debug.logWarning("commit() called without end()", MODULE);
         }
-        if (this.xid == null || !this.xid.equals(xid)) {
+        if (this.getXid() == null || !this.getXid().equals(xid)) {
             throw new XAException(XAException.XAER_NOTA);
         }
 
@@ -200,8 +200,8 @@ public class ServiceXaWrapper extends GenericXaResource {
         };
         thread.start();
 
-        this.xid = null;
-        this.active = false;
+        this.setXid(null);
+        this.setActive(false);
     }
 
     /**
@@ -213,10 +213,10 @@ public class ServiceXaWrapper extends GenericXaResource {
             Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), MODULE);
         }
         // the rollback listener
-        if (this.active) {
+        if (this.isActive()) {
             Debug.logWarning("rollback() called without end()", MODULE);
         }
-        if (this.xid == null || !this.xid.equals(xid)) {
+        if (this.getXid() == null || !this.getXid().equals(xid)) {
             throw new XAException(XAException.XAER_NOTA);
         }
 
@@ -237,8 +237,8 @@ public class ServiceXaWrapper extends GenericXaResource {
         };
         thread.start();
 
-        this.xid = null;
-        this.active = false;
+        this.setXid(null);
+        this.setActive(false);
     }
 
     @Override
@@ -364,7 +364,7 @@ public class ServiceXaWrapper extends GenericXaResource {
             }
         }
 
-        this.xid = null;
-        this.active = false;
+        this.setXid(null);
+        this.setActive(false);
     }
 }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
index b77d12e..826f6e3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
@@ -43,18 +43,18 @@ public class ServiceEcaAction implements java.io.Serializable {
 
     private static final String MODULE = ServiceEcaAction.class.getName();
 
-    protected String eventName = null;
-    protected String serviceName = null;
-    protected String serviceMode = null;
-    protected String resultMapName = null;
-    protected String runAsUser = null;
+    private String eventName = null;
+    private String serviceName = null;
+    private String serviceMode = null;
+    private String resultMapName = null;
+    private String runAsUser = null;
 
-    protected boolean newTransaction = false;
-    protected boolean resultToContext = true;
-    protected boolean resultToResult = false;
-    protected boolean ignoreFailure = false;
-    protected boolean ignoreError = false;
-    protected boolean persist = false;
+    private boolean newTransaction = false;
+    private boolean resultToContext = true;
+    private boolean resultToResult = false;
+    private boolean ignoreFailure = false;
+    private boolean ignoreError = false;
+    private boolean persist = false;
 
     protected ServiceEcaAction() { }
 
@@ -77,23 +77,49 @@ public class ServiceEcaAction implements java.io.Serializable {
         this.persist = "true".equals(action.getAttribute("persist"));
     }
 
+    /**
+     * Gets service name.
+     * @return the service name
+     */
     public String getServiceName() {
         return this.serviceName;
     }
 
+    /**
+     * Gets service mode.
+     * @return the service mode
+     */
     public String getServiceMode() {
         return this.serviceMode;
     }
 
+    /**
+     * Is persist boolean.
+     * @return the boolean
+     */
     public boolean isPersist() {
         return this.persist;
     }
 
+    /**
+     * Gets short display description.
+     * @return the short display description
+     */
     public String getShortDisplayDescription() {
         return this.serviceName + "[" + this.serviceMode + (this.persist ? "-persist" : "") + "]";
     }
 
-    public boolean runAction(String selfService, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result) throws GenericServiceException {
+    /**
+     * Run action boolean.
+     * @param selfService the self service
+     * @param dctx the dctx
+     * @param context the context
+     * @param result the result
+     * @return the boolean
+     * @throws GenericServiceException the generic service exception
+     */
+    public boolean runAction(String selfService, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result)
+            throws GenericServiceException {
         if (serviceName.equals(selfService)) {
             throw new GenericServiceException("Cannot invoke self on ECA.");
         }
@@ -114,11 +140,14 @@ public class ServiceEcaAction implements java.io.Serializable {
 
         if (eventName.startsWith("global-")) {
             if ("global-rollback".equals(eventName)) {
-                ServiceSynchronization.registerRollbackService(dctx, serviceName, runAsUser, context, "async".equals(serviceMode), persist); // using the actual context so we get updates
+                ServiceSynchronization.registerRollbackService(dctx, serviceName, runAsUser, context, "async".equals(serviceMode), persist);
+                // using the actual context so we get updates
             } else if ("global-commit".equals(eventName)) {
-                ServiceSynchronization.registerCommitService(dctx, serviceName, runAsUser, context, "async".equals(serviceMode), persist); // using the actual context so we get updates
+                ServiceSynchronization.registerCommitService(dctx, serviceName, runAsUser, context, "async".equals(serviceMode), persist);
+                // using the actual context so we get updates
             } else if ("global-commit-post-run".equals(eventName)) {
-                ServiceSynchronization.registerCommitService(dctx, serviceName, runAsUser, context, "async".equals(serviceMode), persist); // using the actual context so we get updates
+                ServiceSynchronization.registerCommitService(dctx, serviceName, runAsUser, context, "async".equals(serviceMode), persist);
+                // using the actual context so we get updates
             }
         } else {
             // standard ECA
@@ -150,7 +179,8 @@ public class ServiceEcaAction implements java.io.Serializable {
 
         // use the result to update the result fields
         if (resultToResult) {
-            Map<String, Object> normalizedActionResult = dctx.getModelService(selfService).makeValid(actionResult, ModelService.OUT_PARAM, false, null);
+            Map<String, Object> normalizedActionResult = dctx.getModelService(selfService).makeValid(actionResult, ModelService.OUT_PARAM,
+                    false, null);
             // don't copy over the error messages, use the combining code to do that later
             normalizedActionResult.remove(ModelService.ERROR_MESSAGE);
             normalizedActionResult.remove(ModelService.ERROR_MESSAGE_LIST);
@@ -181,7 +211,8 @@ public class ServiceEcaAction implements java.io.Serializable {
             }
         }
 
-        // copy/combine error messages on error/failure (!success) or on resultToResult to combine any error info coming out, regardless of success status
+        // copy/combine error messages on error/failure (!success) or on resultToResult to combine
+        // any error info coming out, regardless of success status
         if ((!success || resultToResult) && UtilValidate.isNotEmpty(actionResult)) {
             String errorMessage = (String) actionResult.get(ModelService.ERROR_MESSAGE);
             String failMessage = (String) actionResult.get("failMessage");
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
index c017304..97e221f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
@@ -40,14 +40,14 @@ public final class ServiceEcaRule implements java.io.Serializable {
 
     private static final String MODULE = ServiceEcaRule.class.getName();
 
-    public final String serviceName;
-    public final String eventName;
-    public final boolean runOnFailure;
-    public final boolean runOnError;
-    public final List<ServiceEcaCondition> conditions = new ArrayList<>();
-    public final List<Object> actionsAndSets = new ArrayList<>();
-    public boolean enabled = true;
-    public final String definitionLocation;
+    private final String serviceName;
+    private final String eventName;
+    private final boolean runOnFailure;
+    private final boolean runOnError;
+    private final List<ServiceEcaCondition> conditions = new ArrayList<>();
+    private final List<Object> actionsAndSets = new ArrayList<>();
+    private boolean enabled = true;
+    private final String definitionLocation;
 
     public ServiceEcaRule(Element eca, String definitionLocation) {
         this.definitionLocation = definitionLocation;
@@ -119,7 +119,8 @@ public final class ServiceEcaRule implements java.io.Serializable {
         return condList;
     }
 
-    public void eval(String serviceName, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result, boolean isError, boolean isFailure, Set<String> actionsRun) throws GenericServiceException {
+    public void eval(String serviceName, DispatchContext dctx, Map<String, Object> context, Map<String, Object> result, boolean isError,
+                     boolean isFailure, Set<String> actionsRun) throws GenericServiceException {
         if (!enabled) {
             Debug.logInfo("Service ECA [" + this.serviceName + "] on [" + this.eventName + "] is disabled; not running.", MODULE);
             return;
@@ -153,12 +154,13 @@ public final class ServiceEcaRule implements java.io.Serializable {
                     ServiceEcaAction ea = (ServiceEcaAction) setOrAction;
                     // in order to enable OR logic without multiple calls to the given service,
                     // only execute a given service name once per service call phase
-                    if (!actionsRun.contains(ea.serviceName)) {
+                    if (!actionsRun.contains(ea.getServiceName())) {
                         if (Debug.infoOn()) {
-                            Debug.logInfo("Running Service ECA Service: " + ea.serviceName + ", triggered by rule on Service: " + serviceName, MODULE);
+                            Debug.logInfo("Running Service ECA Service: " + ea.getServiceName() + ", triggered by rule on Service: "
+                                    + serviceName, MODULE);
                         }
                         if (ea.runAction(serviceName, dctx, context, result)) {
-                            actionsRun.add(ea.serviceName);
+                            actionsRun.add(ea.getServiceName());
                         }
                     }
                 } else {
@@ -224,6 +226,7 @@ public final class ServiceEcaRule implements java.io.Serializable {
 
     @Override
     public String toString() {
-        return "ServiceEcaRule:" + this.serviceName + ":" + this.eventName + ":runOnError=" + this.runOnError + ":runOnFailure=" + this.runOnFailure + ":enabled=" + this.enabled + ":conditions=" + this.conditions + ":actionsAndSets=" + this.actionsAndSets;
+        return "ServiceEcaRule:" + this.serviceName + ":" + this.eventName + ":runOnError=" + this.runOnError + ":runOnFailure=" + this.runOnFailure
+                + ":enabled=" + this.enabled + ":conditions=" + this.conditions + ":actionsAndSets=" + this.actionsAndSets;
     }
 }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
index 30503be..9366ce6 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
@@ -38,11 +38,11 @@ public class ServiceEcaSetField {
 
     private static final String MODULE = ServiceEcaSetField.class.getName();
 
-    protected String fieldName = null;
-    protected String mapName = null;
-    protected String envName = null;
-    protected String value = null;
-    protected String format = null;
+    private String fieldName = null;
+    private String mapName = null;
+    private String envName = null;
+    private String value = null;
+    private String format = null;
 
     public ServiceEcaSetField(Element set) {
         this.fieldName = set.getAttribute("field-name");
@@ -55,6 +55,10 @@ public class ServiceEcaSetField {
         this.format = set.getAttribute("format");
     }
 
+    /**
+     * Eval.
+     * @param context the context
+     */
     public void eval(Map<String, Object> context) {
         if (fieldName != null) {
             // try to expand the envName
@@ -93,6 +97,12 @@ public class ServiceEcaSetField {
         }
     }
 
+    /**
+     * Format object.
+     * @param s the s
+     * @param c the c
+     * @return the object
+     */
     protected Object format(String s, Map<String, ? extends Object> c) {
         if (UtilValidate.isEmpty(s) || UtilValidate.isEmpty(format)) {
             return s;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
index 58e2cf1..08f8be3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
@@ -63,16 +63,16 @@ public class JavaMailContainer implements Container {
     private static final String MODULE = JavaMailContainer.class.getName();
     public static final String INBOX = "INBOX";
 
-    protected Delegator delegator = null;
-    protected LocalDispatcher dispatcher = null;
-    protected GenericValue userLogin = null;
-    protected long timerDelay = 300000;
-    protected long maxSize = 1000000;
-    protected ScheduledExecutorService pollTimer = null;
-    protected boolean deleteMail = false;    // whether to delete emails after fetching them.
-
-    protected String configFile = null;
-    protected Map<Store, Session> stores = null;
+    private Delegator delegator = null;
+    private LocalDispatcher dispatcher = null;
+    private GenericValue userLogin = null;
+    private long timerDelay = 300000;
+    private long maxSize = 1000000;
+    private ScheduledExecutorService pollTimer = null;
+    private boolean deleteMail = false;    // whether to delete emails after fetching them.
+
+    private String configFile = null;
+    private Map<Store, Session> stores = null;
     private String name;
 
     @Override
@@ -137,7 +137,11 @@ public class JavaMailContainer implements Container {
         return name;
     }
 
-    // java-mail methods
+    /**
+     * Make session session.
+     * @param client the client
+     * @return the session
+     */
     protected Session makeSession(Configuration.Property client) {
         Properties props = new Properties();
         Map<String, Configuration.Property> clientProps = client.properties();
@@ -149,6 +153,12 @@ public class JavaMailContainer implements Container {
         return Session.getInstance(props);
     }
 
+    /**
+     * Gets store.
+     * @param session the session
+     * @return the store
+     * @throws ContainerException the container exception
+     */
     protected Store getStore(Session session) throws ContainerException {
         // create the store object
         Store store;
@@ -186,6 +196,12 @@ public class JavaMailContainer implements Container {
         return store;
     }
 
+    /**
+     * Update url name url name.
+     * @param urlName the url name
+     * @param props the props
+     * @return the url name
+     */
     protected URLName updateUrlName(URLName urlName, Properties props) {
         String protocol = urlName.getProtocol();
         String userName = urlName.getUsername();
@@ -273,8 +289,8 @@ public class JavaMailContainer implements Container {
 
     class PollerTask implements Runnable {
 
-        LocalDispatcher dispatcher;
-        GenericValue userLogin;
+        private LocalDispatcher dispatcher;
+        private GenericValue userLogin;
 
         PollerTask(LocalDispatcher dispatcher, GenericValue userLogin) {
             this.dispatcher = dispatcher;
@@ -343,14 +359,16 @@ public class JavaMailContainer implements Container {
                 if (!message.isSet(Flags.Flag.SEEN)) {
                     long messageSize = message.getSize();
                     if (message instanceof MimeMessage && messageSize >= maxSize) {
-                        Debug.logWarning("Message from: " + message.getFrom()[0] + "not received, too big, size:" + messageSize + " cannot be more than " + maxSize + " bytes", MODULE);
+                        Debug.logWarning("Message from: " + message.getFrom()[0] + "not received, too big, size:" + messageSize
+                                + " cannot be more than " + maxSize + " bytes", MODULE);
 
                         // set the message as read so it doesn't continue to try to process; but don't delete it
                         message.setFlag(Flags.Flag.SEEN, true);
                     } else {
                         this.processMessage(message, session);
                         if (Debug.verboseOn()) {
-                            Debug.logVerbose("Message from " + UtilMisc.toListArray(message.getFrom()) + " with subject [" + message.getSubject() + "]  has been processed.", MODULE);
+                            Debug.logVerbose("Message from " + UtilMisc.toListArray(message.getFrom()) + " with subject [" + message.getSubject()
+                                    + "]  has been processed.", MODULE);
                         }
                         message.setFlag(Flags.Flag.SEEN, true);
                         if (Debug.verboseOn()) {
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
index 2d43f6d..5459603 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
@@ -49,12 +49,12 @@ import org.apache.ofbiz.base.util.UtilDateTime;
 public class MimeMessageWrapper implements java.io.Serializable {
 
     private static final String MODULE = MimeMessageWrapper.class.getName();
-    protected transient MimeMessage message = null;
-    protected transient Session session = null;
-    protected Properties mailProperties = null;
-    protected String contentType = null;
-    protected byte[] serializedBytes = null;
-    protected int parts = 0;
+    private transient MimeMessage message = null;
+    private transient Session session = null;
+    private Properties mailProperties = null;
+    private String contentType = null;
+    private byte[] serializedBytes = null;
+    private int parts = 0;
 
     public MimeMessageWrapper(Session session, MimeMessage message) {
         this(session);
@@ -65,11 +65,19 @@ public class MimeMessageWrapper implements java.io.Serializable {
         this.setSession(session);
     }
 
+    /**
+     * Sets session.
+     * @param session the session
+     */
     public synchronized void setSession(Session session) {
         this.session = session;
         this.mailProperties = session.getProperties();
     }
 
+    /**
+     * Gets session.
+     * @return the session
+     */
     public synchronized Session getSession() {
         if (session == null) {
             session = Session.getInstance(mailProperties, null);
@@ -77,6 +85,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return session;
     }
 
+    /**
+     * Sets message.
+     * @param message the message
+     */
     public synchronized void setMessage(MimeMessage message) {
         if (message != null) {
             // serialize the message
@@ -101,6 +113,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets message.
+     * @return the message
+     */
     public synchronized MimeMessage getMessage() {
         if (message == null) {
             // deserialize the message
@@ -116,6 +132,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return message;
     }
 
+    /**
+     * Gets first header.
+     * @param header the header
+     * @return the first header
+     */
     public String getFirstHeader(String header) {
         String[] headers = getHeader(header);
         if (headers != null && headers.length > 0) {
@@ -124,6 +145,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Get header string [ ].
+     * @param header the header
+     * @return the string [ ]
+     */
     public String[] getHeader(String header) {
         MimeMessage message = getMessage();
         try {
@@ -134,6 +160,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Get from address [ ].
+     * @return the address [ ]
+     */
     public Address[] getFrom() {
         MimeMessage message = getMessage();
         try {
@@ -144,6 +174,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Get to address [ ].
+     * @return the address [ ]
+     */
     public Address[] getTo() {
         MimeMessage message = getMessage();
         try {
@@ -154,6 +188,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Get cc address [ ].
+     * @return the address [ ]
+     */
     public Address[] getCc() {
         MimeMessage message = getMessage();
         try {
@@ -164,6 +202,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Get bcc address [ ].
+     * @return the address [ ]
+     */
     public Address[] getBcc() {
         MimeMessage message = getMessage();
         try {
@@ -174,6 +216,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets subject.
+     * @return the subject
+     */
     public String getSubject() {
         MimeMessage message = getMessage();
         try {
@@ -184,6 +230,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets message id.
+     * @return the message id
+     */
     public String getMessageId() {
         MimeMessage message = getMessage();
         try {
@@ -194,6 +244,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets sent date.
+     * @return the sent date
+     */
     public Timestamp getSentDate() {
         MimeMessage message = getMessage();
         try {
@@ -204,6 +258,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets received date.
+     * @return the received date
+     */
     public Timestamp getReceivedDate() {
         MimeMessage message = getMessage();
         try {
@@ -214,14 +272,27 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets content type.
+     * @return the content type
+     */
     public synchronized String getContentType() {
         return contentType;
     }
 
+    /**
+     * Gets main part count.
+     * @return the main part count
+     */
     public synchronized int getMainPartCount() {
         return this.parts;
     }
 
+    /**
+     * Gets sub part count.
+     * @param index the index
+     * @return the sub part count
+     */
     public int getSubPartCount(int index) {
         BodyPart part = getPart(Integer.toString(index));
         try {
@@ -236,6 +307,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets attachment indexes.
+     * @return the attachment indexes
+     */
     public List<String> getAttachmentIndexes() {
         List<String> attachments = new LinkedList<>();
         if (getMainPartCount() == 0) { // single part message (no attachments)
@@ -262,6 +337,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return attachments;
     }
 
+    /**
+     * Gets message body.
+     * @return the message body
+     */
     public String getMessageBody() {
         MimeMessage message = getMessage();
         if (getMainPartCount() == 0) { // single part message
@@ -298,6 +377,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return body.toString();
     }
 
+    /**
+     * Gets message body content type.
+     * @return the message body content type
+     */
     public String getMessageBodyContentType() {
         String contentType = getContentType();
         if (contentType != null && contentType.toLowerCase(Locale.getDefault()).startsWith("text")) {
@@ -327,6 +410,10 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return "text/html";
     }
 
+    /**
+     * Gets message raw text.
+     * @return the message raw text
+     */
     public String getMessageRawText() {
         MimeMessage message = getMessage();
         try {
@@ -337,6 +424,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets part description.
+     * @param index the index
+     * @return the part description
+     */
     public String getPartDescription(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -350,6 +442,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part content type.
+     * @param index the index
+     * @return the part content type
+     */
     public String getPartContentType(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -363,6 +460,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part disposition.
+     * @param index the index
+     * @return the part disposition
+     */
     public String getPartDisposition(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -376,6 +478,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part filename.
+     * @param index the index
+     * @return the part filename
+     */
     public String getPartFilename(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -389,6 +496,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part byte buffer.
+     * @param index the index
+     * @return the part byte buffer
+     */
     public ByteBuffer getPartByteBuffer(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -402,6 +514,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part text.
+     * @param index the index
+     * @return the part text
+     */
     public String getPartText(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -415,6 +532,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part raw text.
+     * @param index the index
+     * @return the part raw text
+     */
     public String getPartRawText(String index) {
         BodyPart part = getPart(index);
         if (part != null) {
@@ -428,8 +550,14 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets part.
+     * @param indexStr the index str
+     * @return the part
+     */
     public BodyPart getPart(String indexStr) {
-        int mainIndex, subIndex;
+        int mainIndex;
+        int subIndex;
         try {
             if (indexStr.indexOf('.') == -1) {
                 mainIndex = Integer.parseInt(indexStr);
@@ -457,7 +585,8 @@ public class MimeMessageWrapper implements java.io.Serializable {
                     Multipart sp = (Multipart) part.getContent();
                     return sp.getBodyPart(subIndex);
                 }
-                Debug.logWarning("Requested a subpart [" + subIndex + "] which deos not exist; only [" + getSubPartCount(mainIndex) + "] parts", MODULE);
+                Debug.logWarning("Requested a subpart [" + subIndex + "] which deos not exist; only [" + getSubPartCount(mainIndex)
+                        + "] parts", MODULE);
                 // there is no sub part to find
                 return part;
             } catch (MessagingException | IOException e) {
@@ -469,6 +598,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return null;
     }
 
+    /**
+     * Gets content text.
+     * @param content the content
+     * @return the content text
+     */
     protected String getContentText(Object content) {
         if (content == null) {
             return null;
@@ -490,6 +624,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         }
     }
 
+    /**
+     * Gets text from stream.
+     * @param stream the stream
+     * @return the text from stream
+     */
     protected String getTextFromStream(InputStream stream) {
         StringBuilder builder = new StringBuilder();
         byte[] buffer = new byte[4096];
@@ -504,6 +643,11 @@ public class MimeMessageWrapper implements java.io.Serializable {
         return builder.toString();
     }
 
+    /**
+     * Gets byte buffer from stream.
+     * @param stream the stream
+     * @return the byte buffer from stream
+     */
     protected ByteBuffer getByteBufferFromStream(InputStream stream) {
         byte[] buffer = new byte[4096];
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
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 51dc155..59e2165 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
@@ -34,10 +34,10 @@ public class ServiceMcaRule implements java.io.Serializable {
 
     private static final String MODULE = ServiceMcaRule.class.getName();
 
-    protected String ruleName = null;
-    protected List<ServiceMcaCondition> conditions = new LinkedList<>();
-    protected List<ServiceMcaAction> actions = new LinkedList<>();
-    protected boolean enabled = true;
+    private String ruleName = null;
+    private List<ServiceMcaCondition> conditions = new LinkedList<>();
+    private List<ServiceMcaAction> actions = new LinkedList<>();
+    private boolean enabled = true;
 
     public ServiceMcaRule(Element mca) {
         this.ruleName = mca.getAttribute("mail-rule-name");
@@ -59,6 +59,14 @@ public class ServiceMcaRule implements java.io.Serializable {
         }
     }
 
+    /**
+     * Eval.
+     * @param dispatcher the dispatcher
+     * @param messageWrapper the message wrapper
+     * @param actionsRun the actions run
+     * @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 {
         if (!enabled) {
             Debug.logInfo("Service MCA [" + ruleName + "] is disabled; not running.", MODULE);
@@ -86,10 +94,18 @@ public class ServiceMcaRule implements java.io.Serializable {
         }
     }
 
+    /**
+     * Sets enabled.
+     * @param enabled the enabled
+     */
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 
+    /**
+     * Is enabled boolean.
+     * @return the boolean
+     */
     public boolean isEnabled() {
         return this.enabled;
     }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
index 2d1684a..653ab23 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
@@ -43,22 +43,36 @@ import org.apache.ofbiz.base.util.SSLUtil;
 public class SSLServerSocketFactory implements RMIServerSocketFactory, Serializable {
 
     private static final String MODULE = SSLServerSocketFactory.class.getName();
-    protected boolean clientAuth = false;
-    protected String keystore = null;
-    protected String ksType = null;
-    protected String ksPass = null;
-    protected String alias = null;
+    private boolean clientAuth = false;
+    private String keystore = null;
+    private String ksType = null;
+    private String ksPass = null;
+    private String alias = null;
 
+    /**
+     * Sets need client auth.
+     * @param clientAuth the client auth
+     */
     public void setNeedClientAuth(boolean clientAuth) {
         this.clientAuth = clientAuth;
     }
 
+    /**
+     * Sets key store.
+     * @param location the location
+     * @param type the type
+     * @param password the password
+     */
     public void setKeyStore(String location, String type, String password) {
         this.keystore = location;
         this.ksType = type;
         this.ksPass = password;
     }
 
+    /**
+     * Sets key store alias.
+     * @param alias the alias
+     */
     public void setKeyStoreAlias(String alias) {
         this.alias = alias;
     }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java
index d23dc31..cdbc390 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java
@@ -31,14 +31,19 @@ import org.w3c.dom.NodeList;
  * working with WebDAV PROPFIND requests and responses.*/
 public class PropFindHelper extends ResponseHelper {
 
-    protected final Document requestDocument;
+    private final Document requestDocument;
 
     public PropFindHelper(Document requestDocument) {
         this.requestDocument = requestDocument;
     }
 
+    /**
+     * Create prop element element.
+     * @param propList the prop list
+     * @return the element
+     */
     public Element createPropElement(List<Element> propList) {
-        Element element = this.responseDocument.createElementNS(DAV_NAMESPACE_URI, "D:prop");
+        Element element = this.getResponseDocument().createElementNS(DAV_NAMESPACE_URI, "D:prop");
         if (UtilValidate.isNotEmpty(propList)) {
             for (Element propElement : propList) {
                 element.appendChild(propElement);
@@ -47,13 +52,24 @@ public class PropFindHelper extends ResponseHelper {
         return element;
     }
 
+    /**
+     * Create prop stat element element.
+     * @param prop the prop
+     * @param stat the stat
+     * @return the element
+     */
     public Element createPropStatElement(Element prop, String stat) {
-        Element element = this.responseDocument.createElementNS(DAV_NAMESPACE_URI, "D:propstat");
+        Element element = this.getResponseDocument().createElementNS(DAV_NAMESPACE_URI, "D:propstat");
         element.appendChild(prop);
         element.appendChild(createStatusElement(stat));
         return element;
     }
 
+    /**
+     * Gets find props list.
+     * @param nameSpaceUri the name space uri
+     * @return the find props list
+     */
     public List<Element> getFindPropsList(String nameSpaceUri) {
         List<Element> result = new LinkedList<>();
         NodeList nodeList = this.requestDocument.getElementsByTagNameNS(nameSpaceUri == null ? "*" : nameSpaceUri, "prop");
@@ -69,11 +85,19 @@ public class PropFindHelper extends ResponseHelper {
         return result;
     }
 
+    /**
+     * Is all prop boolean.
+     * @return the boolean
+     */
     public boolean isAllProp() {
         NodeList nodeList = this.requestDocument.getElementsByTagNameNS(DAV_NAMESPACE_URI, "allprop");
         return nodeList.getLength() > 0;
     }
 
+    /**
+     * Is prop name boolean.
+     * @return the boolean
+     */
     public boolean isPropName() {
         NodeList nodeList = this.requestDocument.getElementsByTagNameNS(DAV_NAMESPACE_URI, "propname");
         return nodeList.getLength() > 0;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java
index ba7836d..d9cfbc8 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java
@@ -56,12 +56,18 @@ public class ResponseHelper {
         }
     }
 
-    protected final Document responseDocument;
+    private final Document responseDocument;
 
     public ResponseHelper() {
         this.responseDocument = UtilXml.makeEmptyXmlDocument();
     }
 
+    /**
+     * Create element set value element.
+     * @param elementName the element name
+     * @param value the value
+     * @return the element
+     */
     public Element createElementSetValue(String elementName, String value) {
         Element element = this.responseDocument.createElementNS(DAV_NAMESPACE_URI, elementName);
         element.appendChild(element.getOwnerDocument().createTextNode(value));
@@ -69,14 +75,29 @@ public class ResponseHelper {
         return element;
     }
 
+    /**
+     * Create href element element.
+     * @param hrefUrl the href url
+     * @return the element
+     */
     public Element createHrefElement(String hrefUrl) {
         return createElementSetValue("D:href", hrefUrl);
     }
 
+    /**
+     * Create multi status element element.
+     * @return the element
+     */
     public Element createMultiStatusElement() {
         return this.responseDocument.createElementNS(DAV_NAMESPACE_URI, "D:multistatus");
     }
 
+    /**
+     * Create response description element element.
+     * @param description the description
+     * @param lang the lang
+     * @return the element
+     */
     public Element createResponseDescriptionElement(String description, String lang) {
         Element element = createElementSetValue("D:responsedescription", description);
         if (lang != null) {
@@ -85,23 +106,42 @@ public class ResponseHelper {
         return element;
     }
 
+    /**
+     * Create response element element.
+     * @return the element
+     */
     public Element createResponseElement() {
         return this.responseDocument.createElementNS(DAV_NAMESPACE_URI, "D:response");
     }
 
+    /**
+     * Create status element element.
+     * @param statusText the status text
+     * @return the element
+     */
     public Element createStatusElement(String statusText) {
         return createElementSetValue("D:status", statusText);
     }
 
+    /**
+     * Gets response document.
+     * @return the response document
+     */
     public Document getResponseDocument() {
         return this.responseDocument;
     }
 
+    /**
+     * Write response.
+     * @param response the response
+     * @param writer the writer
+     * @throws IOException the io exception
+     */
     public void writeResponse(HttpServletResponse response, Writer writer) throws IOException {
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             UtilXml.writeXmlDocument(os, this.responseDocument, "UTF-8", true, true);
-        response.setContentLength(os.size());
-        writer.write(os.toString("UTF-8"));
+            response.setContentLength(os.size());
+            writer.write(os.toString("UTF-8"));
         } catch (Exception e) {
             throw new IOException(e.getMessage());
         }
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
index e68e765..94de3f6 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
@@ -401,6 +401,12 @@ public class ArtifactInfoFactory {
         return ScreenFactory.getScreenFromLocation(screenLocation, screenName);
     }
 
+    /**
+     * Gets controller request map.
+     * @param controllerXmlUrl the controller xml url
+     * @param requestUri the request uri
+     * @return the controller request map
+     */
     public ConfigXMLReader.RequestMap getControllerRequestMap(URL controllerXmlUrl, String requestUri) {
         try {
             return ConfigXMLReader.getControllerConfig(controllerXmlUrl).getRequestMapMap().get(requestUri);
@@ -410,6 +416,12 @@ public class ArtifactInfoFactory {
         return null;
     }
 
+    /**
+     * Gets controller view map.
+     * @param controllerXmlUrl the controller xml url
+     * @param viewUri the view uri
+     * @return the controller view map
+     */
     public ConfigXMLReader.ViewMap getControllerViewMap(URL controllerXmlUrl, String viewUri) {
         ControllerConfig cc;
         try {
@@ -421,6 +433,12 @@ public class ArtifactInfoFactory {
         return null;
     }
 
+    /**
+     * Gets entity artifact info.
+     * @param entityName the entity name
+     * @return the entity artifact info
+     * @throws GeneralException the general exception
+     */
     public EntityArtifactInfo getEntityArtifactInfo(String entityName) throws GeneralException {
         EntityArtifactInfo curInfo = this.allEntityInfos.get(entityName);
         if (curInfo == null) {
@@ -431,6 +449,12 @@ public class ArtifactInfoFactory {
         return curInfo;
     }
 
+    /**
+     * Gets service artifact info.
+     * @param serviceName the service name
+     * @return the service artifact info
+     * @throws GeneralException the general exception
+     */
     public ServiceArtifactInfo getServiceArtifactInfo(String serviceName) throws GeneralException {
         ServiceArtifactInfo curInfo = this.allServiceInfos.get(serviceName);
         if (curInfo == null) {
@@ -441,6 +465,12 @@ public class ArtifactInfoFactory {
         return curInfo;
     }
 
+    /**
+     * Gets service eca artifact info.
+     * @param ecaRule the eca rule
+     * @return the service eca artifact info
+     * @throws GeneralException the general exception
+     */
     public ServiceEcaArtifactInfo getServiceEcaArtifactInfo(ServiceEcaRule ecaRule) throws GeneralException {
         ServiceEcaArtifactInfo curInfo = this.allServiceEcaInfos.get(ecaRule);
         if (curInfo == null) {
@@ -451,6 +481,12 @@ public class ArtifactInfoFactory {
         return curInfo;
     }
 
+    /**
+     * Gets form widget artifact info.
+     * @param formNameAndLocation the form name and location
+     * @return the form widget artifact info
+     * @throws GeneralException the general exception
+     */
     public FormWidgetArtifactInfo getFormWidgetArtifactInfo(String formNameAndLocation) throws GeneralException {
         return getFormWidgetArtifactInfo(formNameAndLocation.substring(formNameAndLocation.indexOf("#") + 1), formNameAndLocation.substring(0,
                 formNameAndLocation.indexOf("#")));
@@ -548,6 +584,13 @@ public class ArtifactInfoFactory {
         }
     }
 
+    /**
+     * Gets artifact info by name and type.
+     * @param artifactName the artifact name
+     * @param artifactLocation the artifact location
+     * @param type the type
+     * @return the artifact info by name and type
+     */
     public ArtifactInfoBase getArtifactInfoByNameAndType(String artifactName, String artifactLocation, String type) {
         try {
             if ("entity".equals(type)) {
@@ -569,6 +612,12 @@ public class ArtifactInfoFactory {
         return null;
     }
 
+    /**
+     * Gets all artifact infos by name partial.
+     * @param artifactNamePartial the artifact name partial
+     * @param type the type
+     * @return the all artifact infos by name partial
+     */
     public Set<ArtifactInfoBase> getAllArtifactInfosByNamePartial(String artifactNamePartial, String type) {
         Set<ArtifactInfoBase> aiBaseSet = new HashSet<>();
 
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 f18e08b..075d70f 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
@@ -70,10 +70,18 @@ public class ControllerViewArtifactInfo extends ArtifactInfoBase {
         }
     }
 
+    /**
+     * Gets controller xml url.
+     * @return the controller xml url
+     */
     public URL getControllerXmlUrl() {
         return this.controllerXmlUrl;
     }
 
+    /**
+     * Gets view uri.
+     * @return the view uri
+     */
     public String getViewUri() {
         return this.viewUri;
     }
@@ -118,10 +126,18 @@ public class ControllerViewArtifactInfo extends ArtifactInfoBase {
         }
     }
 
+    /**
+     * Gets requests that this view is response to.
+     * @return the requests that this view is response to
+     */
     public Set<ControllerRequestArtifactInfo> getRequestsThatThisViewIsResponseTo() {
         return this.aif.getAllRequestInfosReferringToView().get(this.getUniqueId());
     }
 
+    /**
+     * Gets screen called by this view.
+     * @return the screen called by this view
+     */
     public ScreenWidgetArtifactInfo getScreenCalledByThisView() {
         return screenCalledByThisView;
     }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java
index de4394f..4a13cdb 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java
@@ -22,32 +22,60 @@ import org.apache.ofbiz.base.util.cache.UtilCache;
 
 public abstract class AbstractCache {
 
-    protected String id;
+    private String id;
 
     protected AbstractCache(String id) {
         this.id = id;
     }
 
+    /**
+     * Remove.
+     * @param widgetName the widget name
+     */
     public void remove(String widgetName) {
         UtilCache.clearCache(getCacheName(widgetName));
     }
 
+    /**
+     * Clear.
+     */
     public void clear() {
         UtilCache.clearCachesThatStartWith(getCacheNamePrefix());
     }
 
+    /**
+     * Gets cache name prefix.
+     * @return the cache name prefix
+     */
     public String getCacheNamePrefix() {
         return "widgetcache." + id + ".";
     }
 
+    /**
+     * Gets cache name.
+     * @param widgetName the widget name
+     * @return the cache name
+     */
     public String getCacheName(String widgetName) {
         return getCacheNamePrefix() + widgetName;
     }
 
+    /**
+     * Gets cache.
+     * @param <K> the type parameter
+     * @param <V> the type parameter
+     * @param widgetName the widget name
+     * @return the cache
+     */
     protected <K, V> UtilCache<K, V> getCache(String widgetName) {
         return UtilCache.findCache(getCacheName(widgetName));
     }
 
+    /**
+     * Gets or create cache.
+     * @param widgetName the widget name
+     * @return the or create cache
+     */
     protected UtilCache<WidgetContextCacheKey, GenericWidgetOutput> getOrCreateCache(String widgetName) {
         String name = getCacheName(widgetName);
         return UtilCache.getOrCreateUtilCache(name, 0, 0, 0, true, name);
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
index 951b1bd..a86c405 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
@@ -132,7 +132,7 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
         }
         for (ModelAction action : actions) {
             if (Debug.verboseOn()) {
-                 Debug.logVerbose("Running action " + action.getClass().getName(), MODULE);
+                Debug.logVerbose("Running action " + action.getClass().getName(), MODULE);
             }
             try {
                 action.runAction(context);
@@ -152,7 +152,7 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
     protected AbstractModelAction(ModelWidget modelWidget, Element actionElement) {
         this.modelWidget = modelWidget;
         if (Debug.verboseOn()) {
-             Debug.logVerbose("Reading widget action with name: " + actionElement.getNodeName(), MODULE);
+            Debug.logVerbose("Reading widget action with name: " + actionElement.getNodeName(), MODULE);
         }
     }
 
@@ -193,6 +193,10 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets finder.
+         * @return the finder
+         */
         public ByAndFinder getFinder() {
             return this.finder;
         }
@@ -226,6 +230,10 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets finder.
+         * @return the finder
+         */
         public ByConditionFinder getFinder() {
             return this.finder;
         }
@@ -259,6 +267,10 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets finder.
+         * @return the finder
+         */
         public PrimaryKeyFinder getFinder() {
             return this.finder;
         }
@@ -302,6 +314,10 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets relation name.
+         * @return the relation name
+         */
         public String getRelationName() {
             return this.relationName;
         }
@@ -340,22 +356,42 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
         }
 
+        /**
+         * Gets list name acsr.
+         * @return the list name acsr
+         */
         public FlexibleMapAccessor<List<GenericValue>> getListNameAcsr() {
             return listNameAcsr;
         }
 
+        /**
+         * Gets map acsr.
+         * @return the map acsr
+         */
         public FlexibleMapAccessor<Map<String, Object>> getMapAcsr() {
             return mapAcsr;
         }
 
+        /**
+         * Gets order by list acsr.
+         * @return the order by list acsr
+         */
         public FlexibleMapAccessor<List<String>> getOrderByListAcsr() {
             return orderByListAcsr;
         }
 
+        /**
+         * Gets use cache.
+         * @return the use cache
+         */
         public boolean getUseCache() {
             return useCache;
         }
 
+        /**
+         * Gets value name acsr.
+         * @return the value name acsr
+         */
         public FlexibleMapAccessor<Object> getValueNameAcsr() {
             return valueNameAcsr;
         }
@@ -384,6 +420,10 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets relation name.
+         * @return the relation name
+         */
         public String getRelationName() {
             return this.relationName;
         }
@@ -414,14 +454,26 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
         }
 
+        /**
+         * Gets to value name acsr.
+         * @return the to value name acsr
+         */
         public FlexibleMapAccessor<Object> getToValueNameAcsr() {
             return toValueNameAcsr;
         }
 
+        /**
+         * Gets use cache.
+         * @return the use cache
+         */
         public boolean getUseCache() {
             return useCache;
         }
 
+        /**
+         * Gets value name acsr.
+         * @return the value name acsr
+         */
         public FlexibleMapAccessor<Object> getValueNameAcsr() {
             return valueNameAcsr;
         }
@@ -487,14 +539,26 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
         }
 
+        /**
+         * Gets global exdr.
+         * @return the global exdr
+         */
         public FlexibleStringExpander getGlobalExdr() {
             return globalExdr;
         }
 
+        /**
+         * Gets map name acsr.
+         * @return the map name acsr
+         */
         public FlexibleMapAccessor<ResourceBundleMapWrapper> getMapNameAcsr() {
             return mapNameAcsr;
         }
 
+        /**
+         * Gets resource exdr.
+         * @return the resource exdr
+         */
         public FlexibleStringExpander getResourceExdr() {
             return resourceExdr;
         }
@@ -558,30 +622,58 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             fieldAcsr.put(context, value);
         }
 
+        /**
+         * Gets arg list acsr.
+         * @return the arg list acsr
+         */
         public FlexibleMapAccessor<List<? extends Object>> getArgListAcsr() {
             return argListAcsr;
         }
 
+        /**
+         * Gets default exdr.
+         * @return the default exdr
+         */
         public FlexibleStringExpander getDefaultExdr() {
             return defaultExdr;
         }
 
+        /**
+         * Gets field acsr.
+         * @return the field acsr
+         */
         public FlexibleMapAccessor<Object> getFieldAcsr() {
             return fieldAcsr;
         }
 
+        /**
+         * Gets global exdr.
+         * @return the global exdr
+         */
         public FlexibleStringExpander getGlobalExdr() {
             return globalExdr;
         }
 
+        /**
+         * Gets no locale.
+         * @return the no locale
+         */
         public boolean getNoLocale() {
             return noLocale;
         }
 
+        /**
+         * Gets property exdr.
+         * @return the property exdr
+         */
         public FlexibleStringExpander getPropertyExdr() {
             return propertyExdr;
         }
 
+        /**
+         * Gets resource exdr.
+         * @return the resource exdr
+         */
         public FlexibleStringExpander getResourceExdr() {
             return resourceExdr;
         }
@@ -625,10 +717,18 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
         }
 
+        /**
+         * Gets location.
+         * @return the location
+         */
         public String getLocation() {
             return location;
         }
 
+        /**
+         * Gets method.
+         * @return the method
+         */
         public String getMethod() {
             return method;
         }
@@ -657,6 +757,10 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets service name exdr.
+         * @return the service name exdr
+         */
         public FlexibleStringExpander getServiceNameExdr() {
             return this.serviceNameExdr;
         }
@@ -705,14 +809,26 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
         }
 
+        /**
+         * Gets auto field map exdr.
+         * @return the auto field map exdr
+         */
         public FlexibleStringExpander getAutoFieldMapExdr() {
             return autoFieldMapExdr;
         }
 
+        /**
+         * Gets field map.
+         * @return the field map
+         */
         public Map<FlexibleMapAccessor<Object>, Object> getFieldMap() {
             return fieldMap;
         }
 
+        /**
+         * Gets result map name acsr.
+         * @return the result map name acsr
+         */
         public FlexibleMapAccessor<Map<String, Object>> getResultMapNameAcsr() {
             return resultMapNameAcsr;
         }
@@ -757,6 +873,12 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets in memory persisted from field.
+         * @param storeAgent the store agent
+         * @param context the context
+         * @return the in memory persisted from field
+         */
         public Object getInMemoryPersistedFromField(Object storeAgent, Map<String, Object> context) {
             Object newValue = null;
             String originalName = this.fromField.getOriginalName();
@@ -847,13 +969,15 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
             if (!setIfNull && newValue == null) {
                 if (Debug.warningOn()) {
-                    Debug.logWarning("Field value not found (null) for the field: [" + this.field.getOriginalName() + " and there was no default value, so field was not set", MODULE);
+                    Debug.logWarning("Field value not found (null) for the field: [" + this.field.getOriginalName()
+                            + " and there was no default value, so field was not set", MODULE);
                 }
                 return;
             }
             if (!setIfEmpty && ObjectType.isEmpty(newValue)) {
                 if (Debug.warningOn()) {
-                    Debug.logWarning("Field value not found (empty) for the field: [" + this.field.getOriginalName() + " and there was no default value, so field was not set", MODULE);
+                    Debug.logWarning("Field value not found (empty) for the field: [" + this.field.getOriginalName()
+                            + " and there was no default value, so field was not set", MODULE);
                 }
                 return;
             }
@@ -910,34 +1034,66 @@ public abstract class AbstractModelAction implements Serializable, ModelAction {
             }
         }
 
+        /**
+         * Gets default exdr.
+         * @return the default exdr
+         */
         public FlexibleStringExpander getDefaultExdr() {
             return defaultExdr;
         }
 
+        /**
+         * Gets field.
+         * @return the field
+         */
         public FlexibleMapAccessor<Object> getField() {
             return field;
         }
 
+        /**
+         * Gets from field.
+         * @return the from field
+         */
         public FlexibleMapAccessor<Object> getFromField() {
             return fromField;
         }
 
+        /**
+         * Gets from scope.
+         * @return the from scope
+         */
         public String getFromScope() {
             return fromScope;
         }
 
+        /**
+         * Gets global exdr.
+         * @return the global exdr
+         */
         public FlexibleStringExpander getGlobalExdr() {
             return globalExdr;
         }
 
+        /**
+         * Gets to scope.
+         * @return the to scope
+         */
         public String getToScope() {
             return toScope;
         }
 
+        /**
+         * Gets type.
+         * @return the type
+         */
         public String getType() {
             return type;
         }
 
+        /**
+         * Gets value exdr.
+         * @return the value exdr
+         */
         public FlexibleStringExpander getValueExdr() {
             return valueExdr;
         }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
index f4ba7ea..1d87f43 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
@@ -104,12 +104,17 @@ public class IterateSectionWidget extends ModelScreenWidget {
         }
     }
 
+    /**
+     * Gets section list.
+     * @return the section list
+     */
     public List<ModelScreenWidget.Section> getSectionList() {
         return sectionList;
     }
 
     @Override
-    public void renderWidgetString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException {
+    public void renderWidgetString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer)
+            throws GeneralException, IOException {
         int viewIndex = 0;
         int locViewSize = this.viewSize;
         int lowIndex = -1;
@@ -118,7 +123,8 @@ public class IterateSectionWidget extends ModelScreenWidget {
         int actualPageSize = 0;
 
         boolean isEntrySet = false;
-        // create a standAloneStack, basically a "save point" for this SectionsRenderer, and make a new "screens" object just for it so it is isolated and doesn't follow the stack down
+        // create a standAloneStack, basically a "save point" for this SectionsRenderer, and make a new "screens" object
+        // just for it so it is isolated and doesn't follow the stack down
         MapStack<String> contextMs = MapStack.create(context);
 
         String entryName = this.entryNameExdr.expandString(context);
@@ -220,13 +226,21 @@ public class IterateSectionWidget extends ModelScreenWidget {
         }
 
     }
-    /*
-     * @return
+
+    /**
+     * Gets paginate target.
+     * @param context the context
+     * @return the paginate target
      */
     public String getPaginateTarget(Map<String, Object> context) {
         return this.paginateTarget.expandString(context);
     }
 
+    /**
+     * Gets paginate.
+     * @param context the context
+     * @return the paginate
+     */
     public boolean getPaginate(Map<String, Object> context) {
         if (!this.paginate.isEmpty() && UtilValidate.isNotEmpty(this.paginate.expandString(context))) {
             return Boolean.valueOf(this.paginate.expandString(context));
@@ -234,10 +248,22 @@ public class IterateSectionWidget extends ModelScreenWidget {
         return true;
     }
 
+    /**
+     * Gets view size.
+     * @return the view size
+     */
     public int getViewSize() {
         return viewSize;
     }
 
+    /**
+     * Render next prev.
+     * @param writer the writer
+     * @param context the context
+     * @param listSize the list size
+     * @param actualPageSize the actual page size
+     * @throws IOException the io exception
+     */
     public void renderNextPrev(Appendable writer, Map<String, Object> context, int listSize, int actualPageSize) throws IOException {
         String targetService = this.getPaginateTarget(context);
         if (targetService == null) {
@@ -304,7 +330,8 @@ public class IterateSectionWidget extends ModelScreenWidget {
             if (UtilValidate.isNotEmpty(queryString)) {
                 linkText.append(queryString).append("&amp;");
             }
-            linkText.append("VIEW_SIZE_"+ paginatorNumber + "=").append(viewSize).append("&amp;VIEW_INDEX_" + paginatorNumber + "=").append(viewIndex - 1).append("\"");
+            linkText.append("VIEW_SIZE_" + paginatorNumber + "=").append(viewSize).append("&amp;VIEW_INDEX_" + paginatorNumber
+                    + "=").append(viewIndex - 1).append("\"");
 
             // make the link
             writer.append(rh.makeLink(request, response, linkText.toString(), false, false, false));
@@ -328,7 +355,8 @@ public class IterateSectionWidget extends ModelScreenWidget {
             if (UtilValidate.isNotEmpty(queryString)) {
                 linkText.append(queryString).append("&amp;");
             }
-            linkText.append("VIEW_SIZE_" + paginatorNumber + "=").append(viewSize).append("&amp;VIEW_INDEX_" + paginatorNumber + "=").append(viewIndex + 1).append("\"");
+            linkText.append("VIEW_SIZE_" + paginatorNumber + "=").append(viewSize).append("&amp;VIEW_INDEX_" + paginatorNumber
+                    + "=").append(viewIndex + 1).append("\"");
 
             // make the link
             writer.append(rh.makeLink(request, response, linkText.toString(), false, false, false));
@@ -348,22 +376,42 @@ public class IterateSectionWidget extends ModelScreenWidget {
         visitor.visit(this);
     }
 
+    /**
+     * Gets list name exdr.
+     * @return the list name exdr
+     */
     public FlexibleMapAccessor<Object> getListNameExdr() {
         return listNameExdr;
     }
 
+    /**
+     * Gets entry name exdr.
+     * @return the entry name exdr
+     */
     public FlexibleStringExpander getEntryNameExdr() {
         return entryNameExdr;
     }
 
+    /**
+     * Gets key name exdr.
+     * @return the key name exdr
+     */
     public FlexibleStringExpander getKeyNameExdr() {
         return keyNameExdr;
     }
 
+    /**
+     * Gets paginate target.
+     * @return the paginate target
+     */
     public FlexibleStringExpander getPaginateTarget() {
         return paginateTarget;
     }
 
+    /**
+     * Gets paginate.
+     * @return the paginate
+     */
     public FlexibleStringExpander getPaginate() {
         return paginate;
     }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java
index aac88de..cf77810 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java
@@ -173,6 +173,10 @@ public abstract class ModelFormAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets service name.
+         * @return the service name
+         */
         public String getServiceName() {
             return serviceNameExdr.getOriginal();
         }
@@ -230,26 +234,50 @@ public abstract class ModelFormAction {
             }
         }
 
+        /**
+         * Gets auto field map exdr.
+         * @return the auto field map exdr
+         */
         public FlexibleStringExpander getAutoFieldMapExdr() {
             return autoFieldMapExdr;
         }
 
+        /**
+         * Gets field map.
+         * @return the field map
+         */
         public Map<FlexibleMapAccessor<Object>, Object> getFieldMap() {
             return fieldMap;
         }
 
+        /**
+         * Gets ignore error.
+         * @return the ignore error
+         */
         public boolean getIgnoreError() {
             return ignoreError;
         }
 
+        /**
+         * Gets result map list name exdr.
+         * @return the result map list name exdr
+         */
         public FlexibleStringExpander getResultMapListNameExdr() {
             return resultMapListNameExdr;
         }
 
+        /**
+         * Gets result map name acsr.
+         * @return the result map name acsr
+         */
         public FlexibleMapAccessor<Map<String, Object>> getResultMapNameAcsr() {
             return resultMapNameAcsr;
         }
 
+        /**
+         * Gets service name exdr.
+         * @return the service name exdr
+         */
         public FlexibleStringExpander getServiceNameExdr() {
             return serviceNameExdr;
         }
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 59ee56d..5bdca22 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
@@ -335,8 +335,8 @@ public class ModelFormField {
                     GenericEntity genEnt = (GenericEntity) dataMap;
                     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
+                    // } else {
+                        //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);
@@ -681,7 +681,7 @@ public class ModelFormField {
         // So if a label ends with " Id", replace with " ID".
         // If there is another locale that doesn't follow this rule, we can add condition for this locale to exempt from the change.
         if (autoTitlewriterString.endsWith(" Id")) {
-                autoTitlewriterString = autoTitlewriterString.subSequence(0, autoTitlewriterString.length() - 3) + " ID";
+            autoTitlewriterString = autoTitlewriterString.subSequence(0, autoTitlewriterString.length() - 3) + " ID";
         }
 
         return autoTitlewriterString;
@@ -986,34 +986,66 @@ public class ModelFormField {
             this.fullSearch = element.getAttribute("full-search");
         }
 
+        /**
+         * Gets auto select.
+         * @return the auto select
+         */
         public String getAutoSelect() {
             return this.autoSelect;
         }
 
+        /**
+         * Gets choices.
+         * @return the choices
+         */
         public String getChoices() {
             return this.choices;
         }
 
+        /**
+         * Gets frequency.
+         * @return the frequency
+         */
         public String getFrequency() {
             return this.frequency;
         }
 
+        /**
+         * Gets full search.
+         * @return the full search
+         */
         public String getFullSearch() {
             return this.fullSearch;
         }
 
+        /**
+         * Gets ignore case.
+         * @return the ignore case
+         */
         public String getIgnoreCase() {
             return this.ignoreCase;
         }
 
+        /**
+         * Gets min chars.
+         * @return the min chars
+         */
         public String getMinChars() {
             return this.minChars;
         }
 
+        /**
+         * Gets partial chars.
+         * @return the partial chars
+         */
         public String getPartialChars() {
             return this.partialChars;
         }
 
+        /**
+         * Gets partial search.
+         * @return the partial search
+         */
         public String getPartialSearch() {
             return this.partialSearch;
         }
@@ -1057,10 +1089,19 @@ public class ModelFormField {
             return new CheckField(this, modelFormField);
         }
 
+        /**
+         * Gets all checked.
+         * @return the all checked
+         */
         public FlexibleStringExpander getAllChecked() {
             return allChecked;
         }
 
+        /**
+         * Is all checked boolean.
+         * @param context the context
+         * @return the boolean
+         */
         public Boolean isAllChecked(Map<String, Object> context) {
             String allCheckedStr = this.allChecked.expandString(context);
             if (!allCheckedStr.isEmpty()) {
@@ -1170,10 +1211,19 @@ public class ModelFormField {
             return defaultOption;
         }
 
+        /**
+         * Gets default option thru.
+         * @return the default option thru
+         */
         public String getDefaultOptionThru() {
             return this.defaultOptionThru;
         }
 
+        /**
+         * Gets default option thru.
+         * @param context the context
+         * @return the default option thru
+         */
         public String getDefaultOptionThru(Map<String, Object> context) {
             String defaultOption = getDefaultOptionThru();
 
@@ -1761,10 +1811,19 @@ public class ModelFormField {
             return retVal;
         }
 
+        /**
+         * Gets image location.
+         * @return the image location
+         */
         public FlexibleStringExpander getImageLocation() {
             return imageLocation;
         }
 
+        /**
+         * Gets image location.
+         * @param context the context
+         * @return the image location
+         */
         public String getImageLocation(Map<String, Object> context) {
             if (this.imageLocation != null) {
                 return this.imageLocation.expandString(context);
@@ -1772,14 +1831,26 @@ public class ModelFormField {
             return "";
         }
 
+        /**
+         * Gets in place editor.
+         * @return the in place editor
+         */
         public InPlaceEditor getInPlaceEditor() {
             return this.inPlaceEditor;
         }
 
+        /**
+         * Gets size.
+         * @return the size
+         */
         public String getSize() {
             return this.size;
         }
 
+        /**
+         * Gets type.
+         * @return the type
+         */
         public String getType() {
             return this.type;
         }
@@ -2420,18 +2491,36 @@ public class ModelFormField {
             return new FormField(this, modelFormField);
         }
 
+        /**
+         * Gets form name.
+         * @param context the context
+         * @return the form name
+         */
         public String getFormName(Map<String, Object> context) {
             return this.formName.expandString(context);
         }
 
+        /**
+         * Gets form name.
+         * @return the form name
+         */
         public FlexibleStringExpander getFormName() {
             return formName;
         }
 
+        /**
+         * Gets form location.
+         * @param context the context
+         * @return the form location
+         */
         public String getFormLocation(Map<String, Object> context) {
             return this.formLocation.expandString(context);
         }
 
+        /**
+         * Gets form location.
+         * @return the form location
+         */
         public FlexibleStringExpander getFormLocation() {
             return formLocation;
         }
@@ -2452,6 +2541,11 @@ public class ModelFormField {
             }
         }
 
+        /**
+         * Gets model form.
+         * @param context the context
+         * @return the model form
+         */
         public ModelForm getModelForm(Map<String, Object> context) {
             String name = this.getFormName(context);
             String location = this.getFormLocation(context);
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
index 5a209db..3d9520d 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
@@ -338,6 +338,10 @@ public class ModelMenu extends ModelWidget {
         }
     }
 
+    /**
+     * Gets actions.
+     * @return the actions
+     */
     public List<ModelAction> getActions() {
         return actions;
     }
@@ -347,74 +351,149 @@ public class ModelMenu extends ModelWidget {
         return menuLocation + "#" + getName();
     }
 
+    /**
+     * Gets current menu name.
+     * @param context the context
+     * @return the current menu name
+     */
     public String getCurrentMenuName(Map<String, Object> context) {
         return getName();
     }
 
+    /**
+     * Gets default align.
+     * @return the default align
+     */
     public String getDefaultAlign() {
         return this.defaultAlign;
     }
 
+    /**
+     * Gets default align style.
+     * @return the default align style
+     */
     public String getDefaultAlignStyle() {
         return this.defaultAlignStyle;
     }
 
+    /**
+     * Gets default associated content id.
+     * @return the default associated content id
+     */
     public FlexibleStringExpander getDefaultAssociatedContentId() {
         return defaultAssociatedContentId;
     }
 
+    /**
+     * Gets default associated content id.
+     * @param context the context
+     * @return the default associated content id
+     */
     public String getDefaultAssociatedContentId(Map<String, Object> context) {
         return defaultAssociatedContentId.expandString(context);
     }
 
+    /**
+     * Gets default cell width.
+     * @return the default cell width
+     */
     public String getDefaultCellWidth() {
         return this.defaultCellWidth;
     }
 
+    /**
+     * Gets default disabled title style.
+     * @return the default disabled title style
+     */
     public String getDefaultDisabledTitleStyle() {
         return this.defaultDisabledTitleStyle;
     }
 
+    /**
+     * Gets default entity name.
+     * @return the default entity name
+     */
     public String getDefaultEntityName() {
         return this.defaultEntityName;
     }
 
+    /**
+     * Gets default hide if selected.
+     * @return the default hide if selected
+     */
     public Boolean getDefaultHideIfSelected() {
         return this.defaultHideIfSelected;
     }
 
+    /**
+     * Gets default menu item name.
+     * @return the default menu item name
+     */
     public String getDefaultMenuItemName() {
         return this.defaultMenuItemName;
     }
 
+    /**
+     * Gets default permission entity action.
+     * @return the default permission entity action
+     */
     public String getDefaultPermissionEntityAction() {
         return this.defaultPermissionEntityAction;
     }
 
+    /**
+     * Gets default permission operation.
+     * @return the default permission operation
+     */
     public String getDefaultPermissionOperation() {
         return this.defaultPermissionOperation;
     }
 
+    /**
+     * Gets default selected style.
+     * @return the default selected style
+     */
     public String getDefaultSelectedStyle() {
         return this.defaultSelectedStyle;
     }
 
+    /**
+     * Gets default title style.
+     * @return the default title style
+     */
     public String getDefaultTitleStyle() {
         return this.defaultTitleStyle;
     }
 
+    /**
+     * Gets default tooltip style.
+     * @return the default tooltip style
+     */
     public String getDefaultTooltipStyle() {
         return this.defaultTooltipStyle;
     }
 
+    /**
+     * Gets default widget style.
+     * @return the default widget style
+     */
     public String getDefaultWidgetStyle() {
         return this.defaultWidgetStyle;
     }
 
+    /**
+     * Gets extra index.
+     * @return the extra index
+     */
     public FlexibleStringExpander getExtraIndex() {
         return extraIndex;
     }
 
+    /**
+     * Gets extra index.
+     * @param context the context
+     * @return the extra index
+     */
     public String getExtraIndex(Map<String, Object> context) {
         try {
             return extraIndex.expandString(context);
@@ -423,54 +502,109 @@ public class ModelMenu extends ModelWidget {
         }
     }
 
+    /**
+     * Gets fill style.
+     * @return the fill style
+     */
     public String getFillStyle() {
         return this.fillStyle;
     }
 
+    /**
+     * Gets id.
+     * @return the id
+     */
     public String getId() {
         return this.id;
     }
 
+    /**
+     * Gets menu container style.
+     * @param context the context
+     * @return the menu container style
+     */
     public String getMenuContainerStyle(Map<String, Object> context) {
         return menuContainerStyleExdr.expandString(context);
     }
 
+    /**
+     * Gets menu container style exdr.
+     * @return the menu container style exdr
+     */
     public FlexibleStringExpander getMenuContainerStyleExdr() {
         return menuContainerStyleExdr;
     }
 
+    /**
+     * Gets menu item list.
+     * @return the menu item list
+     */
     public List<ModelMenuItem> getMenuItemList() {
         return menuItemList;
     }
 
+    /**
+     * Gets menu item map.
+     * @return the menu item map
+     */
     public Map<String, ModelMenuItem> getMenuItemMap() {
         return menuItemMap;
     }
 
+    /**
+     * Gets menu location.
+     * @return the menu location
+     */
     public String getMenuLocation() {
         return menuLocation;
     }
 
+    /**
+     * Gets menu width.
+     * @return the menu width
+     */
     public String getMenuWidth() {
         return this.menuWidth;
     }
 
+    /**
+     * Gets model menu item by name.
+     * @param name the name
+     * @return the model menu item by name
+     */
     public ModelMenuItem getModelMenuItemByName(String name) {
         return this.menuItemMap.get(name);
     }
 
+    /**
+     * Gets orientation.
+     * @return the orientation
+     */
     public String getOrientation() {
         return this.orientation;
     }
 
+    /**
+     * Gets parent menu.
+     * @return the parent menu
+     */
     public ModelMenu getParentMenu() {
         return parentMenu;
     }
 
+    /**
+     * Gets selected menu item context field name.
+     * @return the selected menu item context field name
+     */
     public FlexibleMapAccessor<String> getSelectedMenuItemContextFieldName() {
         return selectedMenuItemContextFieldName;
     }
 
+    /**
+     * Gets selected menu item context field name.
+     * @param context the context
+     * @return the selected menu item context field name
+     */
     public String getSelectedMenuItemContextFieldName(Map<String, Object> context) {
         String menuItemName = this.selectedMenuItemContextFieldName.get(context);
         if (UtilValidate.isEmpty(menuItemName)) {
@@ -479,26 +613,52 @@ public class ModelMenu extends ModelWidget {
         return menuItemName;
     }
 
+    /**
+     * Gets target.
+     * @return the target
+     */
     public String getTarget() {
         return target;
     }
 
+    /**
+     * Gets title.
+     * @return the title
+     */
     public FlexibleStringExpander getTitle() {
         return title;
     }
 
+    /**
+     * Gets title.
+     * @param context the context
+     * @return the title
+     */
     public String getTitle(Map<String, Object> context) {
         return title.expandString(context);
     }
 
+    /**
+     * Gets tooltip.
+     * @return the tooltip
+     */
     public String getTooltip() {
         return this.tooltip;
     }
 
+    /**
+     * Gets type.
+     * @return the type
+     */
     public String getType() {
         return this.type;
     }
 
+    /**
+     * Rendered menu item count int.
+     * @param context the context
+     * @return the int
+     */
     public int renderedMenuItemCount(Map<String, Object> context) {
         int count = 0;
         for (ModelMenuItem item : this.menuItemList) {
@@ -534,6 +694,13 @@ public class ModelMenu extends ModelWidget {
         }
     }
 
+    /**
+     * Render simple menu string.
+     * @param writer the writer
+     * @param context the context
+     * @param menuStringRenderer the menu string renderer
+     * @throws IOException the io exception
+     */
     public void renderSimpleMenuString(Appendable writer, Map<String, Object> context, MenuStringRenderer menuStringRenderer)
             throws IOException {
         // render menu open
@@ -553,6 +720,10 @@ public class ModelMenu extends ModelWidget {
         menuStringRenderer.renderMenuClose(writer, context, this);
     }
 
+    /**
+     * Run actions.
+     * @param context the context
+     */
     public void runActions(Map<String, Object> context) {
         AbstractModelAction.runSubActions(this.actions, context);
     }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java
index ca18803..a7baea4 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java
@@ -76,17 +76,19 @@ public abstract class ModelMenuAction {
         private final String fromScope;
 
         public SetField(ModelMenu modelMenu, Element setElement) {
-            super (modelMenu, setElement);
+            super(modelMenu, setElement);
             this.field = FlexibleMapAccessor.getInstance(setElement.getAttribute("field"));
             this.fromField = FlexibleMapAccessor.getInstance(setElement.getAttribute("from-field"));
             this.valueExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("value"));
-            this.defaultExdr = UtilValidate.isNotEmpty(setElement.getAttribute("default-value")) ? FlexibleStringExpander.getInstance(setElement.getAttribute("default-value")) : null;
+            this.defaultExdr = UtilValidate.isNotEmpty(setElement.getAttribute("default-value"))
+                    ? FlexibleStringExpander.getInstance(setElement.getAttribute("default-value")) : null;
             this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global"));
             this.type = setElement.getAttribute("type");
             this.toScope = setElement.getAttribute("to-scope");
             this.fromScope = setElement.getAttribute("from-scope");
             if (!this.fromField.isEmpty() && !this.valueExdr.isEmpty()) {
-                throw new IllegalArgumentException("Cannot specify a from-field [" + setElement.getAttribute("from-field") + "] and a value [" + setElement.getAttribute("value") + "] on the set action in a screen widget");
+                throw new IllegalArgumentException("Cannot specify a from-field [" + setElement.getAttribute("from-field")
+                        + "] and a value [" + setElement.getAttribute("value") + "] on the set action in a screen widget");
             }
         }
 
@@ -120,7 +122,8 @@ public abstract class ModelMenuAction {
                     ServletContext servletContext = (ServletContext) context.get("application");
                     newValue = servletContext.getAttribute(newKey);
                     if (Debug.verboseOn()) {
-                        Debug.logVerbose("In application getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue, MODULE);
+                        Debug.logVerbose("In application getting value for field from [" + this.fromField.getOriginalName() + "]: "
+                                + newValue, MODULE);
                     }
                 } else if (!this.valueExdr.isEmpty()) {
                     newValue = this.valueExdr.expandString(context);
@@ -151,9 +154,11 @@ public abstract class ModelMenuAction {
                     newValue = new LinkedList();
                 } else {
                     try {
-                        newValue = ObjectType.simpleTypeOrObjectConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
+                        newValue = ObjectType.simpleTypeOrObjectConvert(newValue, this.type, null,
+                                (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
                     } catch (GeneralException e) {
-                        String errMsg = "Could not convert field value for the field: [" + this.field.getOriginalName() + "] to the [" + this.type + "] type for the value [" + newValue + "]: " + e.toString();
+                        String errMsg = "Could not convert field value for the field: [" + this.field.getOriginalName()
+                                + "] to the [" + this.type + "] type for the value [" + newValue + "]: " + e.toString();
                         Debug.logError(e, errMsg, MODULE);
                         throw new IllegalArgumentException(errMsg);
                     }
@@ -199,34 +204,66 @@ public abstract class ModelMenuAction {
             visitor.visit(this);
         }
 
+        /**
+         * Gets field.
+         * @return the field
+         */
         public FlexibleMapAccessor<Object> getField() {
             return field;
         }
 
+        /**
+         * Gets from field.
+         * @return the from field
+         */
         public FlexibleMapAccessor<Object> getFromField() {
             return fromField;
         }
 
+        /**
+         * Gets value exdr.
+         * @return the value exdr
+         */
         public FlexibleStringExpander getValueExdr() {
             return valueExdr;
         }
 
+        /**
+         * Gets default exdr.
+         * @return the default exdr
+         */
         public FlexibleStringExpander getDefaultExdr() {
             return defaultExdr;
         }
 
+        /**
+         * Gets global exdr.
+         * @return the global exdr
+         */
         public FlexibleStringExpander getGlobalExdr() {
             return globalExdr;
         }
 
+        /**
+         * Gets type.
+         * @return the type
+         */
         public String getType() {
             return type;
         }
 
+        /**
+         * Gets to scope.
+         * @return the to scope
+         */
         public String getToScope() {
             return toScope;
         }
 
+        /**
+         * Gets from scope.
+         * @return the from scope
+         */
         public String getFromScope() {
             return fromScope;
         }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java
index c110dda..057e7b8 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java
@@ -72,26 +72,50 @@ public class ModelScreen extends ModelWidget {
         visitor.visit(this);
     }
 
+    /**
+     * Gets transaction timeout.
+     * @return the transaction timeout
+     */
     public String getTransactionTimeout() {
         return transactionTimeoutExdr.getOriginal();
     }
 
+    /**
+     * Gets model screen map.
+     * @return the model screen map
+     */
     public Map<String, ModelScreen> getModelScreenMap() {
         return modelScreenMap;
     }
 
+    /**
+     * Gets use transaction.
+     * @return the use transaction
+     */
     public boolean getUseTransaction() {
         return useTransaction;
     }
 
+    /**
+     * Gets use cache.
+     * @return the use cache
+     */
     public boolean getUseCache() {
         return useCache;
     }
 
+    /**
+     * Gets section.
+     * @return the section
+     */
     public ModelScreenWidget.Section getSection() {
         return section;
     }
 
+    /**
+     * Gets source location.
+     * @return the source location
+     */
     public String getSourceLocation() {
         return sourceLocation;
     }
@@ -115,7 +139,8 @@ public class ModelScreen extends ModelWidget {
      *   different screen elements; implementing your own makes it possible to
      *   use the same screen definitions for many types of screen UIs
      */
-    public void renderScreenString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws ScreenRenderException {
+    public void renderScreenString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer)
+            throws ScreenRenderException {
         // make sure the "nullField" object is in there for entity ops
         context.put("nullField", GenericEntity.NULL_FIELD);
 
@@ -150,11 +175,21 @@ public class ModelScreen extends ModelWidget {
         }
     }
 
+    /**
+     * Gets dispatcher.
+     * @param context the context
+     * @return the dispatcher
+     */
     public LocalDispatcher getDispatcher(Map<String, Object> context) {
         LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher");
         return dispatcher;
     }
 
+    /**
+     * Gets delegator.
+     * @param context the context
+     * @return the delegator
+     */
     public Delegator getDelegator(Map<String, Object> context) {
         Delegator delegator = (Delegator) context.get("delegator");
         return delegator;
@@ -178,7 +213,8 @@ public class ModelScreen extends ModelWidget {
                 try {
                     transactionTimeout = Integer.parseInt(transactionTimeoutPar);
                 } catch (NumberFormatException nfe) {
-                    String msg = "TRANSACTION_TIMEOUT parameter for screen [" + this.sourceLocation + "#" + getName() + "] is invalid and it will be ignored: " + nfe.toString();
+                    String msg = "TRANSACTION_TIMEOUT parameter for screen [" + this.sourceLocation + "#" + getName()
+                            + "] is invalid and it will be ignored: " + nfe.toString();
                     Debug.logWarning(msg, MODULE);
                 }
             }
@@ -191,12 +227,13 @@ public class ModelScreen extends ModelWidget {
                 try {
                     transactionTimeout = Integer.parseInt(transactionTimeoutStr);
                 } catch (NumberFormatException e) {
-                    Debug.logWarning(e, "Could not parse transaction-timeout value, original=[" + transactionTimeoutExdr + "], expanded=[" + transactionTimeoutStr + "]", MODULE);
+                    Debug.logWarning(e, "Could not parse transaction-timeout value, original=[" + transactionTimeoutExdr
+                            + "], expanded=[" + transactionTimeoutStr + "]", MODULE);
                 }
             }
         }
-        return transactionTimeout > 0 ? transactionTimeout:
-                UtilProperties.getPropertyAsInteger("widget", "widget.screen.transaction.defaultTimeout", 60);
+        return transactionTimeout > 0 ? transactionTimeout
+                : UtilProperties.getPropertyAsInteger("widget", "widget.screen.transaction.defaultTimeout", 60);
     }
 }
 
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
index 0ee9088..d336a2b 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
@@ -236,50 +236,115 @@ public class ModelTheme implements Serializable {
         this.modelCommonMenusMap = Collections.unmodifiableMap(initModelCommonMenusMap);
     }
 
+    /**
+     * Gets name.
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Gets visual theme ids.
+     * @return the visual theme ids
+     */
     public List<String> getVisualThemeIds() {
         return new ArrayList<>(visualThemes.keySet());
     }
-    public VisualTheme getVisualTheme(String visualThemeId) { return visualThemes.get(visualThemeId); }
 
+    /**
+     * Gets visual theme.
+     * @param visualThemeId the visual theme id
+     * @return the visual theme
+     */
+    public VisualTheme getVisualTheme(String visualThemeId) {
+        return visualThemes.get(visualThemeId);
+    }
+
+    /**
+     * Gets default view size.
+     * @return the default view size
+     */
     public Integer getDefaultViewSize() {
         return defaultViewSize;
     }
 
+    /**
+     * Gets autocompleter default view size.
+     * @return the autocompleter default view size
+     */
     public Integer getAutocompleterDefaultViewSize() {
         return autocompleterDefaultViewSize;
     }
+
+    /**
+     * Gets autocompleter default min length.
+     * @return the autocompleter default min length
+     */
     public Integer getAutocompleterDefaultMinLength() {
         return autocompleterDefaultMinLength;
     }
+
+    /**
+     * Gets autocompleter display return field.
+     * @return the autocompleter display return field
+     */
     public Boolean getAutocompleterDisplayReturnField() {
         return autocompleterDisplayReturnField;
     }
+
+    /**
+     * Gets autocompleter default delay.
+     * @return the autocompleter default delay
+     */
     public Integer getAutocompleterDefaultDelay() {
         return autocompleterDefaultDelay;
     }
 
+    /**
+     * Gets link default layered modal height.
+     * @return the link default layered modal height
+     */
     public Integer getLinkDefaultLayeredModalHeight() {
         return linkDefaultLayeredModalHeight;
     }
+
+    /**
+     * Gets link default layered modal width.
+     * @return the link default layered modal width
+     */
     public Integer getLinkDefaultLayeredModalWidth() {
         return linkDefaultLayeredModalWidth;
     }
 
+    /**
+     * Gets lookup height.
+     * @return the lookup height
+     */
     public Integer getLookupHeight() {
         return lookupHeight;
     }
 
+    /**
+     * Gets lookup width.
+     * @return the lookup width
+     */
     public Integer getLookupWidth() {
         return lookupWidth;
     }
 
+    /**
+     * Gets lookup position.
+     * @return the lookup position
+     */
     public String getLookupPosition() {
         return lookupPosition;
     }
+
+    /**
+     * Gets lookup show description.
+     * @return the lookup show description
+     */
     public String getLookupShowDescription() {
         return lookupShowDescription;
     }
@@ -299,7 +364,8 @@ public class ModelTheme implements Serializable {
                 initWidgetPropertiesMap.put("autocompleterDefaultDelay", Integer.valueOf(childElement.getAttribute("default-delay")));
                 initWidgetPropertiesMap.put("autocompleterDefaultMinLength", Integer.valueOf(childElement.getAttribute("default-min-lenght")));
                 initWidgetPropertiesMap.put("autocompleterDefaultViewSize", Integer.valueOf(childElement.getAttribute("default-view-size")));
-                initWidgetPropertiesMap.put("autocompleterDisplayReturnField", "true".equalsIgnoreCase(childElement.getAttribute("display-return-field")));
+                initWidgetPropertiesMap.put("autocompleterDisplayReturnField", "true"
+                        .equalsIgnoreCase(childElement.getAttribute("display-return-field")));
                 break;
             case "lookup":
                 initWidgetPropertiesMap.put("lookupPosition", childElement.getAttribute("position"));
@@ -335,6 +401,12 @@ public class ModelTheme implements Serializable {
             }
         }
     }
+
+    /**
+     * Gets property.
+     * @param propertyName the property name
+     * @return the property
+     */
     public Object getProperty(String propertyName) {
         if (!themePropertiesMap.containsKey(propertyName)
                 || themePropertiesMap.get(propertyName) == null) {
@@ -351,6 +423,11 @@ public class ModelTheme implements Serializable {
         return themePropertiesMap;
     }
 
+    /**
+     * Gets type.
+     * @param name the name
+     * @return the type
+     */
     public String getType(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -358,6 +435,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets encoder.
+     * @param name the name
+     * @return the encoder
+     */
     public String getEncoder(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -365,6 +448,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets compress.
+     * @param name the name
+     * @return the compress
+     */
     public String getCompress(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -372,6 +461,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets content type.
+     * @param name the name
+     * @return the content type
+     */
     public String getContentType(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -379,6 +474,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets encoding.
+     * @param name the name
+     * @return the encoding
+     */
     public String getEncoding(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -387,6 +488,11 @@ public class ModelTheme implements Serializable {
         return null;
     }
 
+    /**
+     * Gets screen renderer location.
+     * @param name the name
+     * @return the screen renderer location
+     */
     public String getScreenRendererLocation(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -394,6 +500,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets form renderer location.
+     * @param name the name
+     * @return the form renderer location
+     */
     public String getFormRendererLocation(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -401,6 +513,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets tree renderer location.
+     * @param name the name
+     * @return the tree renderer location
+     */
     public String getTreeRendererLocation(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -408,6 +526,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets menu renderer location.
+     * @param name the name
+     * @return the menu renderer location
+     */
     public String getMenuRendererLocation(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -415,6 +539,12 @@ public class ModelTheme implements Serializable {
         }
         return null;
     }
+
+    /**
+     * Gets error template location.
+     * @param name the name
+     * @return the error template location
+     */
     public String getErrorTemplateLocation(String name) {
         ModelTemplate modelTemplate = modelTemplateMap.get(name);
         if (modelTemplate != null) {
@@ -423,12 +553,26 @@ public class ModelTheme implements Serializable {
         return null;
     }
 
+    /**
+     * Gets model common screens.
+     * @return the model common screens
+     */
     public Map<String, String> getModelCommonScreens() {
         return modelCommonScreensMap;
     }
+
+    /**
+     * Gets model common forms.
+     * @return the model common forms
+     */
     public Map<String, String> getModelCommonForms() {
         return modelCommonFormsMap;
     }
+
+    /**
+     * Gets model common menus.
+     * @return the model common menus
+     */
     public Map<String, String> getModelCommonMenus() {
         return modelCommonMenusMap;
     }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java
index 9c3be0a..85080c2 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java
@@ -151,10 +151,19 @@ public class ModelTree extends ModelWidget {
         return location + "#" + getName();
     }
 
+    /**
+     * Gets default entity name.
+     * @return the default entity name
+     */
     public String getDefaultEntityName() {
         return this.defaultEntityName;
     }
 
+    /**
+     * Gets default pk name.
+     * @param context the context
+     * @return the default pk name
+     */
     public String getDefaultPkName(Map<String, Object> context) {
         ModelEntity modelEntity = WidgetWorker.getDelegator(context).getModelEntity(this.defaultEntityName);
         if (modelEntity.getPksSize() == 1) {
@@ -164,6 +173,11 @@ public class ModelTree extends ModelWidget {
         return null;
     }
 
+    /**
+     * Gets expand collapse request.
+     * @param context the context
+     * @return the expand collapse request
+     */
     public String getExpandCollapseRequest(Map<String, Object> context) {
         String expColReq = this.expandCollapseRequestExdr.expandString(context);
         if (UtilValidate.isEmpty(expColReq)) {
@@ -194,26 +208,52 @@ public class ModelTree extends ModelWidget {
         return expColReq;
     }
 
+    /**
+     * Gets open depth.
+     * @return the open depth
+     */
     public int getOpenDepth() {
         return openDepth;
     }
 
+    /**
+     * Gets post trail open depth.
+     * @return the post trail open depth
+     */
     public int getPostTrailOpenDepth() {
         return postTrailOpenDepth;
     }
 
+    /**
+     * Gets render style.
+     * @return the render style
+     */
     public String getRenderStyle() {
         return this.defaultRenderStyle;
     }
 
+    /**
+     * Gets root node name.
+     * @return the root node name
+     */
     public String getRootNodeName() {
         return rootNodeName;
     }
 
+    /**
+     * Gets trail name.
+     * @param context the context
+     * @return the trail name
+     */
     public String getTrailName(Map<String, Object> context) {
         return this.trailNameExdr.expandString(context);
     }
 
+    /**
+     * Gets wrap style.
+     * @param context the context
+     * @return the wrap style
+     */
     public String getWrapStyle(Map<String, Object> context) {
         return this.defaultWrapStyleExdr.expandString(context);
     }
@@ -257,30 +297,58 @@ public class ModelTree extends ModelWidget {
 
     }
 
+    /**
+     * Gets default render style.
+     * @return the default render style
+     */
     public String getDefaultRenderStyle() {
         return defaultRenderStyle;
     }
 
+    /**
+     * Gets default wrap style exdr.
+     * @return the default wrap style exdr
+     */
     public FlexibleStringExpander getDefaultWrapStyleExdr() {
         return defaultWrapStyleExdr;
     }
 
+    /**
+     * Gets expand collapse request exdr.
+     * @return the expand collapse request exdr
+     */
     public FlexibleStringExpander getExpandCollapseRequestExdr() {
         return expandCollapseRequestExdr;
     }
 
+    /**
+     * Gets force child check.
+     * @return the force child check
+     */
     public boolean getForceChildCheck() {
         return forceChildCheck;
     }
 
+    /**
+     * Gets location.
+     * @return the location
+     */
     public String getLocation() {
         return location;
     }
 
+    /**
+     * Gets node map.
+     * @return the node map
... 1044 lines suppressed ...