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

[Minor] removed all tx.commitOnClose() for read only TXs

This commit is contained in:
Robert von Burg 2015-02-06 22:13:48 +01:00
parent 85b82f6628
commit 3fc4c83a61
13 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedRealm.java
View File

@ -115,8 +115,6 @@ public class CachedRealm extends InternalStrolchRealm {
nrOfResources++;
}
}
tx.commitOnClose();
}
try (StrolchTransaction tx = openTx(privilegeContext.getCertificate(), DefaultRealmHandler.AGENT_BOOT)) {
@ -129,8 +127,6 @@ public class CachedRealm extends InternalStrolchRealm {
nrOfOrders++;
}
}
tx.commitOnClose();
}
long duration = System.nanoTime() - start;

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalRealm.java
View File

@ -101,12 +101,10 @@ public class TransactionalRealm extends InternalStrolchRealm {
try (StrolchTransaction tx = openTx(privilegeContext.getCertificate(), DefaultRealmHandler.AGENT_BOOT)) {
nrOfOrders = this.orderMap.getAllKeys(tx).size();
tx.commitOnClose();
}
try (StrolchTransaction tx = openTx(privilegeContext.getCertificate(), DefaultRealmHandler.AGENT_BOOT)) {
nrOfResources = this.resourceMap.getAllKeys(tx).size();
tx.commitOnClose();
}
long duration = System.nanoTime() - start;

4
li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
View File

@ -96,9 +96,7 @@ public class DefaultEnumHandler extends StrolchComponent implements EnumHandler
values.put(paramKey, new EnumValue(paramKey, enumParam.getValue()));
}
StrolchEnum strolchEnum = new StrolchEnum(name, locale, values);
tx.commitOnClose();
return strolchEnum;
return new StrolchEnum(name, locale, values);
}
}

2
li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
View File

@ -86,8 +86,6 @@ public class FindByLocatorTest {
Locator locResIntegerState = Locator.valueOf("Resource/TestType/MyTestResource/State/@integerState");
IntegerTimedState integerS = tx.findElement(locResIntegerState);
assertNotNull("Should have found a IntegerTimedState with the locator " + locResIntegerState, integerS);
tx.commitOnClose();
}
}
}

9
li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/QueryTest.java
View File

@ -86,7 +86,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = inMemoryQuery.doQuery(tx.getPersistenceHandler().getResourceDao(tx));
tx.commitOnClose();
}
assertEquals(1, result.size());
assertEquals("@1", result.get(0).getId());
@ -120,7 +119,6 @@ public class QueryTest {
List<Order> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = inMemoryQuery.doQuery(tx.getPersistenceHandler().getOrderDao(tx));
tx.commitOnClose();
}
assertEquals(1, result.size());
assertEquals("@1", result.get(0).getId());
@ -148,7 +146,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(1, result.size());
assertEquals("@1", result.get(0).getId());
@ -176,7 +173,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(0, result.size());
}
@ -203,7 +199,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(1, result.size());
assertEquals("@1", result.get(0).getId());
@ -231,7 +226,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(0, result.size());
}
@ -259,7 +253,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(1, result.size());
assertEquals("@2", result.get(0).getId());
@ -271,7 +264,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(1, result.size());
assertEquals("@1", result.get(0).getId());
@ -283,7 +275,6 @@ public class QueryTest {
List<Resource> result;
try (StrolchTransaction tx = container.getRealm(StrolchConstants.DEFAULT_REALM).openTx(certificate, "test")) {
result = tx.doQuery(query);
tx.commitOnClose();
}
assertEquals(0, result.size());
}

3
li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/RealmTest.java
View File

@ -97,7 +97,6 @@ public class RealmTest extends AbstractModelTest {
try (StrolchTransaction tx = firstRealm.openTx(certificate, TEST)) {
Resource res = tx.getResourceMap().getBy(tx, type, expectedId1);
assertEquals("Should find object previously added in same realm!", expectedRes1, res); //$NON-NLS-1$
tx.commitOnClose();
}
}
@ -113,7 +112,6 @@ public class RealmTest extends AbstractModelTest {
try (StrolchTransaction tx = secondRealm.openTx(certificate, TEST)) {
Resource res = tx.getResourceMap().getBy(tx, type, expectedId2);
assertEquals("Should find object previously added in same realm!", expectedRes2, res); //$NON-NLS-1$
tx.commitOnClose();
}
}
@ -122,7 +120,6 @@ public class RealmTest extends AbstractModelTest {
try (StrolchTransaction tx = secondRealm.openTx(certificate, TEST)) {
Resource res = tx.getResourceMap().getBy(tx, type, expectedId1);
assertNull("Should not find object added in differenct realm!", res); //$NON-NLS-1$
tx.commitOnClose();
}
}
}

