[ofbiz-plugins] branch trunk updated: Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in plugins component. (OFBIZ-11886)

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

[ofbiz-plugins] branch trunk updated: Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in plugins component. (OFBIZ-11886)

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-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 22ccc68  Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in plugins component. (OFBIZ-11886)
     new 51cb1d7  Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-plugins into trunk
22ccc68 is described below

commit 22ccc6801ffbfb31afc7147e207ace958d2ba54f
Author: Suraj Khurana <[hidden email]>
AuthorDate: Tue Jul 21 12:28:45 2020 +0530

    Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in plugins component.
    (OFBIZ-11886)
---
 .../ofbiz/assetmaint/FixedAssetMaintServices.java  |  2 +-
 .../apache/ofbiz/birt/email/BirtEmailServices.java |  6 +-
 .../birt/flexible/BirtMasterReportServices.java    | 76 +++++++++++-----------
 .../apache/ofbiz/birt/flexible/BirtServices.java   |  8 ++-
 .../ofbiz/birt/flexible/ReportDesignGenerator.java |  4 +-
 .../java/org/apache/ofbiz/ebay/EbayHelper.java     |  8 ++-
 .../org/apache/ofbiz/ebay/EbayOrderServices.java   |  2 +-
 .../org/apache/ofbiz/ebaystore/EbayEvents.java     |  4 +-
 .../org/apache/ofbiz/ebaystore/EbayFeedback.java   |  6 +-
 .../java/org/apache/ofbiz/ebaystore/EbayStore.java | 18 ++---
 .../ofbiz/ebaystore/EbayStoreAutoPreferences.java  |  6 +-
 .../org/apache/ofbiz/ebaystore/EbayStoreOrder.java |  2 +-
 .../ofbiz/ecommerce/janrain/JanrainHelper.java     |  2 +-
 .../ofbiz/ecommerce/misc/ThirdPartyEvents.java     | 12 ++--
 .../ofbiz/content/search/DocumentIndexer.java      |  8 ++-
 .../apache/ofbiz/passport/event/GitHubEvents.java  |  2 -
 .../ofbiz/passport/event/LinkedInEvents.java       |  2 -
 .../ofbiz/passport/user/GitHubAuthenticator.java   |  4 +-
 .../ofbiz/passport/user/LinkedInAuthenticator.java |  4 +-
 .../ofbiz/htmlreport/AbstractHtmlReport.java       |  1 -
 .../apache/ofbiz/htmlreport/AbstractReport.java    |  1 -
 .../ofbiz/htmlreport/AbstractReportThread.java     |  3 +-
 .../org/apache/ofbiz/htmlreport/HtmlReport.java    |  3 +-
 .../apache/ofbiz/htmlreport/InterfaceReport.java   |  3 +-
 .../ofbiz/htmlreport/InterfaceReportThread.java    |  1 -
 .../ofbiz/htmlreport/sample/SampleHtmlReport.java  |  3 +-
 .../ofbiz/htmlreport/sample/SampleHtmlThread.java  |  4 +-
 .../ofbiz/htmlreport/util/ReportEncoder.java       |  4 --
 .../ofbiz/htmlreport/util/ReportStringUtil.java    |  1 -
 .../apache/ofbiz/pricat/AbstractPricatParser.java  |  1 -
 .../apache/ofbiz/pricat/InterfacePricatParser.java |  1 -
 .../ofbiz/pricat/PricatParseExcelHtmlReport.java   |  5 +-
 .../ofbiz/pricat/PricatParseExcelHtmlThread.java   |  1 -
 .../ofbiz/pricat/sample/SamplePricatParser.java    |  3 +-
 .../org/apache/ofbiz/solr/SolrProductSearch.java   |  4 +-
 .../main/java/org/apache/ofbiz/solr/SolrUtil.java  |  6 +-
 .../solr/webapp/OFBizSolrLoadAdminUiServlet.java   |  3 +-
 37 files changed, 115 insertions(+), 109 deletions(-)

