Improvement: Extract datafile component, base/util and base/crypt projects

* There are a LOT of circular dependencies !!!
* I had to split some files to be able to shuffle code around:
  UtilValidateEmpty, UtilPropertiesRuntime, etc.
* A lot of code changes are related to CheckStyle
* We should consider spotbugs for code formatting via gradle

Author: ieugen

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/fixedasset/FixedAssetGeoLocation.groovy

@@ -18,10 +18,11 @@
 */
 package org.apache.ofbiz.accounting.fixedasset
 
-import org.apache.ofbiz.base.util.UtilProperties
+
+import org.apache.ofbiz.base.util.UtilPropertiesRuntime
 import org.apache.ofbiz.common.geo.GeoWorker
 
-uiLabelMap = UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)
+uiLabelMap = UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)
 
 if (fixedAsset) {
     latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, 'FixedAssetAndGeoPoint', 'fixedAssetId', fixedAssetId, null, null)

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/payment/PaymentServices.groovy

@@ -18,6 +18,8 @@
 */
 package org.apache.ofbiz.accounting.payment
 
+import org.apache.ofbiz.base.util.UtilPropertiesRuntime
+
 import java.sql.Timestamp
 
 import org.apache.ofbiz.accounting.invoice.InvoiceWorker
@@ -362,7 +364,7 @@ Map getInvoicePaymentInfoListByDueDateOffset() {
 Map voidPayment() {
     GenericValue payment = from('Payment').where(parameters).queryOne()
     if (!payment) {
-        return error(UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)?.AccountingNoPaymentsfound)
+        return error(UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)?.AccountingNoPaymentsfound)
     }
     String paymentId = payment.paymentId
     Map paymentStatusCtx = [paymentId: paymentId,

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/BalanceSheet.groovy

@@ -21,7 +21,7 @@ package org.apache.ofbiz.accounting.reports
 import org.apache.ofbiz.accounting.util.UtilAccounting
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.base.util.UtilMisc
-import org.apache.ofbiz.base.util.UtilProperties
+import org.apache.ofbiz.base.util.UtilPropertiesRuntime
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityExpr
@@ -30,7 +30,7 @@ import org.apache.ofbiz.party.party.PartyWorker
 
 import java.sql.Timestamp
 
-uiLabelMap = UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)
+uiLabelMap = UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)
 
 thruDate = thruDate ?: UtilDateTime.nowTimestamp()
 if (!glFiscalTypeId) {

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/CashFlowStatement.groovy

@@ -21,7 +21,8 @@ package org.apache.ofbiz.accounting.reports
 import org.apache.ofbiz.accounting.util.UtilAccounting
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.base.util.UtilMisc
-import org.apache.ofbiz.base.util.UtilProperties
+import org.apache.ofbiz.base.util.UtilMiscRuntime
+import org.apache.ofbiz.base.util.UtilPropertiesRuntime
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
@@ -35,7 +36,7 @@ if (!fromDate) {
 thruDate = thruDate ?: UtilDateTime.nowTimestamp()
 parameters.glFiscalTypeId = parameters.glFiscalTypeId ?: 'ACTUAL'
 
-uiLabelMap = UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)
+uiLabelMap = UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)
 parametersFromDate = fromDate
 
 // Setup the divisions for which the report is executed
@@ -115,7 +116,7 @@ transactionTotals.each { transactionTotal ->
     transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
 }
 glAccountIdList = []
-accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
 accountBalanceList.each { accountBalance ->
     balanceTotal = balanceTotal.add(accountBalance.balance)
 }
@@ -160,7 +161,7 @@ if (transactionTotals) {
         accountMap.balance = balance
         transactionTotalsMap.(transactionTotal.glAccountId) = accountMap
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
 }
 periodCashBalanceTotal = balanceTotal
@@ -175,7 +176,7 @@ balanceTotal = BigDecimal.ZERO
 List transactionTotals = []
 transactionTotals.addAll(new LinkedList(context.openingCashBalanceList))
 transactionTotals.addAll(new LinkedList(context.periodCashBalanceList))
