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

[Major] Implemented CACHED mode 

This lead to refactoring of other code:
 - removed get*Dao() from StrolchTransaction
 - added StrolchTransaction.getPersistenceHandler()
 - removed unused variables in TransactionalElementMap
   - this lead to removal of constructors in subclasses
 - added ComponentContainer.getDataStoreMode()
 - added ElementMap.addAll(), removeAll() and updateAll() methods
   - implemented in all ElementMap implementations
This commit is contained in:
Robert von Burg 2014-01-11 17:56:12 +01:00
parent 3b7927bdac
commit 21502ddf82
3 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ public abstract class AbstractModelTest {
@Test
public void shouldStartContainer() {
try (StrolchTransaction tx = getRuntimeMock().getDefaultRealm().openTx()) {
tx.getOrderDao().queryKeySet();
tx.getOrderMap().getAllKeys(tx);
}
}

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

@ -16,9 +16,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import li.strolch.agent.api.OrderMap;
import li.strolch.agent.impl.DataStoreMode;
import li.strolch.model.Order;
import li.strolch.model.parameter.Parameter;
import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.StrolchTransaction;
@SuppressWarnings("nls")
@ -39,7 +40,7 @@ public class OrderModelTestRunner {
// create
Order newOrder = createOrder("MyTestOrder", "Test Name", "TestType"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getOrderDao().save(newOrder);
tx.getOrderMap().add(tx, newOrder);
}
}
@ -48,13 +49,13 @@ public class OrderModelTestRunner {
// create
Order newOrder = createOrder(ID, NAME, TYPE);
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getOrderDao().save(newOrder);
tx.getOrderMap().add(tx, newOrder);
}
// read
Order readOrder = null;
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
readOrder = tx.getOrderDao().queryBy(TYPE, ID);
readOrder = tx.getOrderMap().getBy(tx, TYPE, ID);
}
assertNotNull("Should read Order with id " + ID, readOrder);
@ -63,27 +64,28 @@ public class OrderModelTestRunner {
String newStringValue = "Giddiya!";
sParam.setValue(newStringValue);
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getOrderDao().update(readOrder);
tx.getOrderMap().update(tx, readOrder);
}
// read updated
Order updatedOrder = null;
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
updatedOrder = tx.getOrderDao().queryBy(TYPE, ID);
updatedOrder = tx.getOrderMap().getBy(tx, TYPE, ID);
}
assertNotNull("Should read Order with id " + ID, updatedOrder);
assertFalse("Objects can't be the same reference after re-reading!", readOrder == updatedOrder);
if (runtimeMock.getContainer().getDataStoreMode() != DataStoreMode.CACHED)
assertFalse("Objects can't be the same reference after re-reading!", readOrder == updatedOrder);
Parameter<String> updatedParam = readOrder.getParameter(BAG_ID, PARAM_STRING_ID);
assertEquals(newStringValue, updatedParam.getValue());
// delete
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getOrderDao().remove(readOrder);
tx.getOrderMap().remove(tx, readOrder);
}
// fail to re-read
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
Order order = tx.getOrderDao().queryBy(TYPE, ID);
Order order = tx.getOrderMap().getBy(tx, TYPE, ID);
assertNull("Should no read Order with id " + ID, order);
}
}
@ -104,11 +106,12 @@ public class OrderModelTestRunner {
Collections.sort(orders, comparator);
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
tx.getOrderDao().removeAll(tx.getOrderDao().queryAll());
OrderMap orderMap = tx.getOrderMap();
orderMap.removeAll(tx, orderMap.getAllElements(tx));
}
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
tx.getOrderDao().saveAll(orders);
tx.getOrderMap().addAll(tx, orders);
}
Set<String> expectedTypes = new HashSet<>();
@ -117,35 +120,35 @@ public class OrderModelTestRunner {
expectedTypes.add("MyType3");
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
List<Order> allOrders = tx.getOrderDao().queryAll();
List<Order> allOrders = tx.getOrderMap().getAllElements(tx);
Collections.sort(allOrders, comparator);
assertEquals(orders, allOrders);
}
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
OrderDao orderDao = tx.getOrderDao();
OrderMap orderMap = tx.getOrderMap();
Set<String> types = orderDao.queryTypes();
Set<String> types = orderMap.getTypes(tx);
assertEquals(expectedTypes, types);
Set<String> keySet = orderDao.queryKeySet();
Set<String> keySet = orderMap.getAllKeys(tx);
assertEquals(15, keySet.size());
for (String type : types) {
Set<String> idsByType = orderDao.queryKeySet(type);
Set<String> idsByType = orderMap.getKeysBy(tx, type);
assertEquals(5, idsByType.size());
List<Order> ordersByType = orderDao.queryAll(type);
List<Order> ordersByType = orderMap.getElementsBy(tx, type);
assertEquals(5, ordersByType.size());
}
}
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
Order order = tx.getOrderDao().queryBy("MyType1", "@_00000001");
Order order = tx.getOrderMap().getBy(tx, "MyType1", "@_00000001");
assertNotNull(order);
order = tx.getOrderDao().queryBy("MyType2", "@_00000006");
order = tx.getOrderMap().getBy(tx, "MyType2", "@_00000006");
assertNotNull(order);
order = tx.getOrderDao().queryBy("MyType3", "@_00000011");
order = tx.getOrderMap().getBy(tx, "MyType3", "@_00000011");
assertNotNull(order);
}
}

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

