honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a couple more int -> long

This commit is contained in:
Ken Stevens 2019-08-07 13:33:36 -04:00 committed by James Agnew
parent 0c41f35583
commit 1b17097f62
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StopWatch.java
View File

@ -96,7 +96,7 @@ public class StopWatch {
*
* @see #formatMillis(long)
*/
public String formatMillisPerOperation(int theNumOperations) {
public String formatMillisPerOperation(long theNumOperations) {
double millisPerOperation = (((double) getMillis()) / Math.max(1.0, theNumOperations));
return formatMillis(millisPerOperation);
}
@ -163,9 +163,9 @@ public class StopWatch {
* this method will return 15
* </p>
*
* @see #getThroughput(int, TimeUnit)
* @see #getThroughput(long, TimeUnit)
*/
public String formatThroughput(int theNumOperations, TimeUnit theUnit) {
public String formatThroughput(long theNumOperations, TimeUnit theUnit) {
double throughput = getThroughput(theNumOperations, theUnit);
return new DecimalFormat("0.0").format(throughput);
}
@ -202,8 +202,8 @@ public class StopWatch {
/**
* @param theNumOperations Ok for this to be 0, it will be treated as 1
*/
public int getMillisPerOperation(int theNumOperations) {
return (int) (((double) getMillis()) / Math.max(1.0, theNumOperations));
public long getMillisPerOperation(long theNumOperations) {
return (long) (((double) getMillis()) / Math.max(1.0, theNumOperations));
}
public Date getStartedDate() {
@ -219,7 +219,7 @@ public class StopWatch {
* this method will return 15
* </p>
*
* @see #formatThroughput(int, TimeUnit)
* @see #formatThroughput(long, TimeUnit)
*/
public double getThroughput(long theNumOperations, TimeUnit theUnit) {
if (theNumOperations <= 0) {

6
hapi-fhir-base/src/test/java/ca/uhn/fhir/util/StopWatchTest.java
View File

@ -141,11 +141,11 @@ public class StopWatchTest {
int minutes = 60;
StopWatch sw = new StopWatch(DateUtils.addMinutes(new Date(), -minutes));
int numOperations = 60;
int millis = sw.getMillisPerOperation(numOperations);
long millis = sw.getMillisPerOperation(numOperations);
ourLog.info("{} operations in {}ms = {}ms / operation", numOperations, minutes * DateUtils.MILLIS_PER_MINUTE, millis);
assertThat(millis, Matchers.lessThan(62000));
assertThat(millis, Matchers.greaterThan(58000));
assertThat(millis, Matchers.lessThan(62000L));
assertThat(millis, Matchers.greaterThan(58000L));
}
@Test