svn commit: r1580763 - /archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java

[olamy]

Author: olamy
Date: Mon Mar 24 06:15:58 2014
New Revision: 1580763

URL: http://svn.apache.org/r1580763
Log:
fix removeArtifact

Modified:
    
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.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=1580763&r1=1580762&r2=1580763&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 06:15:58 2014
@@ -1690,15 +1690,13 @@ public class CassandraMetadataRepository
         logger.debug( "removeArtifact repositoryId: '{}', namespace: '{}', 
project: '{}', version: '{}', id: '{}'",
                       artifactMetadata.getRepositoryId(), 
artifactMetadata.getNamespace(),
                       artifactMetadata.getProject(), baseVersion, 
artifactMetadata.getId() );
-/*        String key =
+        String key =
             new ArtifactMetadataModel.KeyBuilder().withRepositoryId( 
artifactMetadata.getRepositoryId() ).withNamespace(
                 artifactMetadata.getNamespace() ).withId( 
artifactMetadata.getId() ).withProjectVersion(
                 baseVersion ).withProject( artifactMetadata.getProject() 
).build();
 
-        ArtifactMetadataModel artifactMetadataModel = new 
ArtifactMetadataModel();
-        artifactMetadataModel.setArtifactMetadataModelId( key );
+        this.artifactMetadataTemplate.deleteRow( key );
 
-        getArtifactMetadataModelEntityManager().remove( artifactMetadataModel 
);*/
     }
 
     @Override
@@ -1798,9 +1796,9 @@ public class CassandraMetadataRepository
             .addEqualsExpression( "project", projectId ) //
             .addEqualsExpression( "projectVersion", projectVersion );
 
-        QueryResult<OrderedRows<String,String,String>> result = 
query.execute();
+        QueryResult<OrderedRows<String, String, String>> result = 
query.execute();
 
-        for (Row<String,String,String> row : result.get())
+        for ( Row<String, String, String> row : result.get() )
         {
             this.artifactMetadataTemplate.deleteRow( row.getKey() );
         }