svn commit: r1579823 - in /archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra: CassandraMetadataRepository.java model/Namespace.java

[olamy]

Author: olamy
Date: Thu Mar 20 23:22:59 2014
New Revision: 1579823

URL: http://svn.apache.org/r1579823
Log:
this id field is not anymore needed

Modified:
    
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/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java

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=1579823&r1=1579822&r2=1579823&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
 Thu Mar 20 23:22:59 2014
@@ -163,16 +163,19 @@ public class CassandraMetadataRepository
 
             Keyspace keyspace = cassandraArchivaManager.getKeyspace();
 
+            String key =
+                new Namespace.KeyBuilder().withNamespace( namespaceId 
).withRepositoryId( repositoryId ).build();
+
             Namespace namespace = getNamespace( repositoryId, namespaceId );
             if ( namespace == null )
             {
                 namespace = new Namespace( namespaceId, repository );
                 HFactory.createMutator( keyspace, StringSerializer.get() )
                     //  values
-                    .addInsertion( namespace.getId(), //
+                    .addInsertion( key, //
                                    
cassandraArchivaManager.getNamespaceFamilyName(), //
                                    CassandraUtils.column( "name", 
namespace.getName() ) ) //
-                    .addInsertion( namespace.getId(), //
+                    .addInsertion( key, //
                                    
cassandraArchivaManager.getNamespaceFamilyName(), //
                                    CassandraUtils.column( "repositoryId", 
repository.getId() ) ) //
                     .execute();

Modified: 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java?rev=1579823&r1=1579822&r2=1579823&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
 Thu Mar 20 23:22:59 2014
@@ -33,8 +33,6 @@ public class Namespace
     implements Serializable
 {
 
-    private String id;
-
     private String name;
 
     private String repositoryId;
@@ -49,21 +47,11 @@ public class Namespace
 
     public Namespace( String id, Repository repository )
     {
-        this.id = new KeyBuilder().withNamespace( id ).withRepositoryId( 
repository.getId() ).build();
         this.name = id;
         this.repositoryId = repository.getId();
         this.repositoryName = repository.getName();
     }
 
-    public String getId()
-    {
-        return id;
-    }
-
-    public void setId( String id )
-    {
-        this.id = id;
-    }
 
     public String getName()
     {
@@ -100,7 +88,7 @@ public class Namespace
 
         Namespace namespace = (Namespace) o;
 
-        if ( !id.equals( namespace.id ) )
+        if ( !name.equals( namespace.name ) )
         {
             return false;
         }
@@ -115,7 +103,7 @@ public class Namespace
     @Override
     public int hashCode()
     {
-        int result = id.hashCode();
+        int result = name.hashCode();
         result = 31 * result + repositoryId.hashCode();
         return result;
     }
@@ -124,7 +112,6 @@ public class Namespace
     public String toString()
     {
         final StringBuilder sb = new StringBuilder( "Namespace{" );
-        sb.append( "id='" ).append( id ).append( '\'' );
         sb.append( ", name='" ).append( name ).append( '\'' );
         sb.append( ", repository='" ).append( repositoryId ).append( '\'' );
         sb.append( '}' );