-transactionTotals = UtilMisc.sortMaps(transactionTotals, UtilMisc.toList('accountCode'))
+transactionTotals = UtilMiscRuntime.sortMaps(transactionTotals, UtilMisc.toList('accountCode'))
 closingTransactionKeySet = []
 if (transactionTotals) {
     Map transactionTotalsMap = [:]
@@ -197,7 +198,7 @@ if (transactionTotals) {
             } else {
                 transactionTotalsMap.(transactionTotal.glAccountId) = transactionTotal
             }
-            accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+            accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
         }
     }
     closingTransactionKeySet = transactionTotalsMap.keySet()

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/ComparativeBalanceSheet.groovy

@@ -19,6 +19,7 @@
 package org.apache.ofbiz.accounting.reports
 
 import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilMiscRuntime
 
 assetAccountBalanceMap = [:]
 assetAccountBalanceList = []
@@ -37,7 +38,7 @@ assetAccountBalanceList2.each { accountBalance ->
                                                                 balance1: BigDecimal.ZERO])
     }
 }
-assetAccountBalanceList = UtilMisc.sortMaps(assetAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+assetAccountBalanceList = UtilMiscRuntime.sortMaps(assetAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.assetAccountBalanceList = assetAccountBalanceList
 
 liabilityAccountBalanceMap = [:]
@@ -57,7 +58,7 @@ liabilityAccountBalanceList2.each { accountBalance ->
                                                                     balance1: BigDecimal.ZERO])
     }
 }
-liabilityAccountBalanceList = UtilMisc.sortMaps(liabilityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+liabilityAccountBalanceList = UtilMiscRuntime.sortMaps(liabilityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.liabilityAccountBalanceList = liabilityAccountBalanceList
 
 equityAccountBalanceMap = [:]
@@ -77,7 +78,7 @@ equityAccountBalanceList2.each { accountBalance ->
                                                                  balance1: BigDecimal.ZERO])
     }
 }
-equityAccountBalanceList = UtilMisc.sortMaps(equityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+equityAccountBalanceList = UtilMiscRuntime.sortMaps(equityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.equityAccountBalanceList = equityAccountBalanceList
 
 balanceTotalMap = [:]

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/ComparativeCashFlowStatement.groovy

@@ -19,6 +19,7 @@
 package org.apache.ofbiz.accounting.reports
 
 import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilMiscRuntime
 
 openingCashBalanceMap = [:]
 openingCashBalanceList = []
@@ -37,7 +38,7 @@ openingCashBalanceList2.each { accountBalance ->
                                                                balance1: BigDecimal.ZERO])
     }
 }
-openingCashBalanceList = UtilMisc.sortMaps(openingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+openingCashBalanceList = UtilMiscRuntime.sortMaps(openingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.openingCashBalanceList = openingCashBalanceList
 
 periodCashBalanceMap = [:]
@@ -61,7 +62,7 @@ periodCashBalanceList2.each { accountBalance ->
                                                               D1: BigDecimal.ZERO, C1: BigDecimal.ZERO])
     }
 }
-periodCashBalanceList = UtilMisc.sortMaps(periodCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+periodCashBalanceList = UtilMiscRuntime.sortMaps(periodCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 
 context.periodCashBalanceList = periodCashBalanceList
 closingCashBalanceMap = [:]
@@ -81,7 +82,7 @@ closingCashBalanceList2.each { accountBalance ->
                                                                balance1: BigDecimal.ZERO])
     }
 }
-closingCashBalanceList = UtilMisc.sortMaps(closingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+closingCashBalanceList = UtilMiscRuntime.sortMaps(closingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.closingCashBalanceList = closingCashBalanceList
 
 balanceTotalMap = [:]

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/ComparativeIncomeStatement.groovy

@@ -19,6 +19,7 @@
 package org.apache.ofbiz.accounting.reports
 
 import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilMiscRuntime
 
 revenueAccountBalanceMap = [:]
 revenueAccountBalanceList = []
@@ -37,7 +38,7 @@ revenueAccountBalanceList2.each { accountBalance ->
                                                                   balance1: BigDecimal.ZERO])
     }
 }