@ -16,9 +16,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import li.strolch.agent.api.ResourceMap;
import li.strolch.agent.impl.DataStoreMode;
import li.strolch.model.Resource;
import li.strolch.model.parameter.Parameter;
import li.strolch.persistence.api.ResourceDao;
import li.strolch.persistence.api.StrolchTransaction;
@SuppressWarnings("nls")
@ -39,7 +40,7 @@ public class ResourceModelTestRunner {
// create
Resource newResource = createResource("MyTestResource", "Test Name", "TestType"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getResourceDao().save(newResource);
tx.getResourceMap().add(tx, newResource);
}
}
@ -48,13 +49,13 @@ public class ResourceModelTestRunner {
// create
Resource newResource = createResource(ID, NAME, TYPE);
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getResourceDao().save(newResource);
tx.getResourceMap().add(tx, newResource);
}
// read
Resource readResource = null;
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
readResource = tx.getResourceDao().queryBy(TYPE, ID);
readResource = tx.getResourceMap().getBy(tx, TYPE, ID);
}
assertNotNull("Should read Resource with id " + ID, readResource); //$NON-NLS-1$
@ -63,27 +64,28 @@ public class ResourceModelTestRunner {
String newStringValue = "Giddiya!"; //$NON-NLS-1$
sParam.setValue(newStringValue);
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getResourceDao().update(readResource);
tx.getResourceMap().update(tx, readResource);
}
// read updated
Resource updatedResource = null;
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
updatedResource = tx.getResourceDao().queryBy(TYPE, ID);
updatedResource = tx.getResourceMap().getBy(tx, TYPE, ID);
}
assertNotNull("Should read Resource with id " + ID, updatedResource); //$NON-NLS-1$
assertFalse("Objects can't be the same reference after re-reading!", readResource == updatedResource); //$NON-NLS-1$
if (runtimeMock.getContainer().getDataStoreMode() != DataStoreMode.CACHED)
assertFalse("Objects can't be the same reference after re-reading!", readResource == updatedResource); //$NON-NLS-1$
Parameter<String> updatedParam = readResource.getParameter(BAG_ID, PARAM_STRING_ID);
assertEquals(newStringValue, updatedParam.getValue());
// delete
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
tx.getResourceDao().remove(readResource);
tx.getResourceMap().remove(tx, readResource);
}
// fail to re-read
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx();) {
Resource resource = tx.getResourceDao().queryBy(TYPE, ID);
Resource resource = tx.getResourceMap().getBy(tx, TYPE, ID);
assertNull("Should no read Resource with id " + ID, resource); //$NON-NLS-1$
}
}
@ -104,11 +106,12 @@ public class ResourceModelTestRunner {
Collections.sort(resources, comparator);
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
tx.getResourceDao().removeAll(tx.getResourceDao().queryAll());
ResourceMap resourceMap = tx.getResourceMap();
resourceMap.removeAll(tx, resourceMap.getAllElements(tx));
}
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
tx.getResourceDao().saveAll(resources);
tx.getResourceMap().addAll(tx, resources);
}
Set<String> expectedTypes = new HashSet<>();
@ -117,35 +120,35 @@ public class ResourceModelTestRunner {
expectedTypes.add("MyType3");
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
List<Resource> allResources = tx.getResourceDao().queryAll();
List<Resource> allResources = tx.getResourceMap().getAllElements(tx);
Collections.sort(allResources, comparator);
assertEquals(resources, allResources);
}
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
ResourceDao resourceDao = tx.getResourceDao();
ResourceMap resourceMap = tx.getResourceMap();
Set<String> types = resourceDao.queryTypes();
Set<String> types = resourceMap.getTypes(tx);
assertEquals(expectedTypes, types);
Set<String> keySet = resourceDao.queryKeySet();
Set<String> keySet = resourceMap.getAllKeys(tx);
assertEquals(15, keySet.size());
for (String type : types) {
Set<String> idsByType = resourceDao.queryKeySet(type);
Set<String> idsByType = resourceMap.getKeysBy(tx, type);
assertEquals(5, idsByType.size());
List<Resource> resourcesByType = resourceDao.queryAll(type);
List<Resource> resourcesByType = resourceMap.getElementsBy(tx, type);
assertEquals(5, resourcesByType.size());
}
}
try (StrolchTransaction tx = this.runtimeMock.getDefaultRealm().openTx()) {
Resource resource = tx.getResourceDao().queryBy("MyType1", "@_00000001");
Resource resource = tx.getResourceMap().getBy(tx, "MyType1", "@_00000001");
assertNotNull(resource);
resource = tx.getResourceDao().queryBy("MyType2", "@_00000006");
resource = tx.getResourceMap().getBy(tx, "MyType2", "@_00000006");
assertNotNull(resource);
resource = tx.getResourceDao().queryBy("MyType3", "@_00000011");
resource = tx.getResourceMap().getBy(tx, "MyType3", "@_00000011");
assertNotNull(resource);
}
}