Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix truncating datas in unit and wrong StringUtils usage 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1580690 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2014-03-24 01:36:21 +00:00
parent c6afb274c0
commit fddb0ca9cf
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
View File

@ -76,7 +76,7 @@ public class CassandraUtils
public static String getStringValue( ColumnSlice<String, String> columnSlice, String columnName ) public static String getStringValue( ColumnSlice<String, String> columnSlice, String columnName )
{ {
if ( StringUtils.isNotEmpty( columnName ) ) if ( StringUtils.isEmpty( columnName ) )
{ {
return null; return null;
} }
@ -87,7 +87,7 @@ public class CassandraUtils
public static Long getLongValue( ColumnSlice<String, Long> columnSlice, String columnName ) public static Long getLongValue( ColumnSlice<String, Long> columnSlice, String columnName )
{ {
if ( StringUtils.isNotEmpty( columnName ) ) if ( StringUtils.isEmpty( columnName ) )
{ {
return null; return null;
} }
@ -99,7 +99,7 @@ public class CassandraUtils
public static String getAsStringValue( ColumnSlice<String, Long> columnSlice, String columnName ) public static String getAsStringValue( ColumnSlice<String, Long> columnSlice, String columnName )
{ {
StringSerializer ss = StringSerializer.get(); StringSerializer ss = StringSerializer.get();
if ( StringUtils.isNotEmpty( columnName ) ) if ( StringUtils.isEmpty( columnName ) )
{ {
return null; return null;
} }
@ -111,7 +111,7 @@ public class CassandraUtils
public static Long getAsLongValue( ColumnSlice<String, String> columnSlice, String columnName ) public static Long getAsLongValue( ColumnSlice<String, String> columnSlice, String columnName )
{ {
LongSerializer ls = LongSerializer.get(); LongSerializer ls = LongSerializer.get();
if ( StringUtils.isNotEmpty( columnName ) ) if ( StringUtils.isEmpty( columnName ) )
{ {
return null; return null;
} }

12
archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
View File

@ -85,6 +85,18 @@ public class CassandraMetadataRepositoryTest
cassandraArchivaManager.getCluster().truncate( cassandraArchivaManager.getKeyspace().getKeyspaceName(), cassandraArchivaManager.getCluster().truncate( cassandraArchivaManager.getKeyspace().getKeyspaceName(),
"repository" ); "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" );
} }
} }