1.7 diamond

diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
index ce28c48b9ae38e364422a85a6e19e53a14297a65..d102cfe5917335b8ca1e11f2ea1e880c181ed1a6 100644 (file)
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
@@ -125,50 +125,45 @@ public class CassandraMetadataRepository
         this.keyspace = cassandraArchivaManager.getKeyspace();
 
         this.projectVersionMetadataTemplate =
-            new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                            cassandraArchivaManager.getProjectVersionMetadataFamilyName(),
-                                                            StringSerializer.get(), //
-                                                            StringSerializer.get() );
-
-        this.projectTemplate = new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                                               cassandraArchivaManager.getProjectFamilyName(),
-                                                                               //
-                                                                               StringSerializer.get(), //
-                                                                               StringSerializer.get() );
-
-        this.artifactMetadataTemplate =
-            new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                            cassandraArchivaManager.getArtifactMetadataFamilyName(),
-                                                            //
-                                                            StringSerializer.get(), //
-                                                            StringSerializer.get() );
-
-        this.metadataFacetTemplate =
-            new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                            cassandraArchivaManager.getMetadataFacetFamilyName(),
-                                                            //
-                                                            StringSerializer.get(), //
-                                                            StringSerializer.get() );
-
-        this.mailingListTemplate =
-            new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                            cassandraArchivaManager.getMailingListFamilyName(),
-                                                            //
-                                                            StringSerializer.get(), //
-                                                            StringSerializer.get() );
-
-        this.licenseTemplate = new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                                               cassandraArchivaManager.getLicenseFamilyName(),
-                                                                               //
-                                                                               StringSerializer.get(), //
-                                                                               StringSerializer.get() );
-
-        this.dependencyTemplate =
-            new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
-                                                            cassandraArchivaManager.getDependencyFamilyName(),
-                                                            //
-                                                            StringSerializer.get(), //
-                                                            StringSerializer.get() );
+            new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                              cassandraArchivaManager.getProjectVersionMetadataFamilyName(), //
+                                              StringSerializer.get(), //
+                                              StringSerializer.get() );
+
+        this.projectTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                                                 cassandraArchivaManager.getProjectFamilyName(), //
+                                                                 //
+                                                                 StringSerializer.get(), //
+                                                                 StringSerializer.get() );
+
+        this.artifactMetadataTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                                                          cassandraArchivaManager.getArtifactMetadataFamilyName(),
+                                                                          StringSerializer.get(), //
+                                                                          StringSerializer.get() );
+
+        this.metadataFacetTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                                                       cassandraArchivaManager.getMetadataFacetFamilyName(),
+                                                                       //
+                                                                       StringSerializer.get(), //
+                                                                       StringSerializer.get() );
+
+        this.mailingListTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                                                     cassandraArchivaManager.getMailingListFamilyName(),
+                                                                     //
+                                                                     StringSerializer.get(), //
+                                                                     StringSerializer.get() );
+
+        this.licenseTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                                                 cassandraArchivaManager.getLicenseFamilyName(),
+                                                                 //
+                                                                 StringSerializer.get(), //
+                                                                 StringSerializer.get() );
+
+        this.dependencyTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+                                                                    cassandraArchivaManager.getDependencyFamilyName(),
+                                                                    //
+                                                                    StringSerializer.get(), //
+                                                                    StringSerializer.get() );
     }
 
 
@@ -202,6 +197,7 @@ public class CassandraMetadataRepository
                     .addInsertion( repositoryId, cf,
                                    CassandraUtils.column( "repositoryName", repository.getName() ) ) //
                     .execute();
+                logger.debug( "time to insert repository: {}", mutationResult.getExecutionTimeMicro() );
                 return repository;
             }
             catch ( HInvalidRequestException e )