1
li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/ExistingDbTest.java
View File

@ -68,7 +68,6 @@ public class ExistingDbTest {
Order order = tx.getOrderMap().getBy(tx, "MyType", "@1"); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull("Should be able to read existing element from db", order); //$NON-NLS-1$
tx.commitOnClose();
}
}
}

9
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
View File

@ -96,7 +96,6 @@ public class Inspector {
size += tx.getOrderMap().querySize(tx);
RealmOverview realmOverview = new RealmOverview(realmName, size);
realmOverviews.add(realmOverview);
tx.commitOnClose();
}
}
@ -147,8 +146,6 @@ public class Inspector {
orderOverview.setNrOfElements(orderMap.querySize(tx));
orderOverview.setTypes(orderMap.getTypes(tx));
elementMapOverviews.add(orderOverview);
tx.commitOnClose();
}
RealmDetail modelOverview = new RealmDetail(elementMapOverviews);
@ -192,7 +189,6 @@ public class Inspector {
}
resourcesOverview = new ElementMapOverview(ElementMapType.RESOURCE.getName(), typeOverviews);
tx.commitOnClose();
}
GenericEntity<ElementMapOverview> entity = new GenericEntity<ElementMapOverview>(resourcesOverview,
@ -236,7 +232,6 @@ public class Inspector {
}
ordersOverview = new ElementMapOverview(ElementMapType.ORDER.getName(), typeOverviews);
tx.commitOnClose();
}
GenericEntity<ElementMapOverview> entity = new GenericEntity<ElementMapOverview>(ordersOverview,
@ -283,7 +278,6 @@ public class Inspector {
elementOverviews.add(resourceOverview);
}
typeDetail = new TypeDetail(type, elementOverviews);
tx.commitOnClose();
}
GenericEntity<TypeDetail> entity = new GenericEntity<TypeDetail>(typeDetail, TypeDetail.class) {
@ -325,7 +319,6 @@ public class Inspector {
elementOverviews.add(orderOverview);
}
typeDetail = new TypeDetail(type, elementOverviews);
tx.commitOnClose();
}
GenericEntity<TypeDetail> entity = new GenericEntity<TypeDetail>(typeDetail, TypeDetail.class) {
@ -364,7 +357,6 @@ public class Inspector {
Resource resource;
try (StrolchTransaction tx = openTx(cert, realm)) {
resource = tx.getResourceMap().getBy(tx, type, id);
tx.commitOnClose();
}
if (resource == null) {
throw new StrolchException(MessageFormat.format("No Resource exists for {0}/{1}", type, id)); //$NON-NLS-1$
@ -387,7 +379,6 @@ public class Inspector {
Order order;
try (StrolchTransaction tx = openTx(cert, realm)) {
order = tx.getOrderMap().getBy(tx, type, id);
tx.commitOnClose();
}
if (order == null) {
throw new StrolchException(MessageFormat.format("No Order exists for {0}/{1}", type, id)); //$NON-NLS-1$

3
li.strolch.service/src/test/java/li/strolch/service/ClearModelServiceTest.java
View File

@ -38,7 +38,6 @@ public class ClearModelServiceTest extends AbstractRealmServiceTest {
try (StrolchTransaction tx = strolchRealm.openTx(ClearModelServiceTest.this.certificate, "test")) {
assertEquals(0, tx.getResourceMap().querySize(tx));
assertEquals(0, tx.getOrderMap().querySize(tx));
tx.commitOnClose();
}
}
};
@ -59,7 +58,6 @@ public class ClearModelServiceTest extends AbstractRealmServiceTest {
try (StrolchTransaction tx = strolchRealm.openTx(ClearModelServiceTest.this.certificate, "test")) {
assertNotEquals(0, tx.getResourceMap().querySize(tx));
assertEquals(0, tx.getOrderMap().querySize(tx));
tx.commitOnClose();
}
}
};
@ -80,7 +78,6 @@ public class ClearModelServiceTest extends AbstractRealmServiceTest {
try (StrolchTransaction tx = strolchRealm.openTx(ClearModelServiceTest.this.certificate, "test")) {
assertNotEquals(0, tx.getOrderMap().querySize(tx));
assertEquals(0, tx.getResourceMap().querySize(tx));
tx.commitOnClose();
}
}
};

1
li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/AbstractModelTest.java
View File

@ -20,7 +20,6 @@ public abstract class AbstractModelTest {
Certificate certificate = privilegeHandler.authenticate("test", "test".getBytes());
try (StrolchTransaction tx = getRuntimeMock().getRealm(this.realmName).openTx(certificate, "test")) {
tx.getOrderMap().getAllKeys(tx);
tx.commitOnClose();
}
}

9
li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/AuditModelTestRunner.java
View File

@ -100,7 +100,6 @@ public class AuditModelTestRunner {
Set<String> types = auditTrail.getTypes(tx);
assertEquals(1, types.size());
assertTrue(types.contains(audit.getElementType()));
tx.commitOnClose();
}
// has
@ -114,7 +113,6 @@ public class AuditModelTestRunner {
dbAudit = auditTrail.getBy(tx, "Foo", audit.getId());
assertNull(dbAudit);
tx.commitOnClose();
}
// remove
@ -127,7 +125,6 @@ public class AuditModelTestRunner {
AuditTrail auditTrail = tx.getAuditTrail();
Audit dbAudit = auditTrail.getBy(tx, audit.getElementType(), audit.getId());
assertNull(dbAudit);
tx.commitOnClose();
}
// update
@ -147,7 +144,6 @@ public class AuditModelTestRunner {
AuditTrail auditTrail = tx.getAuditTrail();
Audit dbAudit = auditTrail.getBy(tx, audit.getElementType(), audit.getId());
assertEquals("Foo", dbAudit.getAction());
tx.commitOnClose();
}
}
@ -163,7 +159,6 @@ public class AuditModelTestRunner {
assertEquals(1, auditTrail.querySize(tx, audit.getElementType(), containsRange));
assertEquals(0, auditTrail.querySize(tx, audit.getElementType(), earlierRange));
assertEquals(0, auditTrail.querySize(tx, audit.getElementType(), laterRange));
tx.commitOnClose();
}
}
@ -196,7 +191,6 @@ public class AuditModelTestRunner {
assertEquals(0, allElements.size());
allElements = auditTrail.getAllElements(tx, "FooBar", laterRange);
assertEquals(0, allElements.size());
tx.commitOnClose();
}
try (StrolchTransaction tx = realm.openTx(this.certificate, "test")) {
@ -209,7 +203,6 @@ public class AuditModelTestRunner {
try (StrolchTransaction tx = realm.openTx(this.certificate, "test")) {
AuditTrail auditTrail = tx.getAuditTrail();
assertEquals(0, auditTrail.querySize(tx, "FooBar", containsRange));
tx.commitOnClose();
}
}
@ -255,7 +248,6 @@ public class AuditModelTestRunner {
for (Audit dbAudit : allElements) {
assertEquals("Foo", dbAudit.getAction());
}
tx.commitOnClose();
}
}
@ -296,7 +288,6 @@ public class AuditModelTestRunner {
assertEquals(5, auditTrail.querySize(tx, "BarBarBar", containsRange));
assertEquals(5, auditTrail.querySize(tx, "FooFooFoo", containsRange));
assertEquals(5, auditTrail.querySize(tx, "BarFooBar", containsRange));
tx.commitOnClose();
}
try (StrolchTransaction tx = realm.openTx(this.certificate, "test")) {

12
li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java
View File

@ -88,7 +88,6 @@ public class OrderModelTestRunner {
size = tx.getOrderMap().querySize(tx, "NonExistingType");
assertEquals("Should have zero objects of type 'NonExistingType'", 0, size);
tx.commitOnClose();
}
}
@ -105,7 +104,6 @@ public class OrderModelTestRunner {
Order readOrder = null;
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test");) {
readOrder = tx.getOrderMap().getBy(tx, TYPE, ID);
tx.commitOnClose();
}
assertNotNull("Should read Order with id " + ID, readOrder);
@ -122,7 +120,6 @@ public class OrderModelTestRunner {
Order updatedOrder = null;
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test");) {
updatedOrder = tx.getOrderMap().getBy(tx, TYPE, ID);
tx.commitOnClose();
}
assertNotNull("Should read Order with id " + ID, updatedOrder);
if (this.runtimeMock.getRealm(this.realmName).getMode() != DataStoreMode.CACHED)
@ -140,7 +137,6 @@ public class OrderModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test");) {
Order order = tx.getOrderMap().getBy(tx, TYPE, ID);
assertNull("Should no read Order with id " + ID, order);
tx.commitOnClose();
}
}
@ -165,7 +161,6 @@ public class OrderModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
OrderMap orderMap = tx.getOrderMap();
orderMap.removeAll(tx, orderMap.getAllElements(tx));
tx.commitOnClose();
}
{
@ -173,7 +168,6 @@ public class OrderModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
OrderMap orderMap = tx.getOrderMap();
assertEquals(0, orderMap.querySize(tx));
tx.commitOnClose();
}
// now add some orders
@ -187,7 +181,6 @@ public class OrderModelTestRunner {
OrderMap orderMap = tx.getOrderMap();
assertEquals(orders.size(), orderMap.querySize(tx));
assertEquals(5, orderMap.querySize(tx, "MyType3"));
tx.commitOnClose();
}
// now use the remove all by type
@ -201,7 +194,6 @@ public class OrderModelTestRunner {
OrderMap orderMap = tx.getOrderMap();
assertEquals(orders.size() - 5, orderMap.querySize(tx));
assertEquals(0, orderMap.querySize(tx, "MyType3"));
tx.commitOnClose();
}
// now use the remove all
@ -215,7 +207,6 @@ public class OrderModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
OrderMap orderMap = tx.getOrderMap();
assertEquals(0, orderMap.querySize(tx));
tx.commitOnClose();
}
}
@ -234,7 +225,6 @@ public class OrderModelTestRunner {
List<Order> allOrders = tx.getOrderMap().getAllElements(tx);
Collections.sort(allOrders, comparator);
assertEquals(orders, allOrders);
tx.commitOnClose();
}
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
@ -253,7 +243,6 @@ public class OrderModelTestRunner {
List<Order> ordersByType = orderMap.getElementsBy(tx, type);
assertEquals(5, ordersByType.size());
}
tx.commitOnClose();
}
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
@ -263,7 +252,6 @@ public class OrderModelTestRunner {
assertNotNull(order);
order = tx.getOrderMap().getBy(tx, "MyType3", "@00000011");
assertNotNull(order);
tx.commitOnClose();
}
}
}

