Author: bdekruijff at gmail.com
Date: Thu Nov 25 18:19:19 2010
New Revision: 444
Log:
AMDATU-176 processed code review: naming / logging
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivatorTest.java
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProvider.java
Thu Nov 25 18:19:19 2010
@@ -44,13 +44,13 @@
private static final String STORAGEFILE_POSTFIX = ".ser";
// DM injected (option)
- private volatile LogService m_LogService;
+ private volatile LogService m_logService;
// Storage directory
- private File m_DataDirectory;
+ private File m_dataDirectory;
// Collaborator
- private FSTenantIdList m_TenantIdList;
+ private FSTenantIdList m_tenantIdList;
/*
* Constructors
@@ -64,7 +64,7 @@
*/
public synchronized File getDataDirectory() {
- return m_DataDirectory;
+ return m_dataDirectory;
}
public synchronized void setDataDirectory(File dataDirectory) throws
TenantStorageException {
@@ -77,8 +77,11 @@
throw new TenantStorageException("Unable to access data directory:
"
+ dataDirectory.getAbsolutePath());
}
- m_DataDirectory = dataDirectory;
- m_TenantIdList = new FSTenantIdList(new File(m_DataDirectory,
ENTITYLIST_FILENAME));
+ m_dataDirectory = dataDirectory;
+ m_tenantIdList = new FSTenantIdList(new File(m_dataDirectory,
ENTITYLIST_FILENAME));
+
+ if (m_logService != null)
+ m_logService.log(LogService.LOG_DEBUG, "Datadirectory set to: " +
m_dataDirectory.getAbsolutePath());
}
/*
@@ -88,10 +91,15 @@
public synchronized void start() throws TenantStorageException {
// by contract DM ConfigurationDependency contract dataDirectory has
// been set through the updated method.
+ if (m_logService != null)
+ m_logService.log(LogService.LOG_INFO, "Filesystem Tenant storage
provider started");
}
public synchronized void stop() {
- m_TenantIdList = null;
+ m_tenantIdList = null;
+
+ if (m_logService != null)
+ m_logService.log(LogService.LOG_INFO, "Filesystem Tenant storage
provider stopped");
}
/*
@@ -122,7 +130,7 @@
FSTenantStore tenantStorageFile = getStorageFile(entity.getId());
TenantEntity storedEntity = tenantStorageFile.addEntity(entity);
if (storedEntity == null) {
- m_TenantIdList.addTenantId(entity.getId());
+ m_tenantIdList.addTenantId(entity.getId());
}
tenantStorageFile.save();
}
@@ -131,7 +139,7 @@
FSTenantStore tenantStorageFile = getStorageFile(entity.getId());
TenantEntity storedEntity =
tenantStorageFile.removeEntity(entity.getId());
if (storedEntity != null) {
- m_TenantIdList.removeTenantId(entity.getId());
+ m_tenantIdList.removeTenantId(entity.getId());
tenantStorageFile.save();
}
}
@@ -142,7 +150,7 @@
}
public synchronized List<TenantEntity> getAll() throws
TenantStorageException {
- final List<String> entityIdList = m_TenantIdList.getAll();
+ final List<String> entityIdList = m_tenantIdList.getAll();
final List<TenantEntity> tenantEntityList = new
LinkedList<TenantEntity>();
for (String tenantEntityId : entityIdList) {
tenantEntityList.add(getById(tenantEntityId));
@@ -153,7 +161,7 @@
private FSTenantStore getStorageFile(final String entityId) throws
TenantStorageException {
final int hash = Math.abs(entityId.hashCode());
final String subdirName = "" + (hash % 50);
- final File subdirFile = new File(m_DataDirectory, subdirName);
+ final File subdirFile = new File(m_dataDirectory, subdirName);
if (!subdirFile.exists()) {
subdirFile.mkdir();
}
Modified:
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivatorTest.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivatorTest.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivatorTest.java
Thu Nov 25 18:19:19 2010
@@ -54,7 +54,7 @@
private static File m_absoluteTestRootDirectory;
private static String m_relativeTestRootDirectory;
- private List<Object> m_RegisteredServices;
+ private List<Object> m_registeredServices;
@Rule
public TestName m_testName = new TestName();
@@ -73,7 +73,7 @@
@Before
public void setUp() {
- m_RegisteredServices = new LinkedList<Object>();
+ m_registeredServices = new LinkedList<Object>();
}
@Test
@@ -124,10 +124,10 @@
// simulate config admin callback
Dictionary<String, String> dict = new Hashtable<String, String>();
dict.put(FSTenantStorageProvider.DATA_DIRECTORY,
bundleStorageDir.getAbsolutePath());
- ((ManagedService) m_RegisteredServices.get(1)).updated(dict);
+ ((ManagedService) m_registeredServices.get(1)).updated(dict);
// invoke the storage provider to get it persist something
- TenantStorageProvider provider = (TenantStorageProvider)
m_RegisteredServices.get(2);
+ TenantStorageProvider provider = (TenantStorageProvider)
m_registeredServices.get(2);
provider.store(new TenantEntity("1", "Bram"));
// assert that the bundleContext storage directory was used
@@ -189,10 +189,10 @@
System.setProperty("user.dir", JAVA_IO_TMPDIR);
Dictionary<String, String> dict = new Hashtable<String, String>();
dict.put(FSTenantStorageProvider.DATA_DIRECTORY,
relativeStorageDirectoryPath);
- ((ManagedService) m_RegisteredServices.get(1)).updated(dict);
+ ((ManagedService) m_registeredServices.get(1)).updated(dict);
// invoke the storage provider to get it persist something
- TenantStorageProvider provider = (TenantStorageProvider)
m_RegisteredServices.get(2);
+ TenantStorageProvider provider = (TenantStorageProvider)
m_registeredServices.get(2);
provider.store(new TenantEntity("1", "Bram"));
// assert that the correct storage directory was actually used
@@ -206,7 +206,7 @@
}
private <Object> Action addRegisteredService() {
- return new AddElementsAction<Object>((Collection<Object>)
m_RegisteredServices);
+ return new AddElementsAction<Object>((Collection<Object>)
m_registeredServices);
}
}
Modified:
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
Thu Nov 25 18:19:19 2010
@@ -28,7 +28,7 @@
public TestName m_testName = new TestName();
private File m_testDirectory;
- private FSTenantStorageProvider m_TenantBundleStorageProvider;
+ private FSTenantStorageProvider m_tenantBundleStorageProvider;
@BeforeClass
public static void setUpOnce() throws TenantStorageException {
@@ -44,9 +44,9 @@
public void setUp() throws TenantStorageException, ConfigurationException {
m_testDirectory = new File(m_absoluteTestRootDirectory,
m_testName.getMethodName());
m_testDirectory.mkdir();
- m_TenantBundleStorageProvider = new FSTenantStorageProvider();
- m_TenantBundleStorageProvider.setDataDirectory(m_testDirectory);
- m_TenantBundleStorageProvider.start();
+ m_tenantBundleStorageProvider = new FSTenantStorageProvider();
+ m_tenantBundleStorageProvider.setDataDirectory(m_testDirectory);
+ m_tenantBundleStorageProvider.start();
}
/**
@@ -72,12 +72,12 @@
else {
tenantEntity = new TenantEntity("" + i, "Bram_" + i);
}
- m_TenantBundleStorageProvider.store(tenantEntity);
+ m_tenantBundleStorageProvider.store(tenantEntity);
}
// testing
for (int i = 0; i < testSize; i++) {
- TenantEntity tenantEntity =
m_TenantBundleStorageProvider.getById("" + i);
+ TenantEntity tenantEntity =
m_tenantBundleStorageProvider.getById("" + i);
Assert.assertEquals("" + i, tenantEntity.getId());
Assert.assertEquals("Bram_" + i, tenantEntity.getName());
if (i % 3 == 0) {
@@ -88,28 +88,28 @@
}
}
- List<TenantEntity> tenantEntityList =
m_TenantBundleStorageProvider.getAll();
+ List<TenantEntity> tenantEntityList =
m_tenantBundleStorageProvider.getAll();
Assert.assertEquals(testSize, tenantEntityList.size());
// updating
for (int i = 0; i < testSize; i++) {
if (i % 4 == 0) {
// mod 4 entities get updated
- TenantEntity tenantEntity =
m_TenantBundleStorageProvider.getById("" + i);
+ TenantEntity tenantEntity =
m_tenantBundleStorageProvider.getById("" + i);
tenantEntity.setName(tenantEntity.getName() + "_updated");
if (i % 12 == 0) {
// mod 12 entities get (new) properties
tenantEntity.putProperty("key_" + i, "newvalue_" + i);
}
- m_TenantBundleStorageProvider.store(tenantEntity);
+ m_tenantBundleStorageProvider.store(tenantEntity);
}
}
// testing
for (int i = 0; i < testSize; i++) {
if (i % 4 == 0) {
- TenantEntity tenantEntity =
m_TenantBundleStorageProvider.getById("" + i);
+ TenantEntity tenantEntity =
m_tenantBundleStorageProvider.getById("" + i);
Assert.assertEquals("Bram_" + i + "_updated",
tenantEntity.getName());
if (i % 3 == 0) {
if (i % 12 != 0) {
@@ -124,15 +124,15 @@
}
}
- List<TenantEntity> tenantEntityList2 =
m_TenantBundleStorageProvider.getAll();
+ List<TenantEntity> tenantEntityList2 =
m_tenantBundleStorageProvider.getAll();
Assert.assertEquals(testSize, tenantEntityList2.size());
// deleting
int deleted = 0;
for (int i = 0; i < testSize; i++) {
if (i % 5 == 0) {
- TenantEntity tenantEntity =
m_TenantBundleStorageProvider.getById("" + i);
- m_TenantBundleStorageProvider.delete(tenantEntity);
+ TenantEntity tenantEntity =
m_tenantBundleStorageProvider.getById("" + i);
+ m_tenantBundleStorageProvider.delete(tenantEntity);
deleted++;
}
}
@@ -140,19 +140,19 @@
// testing
for (int i = 0; i < testSize; i++) {
if (i % 5 == 0) {
- TenantEntity tenantEntity =
m_TenantBundleStorageProvider.getById("" + i);
+ TenantEntity tenantEntity =
m_tenantBundleStorageProvider.getById("" + i);
Assert.assertNull(tenantEntity);
}
}
- List<TenantEntity> tenantEntityList3 =
m_TenantBundleStorageProvider.getAll();
+ List<TenantEntity> tenantEntityList3 =
m_tenantBundleStorageProvider.getAll();
Assert.assertEquals(testSize - deleted, tenantEntityList3.size());
// test lenient behavior on delete of non existing
- TenantEntity tenantEntity5 = m_TenantBundleStorageProvider.getById(""
+ 6);
+ TenantEntity tenantEntity5 = m_tenantBundleStorageProvider.getById(""
+ 6);
Assert.assertNotNull(tenantEntity5);
- m_TenantBundleStorageProvider.delete(tenantEntity5);
- m_TenantBundleStorageProvider.delete(tenantEntity5);
+ m_tenantBundleStorageProvider.delete(tenantEntity5);
+ m_tenantBundleStorageProvider.delete(tenantEntity5);
}
/**
@@ -168,35 +168,35 @@
Assert.assertEquals("BB".hashCode(), "Aa".hashCode());
TenantEntity tenantEntity1 = new TenantEntity("Aa", "Bram");
- m_TenantBundleStorageProvider.store(tenantEntity1);
+ m_tenantBundleStorageProvider.store(tenantEntity1);
TenantEntity tenantEntity2 = new TenantEntity("BB", "Pipo");
- m_TenantBundleStorageProvider.store(tenantEntity2);
+ m_tenantBundleStorageProvider.store(tenantEntity2);
- TenantEntity tenantEntity3 =
m_TenantBundleStorageProvider.getById("Aa");
+ TenantEntity tenantEntity3 =
m_tenantBundleStorageProvider.getById("Aa");
Assert.assertEquals("Aa", tenantEntity3.getId());
Assert.assertEquals("Bram", tenantEntity3.getName());
- TenantEntity tenantEntity4 =
m_TenantBundleStorageProvider.getById("BB");
+ TenantEntity tenantEntity4 =
m_tenantBundleStorageProvider.getById("BB");
Assert.assertEquals("BB", tenantEntity4.getId());
Assert.assertEquals("Pipo", tenantEntity4.getName());
- List<TenantEntity> tenantEntityList1 =
m_TenantBundleStorageProvider.getAll();
+ List<TenantEntity> tenantEntityList1 =
m_tenantBundleStorageProvider.getAll();
Assert.assertEquals(2, tenantEntityList1.size());
- m_TenantBundleStorageProvider.delete(tenantEntity4);
+ m_tenantBundleStorageProvider.delete(tenantEntity4);
- List<TenantEntity> tenantEntityList2 =
m_TenantBundleStorageProvider.getAll();
+ List<TenantEntity> tenantEntityList2 =
m_tenantBundleStorageProvider.getAll();
Assert.assertEquals(1, tenantEntityList2.size());
- TenantEntity tenantEntity5 =
m_TenantBundleStorageProvider.getById("Aa");
+ TenantEntity tenantEntity5 =
m_tenantBundleStorageProvider.getById("Aa");
Assert.assertEquals("Aa", tenantEntity5.getId());
Assert.assertEquals("Bram", tenantEntity5.getName());
- TenantEntity tenantEntity6 =
m_TenantBundleStorageProvider.getById("BB");
+ TenantEntity tenantEntity6 =
m_tenantBundleStorageProvider.getById("BB");
Assert.assertNull(tenantEntity6);
// test lenient behavior on delete of non existing
- m_TenantBundleStorageProvider.delete(tenantEntity4);
+ m_tenantBundleStorageProvider.delete(tenantEntity4);
}
}
