This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new 23f313c Use the scale in the var name.
23f313c is described below
commit 23f313c0fa2ee8caa3021ab53dd3925b64184f7f
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Feb 2 14:12:30 2021 -0500
Use the scale in the var name.
---
.../commons/beanutils2/BeanUtilsBenchCase.java | 84 +++++++++++-----------
.../commons/beanutils2/PropertyUtilsBenchCase.java | 48 ++++++-------
.../apache/commons/beanutils2/TestResultSet.java | 14 ++--
.../converters/DateConverterTestBase.java | 26 +++----
4 files changed, 87 insertions(+), 85 deletions(-)
diff --git
a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index ff9eae9..c4f9872 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -162,160 +162,160 @@ public class BeanUtilsBenchCase extends TestCase {
// Time copyProperties() from a bean
public void testCopyPropertiesBean() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Bean->Bean
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inBean);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inBean);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(bean,bean), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Bean->Dyna
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inBean);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inBean);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(dyna,bean), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
// Time copyProperties() from a DynaBean
public void testCopyPropertiesDyna() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Dyna->Bean
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inDyna);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inDyna);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(bean,dyna), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Dyna->Dyna
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inDyna);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inDyna);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(dyna,dyna), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
// Time copyProperties() from a Map of Objects
public void testCopyPropertiesMap() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Map->Bean
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inMap);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inMap);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(bean, map), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Map->Dyna
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inMap);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inMap);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(dyna, map), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
// Time copyProperties() from a Map of Strings
public void testCopyPropertiesStrs() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Strs->Bean
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inStrs);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outBean, inStrs);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(bean,strs), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Strs->Dyna
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inStrs);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.copyProperties(outDyna, inStrs);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("BU.copyProperties(dyna,strs), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
// Time populate() from a Map of Objects
public void testPopulateMap() throws Exception {
- long start;
+ long startMillis;
long stop;
// Map->Bean
for (long i = 0; i < counter; i++) {
bu.populate(outBean, inMap);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.populate(outBean, inMap);
}
stop = System.currentTimeMillis();
System.err.println("BU.populate(bean, map), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stop - startMillis));
// Map->Dyna
for (long i = 0; i < counter; i++) {
bu.populate(outDyna, inMap);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.populate(outDyna, inMap);
}
stop = System.currentTimeMillis();
System.err.println("BU.populate(dyna, map), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stop - startMillis));
}
@@ -323,32 +323,32 @@ public class BeanUtilsBenchCase extends TestCase {
// NOTE - This simulates what Struts does when processing form beans
public void testPopulateStrs() throws Exception {
- long start;
+ long startMillis;
long stop;
// Strs->Bean
for (long i = 0; i < counter; i++) {
bu.populate(outBean, inStrs);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.populate(outBean, inStrs);
}
stop = System.currentTimeMillis();
System.err.println("BU.populate(bean,strs), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stop - startMillis));
// Strs->Dyna
for (long i = 0; i < counter; i++) {
bu.populate(outDyna, inStrs);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
bu.populate(outDyna, inStrs);
}
stop = System.currentTimeMillis();
System.err.println("BU.populate(dyna,strs), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stop - startMillis));
}
diff --git
a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index 5764541..da4c5aa 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -151,96 +151,96 @@ public class PropertyUtilsBenchCase extends TestCase {
// Time copyProperties() from a bean
public void testCopyPropertiesBean() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Bean->Bean
for (long i = 0; i < counter; i++) {
pu.copyProperties(outBean, inBean);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
pu.copyProperties(outBean, inBean);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("PU.copyProperties(bean,bean), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Bean->Dyna
for (long i = 0; i < counter; i++) {
pu.copyProperties(outDyna, inBean);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
pu.copyProperties(outDyna, inBean);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("PU.copyProperties(dyna,bean), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
// Time copyProperties() from a DynaBean
public void testCopyPropertiesDyna() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Dyna->Bean
for (long i = 0; i < counter; i++) {
pu.copyProperties(outBean, inDyna);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
pu.copyProperties(outBean, inDyna);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("PU.copyProperties(bean,dyna), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Dyna->Dyna
for (long i = 0; i < counter; i++) {
pu.copyProperties(outDyna, inDyna);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
pu.copyProperties(outDyna, inDyna);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("PU.copyProperties(dyna,dyna), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
// Time copyProperties() from a Map
public void testCopyPropertiesMap() throws Exception {
- long start;
- long stop;
+ long startMillis;
+ long stopMillis;
// Dyna->Bean
for (long i = 0; i < counter; i++) {
pu.copyProperties(outBean, inMap);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
pu.copyProperties(outBean, inMap);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("PU.copyProperties(bean, map), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
// Dyna->Dyna
for (long i = 0; i < counter; i++) {
pu.copyProperties(outDyna, inMap);
}
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (long i = 0; i < counter; i++) {
pu.copyProperties(outDyna, inMap);
}
- stop = System.currentTimeMillis();
+ stopMillis = System.currentTimeMillis();
System.err.println("PU.copyProperties(dyna, map), count=" + counter +
- ", time=" + (stop - start));
+ ", time=" + (stopMillis - startMillis));
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
index db6ae81..73dd859 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
@@ -57,7 +57,7 @@ public class TestResultSet implements InvocationHandler {
/**
* The constant (per run) value used to initialize date/time/timestamp.
*/
- protected long timestamp = System.currentTimeMillis();
+ protected long timestampMillis = System.currentTimeMillis();
/**
* Meta data for the result set.
@@ -166,7 +166,7 @@ public class TestResultSet implements InvocationHandler {
} else if ("byteProperty".equals(columnName)) {
return new Byte((byte) row);
} else if ("dateProperty".equals(columnName)) {
- return new Date(timestamp);
+ return new Date(timestampMillis);
} else if ("doubleProperty".equals(columnName)) {
return new Double(321.0);
} else if ("floatProperty".equals(columnName)) {
@@ -182,24 +182,24 @@ public class TestResultSet implements InvocationHandler {
} else if ("stringProperty".equals(columnName)) {
return "This is a string";
} else if ("timeProperty".equals(columnName)) {
- return new Time(timestamp);
+ return new Time(timestampMillis);
} else if ("timestampProperty".equals(columnName)) {
- return new Timestamp(timestamp);
+ return new Timestamp(timestampMillis);
} else {
throw new SQLException("Unknown column name " + columnName);
}
}
public Date getDate(final String columnName) throws SQLException {
- return new Date(timestamp);
+ return new Date(timestampMillis);
}
public Time getTime(final String columnName) throws SQLException {
- return new Time(timestamp);
+ return new Time(timestampMillis);
}
public Timestamp getTimestamp(final String columnName) throws SQLException
{
- return new Timestamp(timestamp);
+ return new Timestamp(timestampMillis);
}
public boolean next() throws SQLException {
diff --git
a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
index 9435335..732a544 100644
---
a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
+++
b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
@@ -168,22 +168,23 @@ public abstract class DateConverterTestBase extends
TestCase {
"from OffsetDateTime"
};
- final long now = System.currentTimeMillis();
+ final long nowMillis = System.currentTimeMillis();
final Object[] date = {
- new Date(now),
+ new Date(nowMillis),
new java.util.GregorianCalendar(),
- new java.sql.Date(now),
- new java.sql.Time(now),
- new java.sql.Timestamp(now),
-
Instant.ofEpochMilli(now).atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toLocalDate(),
-
Instant.ofEpochMilli(now).atZone(ZoneId.systemDefault()).toLocalDateTime(),
- ZonedDateTime.ofInstant(Instant.ofEpochMilli(now),
ZoneId.systemDefault()),
- OffsetDateTime.ofInstant(Instant.ofEpochMilli(now),
ZoneId.systemDefault())
+ new java.sql.Date(nowMillis),
+ new java.sql.Time(nowMillis),
+ new java.sql.Timestamp(nowMillis),
+
Instant.ofEpochMilli(nowMillis).atZone(ZoneId.systemDefault()).toLocalDate()
+ .atStartOfDay(ZoneId.systemDefault()).toLocalDate(),
+
Instant.ofEpochMilli(nowMillis).atZone(ZoneId.systemDefault()).toLocalDateTime(),
+ ZonedDateTime.ofInstant(Instant.ofEpochMilli(nowMillis),
ZoneId.systemDefault()),
+ OffsetDateTime.ofInstant(Instant.ofEpochMilli(nowMillis),
ZoneId.systemDefault())
};
// Initialize calendar also with same ms to avoid a failing test in a
new time slice
- ((GregorianCalendar)date[1]).setTime(new Date(now));
+ ((GregorianCalendar)date[1]).setTime(new Date(nowMillis));
for (int i = 0; i < date.length; i++) {
final Object val = makeConverter().convert(getExpectedType(),
date[i]);
@@ -191,9 +192,10 @@ public abstract class DateConverterTestBase extends
TestCase {
assertTrue("Convert " + message[i] + " should return a " +
getExpectedType().getName(),
getExpectedType().isInstance(val));
- long test = now;
+ long test = nowMillis;
if (date[i] instanceof LocalDate || val instanceof LocalDate) {
- test =
Instant.ofEpochMilli(now).atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ test =
Instant.ofEpochMilli(nowMillis).atZone(ZoneId.systemDefault()).toLocalDate()
+
.atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli();
}
assertEquals("Convert " + message[i] + " should return a " +
date[0],
