Author: [email protected]
Date: Mon Aug 8 09:02:41 2011
New Revision: 1272
Log:
[AMDATUCASSANDRA-74] Applied changes needed for API changes in Auth 0.2.0
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/osgi/Activator.java
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/OAuthServiceConsumerImpl.java
trunk/amdatu-cassandra/cassandra-store-consumer/src/test/java/org/amdatu/cassandra/test/unit/CassandraConsumerStoreTest.java
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/osgi/Activator.java
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/service/CassandraTokenStorageProviderImpl.java
trunk/amdatu-cassandra/cassandra-store-token/src/test/java/org/amdatu/cassandra/test/unit/CassandraTokenStoreTest.java
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/osgi/Activator.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/osgi/Activator.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/osgi/Activator.java
Mon Aug 8 09:02:41 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -15,7 +15,7 @@
*/
package org.amdatu.cassandra.store.consumer.osgi;
-import
org.amdatu.authentication.oauth.consumerregistry.OAuthServiceConsumerRegistry;
+import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
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
Mon Aug 8 09:02:41 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -26,11 +26,11 @@
import me.prettyprint.hector.api.beans.HColumn;
-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.authentication.oauth.consumerregistry.OAuthServiceConsumerRegistry;
+import org.amdatu.auth.oauth.api.ConsumerAlreadyExistsException;
+import org.amdatu.auth.oauth.api.ConsumerNotFoundException;
+import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException;
+import org.amdatu.auth.oauth.api.OAuthServiceConsumer;
+import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry;
import org.amdatu.cassandra.application.ThriftException;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.codehaus.jackson.JsonParseException;
@@ -45,7 +45,7 @@
* consumer store stores available Service Consumers used by oAuth; they
represent a particular application
* that invokes an oAuth protected REST service. For oAuth to allow or
disallow that invocation it authenticates
* the Service Consumer that invoked the request by looking up the provided
credentials in this store.
- *
+ *
* @author ivol
*/
public class CassandraConsumerStorageProviderImpl implements
OAuthServiceConsumerRegistry {
@@ -65,7 +65,7 @@
*/
public CassandraConsumerStorageProviderImpl() {
}
-
+
/**
* Constructor used by the Unit test.
* @param pm
@@ -75,7 +75,7 @@
m_pm = pm;
m_logService = logService;
}
-
+
@Override
public void addConsumer(OAuthServiceConsumer consumer) throws
ConsumerAlreadyExistsException,
ConsumerRegistryStorageException {
@@ -100,13 +100,13 @@
// FIXME: implement this the LDAP way
throw new ConsumerRegistryStorageException("NOT YET IMPLEMENTED");
}
-
+
@Override
public OAuthServiceConsumer getConsumer(String consumerKey) throws
ConsumerRegistryStorageException {
if (consumerKey == null) {
return null;
}
-
+
// Retrieve the columns for this consumer key
List<HColumn<String, String>> columns = m_pm.getColumns(CF_CONSUMER,
consumerKey, String.class);
if (columns == null || columns.size() == 0) {
@@ -119,7 +119,7 @@
for (HColumn<String, String> column : columns) {
if (NAME.equals(column.getName())) {
consumer.setName(column.getValue());
- }
+ }
else if (SECRET.equals(column.getName())) {
consumer.setConsumerSecret(column.getValue());
}
@@ -135,7 +135,7 @@
}
@Override
- public void removeConsumer(OAuthServiceConsumer consumer) throws
ConsumerNotFoundException,
+ public void removeConsumer(OAuthServiceConsumer consumer) throws
ConsumerNotFoundException,
ConsumerRegistryStorageException {
String rowKey = consumer.getConsumerKey();
try {
@@ -171,14 +171,14 @@
if (!m_pm.exists(CF_CONSUMER, rowKey)) {
throw new ConsumerRegistryStorageException("An oAuth Service
consumer with key '" + rowKey + "' does not exist.");
}
-
+
String grants = m_pm.getValue(CF_CONSUMER, rowKey, null, GRANTS,
String.class);
if (grants != null) {
List<String> grantsList = stringToList(grants);
if (!grantsList.contains(userId)) {
grantsList.add(userId);
m_pm.setValue(CF_CONSUMER, rowKey, null, GRANTS,
listToString(grantsList));
- }
+ }
}
else {
List<String> grantsList = new ArrayList<String>();
@@ -199,14 +199,14 @@
if (!m_pm.exists(CF_CONSUMER, rowKey)) {
throw new ConsumerNotFoundException("An oAuth Service consumer
with key '" + rowKey + "' does not exist.");
}
-
+
String grants = m_pm.getValue(CF_CONSUMER, rowKey, null, GRANTS,
String.class);
if (grants != null) {
List<String> grantsList = stringToList(grants);
if (grantsList.contains(userId)) {
grantsList.remove(userId);
m_pm.setValue(CF_CONSUMER, rowKey, null, GRANTS,
listToString(grantsList));
- }
+ }
}
}
catch (ThriftException e) {
@@ -232,7 +232,7 @@
}
return false;
}
-
+
private void persist(OAuthServiceConsumer consumer) throws ThriftException
{
// Insert the values
String rowKey = consumer.getConsumerKey();
@@ -245,7 +245,7 @@
/**
* This method is used internally to convert a Map<String, String> to a
single JSON String, such that it can be
* persisted in Cassandra as String value. This way all columns in this
ColumnFamily are stored as String which makes
- * using the CassandraPersistenceManager a lot easier.
+ * using the CassandraPersistenceManager a lot easier.
* @return JSON expression
*/
private String mapToString(Map<String, String> map) {
@@ -271,14 +271,14 @@
}
return null;
}
-
+
private String listToString(List<String> list) {
Map<String, List<String>> map = new HashMap<String, List<String>>();
map.put("values", list);
JSONObject json = new JSONObject(map);
return json.toString();
}
-
+
private List<String> stringToList(String json) {
String errorMsg = "Could not convert JSON expression to List<String>.
JSON expression:\r\n" + json;
try {
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/OAuthServiceConsumerImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/OAuthServiceConsumerImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/OAuthServiceConsumerImpl.java
Mon Aug 8 09:02:41 2011
@@ -18,7 +18,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.amdatu.authentication.oauth.api.OAuthServiceConsumer;
+import org.amdatu.auth.oauth.api.OAuthServiceConsumer;
public class OAuthServiceConsumerImpl implements OAuthServiceConsumer {
private String m_name;
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
Mon Aug 8 09:02:41 2011
@@ -15,10 +15,10 @@
*/
package org.amdatu.cassandra.test.unit;
-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.auth.oauth.api.ConsumerAlreadyExistsException;
+import org.amdatu.auth.oauth.api.ConsumerNotFoundException;
+import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException;
+import org.amdatu.auth.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;
Modified:
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantColumnFamilyProviderTest.java
Mon Aug 8 09:02:41 2011
@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.store.tenant.service;
+package org.amdatu.cassandra.tenantstore.service;
-import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
-import org.junit.Assert;
-import org.junit.Test;
+import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
+import org.amdatu.cassandra.store.tenant.service.TenantColumnFamilyProvider;
+import org.junit.Assert;
+import org.junit.Test;
public class TenantColumnFamilyProviderTest {
Modified:
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-tenant/src/test/java/org/amdatu/cassandra/tenantstore/service/TenantStorageProviderCassandraImplTest.java
Mon Aug 8 09:02:41 2011
@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.amdatu.cassandra.store.tenant.service;
+package org.amdatu.cassandra.tenantstore.service;
-import org.amdatu.core.tenant.TenantStorageProvider;
-import org.junit.Assert;
-import org.junit.Test;
+import
org.amdatu.cassandra.store.tenant.service.TenantStorageProviderCassandraImpl;
+import org.amdatu.core.tenant.TenantStorageProvider;
+import org.junit.Assert;
+import org.junit.Test;
public class TenantStorageProviderCassandraImplTest {
Modified:
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/osgi/Activator.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/osgi/Activator.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-token/src/main/java/org/amdatu/cassandra/store/token/osgi/Activator.java
Mon Aug 8 09:02:41 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -15,7 +15,7 @@
*/
package org.amdatu.cassandra.store.token.osgi;
-import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
+import org.amdatu.auth.tokenprovider.TokenStorageProvider;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
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
Mon Aug 8 09:02:41 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -24,8 +24,8 @@
import me.prettyprint.hector.api.beans.HColumn;
-import org.amdatu.authentication.tokenprovider.Token;
-import org.amdatu.authentication.tokenprovider.TokenStorageProvider;
+import org.amdatu.auth.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.TokenStorageProvider;
import org.amdatu.cassandra.application.ThriftException;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.codehaus.jackson.JsonParseException;
@@ -37,7 +37,7 @@
/**
* This class implements a Cassandra based Token storage provider.
- *
+ *
* @author ivol
*/
public class CassandraTokenStorageProviderImpl implements TokenStorageProvider
{
@@ -55,10 +55,10 @@
*/
public CassandraTokenStorageProviderImpl() {
}
-
+
/**
* Constructor used by the Unit test.
- *
+ *
* @param pm
* @param logService
*/
@@ -120,7 +120,7 @@
t.setProperties(properties);
return t;
}
-
+
private String mapToString(Map<String, String> map) {
JSONObject json = new JSONObject(map);
return json.toString();
Modified:
trunk/amdatu-cassandra/cassandra-store-token/src/test/java/org/amdatu/cassandra/test/unit/CassandraTokenStoreTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-token/src/test/java/org/amdatu/cassandra/test/unit/CassandraTokenStoreTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-token/src/test/java/org/amdatu/cassandra/test/unit/CassandraTokenStoreTest.java
Mon Aug 8 09:02:41 2011
@@ -16,7 +16,7 @@
*/
package org.amdatu.cassandra.test.unit;
-import org.amdatu.authentication.tokenprovider.Token;
+import org.amdatu.auth.tokenprovider.Token;
import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
import
org.amdatu.cassandra.store.token.service.CassandraTokenStorageProviderImpl;
import org.amdatu.cassandra.store.token.service.TokenColumnFamilyProvider;
@@ -36,7 +36,7 @@
// And the store under test itself
CassandraTokenStorageProviderImpl tokenStore = new
CassandraTokenStorageProviderImpl(pm, logService);
-
+
// OK, I agree, this will not be the most complex unit test...
String key = "i_am_the_token";
String secret = "i_am_the_secret";
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
