Author: [email protected]
Date: Tue Jul 19 16:42:27 2011
New Revision: 1224
Log:
[AMDATUCASSANDRA-8] Changes necessary for latest changes in Amdatu Auth
0.2.0-SNAPSHOT
Modified:
trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
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/test/java/org/amdatu/cassandra/test/unit/CassandraConsumerStoreTest.java
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
Modified: trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml Tue Jul 19
16:42:27 2011
@@ -60,6 +60,13 @@
<type>bundle</type>
</dependency>
<dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <version>${amdatu.auth.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.4.0</version>
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
Tue Jul 19 16:42:27 2011
@@ -15,7 +15,7 @@
*/
package org.amdatu.cassandra.store.consumer.osgi;
-import org.amdatu.authentication.oauth.api.OAuthServiceConsumerRegistry;
+import
org.amdatu.authentication.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
Tue Jul 19 16:42:27 2011
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -29,7 +30,7 @@
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.api.OAuthServiceConsumerRegistry;
+import
org.amdatu.authentication.oauth.consumerregistry.OAuthServiceConsumerRegistry;
import org.amdatu.cassandra.application.ThriftException;
import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import org.codehaus.jackson.JsonParseException;
@@ -95,6 +96,12 @@
}
@Override
+ public Iterator<OAuthServiceConsumer> getConsumers(String filter) throws
ConsumerRegistryStorageException {
+ // 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;
@@ -289,4 +296,6 @@
}
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 Jul 19 16:42:27 2011
@@ -94,7 +94,7 @@
// Finally, remove the consumer
consumerStore.removeConsumer(consumer);
-
Assert.assertNotNull(consumerStore.getConsumer(consumer.getConsumerKey()));
+
Assert.assertNull(consumerStore.getConsumer(consumer.getConsumerKey()));
consumer.setConsumerKey("inexistentconsumer");
try {
Modified:
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
==============================================================================
---
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
(original)
+++
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
Tue Jul 19 16:42:27 2011
@@ -142,6 +142,7 @@
Row row = cf.getRow(rowKey);
if (row == null) {
row = cf.new Row(rowKey);
+ cf.addRow(row);
}
Column col = row.getColumn(column);
if (col == null) {
@@ -151,7 +152,6 @@
col.setValue(value);
}
row.addColumn(col);
- cf.addRow(row);
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
