svn commit: r1579828 - in /archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src: main/java/org/apache/archiva/metadata/repository/cassandra/ test/java/org/apache/archiva/metadata/repository/cassandra/

[olamy]

Author: olamy
Date: Thu Mar 20 23:23:44 2014
New Revision: 1579828

URL: http://svn.apache.org/r1579828
Log:
fix removeProject

Modified:
    
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
    
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java

Modified: 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1579828&r1=1579827&r2=1579828&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
 Thu Mar 20 23:23:44 2014
@@ -98,7 +98,7 @@ public class CassandraMetadataRepository
             .createRangeSlicesQuery( keyspace, StringSerializer.get(), 
StringSerializer.get(),
                                      StringSerializer.get() ) //
             .setColumnFamily( 
cassandraArchivaManager.getRepositoryFamilyName() ) //
-            .setColumnNames(  "repositoryName" ) //
+            .setColumnNames( "repositoryName" ) //
             .addEqualsExpression( "repositoryName", repositoryId ) //
             .execute();
 
@@ -124,7 +124,8 @@ public class CassandraMetadataRepository
 
         }
 
-        return new Repository( result.get().getList().get( 0 
).getColumnSlice().getColumnByName( "repositoryName" ).getValue() );
+        return new Repository(
+            result.get().getList().get( 0 ).getColumnSlice().getColumnByName( 
"repositoryName" ).getValue() );
     }
 
 
@@ -569,6 +570,17 @@ public class CassandraMetadataRepository
         throws MetadataRepositoryException
     {
 
+        String key = new Project.KeyBuilder() //
+            .withProjectId( projectId ) //
+            .withNamespace( new Namespace( namespaceId, new Repository( 
repositoryId ) ) ) //
+            .build();
+
+        HFactory.createMutator( cassandraArchivaManager.getKeyspace(), new 
StringSerializer() ) //
+            .addDeletion( key, cassandraArchivaManager.getProjectFamilyName() 
) //
+            .execute();
+
+        // TODO finish linked data to delete
+
 /*        // cleanup ArtifactMetadataModel
         final List<ArtifactMetadataModel> artifactMetadataModels = new 
ArrayList<ArtifactMetadataModel>();
 

Modified: 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1579828&r1=1579827&r2=1579828&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
 Thu Mar 20 23:23:44 2014
@@ -118,6 +118,10 @@ public class RepositoriesNamespaceTest
             Assertions.assertThat( cmr.getProjects( "release", "org" ) 
).isNotEmpty().hasSize( 1 ).containsExactly(
                 "theproject" );
 
+            cmr.removeProject( "release", "org", "theproject" );
+
+            Assertions.assertThat( cmr.getProjects( "release", "org" ) 
).isEmpty();
+
             cmr.removeRepository( "release" );
 
             r = cmr.getRepository( "release" );