Skip to content

Commit 43602c3

Browse files
ieugenieugen
committed
Improvement: Extract datafile component, base/util and base/crypt (OFBIZ-3500)
* 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
1 parent afe62e2 commit 43602c3

File tree

583 files changed

+9863
-7832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

583 files changed

+9863
-7832
lines changed

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/fixedasset/FixedAssetGeoLocation.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
*/
1919
package org.apache.ofbiz.accounting.fixedasset
2020

21-
import org.apache.ofbiz.base.util.UtilProperties
21+
22+
import org.apache.ofbiz.base.util.UtilPropertiesRuntime
2223
import org.apache.ofbiz.common.geo.GeoWorker
2324

24-
uiLabelMap = UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)
25+
uiLabelMap = UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)
2526

2627
if (fixedAsset) {
2728
latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, 'FixedAssetAndGeoPoint', 'fixedAssetId', fixedAssetId, null, null)

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/payment/PaymentServices.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.apache.ofbiz.accounting.payment
2020

21+
import org.apache.ofbiz.base.util.UtilPropertiesRuntime
22+
2123
import java.sql.Timestamp
2224

2325
import org.apache.ofbiz.accounting.invoice.InvoiceWorker
@@ -362,7 +364,7 @@ Map getInvoicePaymentInfoListByDueDateOffset() {
362364
Map voidPayment() {
363365
GenericValue payment = from('Payment').where(parameters).queryOne()
364366
if (!payment) {
365-
return error(UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)?.AccountingNoPaymentsfound)
367+
return error(UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)?.AccountingNoPaymentsfound)
366368
}
367369
String paymentId = payment.paymentId
368370
Map paymentStatusCtx = [paymentId: paymentId,

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/BalanceSheet.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package org.apache.ofbiz.accounting.reports
2121
import org.apache.ofbiz.accounting.util.UtilAccounting
2222
import org.apache.ofbiz.base.util.UtilDateTime
2323
import org.apache.ofbiz.base.util.UtilMisc
24-
import org.apache.ofbiz.base.util.UtilProperties
24+
import org.apache.ofbiz.base.util.UtilPropertiesRuntime
2525
import org.apache.ofbiz.entity.GenericValue
2626
import org.apache.ofbiz.entity.condition.EntityCondition
2727
import org.apache.ofbiz.entity.condition.EntityExpr
@@ -30,7 +30,7 @@ import org.apache.ofbiz.party.party.PartyWorker
3030

3131
import java.sql.Timestamp
3232

33-
uiLabelMap = UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)
33+
uiLabelMap = UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)
3434

3535
thruDate = thruDate ?: UtilDateTime.nowTimestamp()
3636
if (!glFiscalTypeId) {

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/CashFlowStatement.groovy‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ package org.apache.ofbiz.accounting.reports
2121
import org.apache.ofbiz.accounting.util.UtilAccounting
2222
import org.apache.ofbiz.base.util.UtilDateTime
2323
import org.apache.ofbiz.base.util.UtilMisc
24-
import org.apache.ofbiz.base.util.UtilProperties
24+
import org.apache.ofbiz.base.util.UtilMiscRuntime
25+
import org.apache.ofbiz.base.util.UtilPropertiesRuntime
2526
import org.apache.ofbiz.entity.GenericValue
2627
import org.apache.ofbiz.entity.condition.EntityCondition
2728
import org.apache.ofbiz.entity.condition.EntityOperator
@@ -35,7 +36,7 @@ if (!fromDate) {
3536
thruDate = thruDate ?: UtilDateTime.nowTimestamp()
3637
parameters.glFiscalTypeId = parameters.glFiscalTypeId ?: 'ACTUAL'
3738

38-
uiLabelMap = UtilProperties.getResourceBundleMap('AccountingUiLabels', locale)
39+
uiLabelMap = UtilPropertiesRuntime.getResourceBundleMap('AccountingUiLabels', locale)
3940
parametersFromDate = fromDate
4041

4142
// Setup the divisions for which the report is executed
@@ -115,7 +116,7 @@ transactionTotals.each { transactionTotal ->
115116
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
116117
}
117118
glAccountIdList = []
118-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
119+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
119120
accountBalanceList.each { accountBalance ->
120121
balanceTotal = balanceTotal.add(accountBalance.balance)
121122
}
@@ -160,7 +161,7 @@ if (transactionTotals) {
160161
accountMap.balance = balance
161162
transactionTotalsMap.(transactionTotal.glAccountId) = accountMap
162163
}
163-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
164+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
164165
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
165166
}
166167
periodCashBalanceTotal = balanceTotal
@@ -175,7 +176,7 @@ balanceTotal = BigDecimal.ZERO
175176
List transactionTotals = []
176177
transactionTotals.addAll(new LinkedList(context.openingCashBalanceList))
177178
transactionTotals.addAll(new LinkedList(context.periodCashBalanceList))
178-
transactionTotals = UtilMisc.sortMaps(transactionTotals, UtilMisc.toList('accountCode'))
179+
transactionTotals = UtilMiscRuntime.sortMaps(transactionTotals, UtilMisc.toList('accountCode'))
179180
closingTransactionKeySet = []
180181
if (transactionTotals) {
181182
Map transactionTotalsMap = [:]
@@ -197,7 +198,7 @@ if (transactionTotals) {
197198
} else {
198199
transactionTotalsMap.(transactionTotal.glAccountId) = transactionTotal
199200
}
200-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
201+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
201202
}
202203
}
203204
closingTransactionKeySet = transactionTotalsMap.keySet()

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/ComparativeBalanceSheet.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.ofbiz.accounting.reports
2020

