svn commit: r1061949 - /ofbiz/trunk/applications/acco
Locked
 
|
Author: mrisaliti
Date: Fri Jan 21 18:24:18 2011 New Revision: 1061949 URL: http://svn.apache.org/viewvc?rev=1061949&view=rev Log: Remove java compilation warnings from TaxAuthorityServices (OFBIZ-4102) Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1061949&r1=1061948&r2=1061949&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri Jan 21 18:24:18 2011 @@ -20,7 +20,6 @@ package org.ofbiz.accounting.tax; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -32,6 +31,7 @@ import javolution.util.FastSet; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; +import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilValidate; @@ -61,7 +61,7 @@ public class TaxAuthorityServices { public static int salestaxCalcDecimals = UtilNumber.getBigDecimalScale("salestax.calc.decimals"); public static int salestaxRounding = UtilNumber.getBigDecimalRoundingMode("salestax.rounding"); - public static Map rateProductTaxCalcForDisplay(DispatchContext dctx, Map context) { + public static Map<String, Object> rateProductTaxCalcForDisplay(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); String productStoreId = (String) context.get("productStoreId"); String billToPartyId = (String) context.get("billToPartyId"); @@ -86,9 +86,9 @@ public class TaxAuthorityServices { } if ("Y".equals(productStore.getString("showPricesWithVatTax"))) { - Set taxAuthoritySet = FastSet.newInstance(); + Set<GenericValue> taxAuthoritySet = FastSet.newInstance(); if (productStore.get("vatTaxAuthPartyId") == null) { - List taxAuthorityRawList = delegator.findList("TaxAuthority", EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, productStore.get("vatTaxAuthGeoId")), null, null, null, true); + List<GenericValue> taxAuthorityRawList = delegator.findList("TaxAuthority", EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, productStore.get("vatTaxAuthGeoId")), null, null, null, true); taxAuthoritySet.addAll(taxAuthorityRawList); } else { GenericValue taxAuthority = delegator.findByPrimaryKeyCache("TaxAuthority", UtilMisc.toMap("taxAuthGeoId", productStore.get("vatTaxAuthGeoId"), "taxAuthPartyId", productStore.get("vatTaxAuthPartyId"))); @@ -99,14 +99,14 @@ public class TaxAuthorityServices { throw new IllegalArgumentException("Could not find any Tax Authories for store with ID [" + productStoreId + "] for tax calculation; the store settings may need to be corrected."); } - List taxAdustmentList = getTaxAdjustments(delegator, product, productStore, null, billToPartyId, taxAuthoritySet, basePrice, quantity, amount, shippingPrice, ZERO_BASE); + List<GenericValue> taxAdustmentList = getTaxAdjustments(delegator, product, productStore, null, billToPartyId, taxAuthoritySet, basePrice, quantity, amount, shippingPrice, ZERO_BASE); if (taxAdustmentList.size() == 0) { // this is something that happens every so often for different products and such, so don't blow up on it... Debug.logWarning("Could not find any Tax Authories Rate Rules for store with ID [" + productStoreId + "], productId [" + productId + "], basePrice [" + basePrice + "], amount [" + amount + "], for tax calculation; the store settings may need to be corrected.", module); } // add up amounts from adjustments (amount OR exemptAmount, sourcePercentage) - Iterator taxAdustmentIter = taxAdustmentList.iterator(); + Iterator<GenericValue> taxAdustmentIter = taxAdustmentList.iterator(); while (taxAdustmentIter.hasNext()) { GenericValue taxAdjustment = (GenericValue) taxAdustmentIter.next(); if ("SALES_TAX".equals(taxAdjustment.getString("orderAdjustmentTypeId"))) { @@ -128,30 +128,28 @@ public class TaxAuthorityServices { taxTotal = taxTotal.setScale(salestaxFinalDecimals, salestaxRounding); priceWithTax = priceWithTax.setScale(salestaxFinalDecimals, salestaxRounding); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("taxTotal", taxTotal); result.put("taxPercentage", taxPercentage); result.put("priceWithTax", priceWithTax); return result; } - public static Map rateProductTaxCalc(DispatchContext dctx, Map context) { + public static Map<String, Object> rateProductTaxCalc(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); String productStoreId = (String) context.get("productStoreId"); String facilityId = (String) context.get("facilityId"); String payToPartyId = (String) context.get("payToPartyId"); String billToPartyId = (String) context.get("billToPartyId"); - List itemProductList = (List) context.get("itemProductList"); - List itemAmountList = (List) context.get("itemAmountList"); - List itemPriceList = (List) context.get("itemPriceList"); - List itemQuantityList = (List) context.get("itemQuantityList"); - List itemShippingList = (List) context.get("itemShippingList"); + List<GenericValue> itemProductList = UtilGenerics.checkList(context.get("itemProductList")); + List<BigDecimal> itemAmountList = UtilGenerics.checkList(context.get("itemAmountList")); + List<BigDecimal> itemPriceList = UtilGenerics.checkList(context.get("itemPriceList")); + List<BigDecimal> itemQuantityList = UtilGenerics.checkList(context.get("itemQuantityList")); + List<BigDecimal> itemShippingList = UtilGenerics.checkList(context.get("itemShippingList")); BigDecimal orderShippingAmount = (BigDecimal) context.get("orderShippingAmount"); BigDecimal orderPromotionsAmount = (BigDecimal) context.get("orderPromotionsAmount"); GenericValue shippingAddress = (GenericValue) context.get("shippingAddress"); - Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - GenericValue productStore = null; GenericValue facility = null; try { @@ -195,7 +193,7 @@ public class TaxAuthorityServices { } // without knowing the TaxAuthority parties, just find all TaxAuthories for the set of IDs... - Set taxAuthoritySet = FastSet.newInstance(); + Set<GenericValue> taxAuthoritySet = FastSet.newInstance(); try { getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); } catch (GenericEntityException e) { @@ -205,8 +203,8 @@ public class TaxAuthorityServices { } // Setup the return lists. - List orderAdjustments = FastList.newInstance(); - List itemAdjustments = FastList.newInstance(); + List<GenericValue> orderAdjustments = FastList.newInstance(); + List<List<GenericValue>> itemAdjustments = FastList.newInstance(); // Loop through the products; get the taxCategory; and lookup each in the cache. for (int i = 0; i < itemProductList.size(); i++) { @@ -215,7 +213,7 @@ public class TaxAuthorityServices { BigDecimal itemPrice = (BigDecimal) itemPriceList.get(i); BigDecimal itemQuantity = itemQuantityList != null ? (BigDecimal) itemQuantityList.get(i) : null; BigDecimal shippingAmount = (BigDecimal) itemShippingList.get(i); - List taxList = null; + List<GenericValue> taxList = null; if (shippingAddress != null) { taxList = getTaxAdjustments(delegator, product, productStore, payToPartyId, billToPartyId, taxAuthoritySet, itemPrice, itemQuantity, itemAmount, shippingAmount, ZERO_BASE); } @@ -223,23 +221,23 @@ public class TaxAuthorityServices { itemAdjustments.add(taxList); } if (orderShippingAmount != null && orderShippingAmount.compareTo(BigDecimal.ZERO) > 0) { - List taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId, taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderShippingAmount, ZERO_BASE); + List<GenericValue> taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId, taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderShippingAmount, ZERO_BASE); orderAdjustments.addAll(taxList); } if (orderPromotionsAmount != null && orderPromotionsAmount.compareTo(BigDecimal.ZERO) != 0) { - List taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId, taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderPromotionsAmount); + List<GenericValue> taxList = getTaxAdjustments(delegator, null, productStore, payToPartyId, billToPartyId, taxAuthoritySet, ZERO_BASE, ZERO_BASE, ZERO_BASE, ZERO_BASE, orderPromotionsAmount); orderAdjustments.addAll(taxList); } - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("orderAdjustments", orderAdjustments); result.put("itemAdjustments", itemAdjustments); return result; } - private static void getTaxAuthorities(Delegator delegator, GenericValue shippingAddress, Set taxAuthoritySet) throws GenericEntityException { - Map geoIdByTypeMap = FastMap.newInstance(); + private static void getTaxAuthorities(Delegator delegator, GenericValue shippingAddress, Set<GenericValue> taxAuthoritySet) throws GenericEntityException { + Map<String, String> geoIdByTypeMap = FastMap.newInstance(); if (shippingAddress != null) { if (UtilValidate.isNotEmpty(shippingAddress.getString("countryGeoId"))) { geoIdByTypeMap.put("COUNTRY", shippingAddress.getString("countryGeoId")); @@ -263,17 +261,17 @@ public class TaxAuthorityServices { geoIdByTypeMap = GeoWorker.expandGeoRegionDeep(geoIdByTypeMap, delegator); //Debug.logInfo("Tax calc geoIdByTypeMap after expand:" + geoIdByTypeMap, module); - List taxAuthorityRawList = delegator.findList("TaxAuthority", EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.IN, geoIdByTypeMap.values()), null, null, null, true); + List<GenericValue> taxAuthorityRawList = delegator.findList("TaxAuthority", EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.IN, geoIdByTypeMap.values()), null, null, null, true); taxAuthoritySet.addAll(taxAuthorityRawList); //Debug.logInfo("Tax calc taxAuthoritySet after expand:" + taxAuthoritySet, module); } - private static List getTaxAdjustments(Delegator delegator, GenericValue product, GenericValue productStore, - String payToPartyId, String billToPartyId, Set taxAuthoritySet, + private static List<GenericValue> getTaxAdjustments(Delegator delegator, GenericValue product, GenericValue productStore, + String payToPartyId, String billToPartyId, Set<GenericValue> taxAuthoritySet, BigDecimal itemPrice, BigDecimal itemQuantity, BigDecimal itemAmount, BigDecimal shippingAmount, BigDecimal orderPromotionsAmount) { Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - List adjustments = FastList.newInstance(); + List<GenericValue> adjustments = FastList.newInstance(); if (payToPartyId == null) { if (productStore != null) { @@ -293,14 +291,14 @@ public class TaxAuthorityServices { } // build the TaxAuthority expressions (taxAuthGeoId, taxAuthPartyId) - List taxAuthCondOrList = FastList.newInstance(); + List<EntityCondition> taxAuthCondOrList = FastList.newInstance(); // start with the _NA_ TaxAuthority... taxAuthCondOrList.add(EntityCondition.makeCondition( EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, "_NA_"), EntityOperator.AND, EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, "_NA_"))); - Iterator taxAuthorityIter = taxAuthoritySet.iterator(); + Iterator<GenericValue> taxAuthorityIter = taxAuthoritySet.iterator(); while (taxAuthorityIter.hasNext()) { GenericValue taxAuthority = (GenericValue) taxAuthorityIter.next(); EntityCondition taxAuthCond = EntityCondition.makeCondition( @@ -321,7 +319,7 @@ public class TaxAuthorityServices { if ("Y".equals(product.getString("isVariant"))) { virtualProductId = ProductWorker.getVariantVirtualId(product); } - Set productCategoryIdSet = FastSet.newInstance(); + Set<String> productCategoryIdSet = FastSet.newInstance(); EntityCondition productIdCond = null; if (virtualProductId != null) { productIdCond = EntityCondition.makeCondition( @@ -332,12 +330,12 @@ public class TaxAuthorityServices { } else { productIdCond = EntityCondition.makeCondition("productId", EntityOperator.EQUALS, product.getString("productId")); } - List pcmList = delegator.findList("ProductCategoryMember", productIdCond, UtilMisc.toSet("productCategoryId"), null, null, true); + List<GenericValue> pcmList = delegator.findList("ProductCategoryMember", productIdCond, UtilMisc.toSet("productCategoryId"), null, null, true); pcmList = EntityUtil.filterByDate(pcmList, true); - Iterator pcmIter = pcmList.iterator(); + Iterator<GenericValue> pcmIter = pcmList.iterator(); while (pcmIter.hasNext()) { GenericValue pcm = (GenericValue) pcmIter.next(); - productCategoryIdSet.add(pcm.get("productCategoryId")); + productCategoryIdSet.add(pcm.getString("productCategoryId")); } if (productCategoryIdSet.size() == 0) { @@ -353,17 +351,17 @@ public class TaxAuthorityServices { } // build the main condition clause - List mainExprs = UtilMisc.toList(storeCond, taxAuthoritiesCond, productCategoryCond); + List<EntityCondition> mainExprs = UtilMisc.toList(storeCond, taxAuthoritiesCond, productCategoryCond); mainExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("minItemPrice", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("minItemPrice", EntityOperator.LESS_THAN_EQUAL_TO, itemPrice))); mainExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("minPurchase", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("minPurchase", EntityOperator.LESS_THAN_EQUAL_TO, itemAmount))); EntityCondition mainCondition = EntityCondition.makeCondition(mainExprs, EntityOperator.AND); // create the orderby clause - List orderList = UtilMisc.toList("minItemPrice", "minPurchase", "fromDate"); + List<String> orderList = UtilMisc.<String>toList("minItemPrice", "minPurchase", "fromDate"); // finally ready... do the rate query - List lookupList = delegator.findList("TaxAuthorityRateProduct", mainCondition, null, orderList, null, false); - List filteredList = EntityUtil.filterByDate(lookupList, true); + List<GenericValue> lookupList = delegator.findList("TaxAuthorityRateProduct", mainCondition, null, orderList, null, false); + List<GenericValue> filteredList = EntityUtil.filterByDate(lookupList, true); if (filteredList.size() == 0) { Debug.logWarning("In TaxAuthority Product Rate no records were found for condition:" + mainCondition.toString(), module); @@ -371,7 +369,7 @@ public class TaxAuthorityServices { } // find the right entry(s) based on purchase amount - Iterator flIt = filteredList.iterator(); + Iterator<GenericValue> flIt = filteredList.iterator(); while (flIt.hasNext()) { GenericValue taxAuthorityRateProduct = (GenericValue) flIt.next(); BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct.getBigDecimal("taxPercentage") : ZERO_BASE; @@ -450,13 +448,13 @@ public class TaxAuthorityServices { if (UtilValidate.isNotEmpty(billToPartyId) && UtilValidate.isNotEmpty(taxAuthGeoId)) { // see if partyId is a member of any groups, if so honor their tax exemptions // look for PartyRelationship with partyRelationshipTypeId=GROUP_ROLLUP, the partyIdTo is the group member, so the partyIdFrom is the groupPartyId - Set billToPartyIdSet = FastSet.newInstance(); + Set<String> billToPartyIdSet = FastSet.newInstance(); billToPartyIdSet.add(billToPartyId); - List partyRelationshipList = EntityUtil.filterByDate(delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP")), true); - Iterator partyRelationshipIter = partyRelationshipList.iterator(); + List<GenericValue> partyRelationshipList = EntityUtil.filterByDate(delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdTo", billToPartyId, "partyRelationshipTypeId", "GROUP_ROLLUP")), true); + Iterator<GenericValue> partyRelationshipIter = partyRelationshipList.iterator(); while (partyRelationshipIter.hasNext()) { GenericValue partyRelationship = (GenericValue) partyRelationshipIter.next(); - billToPartyIdSet.add(partyRelationship.get("partyIdFrom")); + billToPartyIdSet.add(partyRelationship.getString("partyIdFrom")); } handlePartyTaxExempt(taxAdjValue, billToPartyIdSet, taxAuthGeoId, taxAuthPartyId, taxAmount, nowTimestamp, delegator); } else { @@ -513,15 +511,15 @@ public class TaxAuthorityServices { } } catch (GenericEntityException e) { Debug.logError(e, "Problems looking up tax rates", module); - return new ArrayList(); + return FastList.newInstance(); } return adjustments; } - private static void handlePartyTaxExempt(GenericValue adjValue, Set billToPartyIdSet, String taxAuthGeoId, String taxAuthPartyId, BigDecimal taxAmount, Timestamp nowTimestamp, Delegator delegator) throws GenericEntityException { + private static void handlePartyTaxExempt(GenericValue adjValue, Set<String> billToPartyIdSet, String taxAuthGeoId, String taxAuthPartyId, BigDecimal taxAmount, Timestamp nowTimestamp, Delegator delegator) throws GenericEntityException { Debug.logInfo("Checking for tax exemption : " + taxAuthGeoId + " / " + taxAuthPartyId, module); - List ptiConditionList = UtilMisc.toList( + List<EntityCondition> ptiConditionList = UtilMisc.<EntityCondition>toList( EntityCondition.makeCondition("partyId", EntityOperator.IN, billToPartyIdSet), EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, taxAuthGeoId), EntityCondition.makeCondition("taxAuthPartyId", EntityOperator.EQUALS, taxAuthPartyId)); @@ -529,7 +527,7 @@ public class TaxAuthorityServices { ptiConditionList.add(EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN, nowTimestamp))); EntityCondition ptiCondition = EntityCondition.makeCondition(ptiConditionList, EntityOperator.AND); // sort by -fromDate to get the newest (largest) first, just in case there is more than one, we only want the most recent valid one, should only be one per jurisdiction... - List partyTaxInfos = delegator.findList("PartyTaxAuthInfo", ptiCondition, null, UtilMisc.toList("-fromDate"), null, false); + List<GenericValue> partyTaxInfos = delegator.findList("PartyTaxAuthInfo", ptiCondition, null, UtilMisc.toList("-fromDate"), null, false); boolean foundExemption = false; if (partyTaxInfos.size() > 0) { @@ -545,7 +543,7 @@ public class TaxAuthorityServices { // if no exceptions were found for the current; try the parent if (!foundExemption) { // try the "parent" TaxAuthority - List taxAuthorityAssocList = delegator.findByAndCache("TaxAuthorityAssoc", + List<GenericValue> taxAuthorityAssocList = delegator.findByAndCache("TaxAuthorityAssoc", UtilMisc.toMap("toTaxAuthGeoId", taxAuthGeoId, "toTaxAuthPartyId", taxAuthPartyId, "taxAuthorityAssocTypeId", "EXEMPT_INHER"), UtilMisc.toList("-fromDate")); taxAuthorityAssocList = EntityUtil.filterByDate(taxAuthorityAssocList, true); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |