Author: olamy
Date: Thu May 30 11:19:45 2013
New Revision: 1487819
URL: http://svn.apache.org/r1487819
Log:
fix unit tests
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/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.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=1487819&r1=1487818&r2=1487819&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
Thu May 30 11:19:45 2013
@@ -262,6 +262,13 @@ public class CassandraMetadataRepository
public void updateNamespace( String repositoryId, String namespaceId )
throws MetadataRepositoryException
{
+ updateOrAddNamespace( repositoryId, namespaceId );
+
+ }
+
+ public Namespace updateOrAddNamespace( String repositoryId, String
namespaceId )
+ throws MetadataRepositoryException
+ {
try
{
Repository repository = this.repositoryEntityManager.get(
repositoryId );
@@ -285,6 +292,7 @@ public class CassandraMetadataRepository
namespace = new Namespace( namespaceId, repository );
namespaceEntityManager.put( namespace );
}
+ return namespace;
}
catch ( PersistenceException e )
{
@@ -527,12 +535,19 @@ public class CassandraMetadataRepository
Namespace namespace = namespaceEntityManager.get( namespaceKey );
if ( namespace == null )
{
- updateNamespace( repositoryId, projectMetadata.getNamespace() );
+ namespace = updateOrAddNamespace( repositoryId,
projectMetadata.getNamespace() );
}
- project = new Project( projectKey, namespace );
+ project = new Project( projectKey, projectMetadata.getId(), namespace
);
- projectEntityManager.put( project );
+ try
+ {
+ projectEntityManager.put( project );
+ }
+ catch ( PersistenceException e )
+ {
+ throw new MetadataRepositoryException( e.getMessage(), e );
+ }
}
@@ -1151,7 +1166,7 @@ public class CassandraMetadataRepository
}
@Override
- public ProjectMetadata getProject( final String repoId, final String
namespace, final String projectId )
+ public ProjectMetadata getProject( final String repoId, final String
namespace, final String id )
throws MetadataResolutionException
{
//basically just checking it exists
@@ -1159,16 +1174,16 @@ public class CassandraMetadataRepository
final BooleanHolder booleanHolder = new BooleanHolder();
- projectVersionMetadataModelEntityManager.visitAll( new
Function<ProjectVersionMetadataModel, Boolean>()
+ projectEntityManager.visitAll( new Function<Project, Boolean>()
{
@Override
- public Boolean apply( ProjectVersionMetadataModel project )
+ public Boolean apply( Project project )
{
if ( project != null )
{
if ( StringUtils.equals( repoId,
project.getNamespace().getRepository().getName() )
- && StringUtils.equals( namespace,
project.getNamespace().getName() ) && StringUtils.equals(
- projectId, project.getProjectId() ) )
+ && StringUtils.equals( namespace,
project.getNamespace().getName() ) && StringUtils.equals( id,
+
project.getId() ) )
{
booleanHolder.value = true;
}
@@ -1183,10 +1198,10 @@ public class CassandraMetadataRepository
}
ProjectMetadata projectMetadata = new ProjectMetadata();
- projectMetadata.setId( projectId );
+ projectMetadata.setId( id );
projectMetadata.setNamespace( namespace );
- logger.debug( "getProject repoId: {}, namespace: {}, projectId: {} ->
{}", repoId, namespace, projectId,
+ logger.debug( "getProject repoId: {}, namespace: {}, projectId: {} ->
{}", repoId, namespace, id,
projectMetadata );
return projectMetadata;
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java?rev=1487819&r1=1487818&r2=1487819&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
Thu May 30 11:19:45 2013
@@ -32,13 +32,13 @@ public class Project
implements Serializable
{
@Id
- @Column( name = "projectId" )
+ @Column(name = "projectId")
private String projectId;
- @Column( name = "id" )
+ @Column(name = "id")
private String id;
- @Column( name = "repository" )
+ @Column(name = "repository")
private Namespace namespace;
public Project()
@@ -46,8 +46,9 @@ public class Project
// no op
}
- public Project( String id, Namespace namespace )
+ public Project( String projectId, String id, Namespace namespace )
{
+ this.projectId = projectId;
this.id = id;
this.namespace = namespace;
}
@@ -72,6 +73,16 @@ public class Project
this.namespace = namespace;
}
+ public String getProjectId()
+ {
+ return projectId;
+ }
+
+ public void setProjectId( String projectId )
+ {
+ this.projectId = projectId;
+ }
+
@Override
public boolean equals( Object o )
{