2121
import org.apache.ofbiz.base.util.UtilMisc
22+
import org.apache.ofbiz.base.util.UtilMiscRuntime
2223

2324
assetAccountBalanceMap = [:]
2425
assetAccountBalanceList = []
@@ -37,7 +38,7 @@ assetAccountBalanceList2.each { accountBalance ->
3738
balance1: BigDecimal.ZERO])
3839
}
3940
}
40-
assetAccountBalanceList = UtilMisc.sortMaps(assetAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
41+
assetAccountBalanceList = UtilMiscRuntime.sortMaps(assetAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
4142
context.assetAccountBalanceList = assetAccountBalanceList
4243

4344
liabilityAccountBalanceMap = [:]
@@ -57,7 +58,7 @@ liabilityAccountBalanceList2.each { accountBalance ->
5758
balance1: BigDecimal.ZERO])
5859
}
5960
}
60-
liabilityAccountBalanceList = UtilMisc.sortMaps(liabilityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
61+
liabilityAccountBalanceList = UtilMiscRuntime.sortMaps(liabilityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
6162
context.liabilityAccountBalanceList = liabilityAccountBalanceList
6263

6364
equityAccountBalanceMap = [:]
@@ -77,7 +78,7 @@ equityAccountBalanceList2.each { accountBalance ->
7778
balance1: BigDecimal.ZERO])
7879
}
7980
}
80-
equityAccountBalanceList = UtilMisc.sortMaps(equityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
81+
equityAccountBalanceList = UtilMiscRuntime.sortMaps(equityAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
8182
context.equityAccountBalanceList = equityAccountBalanceList
8283

8384
balanceTotalMap = [:]

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/ComparativeCashFlowStatement.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.ofbiz.accounting.reports
2020

2121
import org.apache.ofbiz.base.util.UtilMisc
22+
import org.apache.ofbiz.base.util.UtilMiscRuntime
2223

2324
openingCashBalanceMap = [:]
2425
openingCashBalanceList = []
@@ -37,7 +38,7 @@ openingCashBalanceList2.each { accountBalance ->
3738
balance1: BigDecimal.ZERO])
3839
}
3940
}
40-
openingCashBalanceList = UtilMisc.sortMaps(openingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
41+
openingCashBalanceList = UtilMiscRuntime.sortMaps(openingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
4142
context.openingCashBalanceList = openingCashBalanceList
4243

4344
periodCashBalanceMap = [:]
@@ -61,7 +62,7 @@ periodCashBalanceList2.each { accountBalance ->
6162
D1: BigDecimal.ZERO, C1: BigDecimal.ZERO])
6263
}
6364
}
64-
periodCashBalanceList = UtilMisc.sortMaps(periodCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
65+
periodCashBalanceList = UtilMiscRuntime.sortMaps(periodCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
6566

6667
context.periodCashBalanceList = periodCashBalanceList
6768
closingCashBalanceMap = [:]
@@ -81,7 +82,7 @@ closingCashBalanceList2.each { accountBalance ->
8182
balance1: BigDecimal.ZERO])
8283
}
8384
}
84-
closingCashBalanceList = UtilMisc.sortMaps(closingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
85+
closingCashBalanceList = UtilMiscRuntime.sortMaps(closingCashBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
8586
context.closingCashBalanceList = closingCashBalanceList
8687

8788
balanceTotalMap = [:]

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/ComparativeIncomeStatement.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.ofbiz.accounting.reports
2020

2121
import org.apache.ofbiz.base.util.UtilMisc
22+
import org.apache.ofbiz.base.util.UtilMiscRuntime
2223

2324
revenueAccountBalanceMap = [:]
2425
revenueAccountBalanceList = []
@@ -37,7 +38,7 @@ revenueAccountBalanceList2.each { accountBalance ->
3738
balance1: BigDecimal.ZERO])
3839
}
3940
}
40-
revenueAccountBalanceList = UtilMisc.sortMaps(revenueAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
41+
revenueAccountBalanceList = UtilMiscRuntime.sortMaps(revenueAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
4142
context.revenueAccountBalanceList = revenueAccountBalanceList
4243

4344
expenseAccountBalanceMap = [:]
@@ -57,7 +58,7 @@ expenseAccountBalanceList2.each { accountBalance ->
5758
balance1: BigDecimal.ZERO])
5859
}
5960
}
60-
expenseAccountBalanceList = UtilMisc.sortMaps(expenseAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
61+
expenseAccountBalanceList = UtilMiscRuntime.sortMaps(expenseAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
6162
context.expenseAccountBalanceList = expenseAccountBalanceList
6263

6364
incomeAccountBalanceMap = [:]
@@ -77,7 +78,7 @@ incomeAccountBalanceList2.each { accountBalance ->
7778
balance1: BigDecimal.ZERO])
7879
}
7980
}
80-
incomeAccountBalanceList = UtilMisc.sortMaps(incomeAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
81+
incomeAccountBalanceList = UtilMiscRuntime.sortMaps(incomeAccountBalanceMap.values().asList(), UtilMisc.toList('accountCode'))
8182
context.incomeAccountBalanceList = incomeAccountBalanceList
8283

8384
balanceTotalMap = [:]

‎applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/reports/IncomeStatement.groovy‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package org.apache.ofbiz.accounting.reports
2020

2121
import org.apache.ofbiz.base.util.UtilDateTime
2222
import org.apache.ofbiz.base.util.UtilMisc
23+
import org.apache.ofbiz.base.util.UtilMiscRuntime
2324
import org.apache.ofbiz.entity.GenericValue
2425
import org.apache.ofbiz.entity.condition.EntityCondition
2526
import org.apache.ofbiz.entity.condition.EntityOperator
@@ -106,7 +107,7 @@ if (transactionTotals) {
106107
accountMap.put('balance', balance)
107108
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
108109
}
109-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
110+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
110111
// revenues are accounts of class CREDIT: the balance is given by credits minus debits
111112
balanceTotal = balanceTotalCredit.subtract(balanceTotalDebit)
112113
}
@@ -150,7 +151,7 @@ if (transactionTotals) {
150151
accountMap.put('balance', balance)
151152
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
152153
}
153-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
154+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
154155
// contra revenues are accounts of class DEBIT: the balance is given by debits minus credits
155156
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
156157
}
@@ -193,7 +194,7 @@ if (transactionTotals) {
193194
accountMap.put('balance', balance)
194195
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
195196
}
196-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
197+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
197198
// expenses are accounts of class DEBIT: the balance is given by debits minus credits
198199
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
199200
}
@@ -237,7 +238,7 @@ if (transactionTotals) {
237238
accountMap.put('balance', balance)
238239
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
239240
}
240-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
241+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
241242
// expenses are accounts of class DEBIT: the balance is given by debits minus credits
242243
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
243244
}
@@ -280,7 +281,7 @@ if (transactionTotals) {
280281
accountMap.put('balance', balance)
281282
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
282283
}
283-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
284+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
284285
// expenses are accounts of class DEBIT: the balance is given by debits minus credits
285286
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
286287
}
@@ -322,7 +323,7 @@ if (transactionTotals) {
322323
accountMap.put('balance', balance)
323324
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
324325
}
325-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
326+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
326327
// expenses are accounts of class DEBIT: the balance is given by debits minus credits
327328
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit)
328329
}
@@ -364,7 +365,7 @@ if (transactionTotals) {
364365
accountMap.put('balance', balance)
365366
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap)
366367
}
367-
accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
368+
accountBalanceList = UtilMiscRuntime.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList('accountCode'))
368369
// incomes are accounts of class CREDIT: the balance is given by credits minus debits
369370
balanceTotal = balanceTotalCredit.subtract(balanceTotalDebit)
370371
}

‎applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.ofbiz.base.util.Debug;
3030
import org.apache.ofbiz.base.util.UtilMisc;
3131
import org.apache.ofbiz.base.util.UtilNumber;
32-
import org.apache.ofbiz.base.util.UtilProperties;
32+
import org.apache.ofbiz.base.util.UtilPropertiesRuntime;
3333
import org.apache.ofbiz.entity.Delegator;
3434
import org.apache.ofbiz.entity.GenericEntityException;
3535
import org.apache.ofbiz.entity.GenericValue;
@@ -174,7 +174,7 @@ public static Map<String, Object> getCommissionForProduct(DispatchContext ctx, M
174174
} catch (GenericEntityException e) {
175175
Debug.logWarning(e, MODULE);
176176
Map<String, String> messageMap = UtilMisc.toMap("errMessage", e.getMessage());
177-
errMsg = UtilProperties.getMessage("CommonUiLabels", "CommonDatabaseProblem", messageMap, locale);
177+
errMsg = UtilPropertiesRuntime.getMessage("CommonUiLabels", "CommonDatabaseProblem", messageMap, locale);
178178
return ServiceUtil.returnError(errMsg);
179179
}
180180
return UtilMisc.toMap(

0 commit comments

Comments
 (0)