-revenueAccountBalanceList = UtilMisc.sortMaps(revenueAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+revenueAccountBalanceList = UtilMiscRuntime.sortMaps(revenueAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.revenueAccountBalanceList = revenueAccountBalanceList
 
 expenseAccountBalanceMap = [:]
@@ -57,7 +58,7 @@ expenseAccountBalanceList2.each { accountBalance ->
                                                                   balance1: BigDecimal.ZERO])
     }
 }
-expenseAccountBalanceList = UtilMisc.sortMaps(expenseAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+expenseAccountBalanceList = UtilMiscRuntime.sortMaps(expenseAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.expenseAccountBalanceList = expenseAccountBalanceList
 
 incomeAccountBalanceMap = [:]
@@ -77,7 +78,7 @@ incomeAccountBalanceList2.each { accountBalance ->
                                                                  balance1: BigDecimal.ZERO])
     }
 }
-incomeAccountBalanceList = UtilMisc.sortMaps(incomeAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
+incomeAccountBalanceList = UtilMiscRuntime.sortMaps(incomeAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
 context.incomeAccountBalanceList = incomeAccountBalanceList
 
 balanceTotalMap = [:]

Diff for: applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/IncomeStatement.groovy

@@ -20,6 +20,7 @@ package org.apache.ofbiz.accounting.reports
 
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilMiscRuntime
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
@@ -106,7 +107,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // revenues are accounts of class CREDIT: the balance is given by credits minus debits
     balanceTotal = balanceTotalCredit.subtract(balanceTotalDebit)
 }
@@ -150,7 +151,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // contra revenues are accounts of class DEBIT: the balance is given by debits minus credits
     balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
 }
@@ -193,7 +194,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // expenses are accounts of class DEBIT: the balance is given by debits minus credits
     balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
 }
@@ -237,7 +238,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // expenses are accounts of class DEBIT: the balance is given by debits minus credits
     balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
 }
@@ -280,7 +281,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // expenses are accounts of class DEBIT: the balance is given by debits minus credits
     balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
 }
@@ -322,7 +323,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // expenses are accounts of class DEBIT: the balance is given by debits minus credits
     balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
 }
@@ -364,7 +365,7 @@ if (transactionTotals) {
         accountMap.put('balance', balance)
         transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
     }
-    accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
+    accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
     // incomes are accounts of class CREDIT: the balance is given by credits minus debits
     balanceTotal = balanceTotalCredit.subtract(balanceTotalDebit)
 }

Diff for: applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java

@@ -29,7 +29,7 @@
 import org.apache.ofbiz.base.util.Debug;
 import org.apache.ofbiz.base.util.UtilMisc;
 import org.apache.ofbiz.base.util.UtilNumber;
-import org.apache.ofbiz.base.util.UtilProperties;
+import org.apache.ofbiz.base.util.UtilPropertiesRuntime;
 import org.apache.ofbiz.entity.Delegator;
 import org.apache.ofbiz.entity.GenericEntityException;
 import org.apache.ofbiz.entity.GenericValue;
@@ -174,7 +174,7 @@ public static Map<String, Object> getCommissionForProduct(DispatchContext ctx, M
         } catch (GenericEntityException e) {
             Debug.logWarning(e, MODULE);
             Map<String, String> messageMap = UtilMisc.toMap("errMessage", e.getMessage());
-            errMsg = UtilProperties.getMessage("CommonUiLabels", "CommonDatabaseProblem", messageMap, locale);
+            errMsg = UtilPropertiesRuntime.getMessage("CommonUiLabels", "CommonDatabaseProblem", messageMap, locale);
             return ServiceUtil.returnError(errMsg);
         }
         return UtilMisc.toMap(