You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/06/02 15:08:18 UTC
svn commit: r1488702 - in
/archiva/sandbox/trunk/metadata-store-cassandra/src:
main/java/org/apache/archiva/metadata/repository/cassandra/
test/java/org/apache/archiva/metadata/repository/cassandra/
Author: olamy
Date: Sun Jun 2 13:08:14 2013
New Revision: 1488702
URL: http://svn.apache.org/r1488702
Log:
fix test when adding project
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.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=1488702&r1=1488701&r2=1488702&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 Sun Jun 2 13:08:14 2013
@@ -874,11 +874,20 @@ public class CassandraMetadataRepository
Namespace namespace = namespaceEntityManager.get( namespaceKey );
if ( namespace == null )
{
- updateNamespace( repositoryId, namespaceId );
+ namespace = updateOrAddNamespace( repositoryId, namespaceId );
+ }
+
+ String key = new Project.KeyBuilder().withNamespace( namespace ).withProjectId( projectId ).build();
+
+ Project project = projectEntityManager.get( key );
+ if ( project == null )
+ {
+ project = new Project( key, projectId, namespace );
+ projectEntityManager.put( project );
}
// we don't test of repository and namespace really exist !
- String key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( repositoryId ).withNamespace(
+ key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( repositoryId ).withNamespace(
namespaceId ).withProjectId( projectId ).withId( versionMetadata.getId() ).build();
ProjectVersionMetadataModel projectVersionMetadataModel = projectVersionMetadataModelEntityManager.get( key );
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1488702&r1=1488701&r2=1488702&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java Sun Jun 2 13:08:14 2013
@@ -107,6 +107,7 @@ public class CassandraMetadataRepository
cmr.getProjectVersionMetadataModelEntityManager().getAll();
cmr.getProjectVersionMetadataModelEntityManager().remove( projectVersionMetadataModels );
+
}
}