Author: olamy
Date: Tue Jun 4 12:49:14 2013
New Revision: 1489420
URL: http://svn.apache.org/r1489420
Log:
fix removeArtifact
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1489420&r1=1489419&r2=1489420&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Tue Jun 4 12:49:14 2013
@@ -1340,27 +1340,22 @@ public class CassandraMetadataRepository
{
logger.debug( "removeArtifact repositoryId: '{}', namespace: '{}',
project: '{}', version: '{}', id: '{}'",
repositoryId, namespace, project, version, id );
- final String key =
+ String key =
new ArtifactMetadataModel.KeyBuilder().withRepositoryId(
repositoryId ).withNamespace( namespace ).withId(
id ).withProjectVersion( version ).withProject( project
).build();
- //String key = new ArtifactMetadataModel.KeyBuilder().withNamespace(
namespace ).withProject( projectId ).withId(
- // artifactMeta.getId() ).withProjectVersion( projectVersion
).build();
-
- artifactMetadataModelEntityManager.visitAll( new
Function<ArtifactMetadataModel, Boolean>()
- {
- @Override
- public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
- {
- boolean equals = StringUtils.equals( key,
artifactMetadataModel.getArtifactMetadataModelId() );
- return Boolean.TRUE;
- }
- } );
ArtifactMetadataModel artifactMetadataModel = new
ArtifactMetadataModel();
artifactMetadataModel.setArtifactMetadataModelId( key );
artifactMetadataModelEntityManager.remove( artifactMetadataModel );
+
+ key = new ProjectVersionMetadataModel.KeyBuilder().withId( version
).withRepository( repositoryId ).withNamespace( namespace ).withProjectId(
project ).build();
+
+ ProjectVersionMetadataModel projectVersionMetadataModel = new
ProjectVersionMetadataModel();
+ projectVersionMetadataModel.setRowId( key );
+
+ projectVersionMetadataModelEntityManager.remove(
projectVersionMetadataModel );
}
@Override
