Author: [email protected]
Date: Tue Aug 2 11:36:16 2011
New Revision: 1238
Log:
[AMDATUCASSANDRA-69] Changes needed for new Cassandra PM API
Modified:
trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/service/CassandraGadgetStorageProviderImpl.java
Modified: trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-gadgetstore/pom.xml Tue Aug 2
11:36:16 2011
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
- <version>0.2.0</version>
+ <version>0.2.0-SNAPSHOT</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified:
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/service/CassandraGadgetStorageProviderImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/service/CassandraGadgetStorageProviderImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-gadgetstore/src/main/java/org/amdatu/cassandra/gadgetstore/service/CassandraGadgetStorageProviderImpl.java
Tue Aug 2 11:36:16 2011
@@ -15,23 +15,22 @@
*/
package org.amdatu.cassandra.gadgetstore.service;
-import static
org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider.CF_GADGET;
-import static
org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider.CF_GADGETCATEGORY;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.amdatu.cassandra.persistencemanager.CassandraException;
-import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
-import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
-import org.amdatu.opensocial.gadgetmanagement.GadgetStorageException;
-import org.amdatu.opensocial.gadgetmanagement.GadgetStorageProvider;
-import org.osgi.service.log.LogService;
+import static
org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider.CF_GADGET;
+import static
org.amdatu.cassandra.gadgetstore.service.GadgetColumnFamilyProvider.CF_GADGETCATEGORY;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
+import org.amdatu.opensocial.gadgetmanagement.GadgetCategory;
+import org.amdatu.opensocial.gadgetmanagement.GadgetDefinition;
+import org.amdatu.opensocial.gadgetmanagement.GadgetStorageException;
+import org.amdatu.opensocial.gadgetmanagement.GadgetStorageProvider;
+import org.osgi.service.log.LogService;
/**
* This class provides a Cassandra implementation of the GadgetStore. The
GadgetStore is responsible for storing
@@ -78,9 +77,6 @@
m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_CONSUMERSECRET,
gadget.getConsumerPublicKey());
m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_KEYTYPE,
gadget.getKeyType());
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.writeLock().unlock();
}
@@ -97,8 +93,8 @@
GadgetCategory category = getCategory(categoryId);
boolean defaultVisible =
"true"
- .equalsIgnoreCase(m_pm.getValue(CF_GADGET,
rows.get(i), SC_BASIC,
- C_DEFAULTVISIBLE, String.class));
+ .equalsIgnoreCase(m_pm.getValue(CF_GADGET, rows.get(i),
SC_BASIC,
+ C_DEFAULTVISIBLE, String.class));
if (category != null) {
gadgets[i] = new GadgetDefinition(url, category,
defaultVisible);
}
@@ -117,9 +113,6 @@
}
return orderGadgets(gadgets);
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.readLock().unlock();
}
@@ -131,9 +124,6 @@
String rowKey = gadget.getUrl();
m_pm.deleteRow(CF_GADGET, rowKey);
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.writeLock().unlock();
}
@@ -150,9 +140,6 @@
return false;
}
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.readLock().unlock();
}
@@ -170,9 +157,6 @@
}
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.readLock().unlock();
}
@@ -197,50 +181,37 @@
}
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.readLock().unlock();
}
}
public Map<String, Integer> getCategoryCount() throws
GadgetStorageException {
- try {
- Map<String, Integer> count = new HashMap<String, Integer>();
- for (String row : m_pm.getRowKeys(CF_GADGET)) {
- String catId = m_pm.getValue(CF_GADGET, row, SC_BASIC,
C_CATEGORY, String.class);
- int value = 0;
- if (count.containsKey(catId)) {
- value = count.get(catId);
- }
- count.put(catId, ++value);
- }
- for (GadgetCategory cat : getCategories()) {
- if (!count.containsKey(cat.getId())) {
- count.put(cat.getId(), 0);
- }
+ Map<String, Integer> count = new HashMap<String, Integer>();
+ for (String row : m_pm.getRowKeys(CF_GADGET)) {
+ String catId = m_pm.getValue(CF_GADGET, row, SC_BASIC, C_CATEGORY,
String.class);
+ int value = 0;
+ if (count.containsKey(catId)) {
+ value = count.get(catId);
}
- return count;
+ count.put(catId, ++value);
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
+ for (GadgetCategory cat : getCategories()) {
+ if (!count.containsKey(cat.getId())) {
+ count.put(cat.getId(), 0);
+ }
}
+ return count;
}
public Map<String, String> getGadgetURLCategoryMap() throws
GadgetStorageException {
- try {
- Map<String, String> map = new HashMap<String, String>();
- for (String row : m_pm.getRowKeys(CF_GADGET)) {
- String url = m_pm.getValue(CF_GADGET, row, SC_BASIC,
C_GADGETURL, String.class);
- String catId = m_pm.getValue(CF_GADGET, row, SC_BASIC,
C_CATEGORY, String.class);
- map.put(url, catId);
- }
- return map;
- }
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
+ Map<String, String> map = new HashMap<String, String>();
+ for (String row : m_pm.getRowKeys(CF_GADGET)) {
+ String url = m_pm.getValue(CF_GADGET, row, SC_BASIC, C_GADGETURL,
String.class);
+ String catId = m_pm.getValue(CF_GADGET, row, SC_BASIC, C_CATEGORY,
String.class);
+ map.put(url, catId);
}
+ return map;
}
public boolean removeCategory(final GadgetCategory category) throws
GadgetStorageException {
@@ -255,9 +226,6 @@
}
}
- catch (CassandraException e) {
- throw new GadgetStorageException(e);
- }
finally {
m_cassandraLock.readLock().unlock();
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
