Author: [email protected]
Date: Tue Mar 8 15:34:13 2011
New Revision: 861
Log:
[AMDATU-324] Replaced deprecated calls to Thift PM with Hector PM calls
Modified:
branches/0.2/amdatu-cassandra/cassandra-persistencemanager/pom.xml
branches/0.2/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
branches/0.2/amdatu-cassandra/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
branches/0.2/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
branches/0.2/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
Modified: branches/0.2/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- branches/0.2/amdatu-cassandra/cassandra-persistencemanager/pom.xml
(original)
+++ branches/0.2/amdatu-cassandra/cassandra-persistencemanager/pom.xml Tue Mar
8 15:34:13 2011
@@ -54,7 +54,10 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.persistencemanager.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.persistencemanager</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.cassandra.persistencemanager</Export-Package>
+ <Export-Package>
+ org.amdatu.cassandra.persistencemanager,
+ me.prettyprint.hector.api.beans;version="0.7.0"
+ </Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>*;resolution:=optional</Import-Package>
Modified:
branches/0.2/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
==============================================================================
---
branches/0.2/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
(original)
+++
branches/0.2/amdatu-cassandra/cassandra-persistencemanager/src/main/java/org/amdatu/cassandra/persistencemanager/CassandraPersistenceManager.java
Tue Mar 8 15:34:13 2011
@@ -331,7 +331,7 @@
Map<String, Map<String, Map<String, byte[]>>> getSuperValues(String
columnFamilyName) throws CassandraException;
/**
- * NB: This method is deprecated. Use getSuperRows(columnFamily, rowkey,
byte[].class) instead.
+ * NB: This method is deprecated. Use getSuperColumns(columnFamily,
rowkey, byte[].class) instead.
* Returns the values of all columns in all supercolumns contained by the
row with the specified key in the
* specified ColumnFamily. This method assumes that the ColumnFamily is of
type 'Super' hence the name
* 'getSuperValues'. Note that each value in Cassandra is stored as
byte[], hence the map returns the values as
@@ -346,7 +346,7 @@
Map<String, Map<String, byte[]>> getSuperValues(String columnFamilyName,
String rowKey) throws CassandraException;
/**
- * NB: This method is deprecated. Use getSuperRows(columnFamily, rowkey,
String.class) instead.
+ * NB: This method is deprecated. Use getSuperColumns(columnFamily,
rowkey, String.class) instead.
* Returns the values of all columns in all supercolumns contained by the
row with the specified key in the
* specified ColumnFamily as String. This method assumes that the
ColumnFamily is of type 'Super' hence the name
* 'getSuperValues'. Note that each value in Cassandra is stored as
byte[], but the map returns the values converted
Modified:
branches/0.2/amdatu-cassandra/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
==============================================================================
---
branches/0.2/amdatu-cassandra/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
(original)
+++
branches/0.2/amdatu-cassandra/cassandra-tenantstore/src/main/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImpl.java
Tue Mar 8 15:34:13 2011
@@ -19,9 +19,13 @@
import static
org.amdatu.cassandra.tenantstore.service.TenantColumnFamilyProvider.CF_TENANT;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.HSuperColumn;
+
import org.amdatu.cassandra.persistencemanager.CassandraException;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.amdatu.core.tenant.TenantEntity;
@@ -61,10 +65,24 @@
if (!m_pm.exists(CF_TENANT, rowKey)) {
return null;
}
- Map<String, Map<String, String>> values =
m_pm.getSuperStringValues(CF_TENANT, rowKey);
- Map<String, String> basic = values.get(SC_BASIC);
- Map<String, String> properties = values.get(SC_PROPERTIES);
- String name = basic.get(C_NAME);
+ List<HSuperColumn<String, String, String>> superColumns =
m_pm.getSuperColumns(CF_TENANT, rowKey, String.class);
+ String name = "";
+ Map<String, String> properties = new HashMap<String, String>();
+ for (HSuperColumn<String, String, String> superColumn :
superColumns) {
+ List<HColumn<String, String>> columns =
superColumn.getColumns();
+ if (superColumn.getName().equals(SC_BASIC)) {
+ for (HColumn<String, String> column : columns) {
+ if (column.getName().equals(C_NAME)) {
+ name = column.getValue();
+ }
+ }
+ } else if (superColumn.getName().equals(SC_PROPERTIES)) {
+ for (HColumn<String, String> column : columns) {
+ properties.put(column.getName(), column.getValue());
+ }
+ }
+ }
+
return new TenantEntity(rowKey, name, properties);
}
catch (CassandraException e) {
@@ -75,9 +93,9 @@
public void store(TenantEntity tenant) throws TenantStorageException {
try {
String id = tenant.getId();
- m_pm.setStringValue(CF_TENANT, id, SC_BASIC, C_NAME,
tenant.getName());
+ m_pm.setValue(CF_TENANT, id, SC_BASIC, C_NAME, tenant.getName());
for (String key : tenant.getProperties().keySet()) {
- m_pm.setStringValue(CF_TENANT, id, SC_PROPERTIES, key,
tenant.getProperties().get(key));
+ m_pm.setValue(CF_TENANT, id, SC_PROPERTIES, key,
tenant.getProperties().get(key));
}
}
catch (CassandraException e) {
Modified:
branches/0.2/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
==============================================================================
---
branches/0.2/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
(original)
+++
branches/0.2/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
Tue Mar 8 15:34:13 2011
@@ -16,7 +16,6 @@
*/
package org.amdatu.cassandra.useradminstore.service;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -29,6 +28,9 @@
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.HSuperColumn;
+
import org.amdatu.cassandra.persistencemanager.CassandraException;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.ops4j.pax.useradmin.service.spi.StorageException;
@@ -367,6 +369,35 @@
}
}
+ private HSuperColumn<String, String, byte[]>
getSuperColumn(List<HSuperColumn<String, String, byte[]>> superColumns, String
name) {
+ for (HSuperColumn<String, String, byte[]> superColumn : superColumns) {
+ if (superColumn.getName().equals(name)) {
+ return superColumn;
+ }
+ }
+ return null;
+ }
+
+ private HColumn<String, byte[]> getColumn(List<HColumn<String, byte[]>>
columns, String name) {
+ for (HColumn<String, byte[]> column : columns) {
+ if (column.getName().equals(name)) {
+ return column;
+ }
+ }
+ return null;
+ }
+
+ private Map<String, Object> toMap(HSuperColumn<String, String, byte[]>
superColumn) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ if (superColumn != null) {
+ List<HColumn<String, byte[]>> columns = superColumn.getColumns();
+ for (HColumn<String, byte[]> column : columns) {
+ map.put(column.getName(), column.getValue());
+ }
+ }
+ return map;
+ }
+
// Loads a single role from Cassandra and converts it to either a User or
a Group
private Role internalLoadRole(UserAdminFactory factory, String key, Filter
filter) throws StorageException {
try {
@@ -375,26 +406,22 @@
}
// Load all super columns of the Role ColumnFamily
- Map<String, Map<String, byte[]>> superColumns =
m_pm.getSuperValues(CF_ROLE, key);
- Map<String, byte[]> basic = superColumns.get(SUPER_COLUMN_BASIC);
+ List<HSuperColumn<String, String, byte[]>> superColumns =
m_pm.getSuperColumns(CF_ROLE, key, byte[].class);
+ HSuperColumn<String, String, byte[]> basicSC =
getSuperColumn(superColumns, SUPER_COLUMN_BASIC);
+ HSuperColumn<String, String, byte[]> propertiesSC =
getSuperColumn(superColumns, SUPER_COLUMN_PROPERTIES);
+ HSuperColumn<String, String, byte[]> credentialsSC =
getSuperColumn(superColumns, SUPER_COLUMN_CREDENTIALS);
- Map<String, Object> properties =
toStringObjectMap(superColumns.get(SUPER_COLUMN_PROPERTIES),
superColumns.get(SUPER_COLUMN_PROPERTY_TYPES));
- Map<String, byte[]> bCredentials =
superColumns.get(SUPER_COLUMN_CREDENTIALS);
- Map<String, Object> credentials;
- if (bCredentials != null) {
- credentials = new Hashtable<String, Object>(bCredentials);
- } else {
- credentials = new Hashtable<String, Object>();
- }
+ Map<String, Object> properties = toMap(propertiesSC);
+ Map<String, Object> credentials = toMap(credentialsSC);
// Verify if the filter matches the properties or credentials of
this role
if (filter != null && !filter.match(new Hashtable<String,
Object>(properties))) {
return null;
}
- if (basic != null && basic.get(COLUMN_NAME) != null &&
basic.get(COLUMN_ROLE_TYPE) != null) {
- String name = new String(basic.get(COLUMN_NAME), "UTF-8");
- int roleType = Integer.parseInt(new
String(basic.get(COLUMN_ROLE_TYPE), "UTF-8"));
+ if (basicSC != null && getColumn(basicSC.getColumns(),
COLUMN_NAME) != null && getColumn(basicSC.getColumns(), COLUMN_ROLE_TYPE) !=
null) {
+ String name = new String(getColumn(basicSC.getColumns(),
COLUMN_NAME).getValue(), "UTF-8");
+ int roleType = Integer.parseInt(new
String(getColumn(basicSC.getColumns(), COLUMN_ROLE_TYPE).getValue(), "UTF-8"));
if (Role.USER == roleType) {
return factory.createUser(name, properties, credentials);
} else {
@@ -408,11 +435,7 @@
throw new StorageException(e.getMessage());
} catch (CassandraException e) {
throw new StorageException(e.getMessage());
- } catch (IOException e) {
- throw new StorageException(e.getMessage());
- } catch (ClassNotFoundException e) {
- throw new StorageException(e.getMessage());
- }
+ }
}
// Persists a single role in Cassandra, assuming it does not yet exist.
Thows an exception
@@ -426,9 +449,8 @@
}
// Set the basic properties
- m_pm.setStringValue(CF_ROLE, key, SUPER_COLUMN_BASIC,
COLUMN_ROLE_TYPE, new Integer(role.getType())
- .toString());
- m_pm.setStringValue(CF_ROLE, key, SUPER_COLUMN_BASIC, COLUMN_NAME,
role.getName());
+ m_pm.setValue(CF_ROLE, key, SUPER_COLUMN_BASIC, COLUMN_ROLE_TYPE,
new Integer(role.getType()).toString());
+ m_pm.setValue(CF_ROLE, key, SUPER_COLUMN_BASIC, COLUMN_NAME,
role.getName());
} catch (CassandraException e) {
throw new StorageException(e.getMessage());
}
@@ -487,7 +509,7 @@
private List<String> internalLoadMembers(String roleKey, String column)
throws StorageException {
try {
if (m_pm.exists(CF_ROLE, roleKey, SUPER_COLUMN_MEMBERS, column)) {
- String bm = m_pm.getStringValue(CF_ROLE, roleKey,
SUPER_COLUMN_MEMBERS, column);
+ String bm = m_pm.getValue(CF_ROLE, roleKey,
SUPER_COLUMN_MEMBERS, column, String.class);
Type listType = new TypeToken<List<String>>() {}.getType();
return (List<String>) fromJson(bm, listType);
} else {
@@ -509,7 +531,7 @@
return false;
}
basicMembers.add(newbasicMember);
- m_pm.setStringValue(CF_ROLE, key, SUPER_COLUMN_MEMBERS, column,
toJson(basicMembers));
+ m_pm.setValue(CF_ROLE, key, SUPER_COLUMN_MEMBERS, column,
toJson(basicMembers));
return true;
} catch (CassandraException e) {
throw new StorageException(e.getMessage());
@@ -525,7 +547,7 @@
return false;
}
members.remove(roleKey);
- m_pm.setStringValue(CF_ROLE, groupKey, SUPER_COLUMN_MEMBERS,
column, toJson(members));
+ m_pm.setValue(CF_ROLE, groupKey, SUPER_COLUMN_MEMBERS, column,
toJson(members));
return true;
} catch (CassandraException e) {
throw new StorageException(e.getMessage());
@@ -536,12 +558,11 @@
private void internalAddProperty(Role role, String superColumn, String
key, Object value) throws StorageException {
try {
String rowKey = getKey(role);
+ m_pm.setValue(CF_ROLE, rowKey, superColumn, key, value);
if (value instanceof String) {
- m_pm.setStringValue(CF_ROLE, rowKey, superColumn, key,
(String) value);
- m_pm.setStringValue(CF_ROLE, rowKey,
SUPER_COLUMN_PROPERTY_TYPES, key, STRING_TYPE);
+ m_pm.setValue(CF_ROLE, rowKey, SUPER_COLUMN_PROPERTY_TYPES,
key, STRING_TYPE);
} else if (value instanceof byte[]) {
- m_pm.setValue(CF_ROLE, rowKey, superColumn, key, (byte[])
value);
- m_pm.setStringValue(CF_ROLE, rowKey,
SUPER_COLUMN_PROPERTY_TYPES, key, BYTES_TYPE);
+ m_pm.setValue(CF_ROLE, rowKey, SUPER_COLUMN_PROPERTY_TYPES,
key, BYTES_TYPE);
} else {
throw new StorageException(
"The current implementation of the UserAdmin only supports
storing properties of type byte[]");
@@ -577,35 +598,10 @@
}
// Converts the Json string to an object
- private Object fromJson(String object, Class<?> clazz) {
- return new Gson().fromJson(object, clazz);
- }
-
- // Converts the Json string to an object
private Object fromJson(String object, Type type) {
return new Gson().fromJson(object, type);
}
- // Converts from Map<String, String> (used by Cassandra) to Map<String,
Object> (used by Pax implementation)
- private Map<String, Object> toStringObjectMap(Map<String, byte[]> map,
Map<String, byte[]> typeMap) throws UnsupportedEncodingException,
- IOException, ClassNotFoundException, StorageException {
- Map<String, Object> result = new HashMap<String, Object>();
- if (map != null) {
- for (String name : map.keySet()) {
- // Now values could have been stored as String or byte[]
- String type = new String(typeMap.get(name), "UTF-8");
- if (STRING_TYPE.equals(type)) {
- result.put(name, new String(map.get(name), "UTF-8"));
- } else if (BYTES_TYPE.equals(type)) {
- result.put(name,map.get(name));
- } else {
- throw new StorageException("Property type '" + type + "'
is not supported.");
- }
- }
- }
- return result;
- }
-
// Removes the user as member of all groups, invoked for example when a
user is removed
private void removeUserFromAllGroups(Role role) throws StorageException {
try {
Modified:
branches/0.2/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
==============================================================================
---
branches/0.2/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
(original)
+++
branches/0.2/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/GadgetStoreImpl.java
Tue Mar 8 15:34:13 2011
@@ -122,16 +122,15 @@
try {
m_cassandraLock.writeLock().lock();
String rowKey = gadget.getUrl();
-
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_GADGETURL,
gadget.getUrl());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_DEFAULTVISIBLE,
new Boolean(gadget.isDefaultVisible())
- .toString());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_CATEGORY,
gadget.getCategory().getId());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_CALLBACKURL,
gadget.getCallbackUrl());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_SERVICENAME,
gadget.getServiceName());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_CONSUMERKEY,
gadget.getConsumerPrivateKey());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_CONSUMERSECRET,
gadget.getConsumerPublicKey());
- m_pm.setStringValue(CF_GADGET, rowKey, SC_BASIC, C_KEYTYPE,
gadget.getKeyType());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_GADGETURL,
gadget.getUrl());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_GADGETURL,
gadget.getUrl());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_DEFAULTVISIBLE, new
Boolean(gadget.isDefaultVisible()).toString());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_CATEGORY,
gadget.getCategory().getId());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_CALLBACKURL,
gadget.getCallbackUrl());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_SERVICENAME,
gadget.getServiceName());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_CONSUMERKEY,
gadget.getConsumerPrivateKey());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_CONSUMERSECRET,
gadget.getConsumerPublicKey());
+ m_pm.setValue(CF_GADGET, rowKey, SC_BASIC, C_KEYTYPE,
gadget.getKeyType());
return true;
} catch (CassandraException e) {
m_logService.log(LogService.LOG_ERROR, "Could not persist gadget
definition", e);
@@ -147,25 +146,25 @@
List<String> rows = m_pm.getRowKeys(CF_GADGET);
GadgetDefinition[] gadgets = new GadgetDefinition[rows.size()];
for (int i = 0; i < rows.size(); i++) {
- String url = m_pm.getStringValue(CF_GADGET, rows.get(i),
SC_BASIC, C_GADGETURL);
- String categoryId = m_pm.getStringValue(CF_GADGET,
rows.get(i), SC_BASIC, C_CATEGORY);
+ String url = m_pm.getValue(CF_GADGET, rows.get(i), SC_BASIC,
C_GADGETURL, String.class);
+ String categoryId = m_pm.getValue(CF_GADGET, rows.get(i),
SC_BASIC, C_CATEGORY, String.class);
GadgetCategory category = getCategory(categoryId);
boolean defaultVisible =
"true"
- .equalsIgnoreCase(m_pm.getStringValue(CF_GADGET,
rows.get(i), SC_BASIC,
- C_DEFAULTVISIBLE));
+ .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);
} else {
gadgets[i] = new GadgetDefinition(url,
GadgetCategory.THIRDPARTY, defaultVisible);
}
- gadgets[i].setCallbackUrl(m_pm.getStringValue(CF_GADGET,
rows.get(i), SC_BASIC, C_CALLBACKURL));
- gadgets[i].setServiceName(m_pm.getStringValue(CF_GADGET,
rows.get(i), SC_BASIC, C_SERVICENAME));
-
gadgets[i].setConsumerPrivateKey(m_pm.getStringValue(CF_GADGET, rows.get(i),
SC_BASIC, C_CONSUMERKEY));
+ gadgets[i].setCallbackUrl(m_pm.getValue(CF_GADGET,
rows.get(i), SC_BASIC, C_CALLBACKURL, String.class));
+ gadgets[i].setServiceName(m_pm.getValue(CF_GADGET,
rows.get(i), SC_BASIC, C_SERVICENAME, String.class));
+ gadgets[i].setConsumerPrivateKey(m_pm.getValue(CF_GADGET,
rows.get(i), SC_BASIC, C_CONSUMERKEY, String.class));
gadgets[i]
- .setConsumerPublicKey(m_pm.getStringValue(CF_GADGET,
rows.get(i), SC_BASIC, C_CONSUMERSECRET));
- gadgets[i].setKeyType(m_pm.getStringValue(CF_GADGET,
rows.get(i), SC_BASIC, C_KEYTYPE));
+ .setConsumerPublicKey(m_pm.getValue(CF_GADGET,
rows.get(i), SC_BASIC, C_CONSUMERSECRET, String.class));
+ gadgets[i].setKeyType(m_pm.getValue(CF_GADGET, rows.get(i),
SC_BASIC, C_KEYTYPE, String.class));
}
return orderGadgets(gadgets);
} catch (CassandraException e) {
@@ -180,7 +179,7 @@
try {
m_cassandraLock.readLock().lock();
if (!m_pm.exists(CF_GADGETCATEGORY, category.getId())) {
- m_pm.setStringValue(CF_GADGETCATEGORY, category.getId(),
SC_BASIC, C_NAME, category.getName());
+ m_pm.setValue(CF_GADGETCATEGORY, category.getId(), SC_BASIC,
C_NAME, category.getName());
return true;
} else {
m_logService.log(LogService.LOG_ERROR, "Could not add category
'" + category.getId()
@@ -224,7 +223,7 @@
GadgetCategory[] categories = new GadgetCategory[rows.size()];
int i = 0;
for (String row : rows) {
- String catName = m_pm.getStringValue(CF_GADGETCATEGORY,
row, SC_BASIC, C_NAME);
+ String catName = m_pm.getValue(CF_GADGETCATEGORY, row,
SC_BASIC, C_NAME, String.class);
categories[i] = new GadgetCategory(row, catName);
i++;
}
@@ -244,7 +243,7 @@
public Map<String, Integer> getCategoryCount() throws CassandraException {
Map<String, Integer> count = new HashMap<String, Integer>();
for (String row : m_pm.getRowKeys(CF_GADGET)) {
- String catId = m_pm.getStringValue(CF_GADGET, row, SC_BASIC,
C_CATEGORY);
+ 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);
@@ -262,8 +261,8 @@
public Map<String, String> getGadgetCategories() throws CassandraException
{
Map<String, String> map = new HashMap<String, String>();
for (String row : m_pm.getRowKeys(CF_GADGET)) {
- String url = m_pm.getStringValue(CF_GADGET, row, SC_BASIC,
C_GADGETURL);
- String catId = m_pm.getStringValue(CF_GADGET, row, SC_BASIC,
C_CATEGORY);
+ 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;
@@ -273,7 +272,7 @@
try {
m_cassandraLock.readLock().lock();
if (m_pm.exists(CF_GADGETCATEGORY, categoryId)) {
- String catName = m_pm.getStringValue(CF_GADGETCATEGORY,
categoryId, SC_BASIC, C_NAME);
+ String catName = m_pm.getValue(CF_GADGETCATEGORY, categoryId,
SC_BASIC, C_NAME, String.class);
return new GadgetCategory(categoryId, catName);
} else {
m_logService.log(LogService.LOG_INFO, "Could not find category
'" + categoryId
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
