Author: [email protected]
Date: Tue Jun 7 17:16:34 2011
New Revision: 1160
Log:
[AMDATUCASSANDRA-42] Added default constructors and improved error handling
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
trunk/amdatu-cassandra/cassandra-store-consumer/src/test/java/org/amdatu/cassandra/test/unit/CassandraConsumerStoreTest.java
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/service/CassandraTokenStorageProviderImpl.java
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
Tue Jun 7 17:16:34 2011
@@ -60,6 +60,12 @@
private static final String GRANTS = "grants";
/**
+ * Default constructor.
+ */
+ public CassandraConsumerStorageProviderImpl() {
+ }
+
+ /**
* Constructor used by the Unit test.
* @param pm
* @param logService
@@ -242,21 +248,19 @@
private Map<String, String> stringToMap(String json) {
+ String errorMsg = "Could not convert JSON expression to Map<String,
String>. JSON expression:\r\n" + json;
try {
Map<String, String> result = new ObjectMapper().readValue(json,
TypeFactory.mapType(HashMap.class, String.class, String.class));
return result;
}
catch (JsonParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
return null;
}
@@ -269,21 +273,19 @@
}
private List<String> stringToList(String json) {
+ String errorMsg = "Could not convert JSON expression to List<String>.
JSON expression:\r\n" + json;
try {
Map<String, List<String>> result = new
ObjectMapper().readValue(json, TypeFactory.mapType(HashMap.class, String.class,
List.class));
return result.get("values");
}
catch (JsonParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
catch (JsonMappingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ m_logService.log(LogService.LOG_ERROR, errorMsg, e);
}
return null;
}
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/test/java/org/amdatu/cassandra/test/unit/CassandraConsumerStoreTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-consumer/src/test/java/org/amdatu/cassandra/test/unit/CassandraConsumerStoreTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-consumer/src/test/java/org/amdatu/cassandra/test/unit/CassandraConsumerStoreTest.java
Tue Jun 7 17:16:34 2011
@@ -18,6 +18,7 @@
import org.amdatu.authentication.oauth.api.ConsumerAlreadyExistsException;
import org.amdatu.authentication.oauth.api.ConsumerNotFoundException;
import org.amdatu.authentication.oauth.api.ConsumerRegistryStorageException;
+import org.amdatu.authentication.oauth.api.OAuthServiceConsumer;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
import
org.amdatu.cassandra.store.consumer.service.CassandraConsumerStorageProviderImpl;
import
org.amdatu.cassandra.store.consumer.service.ConsumerColumnFamilyProvider;
@@ -70,8 +71,11 @@
consumerStore.updateConsumer(consumer);
// ... and check if the properties were persisted properly
- Assert.assertTrue(consumer.equals(consumerStore.getConsumer("ckey")));
-
+ OAuthServiceConsumer consumer2 = consumerStore.getConsumer("ckey");
+ Assert.assertTrue(consumer.equals(consumer2));
+ Assert.assertEquals(consumer2.getProperties().get("key1"), "value1");
+ Assert.assertEquals(consumer2.getProperties().get("key2"), "value2");
+
// Now test access grants
Assert.assertFalse(consumerStore.hasResourceAccess(consumer, "ivol"));
consumerStore.grantResourceAccess(consumer, "ivol");
Modified:
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/service/CassandraTokenStorageProviderImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/service/CassandraTokenStorageProviderImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/service/CassandraTokenStorageProviderImpl.java
Tue Jun 7 17:16:34 2011
@@ -36,6 +36,12 @@
private static final String C_TOKEN = "token";
/**
+ * Default (empty) constructor.
+ */
+ public CassandraTokenStorageProviderImpl() {
+ }
+
+ /**
* Constructor used by the Unit test.
*
* @param pm
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
