svn commit: r1581639 - 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/ plugins/me...

[olamy]

Author: olamy
Date: Wed Mar 26 02:41:06 2014
New Revision: 1581639

URL: http://svn.apache.org/r1581639
Log:
should return null if no facets found

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
    
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.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=1581639&r1=1581638&r2=1581639&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
 Wed Mar 26 02:41:06 2014
@@ -743,14 +743,14 @@ public abstract class AbstractMetadataRe
         throws Exception
     {
         List<String> facets = repository.getMetadataFacets( TEST_REPO_ID, 
TEST_FACET_ID );
-        assertTrue( facets.isEmpty() );
-        assertNull( repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, 
TEST_NAME ) );
+        assertThat( facets ).isNotNull().isEmpty();
+        assertThat( repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, 
TEST_NAME ) ).isNull();
 
         repository.removeMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, TEST_NAME 
);
 
         facets = repository.getMetadataFacets( TEST_REPO_ID, TEST_FACET_ID );
-        assertTrue( facets.isEmpty() );
-        assertNull( repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, 
TEST_NAME ) );
+        assertThat( facets ).isNotNull().isEmpty();
+        assertThat( repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, 
TEST_NAME ) ).isNull();
     }
 
     @Test

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=1581639&r1=1581638&r2=1581639&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
 Wed Mar 26 02:41:06 2014
@@ -1300,7 +1300,8 @@ public class CassandraMetadataRepository
 
             addInsertion( dependencyMutator, keyDependency, cfDependency, 
"version", dependency.getVersion() );
 
-        } dependencyMutator.execute();
+        }
+        dependencyMutator.execute();
     }
 
     protected void removeDependencies( String projectVersionMetadataKey )
@@ -1334,7 +1335,8 @@ public class CassandraMetadataRepository
 
         for ( Row<String, String, String> row : result.get() )
         {
-            ColumnFamilyResult<String, String> columnFamilyResult = 
this.dependencyTemplate.queryColumns( row.getKey() );
+            ColumnFamilyResult<String, String> columnFamilyResult =
+                this.dependencyTemplate.queryColumns( row.getKey() );
 
             Dependency dependency = new Dependency();
             dependency.setClassifier( columnFamilyResult.getString( 
"classifier" ) );
@@ -1595,7 +1597,12 @@ public class CassandraMetadataRepository
             .execute();
 
         MetadataFacet metadataFacet = 
metadataFacetFactory.createMetadataFacet( repositoryId, name );
-        Map<String, String> map = new HashMap<String, String>( 
result.get().getCount() );
+        int size = result.get().getCount();
+        if ( size < 1 )
+        {
+            return null;
+        }
+        Map<String, String> map = new HashMap<String, String>( size );
         for ( Row<String, String, String> row : result.get() )
         {
             ColumnSlice<String, String> columnSlice = row.getColumnSlice();

Modified: 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1581639&r1=1581638&r2=1581639&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
 Wed Mar 26 02:41:06 2014
@@ -80,8 +80,10 @@ public class CassandraMetadataRepository
     {
         cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
                                                        
cassandraArchivaManager.getProjectFamilyName() );
+
         cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
                                                        
cassandraArchivaManager.getNamespaceFamilyName() );
+
         cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
                                                        
cassandraArchivaManager.getRepositoryFamilyName() );