11
li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/ResourceModelTestRunner.java
View File

@ -88,7 +88,6 @@ public class ResourceModelTestRunner {
size = tx.getResourceMap().querySize(tx, "NonExistingType");
assertEquals("Should have zero objects of type 'NonExistingType'", 0, size);
tx.commitOnClose();
}
}
@ -105,7 +104,6 @@ public class ResourceModelTestRunner {
Resource readResource = null;
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test");) {
readResource = tx.getResourceMap().getBy(tx, TYPE, ID);
tx.commitOnClose();
}
assertNotNull("Should read Resource with id " + ID, readResource); //$NON-NLS-1$
@ -122,7 +120,6 @@ public class ResourceModelTestRunner {
Resource updatedResource = null;
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test");) {
updatedResource = tx.getResourceMap().getBy(tx, TYPE, ID);
tx.commitOnClose();
}
assertNotNull("Should read Resource with id " + ID, updatedResource); //$NON-NLS-1$
if (this.runtimeMock.getRealm(this.realmName).getMode() != DataStoreMode.CACHED)
@ -140,7 +137,6 @@ public class ResourceModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test");) {
Resource resource = tx.getResourceMap().getBy(tx, TYPE, ID);
assertNull("Should no read Resource with id " + ID, resource); //$NON-NLS-1$
tx.commitOnClose();
}
}
@ -173,7 +169,6 @@ public class ResourceModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
ResourceMap resourceMap = tx.getResourceMap();
assertEquals(0, resourceMap.querySize(tx));
tx.commitOnClose();
}
// now add some resources
@ -187,7 +182,6 @@ public class ResourceModelTestRunner {
ResourceMap resourceMap = tx.getResourceMap();
assertEquals(resources.size(), resourceMap.querySize(tx));
assertEquals(5, resourceMap.querySize(tx, "MyType3"));
tx.commitOnClose();
}
// now use the remove all by type
@ -201,7 +195,6 @@ public class ResourceModelTestRunner {
ResourceMap resourceMap = tx.getResourceMap();
assertEquals(resources.size() - 5, resourceMap.querySize(tx));
assertEquals(0, resourceMap.querySize(tx, "MyType3"));
tx.commitOnClose();
}
// now use the remove all
@ -215,7 +208,6 @@ public class ResourceModelTestRunner {
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
ResourceMap resourceMap = tx.getResourceMap();
assertEquals(0, resourceMap.querySize(tx));
tx.commitOnClose();
}
}
@ -234,7 +226,6 @@ public class ResourceModelTestRunner {
List<Resource> allResources = tx.getResourceMap().getAllElements(tx);
Collections.sort(allResources, comparator);
assertEquals(resources, allResources);
tx.commitOnClose();
}
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
@ -253,7 +244,6 @@ public class ResourceModelTestRunner {
List<Resource> resourcesByType = resourceMap.getElementsBy(tx, type);
assertEquals(5, resourcesByType.size());
}
tx.commitOnClose();
}
try (StrolchTransaction tx = this.runtimeMock.getRealm(this.realmName).openTx(this.certificate, "test")) {
@ -263,7 +253,6 @@ public class ResourceModelTestRunner {
assertNotNull(resource);
resource = tx.getResourceMap().getBy(tx, "MyType3", "@00000011");
assertNotNull(resource);
tx.commitOnClose();
}
}
}