svn commit: r1580690 - in /archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src: main/java/org/apache/archiva/metadata/repository/cassandra/ test/java/org/apache/archiva/metadata/repository/cassandra/

[olamy]

Author: olamy
Date: Mon Mar 24 01:36:21 2014
New Revision: 1580690

URL: http://svn.apache.org/r1580690
Log:
fix truncating datas in unit and wrong StringUtils usage

Modified:
    
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.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/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java?rev=1580690&r1=1580689&r2=1580690&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
 Mon Mar 24 01:36:21 2014
@@ -76,7 +76,7 @@ public class CassandraUtils
 
     public static String getStringValue( ColumnSlice<String, String> 
columnSlice, String columnName )
     {
-        if ( StringUtils.isNotEmpty( columnName ) )
+        if ( StringUtils.isEmpty( columnName ) )
         {
             return null;
         }
@@ -87,7 +87,7 @@ public class CassandraUtils
 
     public static Long getLongValue( ColumnSlice<String, Long> columnSlice, 
String columnName )
     {
-        if ( StringUtils.isNotEmpty( columnName ) )
+        if ( StringUtils.isEmpty( columnName ) )
         {
             return null;
         }
@@ -99,7 +99,7 @@ public class CassandraUtils
     public static String getAsStringValue( ColumnSlice<String, Long> 
columnSlice, String columnName )
     {
         StringSerializer ss = StringSerializer.get();
-        if ( StringUtils.isNotEmpty( columnName ) )
+        if ( StringUtils.isEmpty( columnName ) )
         {
             return null;
         }
@@ -111,7 +111,7 @@ public class CassandraUtils
     public static Long getAsLongValue( ColumnSlice<String, String> 
columnSlice, String columnName )
     {
         LongSerializer ls = LongSerializer.get();
-        if ( StringUtils.isNotEmpty( columnName ) )
+        if ( StringUtils.isEmpty( columnName ) )
         {
             return null;
         }

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=1580690&r1=1580689&r2=1580690&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
 Mon Mar 24 01:36:21 2014
@@ -85,6 +85,18 @@ public class CassandraMetadataRepository
         cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
                                                        "repository" );
 
+        cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
+                                                       
"projectversionmetadatamodel" );
+
+        cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
+                                                       "artifactmetadatamodel" 
);
+
+        cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
+                                                       "metadatafacetmodel" );
+
+        cassandraArchivaManager.getCluster().truncate( 
cassandraArchivaManager.getKeyspace().getKeyspaceName(),
+                                                       "metadatafacetmodel" );
+
     }
 
 }