You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pg...@apache.org on 2018/08/07 07:30:46 UTC
svn commit: r1837577 [5/6] - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/
applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/
applications/accounting/src/main/ja...
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java Tue Aug 7 07:30:43 2018
@@ -713,7 +713,7 @@ public final class SqlJdbcUtil {
if (rs.wasNull()) {
entity.dangerousSetNoCheckButFast(curField, null);
} else {
- entity.dangerousSetNoCheckButFast(curField, Integer.valueOf(intValue));
+ entity.dangerousSetNoCheckButFast(curField, intValue);
}
break;
@@ -722,7 +722,7 @@ public final class SqlJdbcUtil {
if (rs.wasNull()) {
entity.dangerousSetNoCheckButFast(curField, null);
} else {
- entity.dangerousSetNoCheckButFast(curField, Long.valueOf(longValue));
+ entity.dangerousSetNoCheckButFast(curField, longValue);
}
break;
@@ -731,7 +731,7 @@ public final class SqlJdbcUtil {
if (rs.wasNull()) {
entity.dangerousSetNoCheckButFast(curField, null);
} else {
- entity.dangerousSetNoCheckButFast(curField, Float.valueOf(floatValue));
+ entity.dangerousSetNoCheckButFast(curField, floatValue);
}
break;
@@ -740,7 +740,7 @@ public final class SqlJdbcUtil {
if (rs.wasNull()) {
entity.dangerousSetNoCheckButFast(curField, null);
} else {
- entity.dangerousSetNoCheckButFast(curField, Double.valueOf(doubleValue));
+ entity.dangerousSetNoCheckButFast(curField, doubleValue);
}
break;
@@ -758,7 +758,7 @@ public final class SqlJdbcUtil {
if (rs.wasNull()) {
entity.dangerousSetNoCheckButFast(curField, null);
} else {
- entity.dangerousSetNoCheckButFast(curField, Boolean.valueOf(booleanValue));
+ entity.dangerousSetNoCheckButFast(curField, booleanValue);
}
break;
}
@@ -961,7 +961,7 @@ public final class SqlJdbcUtil {
if (val == null) {
throw new GenericNotImplementedException("Java type " + fieldType + " not currently supported. Sorry.");
}
- return val.intValue();
+ return val;
}
public static void addValueSingle(StringBuffer buffer, ModelField field, Object value, List<EntityConditionParam> params) {
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java Tue Aug 7 07:30:43 2018
@@ -464,7 +464,7 @@ public class ModelViewEntity extends Mod
continue;
}
if (alias.isPk != null) {
- isPk = alias.isPk.booleanValue();
+ isPk = alias.isPk;
} else {
isPk = aliasedField.getIsPk();
}
@@ -871,7 +871,7 @@ public class ModelViewEntity extends Mod
String primKeyValue = UtilXml.checkEmpty(aliasElement.getAttribute("prim-key"));
if (UtilValidate.isNotEmpty(primKeyValue)) {
- this.isPk = Boolean.valueOf("true".equals(primKeyValue));
+ this.isPk = "true".equals(primKeyValue);
} else {
this.isPk = null;
}
@@ -903,7 +903,7 @@ public class ModelViewEntity extends Mod
this.colAlias = UtilXml.checkEmpty(colAlias, ModelUtil.javaNameToDbName(UtilXml.checkEmpty(this.name)));
this.isPk = isPk;
if (groupBy != null) {
- this.groupBy = groupBy.booleanValue();
+ this.groupBy = groupBy;
} else {
this.groupBy = false;
}
@@ -1141,7 +1141,7 @@ public class ModelViewEntity extends Mod
this.entityAlias = entityAlias;
this.relEntityAlias = relEntityAlias;
if (relOptional != null) {
- this.relOptional = relOptional.booleanValue();
+ this.relOptional = relOptional;
} else {
this.relOptional = false;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java Tue Aug 7 07:30:43 2018
@@ -388,7 +388,7 @@ public class EntityTestSuite extends Ent
testing.put("testingName", "leaf-#" + node.getString("testingNodeId"));
testing.put("description", "level1 leaf");
testing.put("comments", "No-comments");
- testing.put("testingSize", Long.valueOf(10));
+ testing.put("testingSize", 10L);
testing.put("testingDate", now);
newValues.add(testing);
@@ -484,15 +484,15 @@ public class EntityTestSuite extends Ent
testValue = EntityQuery.use(delegator).from("TestingType").where("testingTypeId", "TEST-DISTINCT-1").cache(true).queryOne();
assertNotNull("Found newly created type value", testValue);
- delegator.create("Testing", "testingId", "TEST-DISTINCT-1", "testingTypeId", "TEST-DISTINCT-1", "testingSize", Long.valueOf(10), "comments", "No-comments");
- delegator.create("Testing", "testingId", "TEST-DISTINCT-2", "testingTypeId", "TEST-DISTINCT-1", "testingSize", Long.valueOf(10), "comments", "Some-comments");
- delegator.create("Testing", "testingId", "TEST-DISTINCT-3", "testingTypeId", "TEST-DISTINCT-1", "testingSize", Long.valueOf(9), "comments", "No-comments");
- delegator.create("Testing", "testingId", "TEST-DISTINCT-4", "testingTypeId", "TEST-DISTINCT-1", "testingSize", Long.valueOf(11), "comments", "Some-comments");
+ delegator.create("Testing", "testingId", "TEST-DISTINCT-1", "testingTypeId", "TEST-DISTINCT-1", "testingSize", 10L, "comments", "No-comments");
+ delegator.create("Testing", "testingId", "TEST-DISTINCT-2", "testingTypeId", "TEST-DISTINCT-1", "testingSize", 10L, "comments", "Some-comments");
+ delegator.create("Testing", "testingId", "TEST-DISTINCT-3", "testingTypeId", "TEST-DISTINCT-1", "testingSize", 9L, "comments", "No-comments");
+ delegator.create("Testing", "testingId", "TEST-DISTINCT-4", "testingTypeId", "TEST-DISTINCT-1", "testingSize", 11L, "comments", "Some-comments");
List<GenericValue> testingSize10 = EntityQuery.use(delegator)
.select("testingSize", "comments")
.from("Testing")
- .where("testingSize", Long.valueOf(10), "comments", "No-comments")
+ .where("testingSize", 10L, "comments", "No-comments")
.distinct()
.cache()
.queryList();
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java Tue Aug 7 07:30:43 2018
@@ -159,7 +159,7 @@ public abstract class GenericXaResource
* @see javax.transaction.xa.XAResource#getTransactionTimeout()
*/
public int getTransactionTimeout() throws XAException {
- return this.timeout == null ? 0 : this.timeout.intValue();
+ return this.timeout == null ? 0 : this.timeout;
}
/**
@@ -167,7 +167,7 @@ public abstract class GenericXaResource
* Note: the valus is saved but in the current implementation this is not used.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
- this.timeout = (seconds == 0 ? null : Integer.valueOf(seconds));
+ this.timeout = (seconds == 0 ? null : seconds);
return true;
}
@@ -205,7 +205,7 @@ public abstract class GenericXaResource
try {
if (timeout != null) {
// sleep until the transaction times out
- sleep(timeout.intValue() * 1000L);
+ sleep(timeout * 1000L);
if (active) {
// get the current status
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java Tue Aug 7 07:30:43 2018
@@ -487,7 +487,7 @@ public class EntityListIterator implemen
if (resultSize == null) {
resultSize = (int) getResultSize();
}
- return resultSize.intValue();
+ return resultSize;
}
return this.last() ? this.currentIndex() : 0;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java Tue Aug 7 07:30:43 2018
@@ -174,7 +174,7 @@ public class EntityCacheServices impleme
Delegator delegator = dctx.getDelegator();
Boolean distributeBool = (Boolean) context.get("distribute");
boolean distribute = false;
- if (distributeBool != null) distribute = distributeBool.booleanValue();
+ if (distributeBool != null) distribute = distributeBool;
delegator.clearAllCaches(distribute);
@@ -191,7 +191,7 @@ public class EntityCacheServices impleme
Delegator delegator = dctx.getDelegator();
Boolean distributeBool = (Boolean) context.get("distribute");
boolean distribute = false;
- if (distributeBool != null) distribute = distributeBool.booleanValue();
+ if (distributeBool != null) distribute = distributeBool;
if (context.containsKey("value")) {
GenericValue value = (GenericValue) context.get("value");
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java Tue Aug 7 07:30:43 2018
@@ -162,7 +162,7 @@ public class EntityDataServices {
Debug.logInfo("Imported/Updated [" + records + "] from : " + file.getAbsolutePath() + " [" + runTime + "ms]", module);
Map<String, Object> result = ServiceUtil.returnSuccess();
- result.put("records", Integer.valueOf(records));
+ result.put("records", records);
return result;
}
@@ -374,7 +374,7 @@ public class EntityDataServices {
}
// step 5 - repair field sizes
- if (fixSizes.booleanValue()) {
+ if (fixSizes) {
Debug.logImportant("Updating column field size changes", module);
List<String> fieldsWrongSize = new LinkedList<String>();
dbUtil.checkDb(modelEntities, fieldsWrongSize, messages, true, true, true, true);
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java Tue Aug 7 07:30:43 2018
@@ -91,7 +91,7 @@ public final class EntityEcaCondition im
} else {
conditionReply = (Boolean) conditionServiceResult.get("conditionReply");
}
- return conditionReply.booleanValue();
+ return conditionReply;
} catch (GenericServiceException gse) {
throw new GenericEntityException("Error in calling condition service "+conditionService+". "+gse.getMessage());
}
@@ -119,7 +119,7 @@ public final class EntityEcaCondition im
}
}
if (cond != null) {
- return cond.booleanValue();
+ return cond;
} else {
return false;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java Tue Aug 7 07:30:43 2018
@@ -78,7 +78,7 @@ public final class EntityEcaSetField {
return s.toLowerCase();
}
if ("hash-code".equalsIgnoreCase(format)) {
- return Integer.valueOf(s.hashCode());
+ return s.hashCode();
}
if ("long".equalsIgnoreCase(format)) {
return Long.valueOf(s);
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java Tue Aug 7 07:30:43 2018
@@ -1054,7 +1054,7 @@ public class EntityPermissionChecker {
public String dumpAsText() {
List<String> fieldNames = UtilMisc.toList("roleFieldName", "auxiliaryFieldName", "statusFieldName");
- Map<String, Integer> widths = UtilMisc.toMap("roleFieldName", Integer.valueOf(24), "auxiliaryFieldName", Integer.valueOf(24), "statusFieldName", Integer.valueOf(24));
+ Map<String, Integer> widths = UtilMisc.toMap("roleFieldName", 24, "auxiliaryFieldName", 24, "statusFieldName", 24);
StringBuilder buf = new StringBuilder();
Integer wid = null;
@@ -1066,13 +1066,13 @@ public class EntityPermissionChecker {
for (String fld: fieldNames) {
wid = widths.get(fld);
buf.append(fld);
- for (int i=0; i < (wid.intValue() - fld.length()); i++) buf.append("^");
+ for (int i = 0; i < (wid - fld.length()); i++) buf.append("^");
buf.append(" ");
}
buf.append("\n");
for (String fld: fieldNames) {
wid = widths.get(fld);
- for (int i=0; i < wid.intValue(); i++) buf.append("-");
+ for (int i = 0; i < wid; i++) buf.append("-");
buf.append(" ");
}
buf.append("\n");
@@ -1095,7 +1095,7 @@ public class EntityPermissionChecker {
}
wid = widths.get("roleFieldName");
buf.append(roleTypeId);
- for (int i=0; i < (wid.intValue() - roleTypeId.length()); i++) buf.append("^");
+ for (int i = 0; i < (wid - roleTypeId.length()); i++) buf.append("^");
buf.append(" ");
String auxiliaryFieldValue = contentPurposeOperation.getString(this.auxiliaryFieldName);
@@ -1104,7 +1104,7 @@ public class EntityPermissionChecker {
}
wid = widths.get("auxiliaryFieldName");
buf.append(auxiliaryFieldValue);
- for (int i=0; i < (wid.intValue() - auxiliaryFieldValue.length()); i++) buf.append("^");
+ for (int i = 0; i < (wid - auxiliaryFieldValue.length()); i++) buf.append("^");
buf.append(" ");
String statusId = contentPurposeOperation.getString(this.statusFieldName);
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java Tue Aug 7 07:30:43 2018
@@ -266,7 +266,7 @@ public class EntitySyncContext {
long splitMillis = defaultSyncSplitMillis;
Long syncSplitMillis = entitySync.getLong("syncSplitMillis");
if (syncSplitMillis != null) {
- splitMillis = syncSplitMillis.longValue();
+ splitMillis = syncSplitMillis;
}
return splitMillis;
}
@@ -275,7 +275,7 @@ public class EntitySyncContext {
long splitMillis = defaultOfflineSyncSplitMillis;
Long syncSplitMillis = entitySync.getLong("offlineSyncSplitMillis");
if (syncSplitMillis != null) {
- splitMillis = syncSplitMillis.longValue();
+ splitMillis = syncSplitMillis;
}
return splitMillis;
}
@@ -284,7 +284,7 @@ public class EntitySyncContext {
long syncEndBufferMillis = defaultSyncEndBufferMillis;
Long syncEndBufferMillisLong = entitySync.getLong("syncEndBufferMillis");
if (syncEndBufferMillisLong != null) {
- syncEndBufferMillis = syncEndBufferMillisLong.longValue();
+ syncEndBufferMillis = syncEndBufferMillisLong;
}
return syncEndBufferMillis;
}
@@ -293,7 +293,7 @@ public class EntitySyncContext {
long maxRunningNoUpdateMillis = defaultMaxRunningNoUpdateMillis;
Long maxRunningNoUpdateMillisLong = entitySync.getLong("maxRunningNoUpdateMillis");
if (maxRunningNoUpdateMillisLong != null) {
- maxRunningNoUpdateMillis = maxRunningNoUpdateMillisLong.longValue();
+ maxRunningNoUpdateMillis = maxRunningNoUpdateMillisLong;
}
return maxRunningNoUpdateMillis;
}
@@ -771,26 +771,26 @@ public class EntitySyncContext {
// store result of service call on history with results so far, should run in own tx
Map<String, Object> updateHistoryMap = UtilMisc.toMap("entitySyncId", entitySyncId, "startDate", startDate,
"lastSuccessfulSynchTime", this.currentRunEndTime, "lastCandidateEndTime", this.getNextRunEndTime(),
- "lastSplitStartTime", Long.valueOf(this.splitStartTime));
- updateHistoryMap.put("toCreateInserted", Long.valueOf(toCreateInserted));
- updateHistoryMap.put("toCreateUpdated", Long.valueOf(toCreateUpdated));
- updateHistoryMap.put("toCreateNotUpdated", Long.valueOf(toCreateNotUpdated));
- updateHistoryMap.put("toStoreInserted", Long.valueOf(toStoreInserted));
- updateHistoryMap.put("toStoreUpdated", Long.valueOf(toStoreUpdated));
- updateHistoryMap.put("toStoreNotUpdated", Long.valueOf(toStoreNotUpdated));
- updateHistoryMap.put("toRemoveDeleted", Long.valueOf(toRemoveDeleted));
- updateHistoryMap.put("toRemoveAlreadyDeleted", Long.valueOf(toRemoveAlreadyDeleted));
- updateHistoryMap.put("runningTimeMillis", Long.valueOf(runningTimeMillis));
- updateHistoryMap.put("totalStoreCalls", Long.valueOf(totalStoreCalls));
- updateHistoryMap.put("totalSplits", Long.valueOf(totalSplits));
- updateHistoryMap.put("totalRowsExported", Long.valueOf(totalRowsExported));
- updateHistoryMap.put("totalRowsToCreate", Long.valueOf(totalRowsToCreate));
- updateHistoryMap.put("totalRowsToStore", Long.valueOf(totalRowsToStore));
- updateHistoryMap.put("totalRowsToRemove", Long.valueOf(totalRowsToRemove));
- updateHistoryMap.put("perSplitMinMillis", Long.valueOf(perSplitMinMillis));
- updateHistoryMap.put("perSplitMaxMillis", Long.valueOf(perSplitMaxMillis));
- updateHistoryMap.put("perSplitMinItems", Long.valueOf(perSplitMinItems));
- updateHistoryMap.put("perSplitMaxItems", Long.valueOf(perSplitMaxItems));
+ "lastSplitStartTime", this.splitStartTime);
+ updateHistoryMap.put("toCreateInserted", toCreateInserted);
+ updateHistoryMap.put("toCreateUpdated", toCreateUpdated);
+ updateHistoryMap.put("toCreateNotUpdated", toCreateNotUpdated);
+ updateHistoryMap.put("toStoreInserted", toStoreInserted);
+ updateHistoryMap.put("toStoreUpdated", toStoreUpdated);
+ updateHistoryMap.put("toStoreNotUpdated", toStoreNotUpdated);
+ updateHistoryMap.put("toRemoveDeleted", toRemoveDeleted);
+ updateHistoryMap.put("toRemoveAlreadyDeleted", toRemoveAlreadyDeleted);
+ updateHistoryMap.put("runningTimeMillis", runningTimeMillis);
+ updateHistoryMap.put("totalStoreCalls", totalStoreCalls);
+ updateHistoryMap.put("totalSplits", totalSplits);
+ updateHistoryMap.put("totalRowsExported", totalRowsExported);
+ updateHistoryMap.put("totalRowsToCreate", totalRowsToCreate);
+ updateHistoryMap.put("totalRowsToStore", totalRowsToStore);
+ updateHistoryMap.put("totalRowsToRemove", totalRowsToRemove);
+ updateHistoryMap.put("perSplitMinMillis", perSplitMinMillis);
+ updateHistoryMap.put("perSplitMaxMillis", perSplitMaxMillis);
+ updateHistoryMap.put("perSplitMinItems", perSplitMinItems);
+ updateHistoryMap.put("perSplitMaxItems", perSplitMaxItems);
updateHistoryMap.put("userLogin", userLogin);
Map<String, Object> updateEsHistRunResult = dispatcher.runSync("updateEntitySyncHistory", updateHistoryMap);
@@ -984,14 +984,14 @@ public class EntitySyncContext {
this.totalStoreCalls++;
- long toCreateInsertedCur = remoteStoreResult.get("toCreateInserted") == null ? 0 : ((Long) remoteStoreResult.get("toCreateInserted")).longValue();
- long toCreateUpdatedCur = remoteStoreResult.get("toCreateUpdated") == null ? 0 : ((Long) remoteStoreResult.get("toCreateUpdated")).longValue();
- long toCreateNotUpdatedCur = remoteStoreResult.get("toCreateNotUpdated") == null ? 0 : ((Long) remoteStoreResult.get("toCreateNotUpdated")).longValue();
- long toStoreInsertedCur = remoteStoreResult.get("toStoreInserted") == null ? 0 : ((Long) remoteStoreResult.get("toStoreInserted")).longValue();
- long toStoreUpdatedCur = remoteStoreResult.get("toStoreUpdated") == null ? 0 : ((Long) remoteStoreResult.get("toStoreUpdated")).longValue();
- long toStoreNotUpdatedCur = remoteStoreResult.get("toStoreNotUpdated") == null ? 0 : ((Long) remoteStoreResult.get("toStoreNotUpdated")).longValue();
- long toRemoveDeletedCur = remoteStoreResult.get("toRemoveDeleted") == null ? 0 : ((Long) remoteStoreResult.get("toRemoveDeleted")).longValue();
- long toRemoveAlreadyDeletedCur = remoteStoreResult.get("toRemoveAlreadyDeleted") == null ? 0 : ((Long) remoteStoreResult.get("toRemoveAlreadyDeleted")).longValue();
+ long toCreateInsertedCur = remoteStoreResult.get("toCreateInserted") == null ? 0 : (Long) remoteStoreResult.get("toCreateInserted");
+ long toCreateUpdatedCur = remoteStoreResult.get("toCreateUpdated") == null ? 0 : (Long) remoteStoreResult.get("toCreateUpdated");
+ long toCreateNotUpdatedCur = remoteStoreResult.get("toCreateNotUpdated") == null ? 0 : (Long) remoteStoreResult.get("toCreateNotUpdated");
+ long toStoreInsertedCur = remoteStoreResult.get("toStoreInserted") == null ? 0 : (Long) remoteStoreResult.get("toStoreInserted");
+ long toStoreUpdatedCur = remoteStoreResult.get("toStoreUpdated") == null ? 0 : (Long) remoteStoreResult.get("toStoreUpdated");
+ long toStoreNotUpdatedCur = remoteStoreResult.get("toStoreNotUpdated") == null ? 0 : (Long) remoteStoreResult.get("toStoreNotUpdated");
+ long toRemoveDeletedCur = remoteStoreResult.get("toRemoveDeleted") == null ? 0 : (Long) remoteStoreResult.get("toRemoveDeleted");
+ long toRemoveAlreadyDeletedCur = remoteStoreResult.get("toRemoveAlreadyDeleted") == null ? 0 : (Long) remoteStoreResult.get("toRemoveAlreadyDeleted");
this.toCreateInserted += toCreateInsertedCur;
this.toCreateUpdated += toCreateUpdatedCur;
Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java Tue Aug 7 07:30:43 2018
@@ -240,14 +240,14 @@ public class EntitySyncServices {
}
Map<String, Object> result = ServiceUtil.returnSuccess();
- result.put("toCreateInserted", Long.valueOf(toCreateInserted));
- result.put("toCreateUpdated", Long.valueOf(toCreateUpdated));
- result.put("toCreateNotUpdated", Long.valueOf(toCreateNotUpdated));
- result.put("toStoreInserted", Long.valueOf(toStoreInserted));
- result.put("toStoreUpdated", Long.valueOf(toStoreUpdated));
- result.put("toStoreNotUpdated", Long.valueOf(toStoreNotUpdated));
- result.put("toRemoveDeleted", Long.valueOf(toRemoveDeleted));
- result.put("toRemoveAlreadyDeleted", Long.valueOf(toRemoveAlreadyDeleted));
+ result.put("toCreateInserted", toCreateInserted);
+ result.put("toCreateUpdated", toCreateUpdated);
+ result.put("toCreateNotUpdated", toCreateNotUpdated);
+ result.put("toStoreInserted", toStoreInserted);
+ result.put("toStoreUpdated", toStoreUpdated);
+ result.put("toStoreNotUpdated", toStoreNotUpdated);
+ result.put("toRemoveDeleted", toRemoveDeleted);
+ result.put("toRemoveAlreadyDeleted", toRemoveAlreadyDeleted);
if (Debug.infoOn()) Debug.logInfo("Finisching storeEntitySyncData (" + entitySyncId + ") - [" + keysToRemove.size() + "] to remove. Actually removed: " + toRemoveDeleted + " already removed: " + toRemoveAlreadyDeleted, module);
return result;
} catch (GenericEntityException e) {
@@ -609,7 +609,7 @@ public class EntitySyncServices {
for (GenericValue entitySyncRemove: entitySyncRemoveList) {
Double curKrih = entitySyncRemove.getDouble("keepRemoveInfoHours");
if (curKrih != null) {
- double curKrihVal = curKrih.doubleValue();
+ double curKrihVal = curKrih;
if (curKrihVal > keepRemoveInfoHours) {
keepRemoveInfoHours = curKrihVal;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java Tue Aug 7 07:30:43 2018
@@ -93,7 +93,7 @@ public final class ValidateMethodConditi
Class<?> valClass = methodContext.getLoader().loadClass(className);
Method valMethod = valClass.getMethod(methodName, paramTypes);
Boolean resultBool = (Boolean) valMethod.invoke(null, params);
- return resultBool.booleanValue();
+ return resultBool;
} catch (Exception e) {
throw new MiniLangRuntimeException(e, this);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java Tue Aug 7 07:30:43 2018
@@ -55,7 +55,7 @@ public final class TransactionCommit ext
boolean beganTransaction = false;
Boolean beganTransactionBoolean = beganTransactionFma.get(methodContext.getEnvMap());
if (beganTransactionBoolean != null) {
- beganTransaction = beganTransactionBoolean.booleanValue();
+ beganTransaction = beganTransactionBoolean;
}
try {
TransactionUtil.commit(beganTransaction);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java Tue Aug 7 07:30:43 2018
@@ -55,7 +55,7 @@ public final class TransactionRollback e
boolean beganTransaction = false;
Boolean beganTransactionBoolean = beganTransactionFma.get(methodContext.getEnvMap());
if (beganTransactionBoolean != null) {
- beganTransaction = beganTransactionBoolean.booleanValue();
+ beganTransaction = beganTransactionBoolean;
}
try {
TransactionUtil.rollback(beganTransaction, "Explicit rollback in simple-method [" + this.simpleMethod.getShortDescription() + "]", null);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java Tue Aug 7 07:30:43 2018
@@ -78,7 +78,7 @@ public final class ToString extends Meth
throw new MiniLangRuntimeException("Exception thrown while converting field to a string: " + e.getMessage(), this);
}
if (this.numericPadding != null) {
- value = StringUtil.padNumberString(value.toString(), this.numericPadding.intValue());
+ value = StringUtil.padNumberString(value.toString(), this.numericPadding);
}
fieldFma.put(methodContext.getEnvMap(), value);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java Tue Aug 7 07:30:43 2018
@@ -129,7 +129,7 @@ public final class Calculate extends Met
String decimalScaleString = decimalScaleFse.expandString(methodContext.getEnvMap());
int decimalScale = 2;
if (!decimalScaleString.isEmpty()) {
- decimalScale = Integer.valueOf(decimalScaleString).intValue();
+ decimalScale = Integer.valueOf(decimalScaleString);
}
BigDecimal resultValue = BigDecimal.ZERO.setScale(decimalScale, roundingMode);
for (Calculate.SubCalc calcop : calcops) {
@@ -139,18 +139,18 @@ public final class Calculate extends Met
Object resultObj = null;
switch (type) {
case TYPE_DOUBLE:
- resultObj = Double.valueOf(resultValue.doubleValue());
+ resultObj = resultValue.doubleValue();
break;
case TYPE_FLOAT:
- resultObj = Float.valueOf(resultValue.floatValue());
+ resultObj = resultValue.floatValue();
break;
case TYPE_LONG:
resultValue = resultValue.setScale(0, roundingMode);
- resultObj = Long.valueOf(resultValue.longValue());
+ resultObj = resultValue.longValue();
break;
case TYPE_INTEGER:
resultValue = resultValue.setScale(0, roundingMode);
- resultObj = Integer.valueOf(resultValue.intValue());
+ resultObj = resultValue.intValue();
break;
case TYPE_STRING:
// run the decimal-formatting
@@ -260,11 +260,11 @@ public final class Calculate extends Met
Object fieldObj = fieldFma.get(methodContext.getEnvMap());
if (fieldObj != null) {
if (fieldObj instanceof Double) {
- resultValue = new BigDecimal(((Double) fieldObj).doubleValue());
+ resultValue = new BigDecimal((Double) fieldObj);
} else if (fieldObj instanceof Long) {
- resultValue = BigDecimal.valueOf(((Long) fieldObj).longValue());
+ resultValue = BigDecimal.valueOf((Long) fieldObj);
} else if (fieldObj instanceof Float) {
- resultValue = new BigDecimal(((Float) fieldObj).floatValue());
+ resultValue = new BigDecimal((Float) fieldObj);
} else if (fieldObj instanceof Integer) {
resultValue = BigDecimal.valueOf(((Integer) fieldObj).longValue());
} else if (fieldObj instanceof String) {
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java Tue Aug 7 07:30:43 2018
@@ -60,7 +60,7 @@ public final class Log extends MethodOpe
MiniLangValidate.handleError("Invalid level attribute", simpleMethod, element);
this.level = Debug.INFO;
} else {
- this.level = levelInt.intValue();
+ this.level = levelInt;
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java Tue Aug 7 07:30:43 2018
@@ -53,7 +53,7 @@ public final class Trace extends MethodO
MiniLangValidate.handleError("Invalid level attribute", simpleMethod, element);
this.level = Debug.INFO;
} else {
- this.level = levelInt.intValue();
+ this.level = levelInt;
}
methodOperations = Collections.unmodifiableList(SimpleMethod.readOperations(element, simpleMethod));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java Tue Aug 7 07:30:43 2018
@@ -47,7 +47,7 @@ public abstract class BaseCompare extend
public void doCompare(Object value1, Object value2, List<Object> messages, Locale locale, ClassLoader loader, boolean value2InlineConstant) {
Boolean success = BaseCompare.doRealCompare(value1, value2, this.operator, this.type, this.format, messages, locale, loader, value2InlineConstant);
- if (success != null && success.booleanValue() == false) {
+ if (success != null && success == false) {
addMessage(messages, loader, locale);
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java Tue Aug 7 07:30:43 2018
@@ -88,7 +88,7 @@ public class ValidateMethod extends Simp
Debug.logError("[ValidateMethod.exec] " + msg, module);
return;
}
- if (!resultBool.booleanValue()) {
+ if (!resultBool) {
addMessage(messages, loader, locale);
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java Tue Aug 7 07:30:43 2018
@@ -122,6 +122,6 @@ public class ModelPermission implements
Debug.logError(failMessage, module);
return false;
}
- return ((Boolean) resp.get("hasPermission")).booleanValue();
+ return (Boolean) resp.get("hasPermission");
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Tue Aug 7 07:30:43 2018
@@ -804,7 +804,7 @@ public class ModelService extends Abstra
throw new GeneralException("Unable to run validation method [" + vali.getMethodName() + "] in class [" + vali.getClassName() + "]");
}
- return resultBool.booleanValue();
+ return resultBool;
}
/**
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java Tue Aug 7 07:30:43 2018
@@ -936,7 +936,7 @@ public class ServiceDispatcher {
if (hasPermission == null) {
throw new ServiceAuthException("ERROR: the permission-service [" + origService.permissionServiceName + "] did not return a result. Not running the service [" + origService.name + "]");
}
- if (hasPermission.booleanValue()) {
+ if (hasPermission) {
context.putAll(permResp);
context = origService.makeValid(context, ModelService.IN_PARAM);
} else {
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java Tue Aug 7 07:30:43 2018
@@ -612,7 +612,7 @@ public final class ServiceUtil {
try {
job = EntityQuery.use(delegator).from("JobSandbox").where("jobId", jobId).queryOne();
if (job != null) {
- job.set("maxRetry", Long.valueOf(0));
+ job.set("maxRetry", 0L);
job.store();
}
} catch (GenericEntityException e) {
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java Tue Aug 7 07:30:43 2018
@@ -147,7 +147,7 @@ public class RecurrenceInfo {
/** Returns the current count of this recurrence. */
public long getCurrentCount() {
if (info.get("recurrenceCount") != null) {
- return info.getLong("recurrenceCount").longValue();
+ return info.getLong("recurrenceCount");
}
return 0;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java Tue Aug 7 07:30:43 2018
@@ -123,7 +123,7 @@ public class RecurrenceRule {
if (!checkFreq(freq)) {
throw new RecurrenceRuleException("Recurrence FREQUENCY is a required parameter.");
}
- if (rule.getLong("intervalNumber").longValue() < 1) {
+ if (rule.getLong("intervalNumber") < 1) {
throw new RecurrenceRuleException("Recurrence INTERVAL must be a positive integer.");
}
@@ -198,7 +198,7 @@ public class RecurrenceRule {
*/
public long getCount() {
if (rule.get("countNumber") != null) {
- return rule.getLong("countNumber").longValue();
+ return rule.getLong("countNumber");
}
return 0;
}
@@ -253,7 +253,7 @@ public class RecurrenceRule {
if (rule.get("intervalNumber") == null) {
return 1;
}
- return rule.getLong("intervalNumber").longValue();
+ return rule.getLong("intervalNumber");
}
/**
@@ -823,8 +823,8 @@ public class RecurrenceRule {
GenericValue value = delegator.makeValue("RecurrenceRule");
value.set("frequency", freqStr);
- value.set("intervalNumber", Long.valueOf(interval));
- value.set("countNumber", Long.valueOf(count));
+ value.set("intervalNumber", (long) interval);
+ value.set("countNumber", (long) count);
if (endTime > 0) {
value.set("untilDateTime", new java.sql.Timestamp(endTime));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java Tue Aug 7 07:30:43 2018
@@ -127,7 +127,7 @@ public class ServiceEcaCondition impleme
} else {
conditionReply = (Boolean) conditionServiceResult.get("conditionReply");
}
- return conditionReply.booleanValue();
+ return conditionReply;
}
Object lhsValue = null;
@@ -185,7 +185,7 @@ public class ServiceEcaCondition impleme
}
}
if (cond != null) {
- return cond.booleanValue();
+ return cond;
} else {
Debug.logWarning("doRealCompare returned null, returning false", module);
return false;
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java Tue Aug 7 07:30:43 2018
@@ -113,7 +113,7 @@ public class ServiceEcaSetField {
return s.toLowerCase(Locale.getDefault());
}
if ("hash-code".equalsIgnoreCase(format)) {
- return Integer.valueOf(s.hashCode());
+ return s.hashCode();
}
if ("long".equalsIgnoreCase(format)) {
return Long.valueOf(s);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java Tue Aug 7 07:30:43 2018
@@ -110,7 +110,7 @@ public abstract class GenericAsyncEngine
jFields.put("statusId", "SERVICE_PENDING");
jFields.put("serviceName", modelService.name);
jFields.put("loaderName", localName);
- jFields.put("maxRetry", Long.valueOf(modelService.maxRetry));
+ jFields.put("maxRetry", (long) modelService.maxRetry);
jFields.put("runtimeDataId", dataId);
if (UtilValidate.isNotEmpty(authUserLoginId)) {
jFields.put("authUserLoginId", authUserLoginId);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java Tue Aug 7 07:30:43 2018
@@ -560,8 +560,8 @@ public final class JobManager {
// set the loader name
jFields.put("loaderName", delegator.getDelegatorName());
// set the max retry
- jFields.put("maxRetry", Long.valueOf(maxRetry));
- jFields.put("currentRetryCount", Long.valueOf(0));
+ jFields.put("maxRetry", (long) maxRetry);
+ jFields.put("currentRetryCount", 0L);
// create the value and store
GenericValue jobV;
try {
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java Tue Aug 7 07:30:43 2018
@@ -80,10 +80,10 @@ public class PersistedServiceJob extends
this.jobValue = jobValue;
Timestamp storedDate = jobValue.getTimestamp("runTime");
this.startTime = storedDate.getTime();
- this.maxRetry = jobValue.get("maxRetry") != null ? jobValue.getLong("maxRetry").longValue() : -1;
+ this.maxRetry = jobValue.get("maxRetry") != null ? jobValue.getLong("maxRetry") : -1;
Long retryCount = jobValue.getLong("currentRetryCount");
if (retryCount != null) {
- this.currentRetryCount = retryCount.longValue();
+ this.currentRetryCount = retryCount;
} else {
// backward compatibility
this.currentRetryCount = getRetries(this.delegator);
@@ -161,10 +161,10 @@ public class PersistedServiceJob extends
}
}
if (jobValue.get("maxRecurrenceCount") != null) {
- maxRecurrenceCount = jobValue.getLong("maxRecurrenceCount").longValue();
+ maxRecurrenceCount = jobValue.getLong("maxRecurrenceCount");
}
if (jobValue.get("currentRecurrenceCount") != null) {
- currentRecurrenceCount = jobValue.getLong("currentRecurrenceCount").longValue();
+ currentRecurrenceCount = jobValue.getLong("currentRecurrenceCount");
}
if (maxRecurrenceCount != -1) {
currentRecurrenceCount++;
@@ -206,9 +206,9 @@ public class PersistedServiceJob extends
newJob.set("runByInstanceId", null);
newJob.set("runTime", new java.sql.Timestamp(next));
if (isRetryOnFailure) {
- newJob.set("currentRetryCount", Long.valueOf(currentRetryCount + 1));
+ newJob.set("currentRetryCount", currentRetryCount + 1);
} else {
- newJob.set("currentRetryCount", Long.valueOf(0));
+ newJob.set("currentRetryCount", 0L);
}
nextRecurrence = next;
delegator.createSetNextSeqId(newJob);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java Tue Aug 7 07:30:43 2018
@@ -100,7 +100,7 @@ public class ServiceMcaCondition impleme
if (reply == null) {
reply = Boolean.FALSE;
}
- return reply.booleanValue();
+ return reply;
} else if (headerName != null) {
// compare the header field
MimeMessage message = messageWrapper.getMessage();
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Tue Aug 7 07:30:43 2018
@@ -595,7 +595,7 @@ public class LoginWorker {
} catch (GenericServiceException e) {
Debug.logError(e, "Error getting user preference", module);
}
- session.setAttribute("javaScriptEnabled", Boolean.valueOf("Y".equals(javaScriptEnabled)));
+ session.setAttribute("javaScriptEnabled", "Y".equals(javaScriptEnabled));
//init theme from user preference, clean the current visualTheme value in session and restart the resolution
UtilHttp.setVisualTheme(session, null);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java Tue Aug 7 07:30:43 2018
@@ -45,7 +45,7 @@ public final class ProtectViewWorker {
private static final String resourceWebapp = "WebappUiLabels";
private static final Map<String, Long> hitsByViewAccessed = new ConcurrentHashMap<String, Long>();
private static final Map<String, Long> durationByViewAccessed = new ConcurrentHashMap<String, Long>();
- private static final Long one = new Long(1);
+ private static final Long one = 1L;
private ProtectViewWorker () {}
@@ -89,7 +89,7 @@ public final class ProtectViewWorker {
if (now < tarpitReleaseDateTime) {
String tarpittedMessage = UtilProperties.getMessage(resourceWebapp, "protectedviewevents.tarpitted_message", UtilHttp.getLocale(request));
// reset since now protected by the tarpit duration
- hitsByViewAccessed.put(viewNameUserLoginId, new Long(0));
+ hitsByViewAccessed.put(viewNameUserLoginId, 0L);
return ":_protect_:" + tarpittedMessage;
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java Tue Aug 7 07:30:43 2018
@@ -126,13 +126,13 @@ public class CoreEvents {
// the frequency map
Map<String, Integer> freqMap = new HashMap<String, Integer>();
- freqMap.put("SECONDLY", Integer.valueOf(1));
- freqMap.put("MINUTELY", Integer.valueOf(2));
- freqMap.put("HOURLY", Integer.valueOf(3));
- freqMap.put("DAILY", Integer.valueOf(4));
- freqMap.put("WEEKLY", Integer.valueOf(5));
- freqMap.put("MONTHLY", Integer.valueOf(6));
- freqMap.put("YEARLY", Integer.valueOf(7));
+ freqMap.put("SECONDLY", 1);
+ freqMap.put("MINUTELY", 2);
+ freqMap.put("HOURLY", 3);
+ freqMap.put("DAILY", 4);
+ freqMap.put("WEEKLY", 5);
+ freqMap.put("MONTHLY", 6);
+ freqMap.put("YEARLY", 7);
// some defaults
long startTime = (new Date()).getTime();
@@ -282,7 +282,7 @@ public class CoreEvents {
String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.invalid_format_frequency", locale);
errorBuf.append(errMsg);
} else {
- frequency = freqMap.get(serviceFreq.toUpperCase()).intValue();
+ frequency = freqMap.get(serviceFreq.toUpperCase());
}
}
}
@@ -479,7 +479,7 @@ public class CoreEvents {
// load the file
File file = new File(filePath);
if (file.exists()) {
- Long longLen = Long.valueOf(file.length());
+ Long longLen = file.length();
int length = longLen.intValue();
try {
FileInputStream fis = new FileInputStream(file);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java Tue Aug 7 07:30:43 2018
@@ -222,7 +222,7 @@ public class ServiceEventHandler impleme
}
}
multiPartMap.put(fieldName, ByteBuffer.wrap(item.get()));
- multiPartMap.put("_" + fieldName + "_size", Long.valueOf(item.getSize()));
+ multiPartMap.put("_" + fieldName + "_size", item.getSize());
multiPartMap.put("_" + fieldName + "_fileName", fileName);
multiPartMap.put("_" + fieldName + "_contentType", item.getContentType());
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java Tue Aug 7 07:30:43 2018
@@ -71,16 +71,16 @@ public class OfbizAmountTransform implem
// handle nulls better
if (o == null) {
- o = Double.valueOf(0.00);
+ o = 0.00;
}
if (o instanceof NumberModel) {
NumberModel s = (NumberModel) o;
- return Double.valueOf(s.getAsNumber().doubleValue());
+ return s.getAsNumber().doubleValue();
}
if (o instanceof SimpleNumber) {
SimpleNumber s = (SimpleNumber) o;
- return Double.valueOf(s.getAsNumber().doubleValue());
+ return s.getAsNumber().doubleValue();
}
if (o instanceof SimpleScalar) {
SimpleScalar s = (SimpleScalar) o;
@@ -88,7 +88,7 @@ public class OfbizAmountTransform implem
}
return Double.valueOf(o.toString());
}
- return Double.valueOf(0.00);
+ return 0.00;
}
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
@@ -129,7 +129,7 @@ public class OfbizAmountTransform implem
if (format.equals(OfbizAmountTransform.SPELLED_OUT_FORMAT)) {
out.write(UtilFormatOut.formatSpelledOutAmount(amount.doubleValue(), localeObj));
} else {
- out.write(UtilFormatOut.formatAmount(amount.doubleValue(), localeObj));
+ out.write(UtilFormatOut.formatAmount(amount, localeObj));
}
} catch (TemplateModelException e) {
throw new IOException(e.getMessage());
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java Tue Aug 7 07:30:43 2018
@@ -219,10 +219,10 @@ public class ServerHitBin {
serverHitBin.set("hitTypeId", ServerHitBin.typeIds[bin.type]);
serverHitBin.set("binStartDateTime", new java.sql.Timestamp(bin.startTime));
serverHitBin.set("binEndDateTime", new java.sql.Timestamp(bin.endTime));
- serverHitBin.set("numberHits", Long.valueOf(bin.getNumberHits()));
- serverHitBin.set("totalTimeMillis", Long.valueOf(bin.getTotalRunningTime()));
- serverHitBin.set("minTimeMillis", Long.valueOf(bin.getMinTime()));
- serverHitBin.set("maxTimeMillis", Long.valueOf(bin.getMaxTime()));
+ serverHitBin.set("numberHits", bin.getNumberHits());
+ serverHitBin.set("totalTimeMillis", bin.getTotalRunningTime());
+ serverHitBin.set("minTimeMillis", bin.getMinTime());
+ serverHitBin.set("maxTimeMillis", bin.getMaxTime());
// get localhost ip address and hostname to store
if (VisitHandler.address != null) {
serverHitBin.set("serverIpAddress", VisitHandler.address.getHostAddress());
@@ -512,7 +512,7 @@ public class ServerHitBin {
}
}
serverHit.set("contentId", this.id);
- serverHit.set("runningTimeMillis", Long.valueOf(runningTime));
+ serverHit.set("runningTimeMillis", runningTime);
String fullRequestUrl = UtilHttp.getFullRequestUrl(request);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java Tue Aug 7 07:30:43 2018
@@ -81,7 +81,7 @@ public class VisitHandler {
if (modelUserLogin.isField("partyId")) {
visit.set("partyId", userLogin.get("partyId"));
}
- visit.set("userCreated", Boolean.valueOf(userCreated));
+ visit.set("userCreated", userCreated);
// make sure the visitorId is still in place
if (visitor != null) {
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java Tue Aug 7 07:30:43 2018
@@ -266,7 +266,7 @@ public class GenericWebEvent {
resultBool = Boolean.TRUE;
}
- if (!resultBool.booleanValue()) {
+ if (!resultBool) {
Field msgField;
String message;
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java Tue Aug 7 07:30:43 2018
@@ -212,9 +212,9 @@ public final class UtilCacheEvents {
if (utilCache != null) {
if (maxInMemory != null)
- utilCache.setMaxInMemory(maxInMemory.intValue());
+ utilCache.setMaxInMemory(maxInMemory);
if (expireTime != null)
- utilCache.setExpireTime(expireTime.longValue());
+ utilCache.setExpireTime(expireTime);
if (useSoftReferenceStr != null) {
utilCache.setUseSoftReference("true".equals(useSoftReferenceStr));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java Tue Aug 7 07:30:43 2018
@@ -122,7 +122,7 @@ public class WebToolsServices {
Integer txTimeout = (Integer)context.get("txTimeout");
if (txTimeout == null) {
- txTimeout = Integer.valueOf(7200);
+ txTimeout = 7200;
}
URL url = null;
@@ -227,14 +227,14 @@ public class WebToolsServices {
Long filePause = (Long)context.get("filePause");
if (txTimeout == null) {
- txTimeout = Integer.valueOf(7200);
+ txTimeout = 7200;
}
if (filePause == null) {
- filePause = Long.valueOf(0);
+ filePause = 0L;
}
if (UtilValidate.isNotEmpty(path)) {
- long pauseLong = filePause != null ? filePause.longValue() : 0;
+ long pauseLong = filePause != null ? filePause : 0;
File baseDir = new File(path);
if (baseDir.isDirectory() && baseDir.canRead()) {
@@ -322,7 +322,7 @@ public class WebToolsServices {
boolean checkDataOnly = "true".equals(context.get("checkDataOnly"));
Locale locale = (Locale) context.get("locale");
Integer txTimeoutInt = (Integer) context.get("txTimeout");
- int txTimeout = txTimeoutInt != null ? txTimeoutInt.intValue() : -1;
+ int txTimeout = txTimeoutInt != null ? txTimeoutInt : -1;
List<Object> messages = new LinkedList<Object>();
@@ -440,7 +440,7 @@ public class WebToolsServices {
Map<String, Object> placeholderValues = UtilGenerics.checkMap(context.get("placeholderValues"));
if (txTimeout == null) {
- txTimeout = Integer.valueOf(7200);
+ txTimeout = 7200;
}
long rowProcessed = 0;
@@ -448,7 +448,7 @@ public class WebToolsServices {
EntitySaxReader reader = new EntitySaxReader(delegator);
reader.setUseTryInsertMethod(onlyInserts);
reader.setMaintainTxStamps(maintainTimeStamps);
- reader.setTransactionTimeout(txTimeout.intValue());
+ reader.setTransactionTimeout(txTimeout);
reader.setCreateDummyFks(createDummyFks);
reader.setCheckDataOnly(checkDataOnly);
reader.setPlaceholderValues(placeholderValues);
@@ -470,7 +470,7 @@ public class WebToolsServices {
Timestamp fromDate = (Timestamp)context.get("fromDate");
Integer txTimeout = (Integer)context.get("txTimeout");
if (txTimeout == null) {
- txTimeout = Integer.valueOf(7200);
+ txTimeout = 7200;
}
List<String> results = new LinkedList<String>();
@@ -855,7 +855,7 @@ public class WebToolsServices {
ModelEntity modelEntity = reader.getModelEntity(curEntityName);
UtilPlist.writePlistFile(modelEntity.createEoModelMap(entityNamePrefix, datasourceName, entityNames, reader), eomodeldFullPath, curEntityName +".plist", true);
}
- Integer entityNamesSize = new Integer(entityNames.size());
+ Integer entityNamesSize = entityNames.size();
return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "WebtoolsEomodelExported", UtilMisc.toMap("entityNamesSize", entityNamesSize.toString(), "eomodeldFullPath", eomodeldFullPath), locale));
} catch (UnsupportedEncodingException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "WebtoolsEomodelSavingFileError", UtilMisc.toMap("errorString", e.toString()), locale));
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java Tue Aug 7 07:30:43 2018
@@ -308,7 +308,7 @@ public final class WidgetWorker {
formUniqueId = (String) context.get("formUniqueId");
}
if (itemIndex != null) {
- return formName + modelForm.getItemIndexSeparator() + itemIndex.intValue() + iterateId + formUniqueId + modelForm.getItemIndexSeparator() + modelFormField.getName();
+ return formName + modelForm.getItemIndexSeparator() + itemIndex + iterateId + formUniqueId + modelForm.getItemIndexSeparator() + modelFormField.getName();
}
return formName + modelForm.getItemIndexSeparator() + modelFormField.getName();
}
@@ -367,14 +367,14 @@ public final class WidgetWorker {
if (context != null) {
Integer paginateNumberInt= (Integer)context.get("PAGINATOR_NUMBER");
if (paginateNumberInt == null) {
- paginateNumberInt = Integer.valueOf(0);
+ paginateNumberInt = 0;
context.put("PAGINATOR_NUMBER", paginateNumberInt);
Map<String, Object> globalCtx = UtilGenerics.checkMap(context.get("globalContext"));
if (globalCtx != null) {
globalCtx.put("PAGINATOR_NUMBER", paginateNumberInt);
}
}
- paginator_number = paginateNumberInt.intValue();
+ paginator_number = paginateNumberInt;
}
return paginator_number;
}
@@ -388,9 +388,9 @@ public final class WidgetWorker {
} else {
Integer paginateNumberInt= (Integer)globalCtx.get("PAGINATOR_NUMBER");
if (paginateNumberInt == null) {
- paginateNumberInt = Integer.valueOf(0);
+ paginateNumberInt = 0;
}
- paginateNumberInt = Integer.valueOf(paginateNumberInt.intValue() + 1);
+ paginateNumberInt = paginateNumberInt + 1;
globalCtx.put("PAGINATOR_NUMBER", paginateNumberInt);
context.put("PAGINATOR_NUMBER", paginateNumberInt);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java Tue Aug 7 07:30:43 2018
@@ -262,7 +262,7 @@ public abstract class AbstractModelCondi
Debug.logWarning(fullString.toString(), module);
throw new IllegalArgumentException(fullString.toString());
}
- return resultBool.booleanValue();
+ return resultBool;
}
public FlexibleMapAccessor<Object> getFieldAcsr() {
@@ -344,7 +344,7 @@ public abstract class AbstractModelCondi
Debug.logWarning(fullString.toString(), module);
throw new IllegalArgumentException(fullString.toString());
}
- return resultBool.booleanValue();
+ return resultBool;
}
public FlexibleMapAccessor<Object> getFieldAcsr() {
@@ -622,7 +622,7 @@ public abstract class AbstractModelCondi
}
Boolean hasPermission = (Boolean) resp.get("hasPermission");
if (hasPermission != null) {
- return hasPermission.booleanValue();
+ return hasPermission;
}
}
return false;
@@ -712,7 +712,7 @@ public abstract class AbstractModelCondi
Debug.logError(e, "Error in IfValidationMethod " + methodName + " of class " + className
+ ", defaulting to false ", module);
}
- return resultBool.booleanValue();
+ return resultBool;
}
public FlexibleStringExpander getClassExdr() {
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java?rev=1837577&r1=1837576&r2=1837577&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java Tue Aug 7 07:30:43 2018
@@ -74,31 +74,31 @@ public abstract class FieldInfo {
private static Map<String, Integer> createFieldTypeMap() {
Map<String, Integer> fieldTypeByName = new HashMap<>();
- fieldTypeByName.put("display", Integer.valueOf(1));
- fieldTypeByName.put("hyperlink", Integer.valueOf(2));
- fieldTypeByName.put("text", Integer.valueOf(3));
- fieldTypeByName.put("textarea", Integer.valueOf(4));
- fieldTypeByName.put("date-time", Integer.valueOf(5));
- fieldTypeByName.put("drop-down", Integer.valueOf(6));
- fieldTypeByName.put("check", Integer.valueOf(7));
- fieldTypeByName.put("radio", Integer.valueOf(8));
- fieldTypeByName.put("submit", Integer.valueOf(9));
- fieldTypeByName.put("reset", Integer.valueOf(10));
- fieldTypeByName.put("hidden", Integer.valueOf(11));
- fieldTypeByName.put("ignored", Integer.valueOf(12));
- fieldTypeByName.put("text-find", Integer.valueOf(13));
- fieldTypeByName.put("date-find", Integer.valueOf(14));
- fieldTypeByName.put("range-find", Integer.valueOf(15));
- fieldTypeByName.put("lookup", Integer.valueOf(16));
- fieldTypeByName.put("file", Integer.valueOf(17));
- fieldTypeByName.put("password", Integer.valueOf(18));
- fieldTypeByName.put("image", Integer.valueOf(19));
- fieldTypeByName.put("display-entity", Integer.valueOf(20));
- fieldTypeByName.put("container", Integer.valueOf(21));
- fieldTypeByName.put("include-menu", Integer.valueOf(22));
- fieldTypeByName.put("include-form", Integer.valueOf(23));
- fieldTypeByName.put("include-grid", Integer.valueOf(24));
- fieldTypeByName.put("include-screen", Integer.valueOf(25));
+ fieldTypeByName.put("display", 1);
+ fieldTypeByName.put("hyperlink", 2);
+ fieldTypeByName.put("text", 3);
+ fieldTypeByName.put("textarea", 4);
+ fieldTypeByName.put("date-time", 5);
+ fieldTypeByName.put("drop-down", 6);
+ fieldTypeByName.put("check", 7);
+ fieldTypeByName.put("radio", 8);
+ fieldTypeByName.put("submit", 9);
+ fieldTypeByName.put("reset", 10);
+ fieldTypeByName.put("hidden", 11);
+ fieldTypeByName.put("ignored", 12);
+ fieldTypeByName.put("text-find", 13);
+ fieldTypeByName.put("date-find", 14);
+ fieldTypeByName.put("range-find", 15);
+ fieldTypeByName.put("lookup", 16);
+ fieldTypeByName.put("file", 17);
+ fieldTypeByName.put("password", 18);
+ fieldTypeByName.put("image", 19);
+ fieldTypeByName.put("display-entity", 20);
+ fieldTypeByName.put("container", 21);
+ fieldTypeByName.put("include-menu", 22);
+ fieldTypeByName.put("include-form", 23);
+ fieldTypeByName.put("include-grid", 24);
+ fieldTypeByName.put("include-screen", 25);
return Collections.unmodifiableMap(fieldTypeByName);
}