diff --git a/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java b/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java
index d83bf25..023631c 100644
--- a/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java
+++ b/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java
@@ -62,7 +62,7 @@ public class FixedAssetMaintServices {
             if (product == null) {
                 return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AssetMaintInvalidPartProductIdError", UtilMisc.toMap("productId", productId), locale));
             }
-            Map<String, ? extends Object> findCurrInventoryParams =  UtilMisc.toMap("productId", productId, "facilityId", facilityId);
+            Map<String, ? extends Object> findCurrInventoryParams = UtilMisc.toMap("productId", productId, "facilityId", facilityId);
             GenericValue userLogin = (GenericValue) context.get("userLogin");
             // Call issuance service
             Map<String, Object> result = dispatcher.runSync("getInventoryAvailableByFacility", findCurrInventoryParams);
diff --git a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java
index b835de9..bb94c95 100644
--- a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java
+++ b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java
@@ -118,7 +118,7 @@ public class BirtEmailServices {
         try {
             screenStringRenderer = new MacroScreenRenderer("screen", visualTheme.getModelTheme().getScreenRendererLocation("screen"));
         } catch (TemplateException e) {
-            String errMsg =  UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale);
+            String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale);
             Debug.logError(e, errMsg, MODULE);
             return ServiceUtil.returnError(errMsg);
         } catch (IOException e) {
@@ -252,7 +252,9 @@ public class BirtEmailServices {
         serviceContext.put("subject", subject);
         serviceContext.put("partyId", partyId);
 
-        if (Debug.verboseOn()) Debug.logVerbose("sendMailFromScreen sendMail context: " + serviceContext, MODULE);
+        if (Debug.verboseOn()) {
+            Debug.logVerbose("sendMailFromScreen sendMail context: " + serviceContext, MODULE);
+        }
 
         Map<String, Object> result = ServiceUtil.returnSuccess();
         try {
diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java
index be41662..a4d86cb 100644
--- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java
+++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java
@@ -52,15 +52,14 @@ public class BirtMasterReportServices {
 
     private static final String MODULE = BirtServices.class.getName();
     private static final String RESOURCE = "BirtUiLabels";
-    private static final String RES_ERROR = "BirtErrorUiLabels";
 
     // The following methods are flexible report services as examples for reporting
     public static Map<String, Object> workEffortPerPersonPrepareDate(DispatchContext dctx, Map<String, Object> context) {
         Map<String, String> dataMap = UtilMisc.toMap(
-                "lastName", "name",
-                "firstName", "name",
-                "hours", "floating-point",
-                "fromDate", "date-time",
+                "lastName", "name",
+                "firstName", "name",
+                "hours", "floating-point",
+                "fromDate", "date-time",
                 "thruDate", "date-time");
         LinkedHashMap<String, String> filterMap = new LinkedHashMap<>();
         filterMap.put("firstName", "name");
@@ -68,10 +67,10 @@ public class BirtMasterReportServices {
         filterMap.put("fromDate", "date-time");
         filterMap.put("thruDate", "date-time");
         Map<String, String> fieldDisplayLabels = UtilMisc.toMap(
-                "lastName", "Last name",
-                "firstName", "First name",
-                "hours", "Hours",
-                "fromDate", "From date",
+                "lastName", "Last name",
+                "firstName", "First name",
+                "hours", "Hours",
+                "fromDate", "From date",
                 "thruDate", "Thru date");
         LinkedHashMap<String, String> filterDisplayLabels = new LinkedHashMap<>();
         filterDisplayLabels.put("firstName", "First name");
@@ -157,36 +156,36 @@ public class BirtMasterReportServices {
 
     public static Map<String, Object> turnOverPrepareFields(DispatchContext dctx, Map<String, Object> context) {
         Map<String, String> dataMap = UtilMisc.toMap(
-                "invoiceTypeId", "short-varchar",
-                "invoicePartyId", "short-varchar",
-                "statusId", "short-varchar",
-                "invoiceDate", "date",
-                "dueDate", "date",
-                "currencyUomId", "short-varchar",
-                "invoiceItemTypeId", "short-varchar",
-                "invoiceItemSeqId", "short-varchar",
-                "productId", "short-varchar",
-                "partyId", "short-varchar",
-                "primaryProductCategoryId", "short-varchar",
-                "quantity", "numeric",
-                "amount", "currency-amount",
-                "productStoreId", "short-varchar",
+                "invoiceTypeId", "short-varchar",
+                "invoicePartyId", "short-varchar",
+                "statusId", "short-varchar",
+                "invoiceDate", "date",
+                "dueDate", "date",
+                "currencyUomId", "short-varchar",
+                "invoiceItemTypeId", "short-varchar",
+                "invoiceItemSeqId", "short-varchar",
+                "productId", "short-varchar",
+                "partyId", "short-varchar",
+                "primaryProductCategoryId", "short-varchar",
+                "quantity", "numeric",
+                "amount", "currency-amount",
+                "productStoreId", "short-varchar",
                 "storeName", "short-varchar");
         Map<String, String> fieldDisplayLabels = UtilMisc.toMap(
-                "invoiceTypeId", "invoice Type",
-                "invoicePartyId", "Invoice",
-                "statusId", "Status",
-                "invoiceDate", "Date",
-                "dueDate", "Due date ",
-                "currencyUomId", "Currency",
-                "invoiceItemTypeId", "Invoice type line",
-                "invoiceItemSeqId", "Invoice line",
-                "productId", "Product",
-                "partyId", "Customer",
-                "primaryProductCategoryId", "Product category",
-                "quantity", "Qty",
-                "amount", "Amount",
-                "productStoreId", "Product Store",
+                "invoiceTypeId", "invoice Type",
+                "invoicePartyId", "Invoice",
+                "statusId", "Status",
+                "invoiceDate", "Date",
+                "dueDate", "Due date",
+                "currencyUomId", "Currency",
+                "invoiceItemTypeId", "Invoice type line",
+                "invoiceItemSeqId", "Invoice line",
+                "productId", "Product",
+                "partyId", "Customer",
+                "primaryProductCategoryId", "Product category",
+                "quantity", "Qty",
+                "amount", "Amount",
+                "productStoreId", "Product Store",
                 "storeName", "Product store name");
         LinkedHashMap<String, String> filterMap = new LinkedHashMap<>();
         filterMap.put("productCategoryId", "short-varchar");
@@ -337,7 +336,8 @@ public class BirtMasterReportServices {
                 // adding productStoreId and productStoreName
                 EntityExpr conditionInvoiceId = EntityCondition.makeCondition("invoiceId", invoice.getString("invoiceId"));
 //                EntityExpr conditionInvoiceItemSeqId = EntityCondition.makeCondition("invoiceItemSeqId", invoice.getString("invoiceItemSeqId"));
-//                List<GenericValue> listOrderBilling = delegator.findList("OrderItemBilling", EntityCondition.makeCondition(UtilMisc.toList(conditionInvoiceId, conditionInvoiceItemSeqId)), UtilMisc.toSet("orderId"), null, null, false);
+//                List<GenericValue> listOrderBilling = delegator.findList("OrderItemBilling", EntityCondition.makeCondition
+//                (UtilMisc.toList(conditionInvoiceId, conditionInvoiceItemSeqId)), UtilMisc.toSet("orderId"), null, null, false);
                 GenericValue orderBilling = EntityQuery.use(delegator)
                         .from("OrderItemBilling")
                         .where(conditionInvoiceId)
diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
index 31cba18..0bf913a 100644
--- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
+++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
@@ -551,7 +551,9 @@ public class BirtServices {
             return ServiceUtil.returnError("Error in createFormForDisplay service."); //TODO labelise
         }
 
-        if (Debug.infoOn()) Debug.logInfo(textData, MODULE);
+        if (Debug.infoOn()) {
+            Debug.logInfo(textData, MODULE);
+        }
         textData = textData.substring(textData.indexOf("<form "), textData.length());
         if (textData.contains("</form>")) {
             textData = textData.substring(0, textData.indexOf("</form>") + 7);
@@ -855,7 +857,9 @@ public class BirtServices {
         }
         designFromUser.close();
         designStored.close();
-        if (Debug.infoOn()) Debug.logInfo("####### Design uploaded: ".concat(rptDesignName), MODULE);
+        if (Debug.infoOn()) {
+            Debug.logInfo("####### Design uploaded: ".concat(rptDesignName), MODULE);
+        }
 
         // TODO check: should we, as a secondary safety precaution, delete any file finishing with _TEMP_.rptdesign?
         listSuccessMessage.add(UtilProperties.getMessage(RESOURCE, "BirtFlexibleRptDesignSuccessfullyUploaded", locale));
diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java
index c70f191..fb6f48f 100644
--- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java
+++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java
@@ -222,7 +222,9 @@ public class ReportDesignGenerator {
 
         design.saveAs(rptDesignName);
         design.close();
-        if (Debug.infoOn()) Debug.logInfo("####### Design generated: " + rptDesignName, MODULE);
+        if (Debug.infoOn()) {
+            Debug.logInfo("####### Design generated: " + rptDesignName, MODULE);
+        }
         session.closeAll(false);
         Platform.shutdown();
     }
diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java
index 329f179..b914e30 100644
--- a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java
+++ b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java
@@ -295,7 +295,9 @@ public class EbayHelper {
 
         try {
             if (UtilValidate.isNotEmpty(name) && userLogin != null) {
-                if (Debug.verboseOn()) Debug.logVerbose("Creating Customer Party: " + name, MODULE);
+                if (Debug.verboseOn()) {
+                    Debug.logVerbose("Creating Customer Party: " + name, MODULE);
+                }
 
                 // Try to split the lastname from the firstname
                 String firstName = "";
@@ -317,7 +319,9 @@ public class EbayHelper {
                     return null;
                 }
                 partyId = (String) summaryResult.get("partyId");
-                if (Debug.verboseOn()) Debug.logVerbose("Created Customer Party: " + partyId, MODULE);
+                if (Debug.verboseOn()) {
+                    Debug.logVerbose("Created Customer Party: " + partyId, MODULE);
+                }
             }
         } catch (GenericServiceException e) {
             Debug.logError(e, "Failed to createPerson", MODULE);
diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
index f723b12..2b1cfa5 100644
--- a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
+++ b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
@@ -1064,7 +1064,7 @@ public class EbayOrderServices {
                 cart.setBillFromVendorPartyId(payToPartyId);
             }
             // Apply shipping costs as order adjustment
-            Map<String, Object> shippingServiceSelectedCtx =  UtilGenerics.cast(context.get("shippingServiceSelectedCtx"));
+            Map<String, Object> shippingServiceSelectedCtx = UtilGenerics.cast(context.get("shippingServiceSelectedCtx"));
 
             String shippingCost = (String) shippingServiceSelectedCtx.get("shippingServiceCost");
             if (UtilValidate.isNotEmpty(shippingCost)) {
diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java
index 46f2213..ab756e7 100644
--- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java
+++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java
@@ -1140,7 +1140,7 @@ public class EbayEvents {
             String productId = item.getSKU();
             if (UtilValidate.isNotEmpty(itemObj.get("requireEbayInventory")) && ("Y".equals(itemObj.get("requireEbayInventory")))) {
                 GetSellingManagerInventoryRequestType req = new GetSellingManagerInventoryRequestType();
-                GetSellingManagerInventoryResponseType resp =  null;
+                GetSellingManagerInventoryResponseType resp = null;
                 SellingManagerProductType[] returnedSellingManagerProductType = null;
                 GetSellingManagerInventoryCall call = new GetSellingManagerInventoryCall(EbayStoreHelper.getApiContext(productStoreId, locale, delegator));
                 resp = (GetSellingManagerInventoryResponseType)call.execute(req);
@@ -1193,7 +1193,7 @@ public class EbayEvents {
                     DetailLevelCodeType.ITEM_RETURN_DESCRIPTION
             };
             categorySpecifics.setDetailLevel(detailLevel);
-            RecommendationsType[] recommend =  categorySpecifics.getCategorySpecifics();
+            RecommendationsType[] recommend = categorySpecifics.getCategorySpecifics();
 
             for (RecommendationsType recommendationsType : recommend) {
                 NameRecommendationType[] nameRecommend = recommendationsType.getNameRecommendation();
diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java
index 9f6ddea..11823b7 100644
--- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java
+++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java
@@ -85,13 +85,13 @@ public class EbayFeedback {
                 GenericValue userLoginEx = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userID).queryOne();
                 if (userLoginEx == null) {
                     //Party
-                    GenericValue party =  delegator.makeValue("Party");
+                    GenericValue party = delegator.makeValue("Party");
                     partyId = delegator.getNextSeqId("Party");
                     party.put("partyId", partyId);
                     party.put("partyTypeId", "PERSON");
                     party.create();
                     //UserLogin
-                    userLoginEx =  delegator.makeValue("UserLogin");
+                    userLoginEx = delegator.makeValue("UserLogin");
                     userLoginEx.put("userLoginId", userID);
                     userLoginEx.put("partyId", partyId);
                     userLoginEx.create();
@@ -103,7 +103,7 @@ public class EbayFeedback {
                                                     .where("partyId", partyId, "roleTypeId", "OWNER")
                                                     .queryOne();
                 if (UtilValidate.isEmpty(ownerPartyRole)) {
-                    GenericValue partyRole =  delegator.makeValue("PartyRole");
+                    GenericValue partyRole = delegator.makeValue("PartyRole");
                     partyRole.put("partyId", partyId);
                     partyRole.put("roleTypeId", "OWNER");
                     partyRole.create();
diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java
index da00da8..4d3aaa5 100644
--- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java
+++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java
@@ -477,7 +477,7 @@ public class EbayStore {
             }
         } catch (Exception e) {
             Debug.logError("Error in processing xml string" + e.getMessage(), MODULE);
-            result =  "Failure";
+            result = "Failure";
         }
         return result;
     }
@@ -617,7 +617,7 @@ public class EbayStore {
         Map<String, Object> result = new HashMap<>();
         StoreType returnedStoreType = null;
         GetStoreRequestType req = new GetStoreRequestType();
-        GetStoreResponseType resp =  null;
+        GetStoreResponseType resp = null;
 
         String userLoginId = null;
         if (context.get("productStoreId") != null) {
@@ -654,7 +654,7 @@ public class EbayStore {
                     ebayResp.put("storeUrl", returnedStoreType.getURL());
                     ebayResp.put("storeUrlPath", returnedStoreType.getURLPath());
                     String desc = returnedStoreType.getDescription();
-                    if (desc != null) desc  =  desc.trim();
+                    if (desc != null) desc  = desc.trim();
                     ebayResp.put("storeDesc", desc);
 
                     StoreLogoType logoType = returnedStoreType.getLogo();
@@ -700,7 +700,7 @@ public class EbayStore {
 
                     StoreHeaderStyleCodeType storeHeaderStyleCodeType = returnedStoreType.getHeaderStyle();
                     ebayResp.put("storeHeaderStyle", storeHeaderStyleCodeType.value());
-                    StoreHeaderStyleCodeType[] storeHeaderStyleCodeList =  StoreHeaderStyleCodeType.values();
+                    StoreHeaderStyleCodeType[] storeHeaderStyleCodeList = StoreHeaderStyleCodeType.values();
                     if (storeHeaderStyleCodeList != null) {
                         List<Map<String, Object>> storeHeaderStyleList = new LinkedList<>();
                         int i = 0;
@@ -1111,7 +1111,7 @@ public class EbayStore {
                     while (i < storeColorSchemeTypes.length) {
 
                         StoreColorSchemeType storeColorSchemeType = storeColorSchemeTypes[i];
-                        StoreFontType storeFontType =  storeColorSchemeType.getFont();
+                        StoreFontType storeFontType = storeColorSchemeType.getFont();
                         advanceFontTheme.put("storeFontTypeNameFaceColor", storeFontType.getNameColor());
                         int j = 0;
                         storeFontType.getNameFace();
@@ -1128,7 +1128,7 @@ public class EbayStore {
                         advanceFontTheme.put("storeFontTypeFontFaceList", nameFaces);
                         j = 0;
                         storeFontType.getNameSize();
-                        StoreFontSizeCodeType[] storeFontSizeCodeTypes =  StoreFontSizeCodeType.values();
+                        StoreFontSizeCodeType[] storeFontSizeCodeTypes = StoreFontSizeCodeType.values();
                         List<Map<String, Object>> sizeFaces = new LinkedList<>();
                         while (j < storeFontSizeCodeTypes.length) {
                             Map<String, Object> storeFontSizeCodeTypeMap = new HashMap<>();
@@ -1157,7 +1157,7 @@ public class EbayStore {
 
                         j = 0;
                         storeFontType.getTitleSize();
-                        StoreFontSizeCodeType[] storeTitleSizeCodeTypes =  StoreFontSizeCodeType.values();
+                        StoreFontSizeCodeType[] storeTitleSizeCodeTypes = StoreFontSizeCodeType.values();
                         List<Map<String, Object>> titleSizes = new LinkedList<>();
                         while (j < storeTitleSizeCodeTypes.length) {
                             Map<String, Object> storeFontSizeCodeTypeMap = new HashMap<>();
@@ -1187,7 +1187,7 @@ public class EbayStore {
 
                         j = 0;
                         storeFontType.getDescSize();
-                        StoreFontSizeCodeType[] storeDescSizeCodeTypes =   StoreFontSizeCodeType.values();
+                        StoreFontSizeCodeType[] storeDescSizeCodeTypes = StoreFontSizeCodeType.values();
                         List<Map<String, Object>> descSizes = new LinkedList<>();
                         while (j < storeDescSizeCodeTypes.length) {
                             Map<String, Object> storeFontSizeCodeTypeMap = new HashMap<>();
@@ -1916,7 +1916,7 @@ public class EbayStore {
             // add to list
             List<Map<String, Object>> soldList = new LinkedList<>();
             if (UtilValidate.isNotEmpty(tempSoldItems)) {
-                soldList =  EbayStore.getOrderTransactions(tempSoldItems);
+                soldList = EbayStore.getOrderTransactions(tempSoldItems);
             }
             int soldSize = tempSoldItems == null ? 0 : tempSoldItems.length;
             ItemType[] tempUnSoldItems = null;
diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java
index d9533f3..d10d7d7 100644
--- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java
+++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java
@@ -940,7 +940,7 @@ public class EbayStoreAutoPreferences {
         String productStoreId = (String) context.get("productStoreId");
         try {
             GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne();
-            Map<String, Object> resultSold =  dispatcher.runSync("getEbaySoldItems", UtilMisc.toMap("productStoreId", productStoreId, "userLogin", userLogin));
+            Map<String, Object> resultSold = dispatcher.runSync("getEbaySoldItems", UtilMisc.toMap("productStoreId", productStoreId, "userLogin", userLogin));
             if (ServiceUtil.isError(resultSold)) {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultSold));
             }
@@ -1015,7 +1015,7 @@ public class EbayStoreAutoPreferences {
         try {
             GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne();
             context.put("userLogin", userLogin);
-            Map<String, Object> resultSold =  dispatcher.runSync("getEbaySoldItems", context);
+            Map<String, Object> resultSold = dispatcher.runSync("getEbaySoldItems", context);
             if (ServiceUtil.isError(resultSold)) {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultSold));
             }
@@ -1073,7 +1073,7 @@ public class EbayStoreAutoPreferences {
         Delegator delegator = dctx.getDelegator();
         Map<String, Object> result = new HashMap<>();
         GetSellingManagerInventoryRequestType req = new GetSellingManagerInventoryRequestType();
-        GetSellingManagerInventoryResponseType resp =  null;
+        GetSellingManagerInventoryResponseType resp = null;
 
         if (context.get("productStoreId") != null) {
             GetSellingManagerInventoryCall call = new GetSellingManagerInventoryCall(EbayStoreHelper.getApiContext((String) context.get("productStoreId"), locale, delegator));
diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
index 9752bdb..04f992e 100644
--- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
+++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
@@ -375,7 +375,7 @@ public class EbayStoreOrder {
                 cart.setBillFromVendorPartyId(payToPartyId);
             }
 
-            Map<String, Object> shippingServiceSelectedCtx =  UtilGenerics.checkMap(context.get("shippingServiceSelectedCtx"));
+            Map<String, Object> shippingServiceSelectedCtx = UtilGenerics.checkMap(context.get("shippingServiceSelectedCtx"));
             if (UtilValidate.isNotEmpty(shippingServiceSelectedCtx.get("shippingServiceCost"))) {
                 BigDecimal shippingAmount = new BigDecimal(shippingServiceSelectedCtx.get("shippingServiceCost").toString());
                 if (shippingAmount.doubleValue() > 0) {
diff --git a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java
index 72e6739..1bfe860 100644
--- a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java
+++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java
@@ -188,7 +188,7 @@ public class JanrainHelper {
 
     public static String janrainCheckLogin(HttpServletRequest request, HttpServletResponse response) {
         Delegator delegator = (Delegator) request.getAttribute("delegator");
-        String token =  request.getParameter("token");
+        String token = request.getParameter("token");
         String errMsg = "";
         if (UtilValidate.isNotEmpty(token)) {
             Element authInfo = JanrainHelper.authInfo(token);
diff --git a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java
index befc689..c7e1f03 100644
--- a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java
+++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java
@@ -53,7 +53,7 @@ public class ThirdPartyEvents {
         Map<String, Object> requestParams = UtilHttp.getParameterMap(request);
 
         // check distributor
-        String distriParam[] = { "distributor_id", "distributorid", "distributor" };
+        String distriParam[] = {"distributor_id", "distributorid", "distributor" };
         String distributorId = null;
 
         for (int i = 0; i < distriParam.length; i++) {
@@ -69,7 +69,7 @@ public class ThirdPartyEvents {
         }
 
         // check affiliate
-        String affiliParam[] = { "affiliate_id", "affiliateid", "affiliate", "affil" };
+        String affiliParam[] = {"affiliate_id", "affiliateid", "affiliate", "affil" };
         String affiliateId = null;
 
         for (int i = 0; i < affiliParam.length; i++) {
@@ -155,7 +155,9 @@ public class ThirdPartyEvents {
                     toBeStored.add(delegator.makeValue("PartyRole", UtilMisc.toMap("partyId", distributorId, "roleTypeId", "DISTRIBUTOR")));
                     try {
                         delegator.storeAll(toBeStored);
-                        if (Debug.infoOn()) Debug.logInfo("Distributor for user " + party.getString("partyId") + " set to " + distributorId, MODULE);
+                        if (Debug.infoOn()) {
+                            Debug.logInfo("Distributor for user " + party.getString("partyId") + " set to " + distributorId, MODULE);
+                        }
                     } catch (GenericEntityException gee) {
                         Debug.logWarning(gee, MODULE);
                     }
@@ -224,7 +226,9 @@ public class ThirdPartyEvents {
                     partyRelationship.set("partyRelationshipTypeId", "SALES_AFFILIATE");
                     try {
                         delegator.create(partyRelationship);
-                        if (Debug.infoOn()) Debug.logInfo("Affiliate for user " + party.getString("partyId") + " set to " + affiliateId, MODULE);
+                        if (Debug.infoOn()) {
+                            Debug.logInfo("Affiliate for user " + party.getString("partyId") + " set to " + affiliateId, MODULE);
+                        }
                     } catch (GenericEntityException gee) {
                         Debug.logWarning(gee, MODULE);
                     }
diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java
index 10721eb..0fefd75 100644
--- a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java
+++ b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java
@@ -116,10 +116,14 @@ public class DocumentIndexer extends Thread {
             try {
                 if (document == null) {
                     indexWriter.deleteDocuments(documentIdentifier);
-                    if (Debug.infoOn()) Debug.logInfo(getName() + ": deleted Lucene document: " + ofbizDocument, MODULE);
+                    if (Debug.infoOn()) {
+                        Debug.logInfo(getName() + ": deleted Lucene document: " + ofbizDocument, MODULE);
+                    }
                 } else {
                     indexWriter.updateDocument(documentIdentifier, document);
-                    if (Debug.infoOn()) Debug.logInfo(getName() + ": indexed Lucene document: " + ofbizDocument, MODULE);
+                    if (Debug.infoOn()) {
+                        Debug.logInfo(getName() + ": indexed Lucene document: " + ofbizDocument, MODULE);
+                    }
                 }
             } catch (Exception e) {
                 Debug.logError(e, getName() + ": error processing Lucene document: " + ofbizDocument, MODULE);
diff --git a/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java b/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java
index 4c1a651..84c54f8 100644
--- a/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java
+++ b/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java
@@ -62,9 +62,7 @@ import org.apache.ofbiz.service.LocalDispatcher;
 
 /**
  * GitHubEvents - Events for GitHub login.
- *
  * Refs: https://developer.github.com/v3/oauth/
- *
  */
 public class GitHubEvents {
 
diff --git a/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java b/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java
index 4e1705a..88ef883 100644
--- a/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java
+++ b/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java
@@ -65,9 +65,7 @@ import org.xml.sax.SAXException;
 
 /**
  * LinkedEvents - Events for LinkedIn login.
- *
  * Refs: https://developer.linkedin.com/documents/authentication
- *
  */
 public class LinkedInEvents {
 
diff --git a/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java b/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
index 11bb535..3c32749 100644
--- a/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
+++ b/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
@@ -196,7 +196,9 @@ public class GitHubAuthenticator implements Authenticator {
             if (parentTx != null) {
                 try {
                     TransactionUtil.resume(parentTx);
-                    if (Debug.verboseOn()) Debug.logVerbose("Resumed the parent transaction.", MODULE);
+                    if (Debug.verboseOn()) {
+                        Debug.logVerbose("Resumed the parent transaction.", MODULE);
+                    }
                 } catch (GenericTransactionException e) {
                     Debug.logError(e, "Could not resume parent nested transaction: " + e.getMessage(), MODULE);
                 }
diff --git a/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java b/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
index aaf71bc..032590a 100644
--- a/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
+++ b/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
@@ -199,7 +199,9 @@ public class LinkedInAuthenticator implements Authenticator {
             if (parentTx != null) {
                 try {
                     TransactionUtil.resume(parentTx);
-                    if (Debug.verboseOn()) Debug.logVerbose("Resumed the parent transaction.", MODULE);
+                    if (Debug.verboseOn()) {
+                        Debug.logVerbose("Resumed the parent transaction.", MODULE);
+                    }
                 } catch (GenericTransactionException e) {
                     Debug.logError(e, "Could not resume parent nested transaction: " + e.getMessage(), MODULE);
                 }
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
index 695f114..424fc90 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
@@ -26,7 +26,6 @@ import org.apache.ofbiz.htmlreport.util.ReportStringUtil;
 
 /**
  * HTML report output to be used for database create tables / drop tables operations.
- *
  */
 public abstract class AbstractHtmlReport extends HtmlReport {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
index 5926628..529f32f 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
@@ -24,7 +24,6 @@ import java.util.Locale;
 
 /**
  * Base report class.
- *
  */
 public abstract class AbstractReport implements InterfaceReport {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
index 379a20c..2d01a40 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
@@ -29,9 +29,8 @@ import org.safehaus.uuid.EthernetAddress;
 import org.safehaus.uuid.UUID;
 import org.safehaus.uuid.UUIDGenerator;
 
-/**
+/**
  * Provides a common Thread class for the reports.
- *
  */
 public abstract class AbstractReportThread extends Thread implements InterfaceReportThread {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
index 792c218..ed45a7f 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
@@ -46,7 +46,6 @@ import org.apache.ofbiz.htmlreport.util.ReportStringUtil;
 
 /**
  * HTML report output to be used in report.ftl.<p>
- *
  */
 public class HtmlReport extends AbstractReport {
 
@@ -541,7 +540,7 @@ public class HtmlReport extends AbstractReport {
         Thread[] threads = new Thread[i];
         threadGroup.enumerate(threads, true);
         AbstractReportThread thread = null;
-        for (int j=0; j<threads.length; j++) {
+        for (int j = 0; j < threads.length; j++) {
             Thread threadInstance = threads[j];
             if (threadInstance instanceof AbstractReportThread) {
                 if (((AbstractReportThread) threadInstance).getUUID().toString().equals(getParamThread(request))) {
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
index 356662b..1a30fe5 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
@@ -21,11 +21,10 @@ package org.apache.ofbiz.htmlreport;
 import java.util.List;
 import java.util.Locale;
 
-/**
+/**
  * This is the interface for the report classes which are used for the output
  * during operations that run on a separate Thread in OFBiz,
  * like import, export etc.<p>
- *
  */
 public interface InterfaceReport {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReportThread.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReportThread.java
index f9f1e1f..d1f6d8a 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReportThread.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReportThread.java
@@ -22,7 +22,6 @@ import org.safehaus.uuid.UUID;
 
 /**
  * Identifies a class that can be used as a report thread.
- *
  */
 public interface InterfaceReportThread {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
index a1e7aa3..d73072b 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
@@ -26,7 +26,6 @@ import org.apache.ofbiz.htmlreport.InterfaceReportThread;
 
 /**
  * Provides a report for running sample html report.
- *
  */
 public class SampleHtmlReport extends AbstractHtmlReport {
 
@@ -58,7 +57,7 @@ public class SampleHtmlReport extends AbstractHtmlReport {
         Thread[] threads = new Thread[i];
         threadGroup.enumerate(threads, true);
         InterfaceReportThread thread = null;
-        for (int j=0; j<threads.length; j++) {
+        for (int j = 0; j < threads.length; j++) {
             Thread threadInstance = threads[j];
             if (threadInstance instanceof SampleHtmlThread) {
                 thread = (InterfaceReportThread) threadInstance;
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
index 7671d0d..d2f73d0 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
@@ -63,7 +63,7 @@ public class SampleHtmlThread extends AbstractReportThread {
                 getReport().println(UtilProperties.getMessage(RESOURCE, "START_COUNT_DOWN", getLocale()), InterfaceReport.FORMAT_HEADLINE);
                 Random random = new Random();
                 int j = 0;
-                for (int i=1000; i>0; i--) {
+                for (int i = 1000; i > 0; i--) {
                     sleep(20);
                     j = random.nextInt(7);
                     if (j == 6) {
@@ -77,7 +77,7 @@ public class SampleHtmlThread extends AbstractReportThread {
                 getReport().println(UtilProperties.getMessage(RESOURCE, "START_COUNT_UP", getLocale()), InterfaceReport.FORMAT_HEADLINE);
                 Random random = new Random();
                 int j = 0;
-                for (int i=1; i<=1000; i++) {
+                for (int i = 1; i <= 1000; i++) {
                     sleep(20);
                     j = random.nextInt(7);
                     if (j == 6) {
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java
index a5b8caa..eb44bc6 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java
@@ -31,18 +31,14 @@ import java.util.regex.Pattern;
 
 /**
  * The ReportEncoder class provides static methods to decode and encode data.<p>
- *
  * The methods in this class are substitutes for <code>java.net.URLEncoder.encode()</code> and
  * <code>java.net.URLDecoder.decode()</code>.<p>
- *
  * The de- and encoding uses the same coding mechanism as JavaScript, special characters are
  * replaced with <code>%hex</code> where hex is a two digit hex number.<p>
- *
  * <b>Note:</b> On the client side (browser) instead of using corresponding <code>escape</code>
  * and <code>unescape</code> JavaScript functions, better use <code>encodeURIComponent</code> and
  * <code>decodeURIComponent</code> functions which are work properly with unicode characters.
  * These functions are supported in IE 5.5+ and NS 6+ only.<p>
- *
  */
 public final class ReportEncoder {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java
index 2695204..b77ebce 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
 
 /**
  * Provides String utility functions.<p>
- *
  */
 public final class ReportStringUtil {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
index e8aa68b..4b9ddd5 100644
--- a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
+++ b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
@@ -75,7 +75,6 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 /**
  * Abstract class of pricat parser.
- *
  */
 public abstract class AbstractPricatParser implements InterfacePricatParser {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java
index 5216b24..8724fb4 100644
--- a/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java
+++ b/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java
@@ -33,7 +33,6 @@ import org.apache.ofbiz.entity.transaction.GenericTransactionException;
 
 /**
  * Interface of pricat parser.
- *
  */
 public interface InterfacePricatParser {
     public static final String PARSE_EXCEL = "parse_excel";
diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java
index 5d78883..6663482 100644
--- a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java
@@ -27,8 +27,7 @@ import org.apache.ofbiz.htmlreport.InterfaceReportThread;
 import org.apache.ofbiz.htmlreport.util.ReportStringUtil;
 
 /**
- * Provides a html report for running parse a PriCat file.<p>
- *
+ * Provides a html report for running parse a PriCat file.<p>
  */
 public class PricatParseExcelHtmlReport extends AbstractHtmlReport {
 
@@ -61,7 +60,7 @@ public class PricatParseExcelHtmlReport extends AbstractHtmlReport {
         Thread[] threads = new Thread[i];
         threadGroup.enumerate(threads, true);
         InterfaceReportThread thread = null;
-        for (int j=0; j<threads.length; j++) {
+        for (int j = 0; j < threads.length; j++) {
             Thread threadInstance = threads[j];
             if (threadInstance instanceof PricatParseExcelHtmlThread) {
                 thread = (PricatParseExcelHtmlThread) threadInstance;
diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
index 07afc0e..7aa5d30 100644
--- a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
+++ b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
@@ -62,7 +62,6 @@ import org.apache.ofbiz.service.LocalDispatcher;
 
 /**
  * Thread for running pricat import excel html report.
- *
  */
 public class PricatParseExcelHtmlThread extends AbstractReportThread {
 
diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java
index 2986eb0..a657a6e 100644
--- a/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java
+++ b/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java
@@ -52,7 +52,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 /**
  * Sample pricat excel parser.
- *
  */
 public class SamplePricatParser extends AbstractPricatParser {
 
@@ -241,7 +240,7 @@ public class SamplePricatParser extends AbstractPricatParser {
         if (UtilValidate.isEmpty(cellContents)) {
             return false;
         }
-        switch(pricatFileVersion) {
+        switch (pricatFileVersion) {
             case "V1.1":
             default:
                 return parseCellContentsAndStoreV1_X(row, cellContents);
diff --git a/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java b/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java
index c3fc78c..cdace10 100644
--- a/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java
+++ b/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java
@@ -102,7 +102,9 @@ public abstract class SolrProductSearch {
             }
         } else {
             final String statusMsg = "Solr ECA indexing disabled; skipping indexing for productId '" + productId + "'";
-            if (Debug.verboseOn()) Debug.logVerbose("Solr: addToSolr: " + statusMsg, MODULE);
+            if (Debug.verboseOn()) {
+                Debug.logVerbose("Solr: addToSolr: " + statusMsg, MODULE);
+            }
             result = ServiceUtil.returnSuccess();
         }
         return result;
diff --git a/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
index c274549..7a9a013 100644
--- a/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+++ b/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
@@ -54,7 +54,7 @@ public final class SolrUtil {
 
     private SolrUtil() { }
     private static final String MODULE = SolrUtil.class.getName();
-    private static final String[] solrProdAttribute = { "productId", "internalName", "manu", "size", "smallImage", "mediumImage", "largeImage", "listPrice", "defaultPrice", "inStock", "isVirtual" };
+    private static final String[] solrProdAttribute = {"productId", "internalName", "manu", "size", "smallImage", "mediumImage", "largeImage", "listPrice", "defaultPrice", "inStock", "isVirtual" };
 
     private static final String solrConfigName = "solrconfig.properties";
     private static final String solrUrl = makeSolrWebappUrl();
@@ -271,7 +271,9 @@ public final class SolrUtil {
             solrQuery.setFacet(true);
             solrQuery.addFacetField("cat");
             solrQuery.setFacetLimit(-1);
-            if (Debug.verboseOn()) Debug.logVerbose("solr: solrQuery: " + solrQuery, MODULE);
+            if (Debug.verboseOn()) {
+                Debug.logVerbose("solr: solrQuery: " + solrQuery, MODULE);
+            }
             returnMap = client.query(solrQuery, METHOD.POST);
             result.put("rows", returnMap);
             result.put("numFound", returnMap.getResults().getNumFound());
diff --git a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java
index 21bb064..4128192 100644
--- a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java
+++ b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java
@@ -36,7 +36,6 @@ import org.apache.solr.core.SolrCore;
 
 /**
  * A simple servlet to load the Solr Admin UI
- *
  */
 public class OFBizSolrLoadAdminUiServlet extends OFBizSolrRedirectServlet {
 
@@ -62,7 +61,7 @@ public class OFBizSolrLoadAdminUiServlet extends OFBizSolrRedirectServlet {
                 String html = IOUtils.toString(in, "UTF-8");
                 Package pack = SolrCore.class.getPackage();
 
-                String[] search = new String[] { "${contextPath}", "${adminPath}", "${version}" };
+                String[] search = new String[] {"${contextPath}", "${adminPath}", "${version}" };
                 String[] replace = new String[] {
                         StringEscapeUtils.escapeJavaScript(request.getContextPath()),
                         StringEscapeUtils.escapeJavaScript(CommonParams.CORES_HANDLER_PATH),