Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] code cleanup

This commit is contained in:
Robert von Burg 2023-04-06 09:53:15 +02:00
parent 4c829b7d6d
commit 542f0496dc
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/li/strolch/report/policy/GenericReport.java
View File

@ -9,6 +9,7 @@ import static li.strolch.utils.helper.StringHelper.EMPTY;
import java.time.ZonedDateTime;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Stream;
import com.google.gson.JsonObject;
@ -58,7 +59,7 @@ public class GenericReport extends ReportPolicy {
protected Map<ReportFilterPolicy, TypedTuple<StringParameter, StringParameter>> filtersByPolicy;
protected MapOfSets<String, String> filtersById;
protected long counter;
protected AtomicLong counter;
protected boolean withPage;
protected int offset = -1;
protected int limit = -1;
@ -67,6 +68,7 @@ public class GenericReport extends ReportPolicy {
public GenericReport(StrolchTransaction tx) {
super(tx);
this.counter = new AtomicLong(0L);
}
/**
@ -230,7 +232,7 @@ public class GenericReport extends ReportPolicy {
@Override
public synchronized long getCounter() {
return this.counter;
return this.counter.get();
}
/**
@ -336,10 +338,6 @@ public class GenericReport extends ReportPolicy {
return this;
}
protected synchronized void incrementCounter() {
this.counter++;
}
/**
* Builds the stream of rows on which further transformations can be performed. Each row is a {@link Map} for where
* the key is an element type, and the value is the associated element
@ -375,7 +373,7 @@ public class GenericReport extends ReportPolicy {
if (hasFilter())
stream = stream.filter(this::filter);
stream = stream.peek(e -> incrementCounter());
stream = stream.peek(e -> this.counter.incrementAndGet());
if (withOrdering && hasOrdering())
stream = stream.sorted(this::sort);

4
test-base/src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java
View File

@ -183,7 +183,7 @@ public class OrderModelTestRunner {
}
// read
Order readOrder = null;
Order readOrder;
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName)
.openTx(this.certificate, "test", false)) {
readOrder = tx.getOrderBy(TYPE, ID);
@ -201,7 +201,7 @@ public class OrderModelTestRunner {
}
// read updated
Order updatedOrder = null;
Order updatedOrder;
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test", true)) {
updatedOrder = tx.getOrderBy(TYPE, ID);
}