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

[olamy]

Author: olamy
Date: Mon Mar 24 03:17:49 2014
New Revision: 1580720

URL: http://svn.apache.org/r1580720
Log:
fix remove artifact

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

Modified: 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1580720&r1=1580719&r2=1580720&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
 Mon Mar 24 03:17:49 2014
@@ -1238,8 +1238,8 @@ public abstract class AbstractMetadataRe
 
         Assertions.assertThat( versions ).isNotNull().isNotEmpty().hasSize( 1 
).contains( "2.0" );
 
-        assertTrue(
-            repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, 
TEST_PROJECT, TEST_PROJECT_VERSION ).isEmpty() );
+        Assertions.assertThat( repository.getArtifacts( TEST_REPO_ID, 
TEST_NAMESPACE, TEST_PROJECT,
+                                                        TEST_PROJECT_VERSION 
)).isNotNull().isEmpty();
 
         Assertions.assertThat( repository.getArtifacts( TEST_REPO_ID, 
TEST_NAMESPACE, TEST_PROJECT,
                                                         
TEST_PROJECT_VERSION_2_0 ) ).isNotEmpty().hasSize( 1 );

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=1580720&r1=1580719&r2=1580720&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
 Mon Mar 24 03:17:49 2014
@@ -1841,25 +1841,23 @@ public class CassandraMetadataRepository
                                 final String version, final String id )
         throws MetadataRepositoryException
     {
-/*        logger.debug( "removeArtifact repositoryId: '{}', namespace: '{}', 
project: '{}', version: '{}', id: '{}'",
+        logger.debug( "removeArtifact repositoryId: '{}', namespace: '{}', 
project: '{}', version: '{}', id: '{}'",
                       repositoryId, namespace, project, version, id );
         String key =
             new ArtifactMetadataModel.KeyBuilder().withRepositoryId( 
repositoryId ).withNamespace( namespace ).withId(
                 id ).withProjectVersion( version ).withProject( project 
).build();
 
-        ArtifactMetadataModel artifactMetadataModel = new 
ArtifactMetadataModel();
-        artifactMetadataModel.setArtifactMetadataModelId( key );
 
-        getArtifactMetadataModelEntityManager().remove( artifactMetadataModel 
);
+        Keyspace keyspace = cassandraArchivaManager.getKeyspace();
+
+        this.artifactMetadataTemplate.deleteRow( key );
 
         key =
             new ProjectVersionMetadataModel.KeyBuilder().withId( version 
).withRepository( repositoryId ).withNamespace(
                 namespace ).withProjectId( project ).build();
 
-        ProjectVersionMetadataModel projectVersionMetadataModel = new 
ProjectVersionMetadataModel();
-        projectVersionMetadataModel.setRowId( key );
+        this.projectVersionMetadataModelTemplate.deleteRow( key );
 
-        getProjectVersionMetadataModelEntityManager().remove( 
projectVersionMetadataModel );*/
     }
 
     @Override
@@ -1919,9 +1917,6 @@ public class CassandraMetadataRepository
         Keyspace keyspace = cassandraArchivaManager.getKeyspace();
         StringSerializer ss = StringSerializer.get();
 
-        // cql cannot run or in queries so running twice the query
-
-
         RangeSlicesQuery<String, String, String> query = HFactory //
             .createRangeSlicesQuery( keyspace, ss, ss, ss ) //
             .setColumnFamily( 
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //