svn commit: r1837577 [3/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1837577 [3/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java Tue Aug 7 07:30:43 2018 @@ -223,7 +223,7 @@ public class ShoppingCartItem implements if (cartLocation == null) { cart.addItemToEnd(newItem); } else { - cart.addItem(cartLocation.intValue(), newItem); + cart.addItem(cartLocation, newItem); } if (selectedAmount != null) { @@ -314,7 +314,7 @@ public class ShoppingCartItem implements String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, String parentProductId, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException, ItemNotFoundException { Delegator delegator = cart.getDelegator(); - GenericValue product = findProduct(delegator, skipProductChecks.booleanValue(), prodCatalogId, productId, cart.getLocale()); + GenericValue product = findProduct(delegator, skipProductChecks, prodCatalogId, productId, cart.getLocale()); GenericValue parentProduct = null; if (parentProductId != null) @@ -392,8 +392,8 @@ public class ShoppingCartItem implements unitPrice = unitPrice == null ? BigDecimal.ZERO : unitPrice; reservLength = reservLength == null ? BigDecimal.ZERO : reservLength; reservPersons = reservPersons == null ? BigDecimal.ZERO : reservPersons; - boolean triggerPriceRules = triggerPriceRulesBool == null ? true : triggerPriceRulesBool.booleanValue(); - boolean triggerExternalOps = triggerExternalOpsBool == null ? true : triggerExternalOpsBool.booleanValue(); + boolean triggerPriceRules = triggerPriceRulesBool == null ? true : triggerPriceRulesBool; + boolean triggerExternalOps = triggerExternalOpsBool == null ? true : triggerExternalOpsBool; // check to see if product is virtual if ("Y".equals(product.getString("isVirtual"))) { @@ -407,7 +407,7 @@ public class ShoppingCartItem implements java.sql.Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - if (!skipProductChecks.booleanValue()) { + if (!skipProductChecks) { isValidCartProduct(configWrapper, product, nowTimestamp, cart.getLocale()); } @@ -476,7 +476,7 @@ public class ShoppingCartItem implements if (cartLocation == null) { cart.addItemToEnd(newItem); } else { - cart.addItem(cartLocation.intValue(), newItem); + cart.addItem(cartLocation, newItem); } // We have to set the selectedAmount before calling setQuantity because @@ -487,7 +487,7 @@ public class ShoppingCartItem implements } try { - newItem.setQuantity(quantity, dispatcher, cart, triggerExternalOps, true, triggerPriceRules, skipInventoryChecks.booleanValue()); + newItem.setQuantity(quantity, dispatcher, cart, triggerExternalOps, true, triggerPriceRules, skipInventoryChecks); } catch (CartItemModifyException e) { Debug.logWarning(e.getMessage(), module); cart.removeCartItem(cart.getItemIndex(newItem), dispatcher); @@ -598,10 +598,10 @@ public class ShoppingCartItem implements if (cartLocation == null) { cart.addItemToEnd(newItem); } else { - cart.addItem(cartLocation.intValue(), newItem); + cart.addItem(cartLocation, newItem); } - boolean triggerExternalOps = triggerExternalOpsBool == null ? true : triggerExternalOpsBool.booleanValue(); + boolean triggerExternalOps = triggerExternalOpsBool == null ? true : triggerExternalOpsBool; try { newItem.setQuantity(quantity, dispatcher, cart, triggerExternalOps); @@ -1098,7 +1098,7 @@ public class ShoppingCartItem implements throw new CartItemModifyException("There was an error while calculating the price: " + ServiceUtil.getErrorMessage(priceResult)); } Boolean validPriceFound = (Boolean) priceResult.get("validPriceFound"); - if (!validPriceFound.booleanValue()) { + if (!validPriceFound) { throw new CartItemModifyException("Could not find a valid price for the product with ID [" + this.getProductId() + "] and supplier with ID [" + partyId + "], not adding to cart."); } @@ -1789,7 +1789,7 @@ public class ShoppingCartItem implements if (pieces == null) { return 1; } - return pieces.longValue(); + return pieces; } // non-product item assumed 1 piece return 1; @@ -1900,7 +1900,7 @@ public class ShoppingCartItem implements itemInfo.put("weight", this.getWeight()); itemInfo.put("weightUomId", this.getProduct().getString("weightUomId")); itemInfo.put("size", this.getSize()); - itemInfo.put("piecesIncluded", Long.valueOf(this.getPiecesIncluded())); + itemInfo.put("piecesIncluded", this.getPiecesIncluded()); itemInfo.put("featureSet", this.getFeatureSet()); GenericValue product = getProduct(); if (product != null) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java Tue Aug 7 07:30:43 2018 @@ -84,8 +84,8 @@ public class ShoppingCartServices { return ServiceUtil.returnSuccess(); } - cart.positionItemToGroup(itemIndex.intValue(), quantity, - fromGroupIndex.intValue(), toGroupIndex.intValue(), clearEmptyGroups.booleanValue()); + cart.positionItemToGroup(itemIndex, quantity, + fromGroupIndex, toGroupIndex, clearEmptyGroups); Debug.logInfo("Called cart.positionItemToGroup()", module); return ServiceUtil.returnSuccess(); @@ -102,9 +102,9 @@ public class ShoppingCartServices { Boolean isGift = (Boolean) context.get("isGift"); Locale locale = (Locale) context.get("locale"); - ShoppingCart.CartShipInfo csi = cart.getShipInfo(groupIndex.intValue()); + ShoppingCart.CartShipInfo csi = cart.getShipInfo(groupIndex); if (csi != null) { - int idx = groupIndex.intValue(); + int idx = groupIndex; if (UtilValidate.isNotEmpty(shipmentMethodString)) { int delimiterPos = shipmentMethodString.indexOf('@'); @@ -880,7 +880,7 @@ public class ShoppingCartServices { configWrapper = ProductConfigWorker.loadProductConfigWrapper(delegator, dispatcher, quoteItem.getString("configId"), productId, productStoreId, null, null, currency, locale, userLogin); } try { - itemIndex = cart.addItemToEnd(productId, amount, quantity, quoteUnitPrice, reservStart, reservLength, reservPersons,null,null, null, null, null, configWrapper, null, dispatcher, Boolean.valueOf(!applyQuoteAdjustments), Boolean.valueOf(quoteUnitPrice.compareTo(BigDecimal.ZERO) == 0), Boolean.FALSE, Boolean.FALSE); + itemIndex = cart.addItemToEnd(productId, amount, quantity, quoteUnitPrice, reservStart, reservLength, reservPersons,null,null, null, null, null, configWrapper, null, dispatcher, !applyQuoteAdjustments, quoteUnitPrice.compareTo(BigDecimal.ZERO) == 0, Boolean.FALSE, Boolean.FALSE); } catch (ItemNotFoundException | CartItemModifyException e) { Debug.logError(e, module); @@ -1197,7 +1197,7 @@ public class ShoppingCartServices { if (UtilValidate.isEmpty(vendorProduct)) { if (vendorMap.containsKey("_NA_")) { - index = ((Integer) vendorMap.get("_NA_")).intValue(); + index = (Integer) vendorMap.get("_NA_"); cart.positionItemToGroup(item, item.getQuantity(), 0, index, true); } else { index = cart.addShipInfo(); @@ -1212,7 +1212,7 @@ public class ShoppingCartServices { if (vendorProduct != null) { String vendorPartyId = vendorProduct.getString("vendorPartyId"); if (vendorMap.containsKey(vendorPartyId)) { - index = ((Integer) vendorMap.get(vendorPartyId)).intValue(); + index = (Integer) vendorMap.get(vendorPartyId); cart.positionItemToGroup(item, item.getQuantity(), 0, index, true); } else { index = cart.addShipInfo(); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Tue Aug 7 07:30:43 2018 @@ -204,9 +204,9 @@ public final class ProductDisplayWorker Integer curOcc = productOccurances.get(product.get("productId")); if (curOcc == null) { - curOcc = Integer.valueOf(0); + curOcc = 0; } - productOccurances.put(product.getString("productId"), Integer.valueOf(curOcc.intValue() + 1)); + productOccurances.put(product.getString("productId"), curOcc + 1); } } } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Tue Aug 7 07:30:43 2018 @@ -463,7 +463,7 @@ public final class ProductPromoWorker { Iterator<GenericValue> productPromoCodeIter = productPromoCodeList.iterator(); // support multiple promo codes for a single promo, ie if we run into a use limit for one code see if we can find another for this promo // check the use limit before each pass so if the promo use limit has been hit we don't keep on trying for the promo code use limit, if there is one of course - while ((useLimit == null || useLimit.longValue() > cart.getProductPromoUseCount(productPromoId)) && productPromoCodeIter.hasNext()) { + while ((useLimit == null || useLimit > cart.getProductPromoUseCount(productPromoId)) && productPromoCodeIter.hasNext()) { GenericValue productPromoCode = productPromoCodeIter.next(); String productPromoCodeId = productPromoCode.getString("productPromoCodeId"); Long codeUseLimit = getProductPromoCodeUseLimit(productPromoCode, partyId, delegator); @@ -529,9 +529,9 @@ public final class ProductPromoWorker { EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED")), EntityOperator.AND); productPromoCustomerUseSize = EntityQuery.use(delegator).from("ProductPromoUseCheck").where(checkCondition).queryCount(); } - long perCustomerThisOrder = useLimitPerCustomer.longValue() - productPromoCustomerUseSize; - if (candidateUseLimit == null || candidateUseLimit.longValue() > perCustomerThisOrder) { - candidateUseLimit = Long.valueOf(perCustomerThisOrder); + long perCustomerThisOrder = useLimitPerCustomer - productPromoCustomerUseSize; + if (candidateUseLimit == null || candidateUseLimit > perCustomerThisOrder) { + candidateUseLimit = perCustomerThisOrder; } } @@ -543,9 +543,9 @@ public final class ProductPromoWorker { EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED")), EntityOperator.AND); long productPromoUseSize = EntityQuery.use(delegator).from("ProductPromoUseCheck").where(checkCondition).queryCount(); - long perPromotionThisOrder = useLimitPerPromotion.longValue() - productPromoUseSize; - if (candidateUseLimit == null || candidateUseLimit.longValue() > perPromotionThisOrder) { - candidateUseLimit = Long.valueOf(perPromotionThisOrder); + long perPromotionThisOrder = useLimitPerPromotion - productPromoUseSize; + if (candidateUseLimit == null || candidateUseLimit > perPromotionThisOrder) { + candidateUseLimit = perPromotionThisOrder; } } @@ -569,8 +569,8 @@ public final class ProductPromoWorker { EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED")), EntityOperator.AND); productPromoCustomerUseSize = EntityQuery.use(delegator).from("ProductPromoUseCheck").where(checkCondition).queryCount(); } - long perCustomerThisOrder = codeUseLimitPerCustomer.longValue() - productPromoCustomerUseSize; - codeUseLimit = Long.valueOf(perCustomerThisOrder); + long perCustomerThisOrder = codeUseLimitPerCustomer - productPromoCustomerUseSize; + codeUseLimit = perCustomerThisOrder; } Long codeUseLimitPerCode = productPromoCode.getLong("useLimitPerCode"); @@ -581,9 +581,9 @@ public final class ProductPromoWorker { EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED")), EntityOperator.AND); long productPromoCodeUseSize = EntityQuery.use(delegator).from("ProductPromoUseCheck").where(checkCondition).queryCount(); - long perCodeThisOrder = codeUseLimitPerCode.longValue() - productPromoCodeUseSize; - if (codeUseLimit == null || codeUseLimit.longValue() > perCodeThisOrder) { - codeUseLimit = Long.valueOf(perCodeThisOrder); + long perCodeThisOrder = codeUseLimitPerCode - productPromoCodeUseSize; + if (codeUseLimit == null || codeUseLimit > perCodeThisOrder) { + codeUseLimit = perCodeThisOrder; } } @@ -651,7 +651,7 @@ public final class ProductPromoWorker { // check per customer and per promotion code use limits Long useLimit = getProductPromoCodeUseLimit(productPromoCode, partyId, delegator); - if (useLimit != null && useLimit.longValue() <= 0) { + if (useLimit != null && useLimit <= 0) { return UtilProperties.getMessage(resource_error, "productpromoworker.promotion_code_maximum_limit", UtilMisc.toMap("productPromoCodeId", productPromoCodeId), locale); } @@ -795,9 +795,9 @@ public final class ProductPromoWorker { boolean cartChanged = false; Map<ShoppingCartItem,BigDecimal> usageInfoMap = prepareProductUsageInfoMap(cart); String productPromoId = productPromo.getString("productPromoId"); - while ((useLimit == null || useLimit.longValue() > cart.getProductPromoUseCount(productPromoId)) && + while ((useLimit == null || useLimit > cart.getProductPromoUseCount(productPromoId)) && (!requireCode || UtilValidate.isNotEmpty(productPromoCodeId)) && - (codeUseLimit == null || codeUseLimit.longValue() > cart.getProductPromoCodeUse(productPromoCodeId))) { + (codeUseLimit == null || codeUseLimit > cart.getProductPromoCodeUse(productPromoCodeId))) { boolean promoUsed = false; BigDecimal totalDiscountAmount = BigDecimal.ZERO; BigDecimal quantityLeftInActions = BigDecimal.ZERO; @@ -964,7 +964,7 @@ public final class ProductPromoWorker { if (Debug.verboseOn()) Debug.logVerbose("Condition compare done, compareBase=" + compareBase, module); if (compareBase != null) { - int compare = compareBase.intValue(); + int compare = compareBase; if ("PPC_EQ".equals(operatorEnumId)) { if (compare == 0) return true; } else if ("PPC_NEQ".equals(operatorEnumId)) { @@ -1029,11 +1029,11 @@ public final class ProductPromoWorker { if ("PPIP_LPMUP_AMT".equals(inputParamEnumId)) { // NOTE: only check this after we know it's this type of cond, otherwise condValue may not be a number BigDecimal condValueBigDecimal = new BigDecimal(condValue); - compareBase = Integer.valueOf(amountOff.compareTo(condValueBigDecimal)); + compareBase = amountOff.compareTo(condValueBigDecimal); } else if ("PPIP_LPMUP_PER".equals(inputParamEnumId)) { // NOTE: only check this after we know it's this type of cond, otherwise condValue may not be a number BigDecimal condValueBigDecimal = new BigDecimal(condValue); - compareBase = Integer.valueOf(percentOff.compareTo(condValueBigDecimal)); + compareBase = percentOff.compareTo(condValueBigDecimal); } else { // condition doesn't apply to individual item, always passes return true; @@ -1042,7 +1042,7 @@ public final class ProductPromoWorker { Debug.logInfo("Checking condition for item productId=" + cartItem.getProductId() + ", listPrice=" + listPrice + ", basePrice=" + basePrice + ", amountOff=" + amountOff + ", percentOff=" + percentOff + ", condValue=" + condValue + ", compareBase=" + compareBase + ", productPromoCond=" + productPromoCond, module); if (compareBase != null) { - int compare = compareBase.intValue(); + int compare = compareBase; if ("PPC_EQ".equals(operatorEnumId)) { if (compare == 0) { return true; @@ -1218,7 +1218,7 @@ public final class ProductPromoWorker { if (productPromoAction.getString("productPromoId").equals(checkOrderAdjustment.get("productPromoId")) && productPromoAction.getString("productPromoRuleId").equals(checkOrderAdjustment.get("productPromoRuleId")) && productPromoAction.getString("productPromoActionSeqId").equals(checkOrderAdjustment.get("productPromoActionSeqId"))) { - return Integer.valueOf(i); + return i; } } } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java Tue Aug 7 07:30:43 2018 @@ -142,7 +142,7 @@ public class ShoppingListEvents { Debug.logWarning(e, UtilProperties.getMessage(resource_error,"OrderIllegalCharacterInSelectedItemField", cart.getLocale()), module); } if (cartIdInt != null) { - ShoppingCartItem item = cart.findCartItem(cartIdInt.intValue()); + ShoppingCartItem item = cart.findCartItem(cartIdInt); if (allowPromo || !item.getIsPromo()) { Debug.logInfo("Adding cart item to shopping list [" + shoppingListId + "], allowPromo=" + allowPromo + ", item.getIsPromo()=" + item.getIsPromo() + ", item.getProductId()=" + item.getProductId() + ", item.getQuantity()=" + item.getQuantity(), module); Map<String, Object> serviceResult = null; Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java Tue Aug 7 07:30:43 2018 @@ -82,15 +82,15 @@ public class ShoppingListServices { } if (startDate == null) { - switch (frequency.intValue()) { + switch (frequency) { case 5: - startDate = UtilDateTime.getWeekStart(UtilDateTime.nowTimestamp(), 0, interval.intValue()); + startDate = UtilDateTime.getWeekStart(UtilDateTime.nowTimestamp(), 0, interval); break; case 6: - startDate = UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp(), 0, interval.intValue()); + startDate = UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp(), 0, interval); break; case 7: - startDate = UtilDateTime.getYearStart(UtilDateTime.nowTimestamp(), 0, interval.intValue()); + startDate = UtilDateTime.getYearStart(UtilDateTime.nowTimestamp(), 0, interval); break; default: return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderInvalidFrequencyForShoppingListRecurrence",locale)); @@ -105,7 +105,7 @@ public class ShoppingListServices { RecurrenceInfo recInfo = null; try { - recInfo = RecurrenceInfo.makeInfo(delegator, startTime, frequency.intValue(), interval.intValue(), -1, endTime); + recInfo = RecurrenceInfo.makeInfo(delegator, startTime, frequency, interval, -1, endTime); } catch (RecurrenceInfoException e) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderUnableToCreateShoppingListRecurrenceInformation",locale)); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java Tue Aug 7 07:30:43 2018 @@ -55,7 +55,7 @@ public class OrderTestServices { LocalDispatcher dispatcher = dctx.getDispatcher(); Integer numberOfOrders = (Integer) context.get("numberOfOrders"); - int numberOfOrdersInt = numberOfOrders.intValue(); + int numberOfOrdersInt = numberOfOrders; for (int i = 1; i <= numberOfOrdersInt; i++) { try { ModelService modelService = dctx.getModelService("createTestSalesOrderSingle"); @@ -137,7 +137,7 @@ public class OrderTestServices { } catch (Exception exc) { Debug.logWarning("Error setting userLogin in the cart: " + exc.getMessage(), module); } - int numberOfProductsPerOrderInt = numberOfProductsPerOrder.intValue(); + int numberOfProductsPerOrderInt = numberOfProductsPerOrder; for (int j = 1; j <= numberOfProductsPerOrderInt; j++) { // get a product int k = r.nextInt(productsList.size()); @@ -163,7 +163,7 @@ public class OrderTestServices { resultMap.put("orderId", orderId); } Boolean shipOrder = (Boolean) context.get("shipOrder"); - if (shipOrder.booleanValue() && UtilValidate.isNotEmpty(orderId)) { + if (shipOrder && UtilValidate.isNotEmpty(orderId)) { try { Map<String, Object> result = dispatcher.runSync("quickShipEntireOrder", UtilMisc.toMap("orderId", orderId, "userLogin", userLogin)); if (ServiceUtil.isError(result)) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java Tue Aug 7 07:30:43 2018 @@ -99,7 +99,7 @@ public class TaxwareUTL { // make the header file Record header = outHead.makeRecord("outHead"); - header.set("NUMBER_RECORDS", Long.valueOf(outItem.getRecords().size())); + header.set("NUMBER_RECORDS", (long) outItem.getRecords().size()); header.set("PROCESS_INDICATOR", "1"); outHead.addRecord(header); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java Tue Aug 7 07:30:43 2018 @@ -897,7 +897,7 @@ public class ContactMechServices { } } Boolean bShowOld = (Boolean)context.get("showOld"); - boolean showOld = (bShowOld != null && bShowOld.booleanValue()) ? true : false; + boolean showOld = (bShowOld != null && bShowOld) ? true : false; String contactMechTypeId = (String)context.get("contactMechTypeId"); List<Map<String, Object>> valueMaps = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld, contactMechTypeId); result.put("valueMaps", valueMaps); @@ -967,7 +967,7 @@ public class ContactMechServices { String expireTime = EntityUtilProperties.getPropertyValue("security", "email_verification.expire.hours", delegator); Integer expTime = Integer.valueOf(expireTime); Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.HOUR, expTime.intValue()); + calendar.add(Calendar.HOUR, expTime); Date date = calendar.getTime(); Timestamp expireDate = UtilDateTime.toTimestamp(date); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java Tue Aug 7 07:30:43 2018 @@ -530,7 +530,7 @@ public class ContactMechWorker { if ("true".equals(request.getParameter("useValues"))) { tryEntity = true; } - target.put("tryEntity", Boolean.valueOf(tryEntity)); + target.put("tryEntity", tryEntity); try { Collection<GenericValue> contactMechTypes = EntityQuery.use(delegator).from("ContactMechType").cache(true).queryList(); @@ -784,7 +784,7 @@ public class ContactMechWorker { if ("true".equals(request.getParameter("useValues"))) { tryEntity = true; } - target.put("tryEntity", Boolean.valueOf(tryEntity)); + target.put("tryEntity", tryEntity); try { Collection<GenericValue> contactMechTypes = EntityQuery.use(delegator).from("ContactMechType").cache(true).queryList(); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java Tue Aug 7 07:30:43 2018 @@ -833,7 +833,7 @@ public class PartyServices { } catch (Exception e) { viewIndex = 0; } - result.put("viewIndex", Integer.valueOf(viewIndex)); + result.put("viewIndex", viewIndex); int viewSize = 20; try { @@ -841,7 +841,7 @@ public class PartyServices { } catch (Exception e) { viewSize = 20; } - result.put("viewSize", Integer.valueOf(viewSize)); + result.put("viewSize", viewSize); // get the lookup flag String lookupFlag = (String) context.get("lookupFlag"); @@ -1238,10 +1238,10 @@ public class PartyServices { partyList = new LinkedList<>(); } result.put("partyList", partyList); - result.put("partyListSize", Integer.valueOf(partyListSize)); + result.put("partyListSize", partyListSize); result.put("paramList", paramList); - result.put("highIndex", Integer.valueOf(highIndex)); - result.put("lowIndex", Integer.valueOf(lowIndex)); + result.put("highIndex", highIndex); + result.put("lowIndex", lowIndex); return result; } @@ -1928,7 +1928,7 @@ public class PartyServices { } } - addrMap.put("sequenceNum", Long.valueOf(seq)); + addrMap.put("sequenceNum", (long) seq); Debug.logInfo("Creating map entry: " + addrMap, module); try { delegator.create(addrMap); Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java Tue Aug 7 07:30:43 2018 @@ -102,7 +102,7 @@ public class PartyWorker { // generate the sequenced number and pad Long seq = delegator.getNextSeqIdLong(clubSeqName); - clubId = clubId + UtilFormatOut.formatPaddedNumber(seq.longValue(), (length - clubId.length() - 1)); + clubId = clubId + UtilFormatOut.formatPaddedNumber(seq, (length - clubId.length() - 1)); // get the check digit int check = UtilValidate.getLuhnCheckDigit(clubId); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java Tue Aug 7 07:30:43 2018 @@ -85,7 +85,7 @@ public class CategoryServices { Delegator delegator = dctx.getDelegator(); String categoryId = (String) context.get("categoryId"); String productId = (String) context.get("productId"); - boolean activeOnly = (context.get("activeOnly") != null ? ((Boolean) context.get("activeOnly")).booleanValue() : true); + boolean activeOnly = (context.get("activeOnly") != null ? (Boolean) context.get("activeOnly") : true); Integer index = (Integer) context.get("index"); Timestamp introductionDateLimit = (Timestamp) context.get("introductionDateLimit"); Timestamp releaseDateLimit = (Timestamp) context.get("releaseDateLimit"); @@ -127,7 +127,7 @@ public class CategoryServices { if (productId != null && index == null) { for (GenericValue v: productCategoryMembers) { if (v.getString("productId").equals(productId)) { - index = Integer.valueOf(productCategoryMembers.indexOf(v)); + index = productCategoryMembers.indexOf(v); } } } @@ -143,16 +143,16 @@ public class CategoryServices { String previous = null; String next = null; - if (index.intValue() - 1 >= 0 && index.intValue() - 1 < productCategoryMembers.size()) { - previous = productCategoryMembers.get(index.intValue() - 1).getString("productId"); + if (index - 1 >= 0 && index - 1 < productCategoryMembers.size()) { + previous = productCategoryMembers.get(index - 1).getString("productId"); result.put("previousProductId", previous); } else { previous = productCategoryMembers.get(productCategoryMembers.size() - 1).getString("productId"); result.put("previousProductId", previous); } - if (index.intValue() + 1 < productCategoryMembers.size()) { - next = productCategoryMembers.get(index.intValue() + 1).getString("productId"); + if (index + 1 < productCategoryMembers.size()) { + next = productCategoryMembers.get(index + 1).getString("productId"); result.put("nextProductId", next); } else { next = productCategoryMembers.get(0).getString("productId"); @@ -211,8 +211,8 @@ public class CategoryServices { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String productCategoryId = (String) context.get("productCategoryId"); - boolean limitView = ((Boolean) context.get("limitView")).booleanValue(); - int defaultViewSize = ((Integer) context.get("defaultViewSize")).intValue(); + boolean limitView = (Boolean) context.get("limitView"); + int defaultViewSize = (Integer) context.get("defaultViewSize"); Timestamp introductionDateLimit = (Timestamp) context.get("introductionDateLimit"); Timestamp releaseDateLimit = (Timestamp) context.get("releaseDateLimit"); @@ -222,12 +222,12 @@ public class CategoryServices { String prodCatalogId = (String) context.get("prodCatalogId"); - boolean useCacheForMembers = (context.get("useCacheForMembers") == null || ((Boolean) context.get("useCacheForMembers")).booleanValue()); - boolean activeOnly = (context.get("activeOnly") == null || ((Boolean) context.get("activeOnly")).booleanValue()); + boolean useCacheForMembers = (context.get("useCacheForMembers") == null || (Boolean) context.get("useCacheForMembers")); + boolean activeOnly = (context.get("activeOnly") == null || (Boolean) context.get("activeOnly")); // checkViewAllow defaults to false, must be set to true and pass the prodCatalogId to enable boolean checkViewAllow = (prodCatalogId != null && context.get("checkViewAllow") != null && - ((Boolean) context.get("checkViewAllow")).booleanValue()); + (Boolean) context.get("checkViewAllow")); String viewProductCategoryId = null; if (checkViewAllow) { @@ -422,11 +422,11 @@ public class CategoryServices { } Map<String, Object> result = new HashMap<String, Object>(); - result.put("viewIndex", Integer.valueOf(viewIndex)); - result.put("viewSize", Integer.valueOf(viewSize)); - result.put("lowIndex", Integer.valueOf(lowIndex)); - result.put("highIndex", Integer.valueOf(highIndex)); - result.put("listSize", Integer.valueOf(listSize)); + result.put("viewIndex", viewIndex); + result.put("viewSize", viewSize); + result.put("lowIndex", lowIndex); + result.put("highIndex", highIndex); + result.put("listSize", listSize); if (productCategory != null) result.put("productCategory", productCategory); if (productCategoryMembers != null) result.put("productCategoryMembers", productCategoryMembers); return result; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java Tue Aug 7 07:30:43 2018 @@ -188,7 +188,7 @@ public final class SeoConfigUtil { jSessionIdAnonEnabled = true; } } else { - jSessionIdAnonEnabled = Boolean.valueOf(DEFAULT_ANONYMOUS_VALUE).booleanValue(); + jSessionIdAnonEnabled = Boolean.valueOf(DEFAULT_ANONYMOUS_VALUE); } Debug.logInfo(" " + ELEMENT_ANONYMOUS + ": " + jSessionIdAnonEnabled, module); @@ -220,7 +220,7 @@ public final class SeoConfigUtil { } } } else { - jSessionIdUserEnabled = Boolean.valueOf(DEFAULT_USER_VALUE).booleanValue(); + jSessionIdUserEnabled = Boolean.valueOf(DEFAULT_USER_VALUE); } Debug.logInfo(" " + ELEMENT_USER + ": " + jSessionIdUserEnabled, module); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java Tue Aug 7 07:30:43 2018 @@ -246,7 +246,7 @@ public class SeoContextFilter implements if (responseCodeInt == null) { response.setStatus(SeoConfigUtil.getDefaultResponseCode()); } else { - response.setStatus(responseCodeInt.intValue()); + response.setStatus(responseCodeInt); } response.setHeader("Location", uri); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java Tue Aug 7 07:30:43 2018 @@ -221,7 +221,7 @@ public class UrlRegexpTransform implemen if (responseCodeInt == null) { response.setStatus(SeoConfigUtil.getDefaultResponseCode()); } else { - response.setStatus(responseCodeInt.intValue()); + response.setStatus(responseCodeInt); } response.setHeader("Location", uri); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java Tue Aug 7 07:30:43 2018 @@ -593,7 +593,7 @@ public class ProductConfigWrapper implem if (mult.compareTo(BigDecimal.ZERO) == 0) { mult = BigDecimal.ONE; } - if (validPriceFound.booleanValue()) { + if (validPriceFound) { if (componentListPrice != null) { listPrice = componentListPrice; } @@ -668,7 +668,7 @@ public class ProductConfigWrapper implem if (mult.compareTo(BigDecimal.ZERO) == 0) { mult = BigDecimal.ONE; } - if (validPriceFound.booleanValue()) { + if (validPriceFound) { if (componentListPrice != null) { listPrice = componentListPrice; } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java Tue Aug 7 07:30:43 2018 @@ -604,7 +604,7 @@ public class InventoryServices { /* Check the split preference. */ boolean maySplit = false; if (orderItemShipGroup.get("maySplit") != null) { - maySplit = orderItemShipGroup.getBoolean("maySplit").booleanValue(); + maySplit = orderItemShipGroup.getBoolean("maySplit"); } /* Figure out if we must cancel all items. */ @@ -937,9 +937,9 @@ public class InventoryServices { salesUsageViewEntity.addMemberEntity("OH", "OrderHeader"); salesUsageViewEntity.addMemberEntity("ItIss", "ItemIssuance"); salesUsageViewEntity.addMemberEntity("InvIt", "InventoryItem"); - salesUsageViewEntity.addViewLink("OI", "OH", Boolean.valueOf(false), ModelKeyMap.makeKeyMapList("orderId")); - salesUsageViewEntity.addViewLink("OI", "ItIss", Boolean.valueOf(false), ModelKeyMap.makeKeyMapList("orderId", "orderId", "orderItemSeqId", "orderItemSeqId")); - salesUsageViewEntity.addViewLink("ItIss", "InvIt", Boolean.valueOf(false), ModelKeyMap.makeKeyMapList("inventoryItemId")); + salesUsageViewEntity.addViewLink("OI", "OH", Boolean.FALSE, ModelKeyMap.makeKeyMapList("orderId")); + salesUsageViewEntity.addViewLink("OI", "ItIss", Boolean.FALSE, ModelKeyMap.makeKeyMapList("orderId", "orderId", "orderItemSeqId", "orderItemSeqId")); + salesUsageViewEntity.addViewLink("ItIss", "InvIt", Boolean.FALSE, ModelKeyMap.makeKeyMapList("inventoryItemId")); salesUsageViewEntity.addAlias("OI", "productId"); salesUsageViewEntity.addAlias("OH", "statusId"); salesUsageViewEntity.addAlias("OH", "orderTypeId"); @@ -952,8 +952,8 @@ public class InventoryServices { productionUsageViewEntity.addMemberEntity("WEIA", "WorkEffortInventoryAssign"); productionUsageViewEntity.addMemberEntity("WE", "WorkEffort"); productionUsageViewEntity.addMemberEntity("II", "InventoryItem"); - productionUsageViewEntity.addViewLink("WEIA", "WE", Boolean.valueOf(false), ModelKeyMap.makeKeyMapList("workEffortId")); - productionUsageViewEntity.addViewLink("WEIA", "II", Boolean.valueOf(false), ModelKeyMap.makeKeyMapList("inventoryItemId")); + productionUsageViewEntity.addViewLink("WEIA", "WE", Boolean.FALSE, ModelKeyMap.makeKeyMapList("workEffortId")); + productionUsageViewEntity.addViewLink("WEIA", "II", Boolean.FALSE, ModelKeyMap.makeKeyMapList("inventoryItemId")); productionUsageViewEntity.addAlias("WEIA", "quantity"); productionUsageViewEntity.addAlias("WE", "actualCompletionDate"); productionUsageViewEntity.addAlias("WE", "workEffortTypeId"); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java Tue Aug 7 07:30:43 2018 @@ -402,7 +402,7 @@ public class PriceServices { result.put("averageCost", averageCostValue != null ? averageCostValue.getBigDecimal("price") : null); result.put("promoPrice", promoPriceValue != null ? promoPriceValue.getBigDecimal("price") : null); result.put("specialPromoPrice", specialPromoPriceValue != null ? specialPromoPriceValue.getBigDecimal("price") : null); - result.put("validPriceFound", Boolean.valueOf(validPriceFound)); + result.put("validPriceFound", validPriceFound); result.put("isSale", Boolean.FALSE); result.put("orderItemPriceInfos", orderItemPriceInfos); @@ -544,7 +544,7 @@ public class PriceServices { Map<String, Object> priceResults = new HashMap<String, Object>(); try { priceResults = dispatcher.runSync("convertUom", UtilMisc.<String, Object> toMap("uomId", currencyDefaultUomId, "uomIdTo", currencyUomIdTo, - "originalValue", tempPrice, "defaultDecimalScale", Long.valueOf(2), "defaultRoundingMode", "HalfUp")); + "originalValue", tempPrice, "defaultDecimalScale", 2L, "defaultRoundingMode", "HalfUp")); if (ServiceUtil.isError(priceResults) || (priceResults.get("convertedValue") == null)) { Debug.logWarning("Unable to convert " + entry.getKey() + " for product " + productId, module); } @@ -1021,8 +1021,8 @@ public class PriceServices { calcResults.put("defaultPrice", defaultPrice); calcResults.put("averageCost", averageCost); calcResults.put("orderItemPriceInfos", orderItemPriceInfos); - calcResults.put("isSale", Boolean.valueOf(isSale)); - calcResults.put("validPriceFound", Boolean.valueOf(validPriceFound)); + calcResults.put("isSale", isSale); + calcResults.put("validPriceFound", validPriceFound); return calcResults; } @@ -1251,7 +1251,7 @@ public class PriceServices { priceFound = EntityUtil.getFirst(agreementPrices); try { Map<String, Object> priceConvertMap = UtilMisc.toMap("uomId", priceFound.getString("currencyUomId"), "uomIdTo", currencyUomId, - "originalValue", priceFound.getBigDecimal("price"), "defaultDecimalScale" , Long.valueOf(2) , "defaultRoundingMode" , "HalfUp"); + "originalValue", priceFound.getBigDecimal("price"), "defaultDecimalScale" , 2L, "defaultRoundingMode" , "HalfUp"); Map<String, Object> priceResults = dispatcher.runSync("convertUom", priceConvertMap); if (ServiceUtil.isError(priceResults) || (priceResults.get("convertedValue") == null)) { Debug.logWarning("Unable to convert " + priceFound + " for product " + productId , module); @@ -1375,7 +1375,7 @@ public class PriceServices { } result.put("price", price); - result.put("validPriceFound", Boolean.valueOf(validPriceFound)); + result.put("validPriceFound", validPriceFound); result.put("orderItemPriceInfos", orderItemPriceInfos); return result; } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java Tue Aug 7 07:30:43 2018 @@ -93,11 +93,11 @@ public class KeywordIndex { int pidWeight = 1; try { - pidWeight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight.Product.productId", 0).intValue(); + pidWeight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight.Product.productId", 0); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } - keywords.put(product.getString("productId").toLowerCase(Locale.getDefault()), Long.valueOf(pidWeight)); + keywords.put(product.getString("productId").toLowerCase(Locale.getDefault()), (long) pidWeight); // Product fields - default is 0 if not found in the properties file if (!"0".equals(EntityUtilProperties.getPropertyValue("prodsearch", "index.weight.Product.productName", "0", delegator))) { @@ -154,7 +154,7 @@ public class KeywordIndex { for (GenericValue variantProductAssoc: variantProductAssocs) { int weight = 1; try { - weight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight.Variant.Product.productId", 0).intValue(); + weight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight.Variant.Product.productId", 0); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } @@ -170,7 +170,7 @@ public class KeywordIndex { int weight = 1; try { // this is defaulting to a weight of 1 because you specified you wanted to index this type - weight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight.ProductContent." + productContentTypeId, 1).intValue(); + weight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight.ProductContent." + productContentTypeId, 1); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } @@ -194,7 +194,7 @@ public class KeywordIndex { } List<GenericValue> toBeStored = new LinkedList<>(); - int keywordMaxLength = EntityUtilProperties.getPropertyAsInteger("prodsearch", "product.keyword.max.length", 0).intValue(); + int keywordMaxLength = EntityUtilProperties.getPropertyAsInteger("prodsearch", "product.keyword.max.length", 0); for (Map.Entry<String, Long> entry: keywords.entrySet()) { if (entry.getKey().length() <= keywordMaxLength) { GenericValue productKeyword = delegator.makeValue("ProductKeyword", UtilMisc.toMap("productId", product.getString("productId"), "keyword", entry.getKey(), "keywordTypeId", "KWT_KEYWORD", "relevancyWeight", entry.getValue())); @@ -232,7 +232,7 @@ public class KeywordIndex { int weight = 1; try { - weight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight." + value.getEntityName() + "." + fieldName, 1).intValue(); + weight = EntityUtilProperties.getPropertyAsInteger("prodsearch", "index.weight." + value.getEntityName() + "." + fieldName, 1); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearch.java Tue Aug 7 07:30:43 2018 @@ -236,7 +236,7 @@ public class ProductSearch { double totalSeconds = ((double)endMillis - (double)startMillis)/1000.0; // store info about results in the database, attached to the user's visitId, if specified - this.saveSearchResultInfo(Long.valueOf(productIds.size()), Double.valueOf(totalSeconds)); + this.saveSearchResultInfo((long) productIds.size(), totalSeconds); return productIds; } @@ -667,7 +667,7 @@ public class ProductSearch { resultSortOrder.setSortOrder(this); } - dynamicViewEntity.addAlias("PROD", "mainProductId", "productId", null, null, Boolean.valueOf(productIdGroupBy), null); + dynamicViewEntity.addAlias("PROD", "mainProductId", "productId", null, null, productIdGroupBy, null); EntityListIterator eli = null; try { @@ -694,7 +694,7 @@ public class ProductSearch { } public ArrayList<String> makeProductIdList(EntityListIterator eli) { - ArrayList<String> productIds = new ArrayList<>(maxResults == null ? 100 : maxResults.intValue()); + ArrayList<String> productIds = new ArrayList<>(maxResults == null ? 100 : maxResults); if (eli == null) { Debug.logWarning("The eli is null, returning zero results", module); return productIds; @@ -707,11 +707,11 @@ public class ProductSearch { if (initialResult != null) { hasResults = true; } - if (resultOffset != null && resultOffset.intValue() > 1) { + if (resultOffset != null && resultOffset > 1) { if (Debug.infoOn()) { Debug.logInfo("Before relative, current index=" + eli.currentIndex(), module); } - hasResults = eli.relative(resultOffset.intValue() - 1); + hasResults = eli.relative(resultOffset - 1); initialResult = null; } @@ -729,9 +729,9 @@ public class ProductSearch { // nothing to get... int failTotal = 0; if (this.resultOffset != null) { - failTotal = this.resultOffset.intValue() - 1; + failTotal = this.resultOffset - 1; } - this.totalResults = Integer.valueOf(failTotal); + this.totalResults = failTotal; return productIds; } @@ -745,7 +745,7 @@ public class ProductSearch { productIds.add(searchResult.getString("mainProductId")); productIdSet.add(searchResult.getString("mainProductId")); - while ((maxResults == null || numRetreived < maxResults.intValue()) && ((searchResult = eli.next()) != null)) { + while ((maxResults == null || numRetreived < maxResults) && ((searchResult = eli.next()) != null)) { String productId = searchResult.getString("mainProductId"); if (!productIdSet.contains(productId)) { productIds.add(productId); @@ -759,12 +759,12 @@ public class ProductSearch { if (searchResult != null) { this.totalResults = eli.getResultsSizeAfterPartialList(); } - if (this.totalResults == null || this.totalResults.intValue() == 0) { + if (this.totalResults == null || this.totalResults == 0) { int total = numRetreived; if (this.resultOffset != null) { - total += (this.resultOffset.intValue() - 1); + total += (this.resultOffset - 1); } - this.totalResults = Integer.valueOf(total); + this.totalResults = total; } Debug.logInfo("Got search values, numRetreived=" + numRetreived + ", totalResults=" + totalResults + ", maxResults=" + maxResults + ", resultOffset=" + resultOffset + ", duplicatesFound(in the current results)=" + duplicatesFound, module); @@ -1543,7 +1543,7 @@ public class ProductSearch { this.anySuffix = anySuffix; this.isAnd = isAnd; if (removeStems != null) { - this.removeStems = removeStems.booleanValue(); + this.removeStems = removeStems; } else { this.removeStems = UtilProperties.propertyValueEquals("keywordsearch", "remove.stems", "true"); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java Tue Aug 7 07:30:43 2018 @@ -306,7 +306,7 @@ public class ProductSearchEvents { pfa.create(); numAdded++; } - Map<String, Object> messageMap = UtilMisc.toMap("numAdded", Integer.valueOf(numAdded), "productFeatureId", productFeatureId); + Map<String, Object> messageMap = UtilMisc.toMap("numAdded", numAdded, "productFeatureId", productFeatureId); String eventMsg = UtilProperties.getMessage(resource, "productSearchEvents.added_param_features", messageMap, locale) + "."; request.setAttribute("_EVENT_MESSAGE_", eventMsg); } catch (GenericEntityException e) { @@ -354,7 +354,7 @@ public class ProductSearchEvents { String productId = searchResultView.getString("mainProductId"); numRemoved += delegator.removeByAnd("ProductFeatureAppl", UtilMisc.toMap("productId", productId, "productFeatureId", productFeatureId)); } - Map<String, Object> messageMap = UtilMisc.toMap("numRemoved", Integer.valueOf(numRemoved), "productFeatureId", productFeatureId); + Map<String, Object> messageMap = UtilMisc.toMap("numRemoved", numRemoved, "productFeatureId", productFeatureId); String eventMsg = UtilProperties.getMessage(resource, "productSearchEvents.removed_param_features", messageMap, locale) + "."; request.setAttribute("_EVENT_MESSAGE_", eventMsg); } catch (GenericEntityException e) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java Tue Aug 7 07:30:43 2018 @@ -178,7 +178,7 @@ public class ProductSearchSession { } catch (Exception e) { Debug.logError(e, "Error in formatting of VIEW_INDEX [" + viewIndexStr + "], setting to 20", module); if (this.viewIndex == null) { - this.setViewIndex(Integer.valueOf(20)); + this.setViewIndex(20); } } } @@ -213,7 +213,7 @@ public class ProductSearchSession { } catch (Exception e) { Debug.logError(e, "Error in formatting of VIEW_SIZE [" + viewSizeStr + "], setting to 20", module); if (this.viewSize == null) { - this.setViewSize(Integer.valueOf(20)); + this.setViewSize(20); } } } @@ -250,7 +250,7 @@ public class ProductSearchSession { */ public void setPreviousViewSize(Integer previousViewSize) { if (previousViewSize == null) { - this.previousViewSize = Integer.valueOf(20); + this.previousViewSize = 20; } else { this.previousViewSize = previousViewSize; } @@ -573,7 +573,7 @@ public class ProductSearchSession { String searchCategoryId = (String) parameters.get("SEARCH_CATEGORY_ID"); String searchSubCategories = (String) parameters.get("SEARCH_SUB_CATEGORIES"); String searchCategoryExc = (String) parameters.get("SEARCH_CATEGORY_EXC"); - Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : !"N".equals(searchCategoryExc); searchAddConstraint(new ProductSearch.CategoryConstraint(searchCategoryId, !"N".equals(searchSubCategories), exclude), session); constraintsChanged = true; } @@ -583,7 +583,7 @@ public class ProductSearchSession { String searchCategoryId = (String) parameters.get("SEARCH_CATEGORY_ID" + catNum); String searchSubCategories = (String) parameters.get("SEARCH_SUB_CATEGORIES" + catNum); String searchCategoryExc = (String) parameters.get("SEARCH_CATEGORY_EXC" + catNum); - Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : !"N".equals(searchCategoryExc); searchAddConstraint(new ProductSearch.CategoryConstraint(searchCategoryId, !"N".equals(searchSubCategories), exclude), session); constraintsChanged = true; } @@ -595,7 +595,7 @@ public class ProductSearchSession { String searchCategoryId = (String) parameters.get("S_CAT" + catNum); String searchSubCategories = (String) parameters.get("S_CSB" + catNum); String searchCategoryExc = (String) parameters.get("S_CEX" + catNum); - Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : !"N".equals(searchCategoryExc); searchAddConstraint(new ProductSearch.CategoryConstraint(searchCategoryId, !"N".equals(searchSubCategories), exclude), session); constraintsChanged = true; } @@ -657,7 +657,7 @@ public class ProductSearchSession { if (UtilValidate.isNotEmpty(productFeatureId)) { String paramNameExt = parameterName.substring("SEARCH_FEAT".length()); String searchCategoryExc = (String) parameters.get("SEARCH_FEAT_EXC" + paramNameExt); - Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : !"N".equals(searchCategoryExc); //Debug.logInfo("parameterName=" + parameterName + ", paramNameExt=" + paramNameExt + ", searchCategoryExc=" + searchCategoryExc + ", exclude=" + exclude, module); searchAddConstraint(new ProductSearch.FeatureConstraint(productFeatureId, exclude), session); constraintsChanged = true; @@ -669,7 +669,7 @@ public class ProductSearchSession { if (UtilValidate.isNotEmpty(productFeatureId)) { String paramNameExt = parameterName.substring("S_PFI".length()); String searchCategoryExc = (String) parameters.get("S_PFX" + paramNameExt); - Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchCategoryExc) ? null : !"N".equals(searchCategoryExc); searchAddConstraint(new ProductSearch.FeatureConstraint(productFeatureId, exclude), session); constraintsChanged = true; } @@ -681,7 +681,7 @@ public class ProductSearchSession { if (UtilValidate.isNotEmpty(productFeatureCategoryId)) { String paramNameExt = parameterName.substring("SEARCH_PROD_FEAT_CAT".length()); String searchProdFeatureCategoryExc = (String) parameters.get("SEARCH_PROD_FEAT_CAT_EXC" + paramNameExt); - Boolean exclude = UtilValidate.isEmpty(searchProdFeatureCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchProdFeatureCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchProdFeatureCategoryExc) ? null : !"N".equals(searchProdFeatureCategoryExc); searchAddConstraint(new ProductSearch.FeatureCategoryConstraint(productFeatureCategoryId, exclude), session); constraintsChanged = true; } @@ -692,7 +692,7 @@ public class ProductSearchSession { if (UtilValidate.isNotEmpty(productFeatureCategoryId)) { String paramNameExt = parameterName.substring("S_FCI".length()); String searchProdFeatureCategoryExc = (String) parameters.get("S_FCX" + paramNameExt); - Boolean exclude = UtilValidate.isEmpty(searchProdFeatureCategoryExc) ? null : Boolean.valueOf(!"N".equals(searchProdFeatureCategoryExc)); + Boolean exclude = UtilValidate.isEmpty(searchProdFeatureCategoryExc) ? null : !"N".equals(searchProdFeatureCategoryExc); searchAddConstraint(new ProductSearch.FeatureCategoryConstraint(productFeatureCategoryId, exclude), session); constraintsChanged = true; } @@ -704,7 +704,7 @@ public class ProductSearchSession { if (UtilValidate.isNotEmpty(productFeatureGroupId)) { String paramNameExt = parameterName.substring("SEARCH_PROD_FEAT_GRP".length()); String searchProdFeatureGroupExc = (String) parameters.get("SEARCH_PROD_FEAT_GRP_EXC" + paramNameExt); - Boolean exclude = UtilValidate.isEmpty(searchProdFeatureGroupExc) ? null : Boolean.valueOf(!"N".equals(searchProdFeatureGroupExc)); + Boolean exclude = UtilValidate.isEmpty(searchProdFeatureGroupExc) ? null : !"N".equals(searchProdFeatureGroupExc); searchAddConstraint(new ProductSearch.FeatureGroupConstraint(productFeatureGroupId, exclude), session); constraintsChanged = true; } @@ -715,7 +715,7 @@ public class ProductSearchSession { if (UtilValidate.isNotEmpty(productFeatureGroupId)) { String paramNameExt = parameterName.substring("S_FGI".length()); String searchProdFeatureGroupExc = (String) parameters.get("S_FGX" + paramNameExt); - Boolean exclude = UtilValidate.isEmpty(searchProdFeatureGroupExc) ? null : Boolean.valueOf(!"N".equals(searchProdFeatureGroupExc)); + Boolean exclude = UtilValidate.isEmpty(searchProdFeatureGroupExc) ? null : !"N".equals(searchProdFeatureGroupExc); searchAddConstraint(new ProductSearch.FeatureGroupConstraint(productFeatureGroupId, exclude), session); constraintsChanged = true; } @@ -906,17 +906,17 @@ public class ProductSearchSession { Integer viewIndexInteger = productSearchOptions.getViewIndex(); if (viewIndexInteger != null) { - viewIndex = viewIndexInteger.intValue(); + viewIndex = viewIndexInteger; } Integer viewSizeInteger = productSearchOptions.getViewSize(); if (viewSizeInteger != null) { - viewSize = viewSizeInteger.intValue(); + viewSize = viewSizeInteger; } Integer previousViewSizeInteger = productSearchOptions.getPreviousViewSize(); if (previousViewSizeInteger != null) { - previousViewSize = previousViewSizeInteger.intValue(); + previousViewSize = previousViewSizeInteger; } String pag = productSearchOptions.getPaging(); @@ -976,8 +976,8 @@ public class ProductSearchSession { resultOffsetInt = 1; } int maxResultsInt = viewSize - addOnTopListSize; - Integer resultOffset = Integer.valueOf(resultOffsetInt); - Integer maxResults = Integer.valueOf(maxResultsInt); + Integer resultOffset = resultOffsetInt; + Integer maxResults = maxResultsInt; ResultSortOrder resultSortOrder = ProductSearchOptions.getResultSortOrder(request); @@ -1006,7 +1006,7 @@ public class ProductSearchSession { Integer totalResults = productSearchContext.getTotalResults(); if (totalResults != null) { - listSize = listSize + totalResults.intValue(); + listSize = listSize + totalResults; } } @@ -1022,11 +1022,11 @@ public class ProductSearchSession { Map<String, Object> result = new HashMap<>(); result.put("productIds", productIds); - result.put("viewIndex", Integer.valueOf(viewIndex)); - result.put("viewSize", Integer.valueOf(viewSize)); - result.put("listSize", Integer.valueOf(listSize)); - result.put("lowIndex", Integer.valueOf(lowIndex)); - result.put("highIndex", Integer.valueOf(highIndex)); + result.put("viewIndex", viewIndex); + result.put("viewSize", viewSize); + result.put("listSize", listSize); + result.put("lowIndex", lowIndex); + result.put("highIndex", highIndex); result.put("paging", paging); result.put("previousViewSize", previousViewSize); result.put("searchConstraintStrings", searchConstraintStrings); @@ -1073,7 +1073,7 @@ public class ProductSearchSession { searchParamString.append("&S_CEX"); searchParamString.append(categoriesCount); searchParamString.append("="); - searchParamString.append(cc.exclude.booleanValue() ? "Y" : "N"); + searchParamString.append(cc.exclude ? "Y" : "N"); } } else if (psc instanceof ProductSearch.FeatureConstraint) { ProductSearch.FeatureConstraint fc = (ProductSearch.FeatureConstraint) psc; @@ -1091,7 +1091,7 @@ public class ProductSearchSession { searchParamString.append("&S_PFX"); searchParamString.append(featuresCount); searchParamString.append("="); - searchParamString.append(fc.exclude.booleanValue() ? "Y" : "N"); + searchParamString.append(fc.exclude ? "Y" : "N"); } } else if (psc instanceof ProductSearch.FeatureCategoryConstraint) { ProductSearch.FeatureCategoryConstraint pfcc = (ProductSearch.FeatureCategoryConstraint) psc; @@ -1109,7 +1109,7 @@ public class ProductSearchSession { searchParamString.append("&S_FCX"); searchParamString.append(featureCategoriesCount); searchParamString.append("="); - searchParamString.append(pfcc.exclude.booleanValue() ? "Y" : "N"); + searchParamString.append(pfcc.exclude ? "Y" : "N"); } } else if (psc instanceof ProductSearch.FeatureGroupConstraint) { ProductSearch.FeatureGroupConstraint pfgc = (ProductSearch.FeatureGroupConstraint) psc; @@ -1127,7 +1127,7 @@ public class ProductSearchSession { searchParamString.append("&S_FGX"); searchParamString.append(featureGroupsCount); searchParamString.append("="); - searchParamString.append(pfgc.exclude.booleanValue() ? "Y" : "N"); + searchParamString.append(pfgc.exclude ? "Y" : "N"); } } else if (psc instanceof ProductSearch.KeywordConstraint) { ProductSearch.KeywordConstraint kc = (ProductSearch.KeywordConstraint) psc; @@ -1318,7 +1318,7 @@ public class ProductSearchSession { entityConditionList.add(EntityCondition.makeCondition("ppcPrice", EntityOperator.LESS_THAN_EQUAL_TO, priceHigh)); entityConditionList.add(EntityCondition.makeCondition("ppcProductPriceTypeId", EntityOperator.EQUALS, "LIST_PRICE")); - Long priceRangeCount = Long.valueOf(0); + Long priceRangeCount = 0L; EntityQuery eq = EntityQuery.use(delegator) .select(UtilMisc.toSet(fieldsToSelect)) .from(dynamicViewEntity) @@ -1374,7 +1374,7 @@ public class ProductSearchSession { ProductSearch.getAllSubCategoryIds(productCategoryId, productCategoryIdSet, delegator, productSearchContext.nowTimestamp); entityConditionList.add(EntityCondition.makeCondition("pcmcProductCategoryId", EntityOperator.IN, productCategoryIdSet)); - Long categoryCount = Long.valueOf(0); + Long categoryCount = 0L; EntityQuery eq = EntityQuery.use(delegator) .select(UtilMisc.toSet(fieldsToSelect)) .from(dynamicViewEntity) Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java Tue Aug 7 07:30:43 2018 @@ -191,7 +191,7 @@ public final class ProductUtilServices { EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN, nowTimestamp), EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null) ), EntityOperator.AND); - EntityCondition havingCond = EntityCondition.makeCondition("productIdCount", EntityOperator.GREATER_THAN, Long.valueOf(1)); + EntityCondition havingCond = EntityCondition.makeCondition("productIdCount", EntityOperator.GREATER_THAN, 1L); try (EntityListIterator eli = EntityQuery.use(delegator).select("productId", "productCategoryId", "productIdCount").from(dve).where(condition).having(havingCond).queryIterator()) { GenericValue pcm = null; @@ -247,7 +247,7 @@ public final class ProductUtilServices { EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN, nowTimestamp)) ), EntityOperator.AND); - EntityCondition havingCond = EntityCondition.makeCondition("productIdToCount", EntityOperator.EQUALS, Long.valueOf(1)); + EntityCondition havingCond = EntityCondition.makeCondition("productIdToCount", EntityOperator.EQUALS, 1L); EntityQuery eq = EntityQuery.use(delegator) .select("productId", "productIdToCount") .from(dve) @@ -335,14 +335,14 @@ public final class ProductUtilServices { String productId = (String) context.get("productId"); Boolean removeOldBool = (Boolean) context.get("removeOld"); - boolean removeOld = removeOldBool.booleanValue(); + boolean removeOld = removeOldBool; Locale locale = (Locale) context.get("locale"); String errMsg = null; Boolean testBool = (Boolean) context.get("test"); boolean test = false; if (testBool != null) { - test = testBool.booleanValue(); + test = testBool; } try { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java Tue Aug 7 07:30:43 2018 @@ -74,7 +74,7 @@ public final class ProductWorker { if (chargeShipping == null) { return true; } - return chargeShipping.booleanValue(); + return chargeShipping; } throw new IllegalArgumentException(errMsg); } @@ -148,7 +148,7 @@ public final class ProductWorker { if (taxable == null) { return true; } - return taxable.booleanValue(); + return taxable; } throw new IllegalArgumentException(errMsg); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java Tue Aug 7 07:30:43 2018 @@ -632,7 +632,7 @@ public final class ProductStoreWorker { Debug.logError("Error calling isStoreInventoryRequired service, result is: " + invReqResult, module); return false; } - requiredOkay = Boolean.valueOf(wantRequired.booleanValue() == "Y".equals(invReqResult.get("requireInventory"))); + requiredOkay = wantRequired == "Y".equals(invReqResult.get("requireInventory")); } Boolean availableOkay = null; @@ -642,10 +642,10 @@ public final class ProductStoreWorker { Debug.logError("Error calling isStoreInventoryAvailable service, result is: " + invAvailResult, module); return false; } - availableOkay = Boolean.valueOf(wantAvailable.booleanValue() == "Y".equals(invAvailResult.get("available"))); + availableOkay = wantAvailable == "Y".equals(invAvailResult.get("available")); } - if ((requiredOkay == null || requiredOkay.booleanValue()) && (availableOkay == null || availableOkay.booleanValue())) { + if ((requiredOkay == null || requiredOkay) && (availableOkay == null || availableOkay)) { return true; } else { return false; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java Tue Aug 7 07:30:43 2018 @@ -127,7 +127,7 @@ public class SubscriptionServices { calendar.setTime(thruDate); int[] times = UomWorker.uomTimeToCalTime(useTimeUomId); if (times != null) { - calendar.add(times[0], (useTime.intValue() * times[1])); + calendar.add(times[0], (useTime * times[1])); } else { Debug.logWarning("Don't know anything about useTimeUomId [" + useTimeUomId + "], defaulting to month", module); calendar.add(Calendar.MONTH, useTime); @@ -189,7 +189,7 @@ public class SubscriptionServices { Integer qty = (Integer) context.get("quantity"); Locale locale = (Locale) context.get("locale"); if (qty == null) { - qty = Integer.valueOf(1); + qty = 1; } Timestamp orderCreatedDate = (Timestamp) context.get("orderCreatedDate"); @@ -212,9 +212,9 @@ public class SubscriptionServices { for (GenericValue productSubscriptionResource: productSubscriptionResourceList) { Long useTime = productSubscriptionResource.getLong("useTime"); - Integer newUseTime = Integer.valueOf(0); + Integer newUseTime = 0; if (useTime != null) { - newUseTime = Integer.valueOf(useTime.intValue() * qty.intValue()); + newUseTime = useTime.intValue() * qty; } Map<String, Object> subContext = UtilMisc.makeMapWritable(context); subContext.put("useTime", newUseTime); @@ -287,7 +287,7 @@ public class SubscriptionServices { subContext.put("orderId", orderId); subContext.put("orderItemSeqId", orderItem.get("orderItemSeqId")); subContext.put("inventoryItemId", orderItem.get("fromInventoryItemId")); - subContext.put("quantity", Integer.valueOf(qty.intValue())); + subContext.put("quantity", qty.intValue()); Map<String, Object> ctx = dctx.getModelService("processExtendSubscriptionByProduct").makeValid(subContext, ModelService.IN_PARAM); Map<String, Object> thisResult = dispatcher.runSync("processExtendSubscriptionByProduct", ctx); if (ServiceUtil.isError(thisResult)) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |