svn commit: r1837577 [4/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1837577 [4/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java Tue Aug 7 07:30:43 2018 @@ -65,7 +65,7 @@ public class PackingServices { } try { - session.addOrIncreaseLine(orderId, null, shipGroupSeqId, productId, quantity, packageSeq.intValue(), weight, false); + session.addOrIncreaseLine(orderId, null, shipGroupSeqId, productId, quantity, packageSeq, weight, false); } catch (GeneralException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); @@ -194,7 +194,7 @@ public class PackingServices { } } for (int numPackage=0; numPackage<numPackages; numPackage++) { - session.addOrIncreaseLine(orderId, orderItemSeqId, shipGroupSeqId, prdStr, quantity, packageSeq+numPackage, weightSeq, updateQuantity.booleanValue()); + session.addOrIncreaseLine(orderId, orderItemSeqId, shipGroupSeqId, prdStr, quantity, packageSeq+numPackage, weightSeq, updateQuantity); } } catch (GeneralException e) { Debug.logError(e, module); @@ -211,7 +211,7 @@ public class PackingServices { PackingSession session = (PackingSession) context.get("packingSession"); int nextSeq = session.nextPackageSeq(); Map<String, Object> result = ServiceUtil.returnSuccess(); - result.put("nextPackageSeq", Integer.valueOf(nextSeq)); + result.put("nextPackageSeq", nextSeq); return result; } @@ -219,7 +219,7 @@ public class PackingServices { PackingSession session = (PackingSession) context.get("packingSession"); int nextSeq = session.clearLastPackage(); Map<String, Object> result = ServiceUtil.returnSuccess(); - result.put("nextPackageSeq", Integer.valueOf(nextSeq)); + result.put("nextPackageSeq", nextSeq); return result; } @@ -234,7 +234,7 @@ public class PackingServices { Locale locale = (Locale) context.get("locale"); PackingSessionLine line = session.findLine(orderId, orderItemSeqId, shipGroupSeqId, - productId, inventoryItemId, packageSeqId.intValue()); + productId, inventoryItemId, packageSeqId); // remove the line if (line != null) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java Tue Aug 7 07:30:43 2018 @@ -973,7 +973,7 @@ public class PackingSession implements j Set<Integer> packageSeqIds = new TreeSet<Integer>(); if (! UtilValidate.isEmpty(this.getLines())) { for (PackingSessionLine line: this.getLines()) { - packageSeqIds.add(Integer.valueOf(line.getPackageSeq())); + packageSeqIds.add(line.getPackageSeq()); } } return UtilMisc.makeListWritable(packageSeqIds); @@ -981,9 +981,9 @@ public class PackingSession implements j public void setPackageWeight(int packageSeqId, BigDecimal packageWeight) { if (UtilValidate.isEmpty(packageWeight)) { - packageWeights.remove(Integer.valueOf(packageSeqId)); + packageWeights.remove(packageSeqId); } else { - packageWeights.put(Integer.valueOf(packageSeqId), packageWeight); + packageWeights.put(packageSeqId, packageWeight); } } @@ -1007,9 +1007,9 @@ public class PackingSession implements j // These methods (setShipmentBoxType and getShipmentBoxType) are added so that each package will have different box type. public void setShipmentBoxType(int packageSeqId, String shipmentBoxType) { if (UtilValidate.isEmpty(shipmentBoxType)) { - shipmentBoxTypes.remove(Integer.valueOf(packageSeqId)); + shipmentBoxTypes.remove(packageSeqId); } else { - shipmentBoxTypes.put(Integer.valueOf(packageSeqId), shipmentBoxType); + shipmentBoxTypes.put(packageSeqId, shipmentBoxType); } } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java Tue Aug 7 07:30:43 2018 @@ -436,7 +436,7 @@ public class ShipmentServices { } // there will be only one of each priority; latest will replace - estimatePriority.put(Integer.valueOf(prioritySum), currentEstimate); + estimatePriority.put(prioritySum, currentEstimate); } // locate the highest priority estimate; or the latest entered @@ -633,7 +633,7 @@ public class ShipmentServices { stageShip.set("postalCodeExt", address.get("postalCodeExt")); stageShip.set("countryGeoId", address.get("countryGeoId")); stageShip.set("stateProvinceGeoId", address.get("stateProvinceGeoId")); - stageShip.set("numberOfPackages", Long.valueOf(packages.size())); + stageShip.set("numberOfPackages", (long) packages.size()); stageShip.set("handlingInstructions", shipment.get("handlingInstructions")); toStore.add(stageShip); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java Tue Aug 7 07:30:43 2018 @@ -114,7 +114,7 @@ public final class ShipmentWorker { if (UtilValidate.isNotEmpty(shippableItemInfo)) { for (Map<String, Object> itemInfo: shippableItemInfo) { - long pieces = ((Long) itemInfo.get("piecesIncluded")).longValue(); + long pieces = (Long) itemInfo.get("piecesIncluded"); BigDecimal totalQuantity = (BigDecimal) itemInfo.get("quantity"); BigDecimal totalWeight = (BigDecimal) itemInfo.get("weight"); String productId = (String) itemInfo.get("productId"); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java Tue Aug 7 07:30:43 2018 @@ -156,7 +156,7 @@ public class FedexServices { Boolean replaceMeterNumber = (Boolean) context.get("replaceMeterNumber"); - if (! replaceMeterNumber.booleanValue()) { + if (!replaceMeterNumber) { String meterNumber = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessMeterNumber", resource, "shipment.fedex.access.meterNumber"); if (UtilValidate.isNotEmpty(meterNumber)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, Modified: ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java Tue Aug 7 07:30:43 2018 @@ -250,11 +250,11 @@ public class LoginEvents { } if (useEncryption) { // password encrypted, can't send, generate new password and email to user - passwordToSend = RandomStringUtils.randomAlphanumeric(EntityUtilProperties.getPropertyAsInteger("security", "password.length.min", 5).intValue()); + passwordToSend = RandomStringUtils.randomAlphanumeric(EntityUtilProperties.getPropertyAsInteger("security", "password.length.min", 5)); if ("true".equals(EntityUtilProperties.getPropertyValue("security", "password.lowercase", delegator))){ passwordToSend=passwordToSend.toLowerCase(Locale.getDefault()); } - autoPassword = RandomStringUtils.randomAlphanumeric(EntityUtilProperties.getPropertyAsInteger("security", "password.length.min", 5).intValue()); + autoPassword = RandomStringUtils.randomAlphanumeric(EntityUtilProperties.getPropertyAsInteger("security", "password.length.min", 5)); EntityCrypto entityCrypto = new EntityCrypto(delegator,null); try { passwordToSend = entityCrypto.encrypt(keyValue, EncryptMethod.TRUE, autoPassword); @@ -323,7 +323,7 @@ public class LoginEvents { // set the needed variables in new context Map<String, Object> bodyParameters = new HashMap<>(); - bodyParameters.put("useEncryption", Boolean.valueOf(useEncryption)); + bodyParameters.put("useEncryption", useEncryption); bodyParameters.put("password", UtilFormatOut.checkNull(passwordToSend)); bodyParameters.put("locale", UtilHttp.getLocale(request)); bodyParameters.put("userLogin", supposedUserLogin); Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java Tue Aug 7 07:30:43 2018 @@ -227,7 +227,7 @@ public class ICalConverter { } Dur dur = iCalObj.getDuration(); TimeDuration td = new TimeDuration(0, 0, (dur.getWeeks() * 7) + dur.getDays(), dur.getHours(), dur.getMinutes(), dur.getSeconds(), 0); - return Double.valueOf(TimeDuration.toLong(td)); + return (double) TimeDuration.toLong(td); } protected static Timestamp fromLastModified(PropertyList propertyList) { @@ -259,7 +259,7 @@ public class ICalConverter { if (iCalObj == null) { return null; } - return Long.valueOf(iCalObj.getPercentage()); + return (long) iCalObj.getPercentage(); } protected static Double fromPriority(PropertyList propertyList) { @@ -267,7 +267,7 @@ public class ICalConverter { if (iCalObj == null) { return null; } - return Double.valueOf(iCalObj.getLevel()); + return (double) iCalObj.getLevel(); } protected static String fromStatus(PropertyList propertyList) { @@ -455,7 +455,7 @@ public class ICalConverter { Map<String, Object> serviceResult = invokeService("workEffortICalendarPermission", serviceMap, context); Boolean hasPermission = (Boolean) serviceResult.get("hasPermission"); if (hasPermission != null) { - return hasPermission.booleanValue(); + return hasPermission; } return false; } Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Tue Aug 7 07:30:43 2018 @@ -62,11 +62,11 @@ public class WorkEffortKeywordIndex { List<String> strings = new LinkedList<>(); int widWeight = 1; try { - widWeight = EntityUtilProperties.getPropertyAsInteger("workeffort", "index.weight.WorkEffort.workEffortId", 1).intValue(); + widWeight = EntityUtilProperties.getPropertyAsInteger("workeffort", "index.weight.WorkEffort.workEffortId", 1); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } - keywords.put(workEffort.getString("workEffortId").toLowerCase(Locale.getDefault()), Long.valueOf(widWeight)); + keywords.put(workEffort.getString("workEffortId").toLowerCase(Locale.getDefault()), (long) widWeight); addWeightedKeywordSourceString(workEffort, "workEffortName", strings); addWeightedKeywordSourceString(workEffort, "workEffortTypeId", strings); @@ -92,7 +92,7 @@ public class WorkEffortKeywordIndex { for (String workEffortContentTypeId: workEffortContentTypes.split(",")) { int weight = 1; try { - weight = EntityUtilProperties.getPropertyAsInteger("workeffort", "index.weight.WorkEffortContent." + workEffortContentTypeId, 1).intValue(); + weight = EntityUtilProperties.getPropertyAsInteger("workeffort", "index.weight.WorkEffortContent." + workEffortContentTypeId, 1); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } @@ -144,7 +144,7 @@ public class WorkEffortKeywordIndex { int weight = 1; try { - weight = EntityUtilProperties.getPropertyAsInteger("workeffort", "index.weight." + value.getEntityName() + "." + fieldName, 1).intValue(); + weight = EntityUtilProperties.getPropertyAsInteger("workeffort", "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/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java Tue Aug 7 07:30:43 2018 @@ -194,7 +194,7 @@ public class WorkEffortSearch { 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(workEffortIds.size()), Double.valueOf(totalSeconds)); + this.saveSearchResultInfo((long) workEffortIds.size(), totalSeconds); return workEffortIds; } catch (GenericEntityException e) { Debug.logError(e, module); @@ -302,7 +302,7 @@ public class WorkEffortSearch { if (resultSortOrder != null) { resultSortOrder.setSortOrder(this); } - dynamicViewEntity.addAlias("WEFF", "workEffortId", null, null, null, Boolean.valueOf(workEffortIdGroupBy), null); + dynamicViewEntity.addAlias("WEFF", "workEffortId", null, null, null, workEffortIdGroupBy, null); EntityListIterator eli = null; try { @@ -327,7 +327,7 @@ public class WorkEffortSearch { } public ArrayList<String> makeWorkEffortIdList(EntityListIterator eli) { - ArrayList<String> workEffortIds = new ArrayList<>(maxResults == null ? 100 : maxResults.intValue()); + ArrayList<String> workEffortIds = new ArrayList<>(maxResults == null ? 100 : maxResults); if (eli == null) { Debug.logWarning("The eli is null, returning zero results", module); return workEffortIds; @@ -341,11 +341,11 @@ public class WorkEffortSearch { 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; } @@ -363,9 +363,9 @@ public class WorkEffortSearch { // 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 workEffortIds; } @@ -379,7 +379,7 @@ public class WorkEffortSearch { workEffortIds.add(searchResult.getString("workEffortId")); workEffortIdSet.add(searchResult.getString("workEffortId")); - while (((searchResult = eli.next()) != null) && (maxResults == null || numRetreived < maxResults.intValue())) { + while (((searchResult = eli.next()) != null) && (maxResults == null || numRetreived < maxResults)) { String workEffortId = searchResult.getString("workEffortId"); if (!workEffortIdSet.contains(workEffortId)) { workEffortIds.add(workEffortId); @@ -393,12 +393,12 @@ public class WorkEffortSearch { 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); @@ -924,7 +924,7 @@ public class WorkEffortSearch { 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/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java Tue Aug 7 07:30:43 2018 @@ -53,19 +53,19 @@ public class WorkEffortSearchEvents { Integer viewIndexInteger = workEffortSearchOptions.getViewIndex(); if (viewIndexInteger != null) { - viewIndex = viewIndexInteger.intValue(); + viewIndex = viewIndexInteger; } Integer viewSizeInteger = workEffortSearchOptions.getViewSize(); if (viewSizeInteger != null) { - viewSize = viewSizeInteger.intValue(); + viewSize = viewSizeInteger; } lowIndex = viewIndex * viewSize; highIndex = (viewIndex + 1) * viewSize; // setup resultOffset and maxResults, noting that resultOffset is 1 based, not zero based as these numbers - Integer resultOffset = Integer.valueOf(lowIndex + 1); - Integer maxResults = Integer.valueOf(viewSize); + Integer resultOffset = lowIndex + 1; + Integer maxResults = viewSize; // ========== Do the actual search ArrayList<String> workEffortIds = null; @@ -89,7 +89,7 @@ public class WorkEffortSearchEvents { Integer totalResults = workEffortSearchContext.getTotalResults(); if (totalResults != null) { - listSize = totalResults.intValue(); + listSize = totalResults; } } @@ -105,11 +105,11 @@ public class WorkEffortSearchEvents { Map<String, Object> result = new HashMap<>(); result.put("workEffortIds", workEffortIds); - 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("searchConstraintStrings", searchConstraintStrings); result.put("searchSortOrderString", searchSortOrderString); Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Tue Aug 7 07:30:43 2018 @@ -268,7 +268,7 @@ public class WorkEffortSearchSession { } catch (Exception e) { Debug.logError(e, "Error formatting VIEW_INDEX, setting to 0", module); // we could just do nothing here, but we know something was specified so we don't want to use the previous value from the session - workEffortSearchOptions.setViewIndex(Integer.valueOf(0)); + workEffortSearchOptions.setViewIndex(0); } } @@ -278,7 +278,7 @@ public class WorkEffortSearchSession { workEffortSearchOptions.setViewSize(Integer.valueOf(viewSizeStr)); } catch (Exception e) { Debug.logError(e, "Error formatting VIEW_SIZE, setting to 20", module); - workEffortSearchOptions.setViewSize(Integer.valueOf(20)); + workEffortSearchOptions.setViewSize(20); } } } Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java Tue Aug 7 07:30:43 2018 @@ -337,7 +337,7 @@ public class WorkEffortServices { } } canView = (UtilValidate.isNotEmpty(workEffortPartyAssignments)) ? Boolean.TRUE : Boolean.FALSE; - if (!canView.booleanValue() && security.hasEntityPermission("WORKEFFORTMGR", "_VIEW", userLogin)) { + if (!canView && security.hasEntityPermission("WORKEFFORTMGR", "_VIEW", userLogin)) { canView = Boolean.TRUE; } @@ -535,12 +535,12 @@ public class WorkEffortServices { Integer periodTypeObject = (Integer) context.get("periodType"); int periodType = 0; if (periodTypeObject != null) { - periodType = periodTypeObject.intValue(); + periodType = periodTypeObject; } int numPeriods = 0; if (numPeriodsInteger != null) { - numPeriods = numPeriodsInteger.intValue(); + numPeriods = numPeriodsInteger; } // get a timestamp (date) for the beginning of today and for beginning of numDays+1 days from now @@ -731,7 +731,7 @@ public class WorkEffortServices { if (length % periodLen == 0 && startDate.getTime() > periodRange.start().getTime()) { periodSpan++; } - calEntry.put("periodSpan", Integer.valueOf(periodSpan)); + calEntry.put("periodSpan", periodSpan); DateRange calEntryRange = new DateRange((weRange.start().before(startStamp) ? startStamp : weRange.start()), (weRange.end().after(endStamp) ? endStamp : weRange.end())); calEntry.put("calEntryRange", calEntryRange); if (firstEntry) { @@ -740,7 +740,7 @@ public class WorkEffortServices { firstEntry = false; } else { boolean startOfPeriod = ((weRange.start().getTime() - periodRange.start().getTime()) >= 0); - calEntry.put("startOfPeriod", Boolean.valueOf(startOfPeriod)); + calEntry.put("startOfPeriod", startOfPeriod); } curWorkEfforts.add(calEntry); } @@ -758,7 +758,7 @@ public class WorkEffortServices { } Map<String, Object> result = new HashMap<>(); result.put("periods", periods); - result.put("maxConcurrentEntries", Integer.valueOf(maxConcurrentEntries)); + result.put("maxConcurrentEntries", maxConcurrentEntries); return result; } @@ -800,17 +800,17 @@ public class WorkEffortServices { GenericValue inventoryItemDetail = EntityQuery.use(delegator).from("InventoryItemDetail").where("inventoryItemId", inventoryItem.getString("inventoryItemId")).orderBy("inventoryItemDetailSeqId").queryFirst(); if (inventoryItemDetail != null && inventoryItemDetail.get("quantityOnHandDiff") != null) { Double inventoryItemQty = inventoryItemDetail.getDouble("quantityOnHandDiff"); - producedQtyTot = producedQtyTot + inventoryItemQty.doubleValue(); + producedQtyTot = producedQtyTot + inventoryItemQty; } } } double estimatedQuantity = 0.0; if (incomingProductionRun.get("estimatedQuantity") != null) { - estimatedQuantity = incomingProductionRun.getDouble("estimatedQuantity").doubleValue(); + estimatedQuantity = incomingProductionRun.getDouble("estimatedQuantity"); } double remainingQuantity = estimatedQuantity - producedQtyTot; // the qty that still needs to be produced if (remainingQuantity > 0) { - incomingProductionRun.set("estimatedQuantity", Double.valueOf(remainingQuantity)); + incomingProductionRun.set("estimatedQuantity", remainingQuantity); } else { continue; } @@ -824,9 +824,9 @@ public class WorkEffortServices { } Double remainingQuantityTot = (Double)quantitySummary.get("estimatedQuantityTotal"); if (remainingQuantityTot == null) { - quantitySummary.put("estimatedQuantityTotal", Double.valueOf(remainingQuantity)); + quantitySummary.put("estimatedQuantityTotal", remainingQuantity); } else { - quantitySummary.put("estimatedQuantityTotal", Double.valueOf(remainingQuantity + remainingQuantityTot.doubleValue())); + quantitySummary.put("estimatedQuantityTotal", remainingQuantity + remainingQuantityTot); } List<GenericValue> incomingProductionRunList = UtilGenerics.checkList(quantitySummary.get("incomingProductionRunList")); @@ -861,7 +861,7 @@ public class WorkEffortServices { String weFacilityId = outgoingProductionRun.getString("facilityId"); Double neededQuantity = outgoingProductionRun.getDouble("estimatedQuantity"); if (neededQuantity == null) { - neededQuantity = Double.valueOf(0); + neededQuantity = (double) 0; } Map<String, Object> quantitySummary = UtilGenerics.checkMap(summaryOutByFacility.get(weFacilityId)); @@ -874,7 +874,7 @@ public class WorkEffortServices { if (remainingQuantityTot == null) { quantitySummary.put("estimatedQuantityTotal", neededQuantity); } else { - quantitySummary.put("estimatedQuantityTotal", Double.valueOf(neededQuantity.doubleValue() + remainingQuantityTot.doubleValue())); + quantitySummary.put("estimatedQuantityTotal", neededQuantity + remainingQuantityTot); } List<GenericValue> outgoingProductionRunList = UtilGenerics.checkList(quantitySummary.get("outgoingProductionRunList")); @@ -955,7 +955,7 @@ public class WorkEffortServices { if (temporalExpression != null) { eventDateTime = temporalExpression.first(cal).getTime(); Date reminderDateTime = null; - long reminderOffset = reminder.get("reminderOffset") == null ? 0 : reminder.getLong("reminderOffset").longValue(); + long reminderOffset = reminder.get("reminderOffset") == null ? 0 : reminder.getLong("reminderOffset"); if (reminderStamp == null) { if (reminderOffset != 0) { cal.setTime(eventDateTime); @@ -991,7 +991,7 @@ public class WorkEffortServices { } else { newReminderDateTime = temporalExpression.next(cal).getTime(); } - reminder.set("currentCount", Long.valueOf(currentCount + 1)); + reminder.set("currentCount", (long) (currentCount + 1)); reminder.set("reminderDateTime", new Timestamp(newReminderDateTime.getTime())); reminder.store(); } @@ -1027,7 +1027,7 @@ public class WorkEffortServices { cal.setTime(now); duration.addToCalendar(cal); reminderDateTime = cal.getTime(); - reminder.set("currentCount", Long.valueOf(currentCount + 1)); + reminder.set("currentCount", (long) (currentCount + 1)); reminder.set("reminderDateTime", new Timestamp(reminderDateTime.getTime())); reminder.store(); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java Tue Aug 7 07:30:43 2018 @@ -28,7 +28,7 @@ public class BooleanConverters implement } public Integer convert(Boolean obj) throws ConversionException { - return obj.booleanValue() ? 1 : 0; + return obj ? 1 : 0; } } @@ -50,7 +50,7 @@ public class BooleanConverters implement } public String convert(Boolean obj) throws ConversionException { - return obj.booleanValue() ? "true" : "false"; + return obj ? "true" : "false"; } } @@ -60,7 +60,7 @@ public class BooleanConverters implement } public Boolean convert(Integer obj) throws ConversionException { - return obj.intValue() == 0 ? false : true; + return obj == 0 ? false : true; } } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java Tue Aug 7 07:30:43 2018 @@ -194,7 +194,7 @@ public class DateTimeConverters implemen } public Double convert(TimeDuration obj) throws ConversionException { - return Double.valueOf(TimeDuration.toLong(obj)); + return (double) TimeDuration.toLong(obj); } } @@ -204,7 +204,7 @@ public class DateTimeConverters implemen } public Float convert(TimeDuration obj) throws ConversionException { - return Float.valueOf(TimeDuration.toLong(obj)); + return (float) TimeDuration.toLong(obj); } } @@ -264,7 +264,7 @@ public class DateTimeConverters implemen } public Calendar convert(Long obj, Locale locale, TimeZone timeZone) throws ConversionException { - return UtilDateTime.toCalendar(new java.util.Date(obj.longValue()), timeZone, locale); + return UtilDateTime.toCalendar(new java.util.Date(obj), timeZone, locale); } public Calendar convert(Long obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java Tue Aug 7 07:30:43 2018 @@ -152,7 +152,7 @@ public class NumberConverters implements } public BigDecimal convert(Double obj) throws ConversionException { - return BigDecimal.valueOf(obj.doubleValue()); + return BigDecimal.valueOf(obj); } } @@ -231,7 +231,7 @@ public class NumberConverters implements } public BigDecimal convert(Integer obj) throws ConversionException { - return BigDecimal.valueOf(obj.intValue()); + return BigDecimal.valueOf(obj); } } @@ -262,7 +262,7 @@ public class NumberConverters implements } public BigDecimal convert(Long obj) throws ConversionException { - return BigDecimal.valueOf(obj.longValue()); + return BigDecimal.valueOf(obj); } } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java Tue Aug 7 07:30:43 2018 @@ -753,13 +753,13 @@ public class ObjectType { Boolean value1Boolean = (Boolean) convertedValue1; Boolean value2Boolean = (Boolean) convertedValue2; if ("equals".equals(operator)) { - if ((value1Boolean.booleanValue() && value2Boolean.booleanValue()) || (!value1Boolean.booleanValue() && !value2Boolean.booleanValue())) { + if ((value1Boolean && value2Boolean) || (!value1Boolean && !value2Boolean)) { result = 0; } else { result = 1; } } else if ("not-equals".equals(operator)) { - if ((!value1Boolean.booleanValue() && value2Boolean.booleanValue()) || (value1Boolean.booleanValue() && !value2Boolean.booleanValue())) { + if ((!value1Boolean && value2Boolean) || (value1Boolean && !value2Boolean)) { result = 0; } else { result = 1; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java Tue Aug 7 07:30:43 2018 @@ -127,7 +127,7 @@ public final class UtilDateTime { StringBuilder sb = new StringBuilder(); for (int i = parts.size() - 1; i >= 0 && count > 0; i--) { Double D = parts.get(i); - double d = D.doubleValue(); + double d = D; if (d < 1) { continue; } @@ -225,7 +225,7 @@ public final class UtilDateTime { } public static java.sql.Timestamp getDayEnd(java.sql.Timestamp stamp) { - return getDayEnd(stamp, Long.valueOf(0)); + return getDayEnd(stamp, 0L); } public static java.sql.Timestamp getDayEnd(java.sql.Timestamp stamp, Long daysLater) { @@ -821,7 +821,7 @@ public final class UtilDateTime { } public static Timestamp getDayEnd(Timestamp stamp, TimeZone timeZone, Locale locale) { - return getDayEnd(stamp, Long.valueOf(0), timeZone, locale); + return getDayEnd(stamp, 0L, timeZone, locale); } public static Timestamp getDayEnd(Timestamp stamp, Long daysLater, TimeZone timeZone, Locale locale) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java Tue Aug 7 07:30:43 2018 @@ -84,10 +84,10 @@ public final class UtilFormatOut { public static Double formatPriceNumber(double price) { try { - return Double.valueOf(priceDecimalFormat.parse(formatPrice(price)).doubleValue()); + return priceDecimalFormat.parse(formatPrice(price)).doubleValue(); } catch (ParseException e) { Debug.logError(e, module); - return Double.valueOf(price); + return price; } } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Tue Aug 7 07:30:43 2018 @@ -125,7 +125,7 @@ public final class UtilHttp { * @return The resulting Map */ public static Map<String, Object> getParameterMap(HttpServletRequest request, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) { - boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue(); + boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip; Map<String, Object> paramMap = new HashMap<>(); // add all the actual HTTP request parameters @@ -191,7 +191,7 @@ public final class UtilHttp { } public static Map<String, Object> getPathInfoOnlyParameterMap(String pathInfoStr, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) { - boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue(); + boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip; Map<String, Object> paramMap = new HashMap<>(); // now add in all path info parameters /~name1=value1/~name2=value2/ @@ -1389,7 +1389,7 @@ public final class UtilHttp { HttpSession session = request.getSession(); Boolean javaScriptEnabled = (Boolean) session.getAttribute("javaScriptEnabled"); if (javaScriptEnabled != null) { - return javaScriptEnabled.booleanValue(); + return javaScriptEnabled; } return false; } @@ -1470,10 +1470,10 @@ public final class UtilHttp { public static String getNextUniqueId(HttpServletRequest request) { Integer uniqueIdNumber= (Integer)request.getAttribute("UNIQUE_ID"); if (uniqueIdNumber == null) { - uniqueIdNumber = Integer.valueOf(1); + uniqueIdNumber = 1; } - request.setAttribute("UNIQUE_ID", Integer.valueOf(uniqueIdNumber.intValue() + 1)); + request.setAttribute("UNIQUE_ID", uniqueIdNumber + 1); return "autoId_" + uniqueIdNumber; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java Tue Aug 7 07:30:43 2018 @@ -243,9 +243,9 @@ public final class UtilMisc { } else if (currentNumberObj instanceof BigDecimal) { currentNumber = (BigDecimal) currentNumberObj; } else if (currentNumberObj instanceof Double) { - currentNumber = new BigDecimal(((Double) currentNumberObj).doubleValue()); + currentNumber = new BigDecimal((Double) currentNumberObj); } else if (currentNumberObj instanceof Long) { - currentNumber = new BigDecimal(((Long) currentNumberObj).longValue()); + currentNumber = new BigDecimal((Long) currentNumberObj); } else { throw new IllegalArgumentException("In addToBigDecimalInMap found a Map value of a type not supported: " + currentNumberObj.getClass().getName()); } @@ -416,7 +416,7 @@ public final class UtilMisc { */ public static double toDouble(Object obj) { Double result = toDoubleObject(obj); - return result == null ? 0.0 : result.doubleValue(); + return result == null ? 0.0 : result; } /** Converts an <code>Object</code> to a <code>Double</code>. Returns @@ -432,7 +432,7 @@ public final class UtilMisc { return (Double) obj; } if (obj instanceof Number) { - return Double.valueOf(((Number) obj).doubleValue()); + return ((Number) obj).doubleValue(); } Double result = null; try { @@ -448,7 +448,7 @@ public final class UtilMisc { */ public static int toInteger(Object obj) { Integer result = toIntegerObject(obj); - return result == null ? 0 : result.intValue(); + return result == null ? 0 : result; } /** Converts an <code>Object</code> to an <code>Integer</code>. Returns @@ -480,7 +480,7 @@ public final class UtilMisc { */ public static long toLong(Object obj) { Long result = toLongObject(obj); - return result == null ? 0 : result.longValue(); + return result == null ? 0 : result; } /** Converts an <code>Object</code> to a <code>Long</code>. Returns @@ -496,7 +496,7 @@ public final class UtilMisc { return (Long) obj; } if (obj instanceof Number) { - return Long.valueOf(((Number) obj).longValue()); + return ((Number) obj).longValue(); } Long result = null; try { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java Tue Aug 7 07:30:43 2018 @@ -543,11 +543,11 @@ public final class UelUtil { } else if ("boolean".equals(createObjectType)) { return Boolean.FALSE; } else if ("integer".equals(createObjectType)) { - return Integer.valueOf(0); + return 0; } else if ("long".equals(createObjectType)) { - return Long.valueOf(0); + return 0L; } else if ("double".equals(createObjectType)) { - return Double.valueOf(0); + return (double) 0; } else if ("bigDecimal".equals(createObjectType)) { return BigDecimal.ZERO; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java Tue Aug 7 07:30:43 2018 @@ -209,7 +209,7 @@ public class UtilObjectTests extends Gen } public void testGetBytes_Object() { - assertNotNull("long", UtilObject.getBytes(Long.valueOf(0))); + assertNotNull("long", UtilObject.getBytes(0L)); assertNotNull("injector good", UtilObject.getBytes(new SerializationInjector(false, false))); boolean errorOn = Debug.isOn(Debug.ERROR); try { @@ -222,7 +222,7 @@ public class UtilObjectTests extends Gen } public void testGetObject() { - Long one = Long.valueOf(1); + Long one = 1L; byte[] oneBytes = UtilObject.getBytes(one); assertNotNull("oneBytes", oneBytes); assertEquals("one getObject", one, UtilObject.getObject(oneBytes)); @@ -249,7 +249,7 @@ public class UtilObjectTests extends Gen } public void testGetByteCount() throws Exception { - assertNotSame("long", 0, UtilObject.getByteCount(Long.valueOf(0))); + assertNotSame("long", 0, UtilObject.getByteCount(0L)); Exception caught = null; try { UtilObject.getByteCount(this); @@ -271,8 +271,8 @@ public class UtilObjectTests extends Gen } public void testCompareToHelper() { - Long one = Long.valueOf(1); - Long two = Long.valueOf(2); + Long one = 1L; + Long two = 2L; assertComparison("one <-> two", -1, UtilObject.compareToHelper(one, two)); assertComparison("one <-> one", 0, UtilObject.compareToHelper(one, one)); assertComparison("two <-> one", 1, UtilObject.compareToHelper(two, one)); Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java Tue Aug 7 07:30:43 2018 @@ -304,7 +304,7 @@ public class CommonServices { public static Map<String, Object> makeALotOfVisits(DispatchContext dctx, Map<String, ?> context) { Delegator delegator = dctx.getDelegator(); - int count = ((Integer) context.get("count")).intValue(); + int count = (Integer) context.get("count"); for (int i = 0; i < count; i++) { GenericValue v = delegator.makeValue("Visit"); Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java Tue Aug 7 07:30:43 2018 @@ -464,18 +464,18 @@ public class FindServices { public static Map<String, Object> performFindList(DispatchContext dctx, Map<String, Object> context) { Integer viewSize = (Integer) context.get("viewSize"); if (viewSize == null) { - viewSize = Integer.valueOf(20); // default + viewSize = 20; // default } context.put("viewSize", viewSize); Integer viewIndex = (Integer) context.get("viewIndex"); if (viewIndex == null) { - viewIndex = Integer.valueOf(0); // default + viewIndex = 0; // default } context.put("viewIndex", viewIndex); Map<String, Object> result = performFind(dctx,context); - int start = viewIndex.intValue() * viewSize.intValue(); + int start = viewIndex * viewSize; List<GenericValue> list = null; Integer listSize = 0; try (EntityListIterator it = (EntityListIterator) result.get("listIt")) { Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java Tue Aug 7 07:30:43 2018 @@ -64,8 +64,8 @@ public class FtpServices { try { Integer defaultTimeout = (Integer) context.get("defaultTimeout"); if (UtilValidate.isNotEmpty(defaultTimeout)) { - Debug.logInfo("[putFile] set default timeout to: " + defaultTimeout.intValue() + " milliseconds", module); - ftp.setDefaultTimeout(defaultTimeout.intValue()); + Debug.logInfo("[putFile] set default timeout to: " + defaultTimeout + " milliseconds", module); + ftp.setDefaultTimeout(defaultTimeout); } Debug.logInfo("[putFile] connecting to: " + (String) context.get("hostname"), module); ftp.connect((String) context.get("hostname")); @@ -81,12 +81,12 @@ public class FtpServices { errorList.add(UtilProperties.getMessage(resource, "CommonFtpLoginFailure", UtilMisc.toMap("username", username, "password", password), locale)); } else { Boolean binaryTransfer = (Boolean) context.get("binaryTransfer"); - boolean binary = (binaryTransfer == null) ? false : binaryTransfer.booleanValue(); + boolean binary = (binaryTransfer == null) ? false : binaryTransfer; if (binary) { ftp.setFileType(FTP.BINARY_FILE_TYPE); } Boolean passiveMode = (Boolean) context.get("passiveMode"); - boolean passive = (passiveMode == null) ? true : passiveMode.booleanValue(); + boolean passive = (passiveMode == null) ? true : passiveMode; if (passive) { ftp.enterLocalPassiveMode(); } @@ -149,8 +149,8 @@ public class FtpServices { try { Integer defaultTimeout = (Integer) context.get("defaultTimeout"); if (UtilValidate.isNotEmpty(defaultTimeout)) { - Debug.logInfo("[getFile] Set default timeout to: " + defaultTimeout.intValue() + " milliseconds", module); - ftp.setDefaultTimeout(defaultTimeout.intValue()); + Debug.logInfo("[getFile] Set default timeout to: " + defaultTimeout + " milliseconds", module); + ftp.setDefaultTimeout(defaultTimeout); } ftp.connect((String) context.get("hostname")); if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { @@ -162,12 +162,12 @@ public class FtpServices { errorList.add(UtilProperties.getMessage(resource, "CommonFtpLoginFailure", UtilMisc.toMap("username", username, "password", password), locale)); } else { Boolean binaryTransfer = (Boolean) context.get("binaryTransfer"); - boolean binary = (binaryTransfer == null) ? false : binaryTransfer.booleanValue(); + boolean binary = (binaryTransfer == null) ? false : binaryTransfer; if (binary) { ftp.setFileType(FTP.BINARY_FILE_TYPE); } Boolean passiveMode = (Boolean) context.get("passiveMode"); - boolean passive = (passiveMode == null) ? false : passiveMode.booleanValue(); + boolean passive = (passiveMode == null) ? false : passiveMode; if (passive) { ftp.enterLocalPassiveMode(); } Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java Tue Aug 7 07:30:43 2018 @@ -169,9 +169,9 @@ public final class KeywordSearchUtil { // group by word, add up weight Long curWeight = keywords.get(token); if (curWeight == null) { - keywords.put(token, Long.valueOf(1)); + keywords.put(token, 1L); } else { - keywords.put(token, Long.valueOf(curWeight.longValue() + 1)); + keywords.put(token, curWeight + 1); } } } Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java Tue Aug 7 07:30:43 2018 @@ -60,7 +60,7 @@ public class LdapAuthenticationServices } String dn = null; Delegator delegator = ctx.getDelegator(); - boolean isServiceAuth = context.get("isServiceAuth") != null && ((Boolean) context.get("isServiceAuth")).booleanValue(); + boolean isServiceAuth = context.get("isServiceAuth") != null && (Boolean) context.get("isServiceAuth"); GenericValue userLogin = null; try { userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", username).cache(isServiceAuth).queryOne(); Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java Tue Aug 7 07:30:43 2018 @@ -99,7 +99,7 @@ public class LoginServices { boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security", "password.encrypt", delegator)); // if isServiceAuth is not specified, default to not a service auth - boolean isServiceAuth = context.get("isServiceAuth") != null && ((Boolean) context.get("isServiceAuth")).booleanValue(); + boolean isServiceAuth = context.get("isServiceAuth") != null && (Boolean) context.get("isServiceAuth"); String username = (String) context.get("login.username"); if (username == null) { @@ -234,8 +234,8 @@ public class LoginServices { // reset failed login count if necessary Long currentFailedLogins = userLogin.getLong("successiveFailedLogins"); - if (currentFailedLogins != null && currentFailedLogins.longValue() > 0) { - userLogin.set("successiveFailedLogins", Long.valueOf(0)); + if (currentFailedLogins != null && currentFailedLogins > 0) { + userLogin.set("successiveFailedLogins", 0L); } else if (!hasLoggedOut) { // successful login & no logout flag, no need to change anything, so don't do the store doStore = false; @@ -273,9 +273,9 @@ public class LoginServices { Long currentFailedLogins = userLogin.getLong("successiveFailedLogins"); if (currentFailedLogins == null) { - currentFailedLogins = Long.valueOf(1); + currentFailedLogins = 1L; } else { - currentFailedLogins = Long.valueOf(currentFailedLogins.longValue() + 1); + currentFailedLogins = currentFailedLogins + 1; } userLogin.set("successiveFailedLogins", currentFailedLogins); @@ -289,7 +289,7 @@ public class LoginServices { Debug.logWarning("Could not parse max.failed.logins from security.properties, using default of 3", module); } - if (maxFailedLogins > 0 && currentFailedLogins.longValue() >= maxFailedLogins) { + if (maxFailedLogins > 0 && currentFailedLogins >= maxFailedLogins) { userLogin.set("enabled", "N"); userLogin.set("disabledDateTime", UtilDateTime.nowTimestamp()); } @@ -439,7 +439,7 @@ public class LoginServices { public static void createUserLoginPasswordHistory(Delegator delegator,String userLoginId, String currentPassword) throws GenericEntityException{ int passwordChangeHistoryLimit = 0; try { - passwordChangeHistoryLimit = EntityUtilProperties.getPropertyAsInteger("security", "password.change.history.limit", 0).intValue(); + passwordChangeHistoryLimit = EntityUtilProperties.getPropertyAsInteger("security", "password.change.history.limit", 0); } catch (NumberFormatException nfe) { //No valid value is found so don't bother to save any password history passwordChangeHistoryLimit = 0; @@ -946,7 +946,7 @@ public class LoginServices { int passwordChangeHistoryLimit = 0; try { - passwordChangeHistoryLimit = EntityUtilProperties.getPropertyAsInteger("security", "password.change.history.limit", 0).intValue(); + passwordChangeHistoryLimit = EntityUtilProperties.getPropertyAsInteger("security", "password.change.history.limit", 0); } catch (NumberFormatException nfe) { //No valid value is found so don't bother to save any password history passwordChangeHistoryLimit = 0; @@ -979,7 +979,7 @@ public class LoginServices { int minPasswordLength = 0; try { - minPasswordLength = EntityUtilProperties.getPropertyAsInteger("security", "password.length.min", 0).intValue(); + minPasswordLength = EntityUtilProperties.getPropertyAsInteger("security", "password.length.min", 0); } catch (NumberFormatException nfe) { minPasswordLength = 0; } Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java Tue Aug 7 07:30:43 2018 @@ -111,7 +111,7 @@ public class QRCodeEvents { if (UtilValidate.isNotEmpty(encoding)) { context.put("encoding", encoding); } - if (UtilValidate.isNotEmpty(verifyOutput) && verifyOutput.booleanValue()) { + if (UtilValidate.isNotEmpty(verifyOutput) && verifyOutput) { context.put("verifyOutput", verifyOutput); } if (UtilValidate.isNotEmpty(logoImageMaxWidth)) { Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java Tue Aug 7 07:30:43 2018 @@ -124,13 +124,13 @@ public class QRCodeServices { if (width == null) { width = Integer.parseInt(QRCODE_DEFAULT_WIDTH); } - if (width.intValue() < MIN_SIZE || width.intValue() > MAX_SIZE) { + if (width < MIN_SIZE || width > MAX_SIZE) { return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "SizeOutOfBorderError", new Object[] {"width", String.valueOf(width), String.valueOf(MIN_SIZE), String.valueOf(MAX_SIZE)}, locale)); } if (height == null) { height = Integer.parseInt(QRCODE_DEFAULT_HEIGHT); } - if (height.intValue() < MIN_SIZE || height.intValue() > MAX_SIZE) { + if (height < MIN_SIZE || height > MAX_SIZE) { return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "SizeOutOfBorderError", new Object[] { "height", String.valueOf(height), String.valueOf(MIN_SIZE), String.valueOf(MAX_SIZE) }, locale)); } @@ -165,7 +165,7 @@ public class QRCodeServices { BufferedImage newBufferedImage = null; if (UtilValidate.isNotEmpty(logoBufferedImage)) { - if (UtilValidate.isNotEmpty(logoImageMaxWidth) && UtilValidate.isNotEmpty(logoImageMaxHeight) && (logoBufferedImage.getWidth() > logoImageMaxWidth.intValue() || logoBufferedImage.getHeight() > logoImageMaxHeight.intValue())) { + if (UtilValidate.isNotEmpty(logoImageMaxWidth) && UtilValidate.isNotEmpty(logoImageMaxHeight) && (logoBufferedImage.getWidth() > logoImageMaxWidth || logoBufferedImage.getHeight() > logoImageMaxHeight)) { Map<String, String> typeMap = new HashMap<>(); typeMap.put("width", logoImageMaxWidth.toString()); typeMap.put("height", logoImageMaxHeight.toString()); @@ -181,7 +181,7 @@ public class QRCodeServices { graphics.dispose(); } - if (UtilValidate.isNotEmpty(verifyOutput) && verifyOutput.booleanValue()) { + if (UtilValidate.isNotEmpty(verifyOutput) && verifyOutput) { Decoder decoder = new Decoder(); Map<DecodeHintType, Object> decodeHints = new EnumMap<>(DecodeHintType.class); decodeHints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE); Modified: ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java Tue Aug 7 07:30:43 2018 @@ -163,7 +163,7 @@ public class Record implements Serializa } if (value != null || setIfNull) { if (value instanceof Boolean) { - value = ((Boolean) value).booleanValue() ? "Y" : "N"; + value = (Boolean) value ? "Y" : "N"; } fields.put(name, value); } @@ -256,7 +256,7 @@ public class Record implements Serializa double divisor = Math.pow(10.0, decimalPlaces); number = number / divisor; - set(name, Double.valueOf(number)); + set(name, number); } // standard types else if (fieldType.equals("java.lang.String") || fieldType.equals("String")) { if (field.format.equals("EncryptedString")) { @@ -283,11 +283,11 @@ public class Record implements Serializa } else if (fieldType.equals("java.lang.Double") || fieldType.equals("Double")) { set(name, Double.valueOf(value)); } else if (fieldType.equals("LEShort")) { - set(name, Short.valueOf(readLEShort(value.getBytes(UtilIO.getUtf8())))); + set(name, readLEShort(value.getBytes(UtilIO.getUtf8()))); } else if (fieldType.equals("LEInteger")) { - set(name, Integer.valueOf(readLEInt(value.getBytes(UtilIO.getUtf8())))); + set(name, readLEInt(value.getBytes(UtilIO.getUtf8()))); } else if (fieldType.equals("LELong")) { - set(name, Long.valueOf(readLELong(value.getBytes(UtilIO.getUtf8())))); + set(name, readLELong(value.getBytes(UtilIO.getUtf8()))); } else { throw new IllegalArgumentException("Field type " + fieldType + " not currently supported. Sorry."); } @@ -336,7 +336,7 @@ public class Record implements Serializa // of decimal places in the formatting string then place it in a Double double decimalPlaces = Double.parseDouble(field.format); double multiplier = Math.pow(10.0, decimalPlaces); - double dnum = multiplier * ((Double) value).doubleValue(); + double dnum = multiplier * (Double) value; long number = Math.round(dnum); str = padFrontZeros(Long.toString(number), field.length); Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java Tue Aug 7 07:30:43 2018 @@ -2338,8 +2338,8 @@ public class GenericDelegator implements } try { int seqVal = Integer.parseInt(currentSeqId); - if (highestSeqVal == null || seqVal > highestSeqVal.intValue()) { - highestSeqVal = Integer.valueOf(seqVal); + if (highestSeqVal == null || seqVal > highestSeqVal) { + highestSeqVal = seqVal; } } catch (NumberFormatException e) { Debug.logWarning("Error in make-next-seq-id converting SeqId [" + currentSeqId + "] in field: " + seqFieldName + " from entity: " + value.getEntityName() + " to a number: " + e.toString(), module); @@ -2347,7 +2347,7 @@ public class GenericDelegator implements } } - int seqValToUse = (highestSeqVal == null ? 1 : highestSeqVal.intValue() + incrementBy); + int seqValToUse = (highestSeqVal == null ? 1 : highestSeqVal + incrementBy); String newSeqId = sequencedIdPrefix + UtilFormatOut.formatPaddedNumber(seqValToUse, numericPadding); value.set(seqFieldName, newSeqId); Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java Tue Aug 7 07:30:43 2018 @@ -478,7 +478,7 @@ public class GenericEntity implements Ma try { int fieldType = SqlJdbcUtil.getType(type.getJavaType()); if (fieldType != 10) { - value = ((Boolean) value).booleanValue() ? "Y" : "N"; + value = (Boolean) value ? "Y" : "N"; } } catch (GenericNotImplementedException e) { throw new IllegalArgumentException(e.getMessage()); @@ -738,7 +738,7 @@ public class GenericEntity implements Ma // this "hack" is needed for now until the Double/BigDecimal issues are all resolved Object value = get(name); if (value instanceof BigDecimal) { - return Double.valueOf(((BigDecimal) value).doubleValue()); + return ((BigDecimal) value).doubleValue(); } return (Double) value; } @@ -748,7 +748,7 @@ public class GenericEntity implements Ma // NOTE: for things to generally work properly BigDecimal should really be used as the java-type in the field type def XML files Object value = get(name); if (value instanceof Double) { - return new BigDecimal(((Double) value).doubleValue()); + return new BigDecimal((Double) value); } return (BigDecimal) value; } @@ -967,7 +967,7 @@ public class GenericEntity implements Ma } Iterator<ModelField> iter = null; if (pks != null) { - if (pks.booleanValue()) { + if (pks) { iter = this.getModelEntity().getPksIterator(); } else { iter = this.getModelEntity().getNopksIterator(); Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java Tue Aug 7 07:30:43 2018 @@ -137,7 +137,7 @@ public abstract class EntityComparisonOp public abstract boolean compare(L lhs, R rhs); public Boolean eval(Delegator delegator, Map<String, ? extends Object> map, L lhs, R rhs) { - return Boolean.valueOf(mapMatches(delegator, map, lhs, rhs)); + return mapMatches(delegator, map, lhs, rhs); } @Override Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java Tue Aug 7 07:30:43 2018 @@ -81,9 +81,9 @@ public class CursorStatement extends Abs } else if ("setCursorName".equals(method.getName())) { setCursorName((String) args[0]); } else if ("getFetchSize".equals(method.getName())) { - return Integer.valueOf(getFetchSize()); + return getFetchSize(); } else if ("setFetchSize".equals(method.getName())) { - setFetchSize(((Integer) args[0]).intValue()); + setFetchSize((Integer) args[0]); } return super.invoke(stmt, proxy, method, args); } Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java Tue Aug 7 07:30:43 2018 @@ -381,7 +381,7 @@ public abstract class JdbcValueHandler<T @Override public Boolean getValue(ResultSet rs, int columnIndex) throws SQLException { boolean value = rs.getBoolean(columnIndex); - return rs.wasNull() ? null : Boolean.valueOf(value); + return rs.wasNull() ? null : value; } @Override protected JdbcValueHandler<Boolean> newInstance(int sqlType) { @@ -523,7 +523,7 @@ public abstract class JdbcValueHandler<T @Override public Double getValue(ResultSet rs, int columnIndex) throws SQLException { double value = rs.getDouble(columnIndex); - return rs.wasNull() ? null : Double.valueOf(value); + return rs.wasNull() ? null : value; } @Override protected JdbcValueHandler<Double> newInstance(int sqlType) { @@ -549,7 +549,7 @@ public abstract class JdbcValueHandler<T @Override public Float getValue(ResultSet rs, int columnIndex) throws SQLException { float value = rs.getFloat(columnIndex); - return rs.wasNull() ? null : Float.valueOf(value); + return rs.wasNull() ? null : value; } @Override protected JdbcValueHandler<Float> newInstance(int sqlType) { @@ -575,7 +575,7 @@ public abstract class JdbcValueHandler<T @Override public Integer getValue(ResultSet rs, int columnIndex) throws SQLException { int value = rs.getInt(columnIndex); - return rs.wasNull() ? null : Integer.valueOf(value); + return rs.wasNull() ? null : value; } @Override protected JdbcValueHandler<Integer> newInstance(int sqlType) { @@ -601,7 +601,7 @@ public abstract class JdbcValueHandler<T @Override public Long getValue(ResultSet rs, int columnIndex) throws SQLException { long value = rs.getLong(columnIndex); - return rs.wasNull() ? null : Long.valueOf(value); + return rs.wasNull() ? null : value; } @Override protected JdbcValueHandler<Long> newInstance(int sqlType) { @@ -699,7 +699,7 @@ public abstract class JdbcValueHandler<T @Override public Short getValue(ResultSet rs, int columnIndex) throws SQLException { short value = rs.getShort(columnIndex); - return rs.wasNull() ? null : Short.valueOf(value); + return rs.wasNull() ? null : value; } @Override protected JdbcValueHandler<Short> newInstance(int sqlType) { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java Tue Aug 7 07:30:43 2018 @@ -631,7 +631,7 @@ public class SQLProcessor implements Aut */ public void setValue(Integer field) throws SQLException { if (field != null) { - _ps.setInt(_ind, field.intValue()); + _ps.setInt(_ind, field); } else { _ps.setNull(_ind, Types.NUMERIC); } @@ -647,7 +647,7 @@ public class SQLProcessor implements Aut */ public void setValue(Long field) throws SQLException { if (field != null) { - _ps.setLong(_ind, field.longValue()); + _ps.setLong(_ind, field); } else { _ps.setNull(_ind, Types.NUMERIC); } @@ -663,7 +663,7 @@ public class SQLProcessor implements Aut */ public void setValue(Float field) throws SQLException { if (field != null) { - _ps.setFloat(_ind, field.floatValue()); + _ps.setFloat(_ind, field); } else { _ps.setNull(_ind, Types.NUMERIC); } @@ -679,7 +679,7 @@ public class SQLProcessor implements Aut */ public void setValue(Double field) throws SQLException { if (field != null) { - _ps.setDouble(_ind, field.doubleValue()); + _ps.setDouble(_ind, field); } else { _ps.setNull(_ind, Types.NUMERIC); } @@ -711,7 +711,7 @@ public class SQLProcessor implements Aut */ public void setValue(Boolean field) throws SQLException { if (field != null) { - _ps.setBoolean(_ind, field.booleanValue()); + _ps.setBoolean(_ind, field); } else { _ps.setNull(_ind, Types.BOOLEAN); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |