Author: olamy
Date: Tue Mar 25 06:28:43 2014
New Revision: 1581255
URL: http://svn.apache.org/r1581255
Log:
use the same naming convention for those methods
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.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/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java?rev=1581255&r1=1581254&r2=1581255&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
Tue Mar 25 06:28:43 2014
@@ -44,11 +44,11 @@ public interface CassandraArchivaManager
String getProjectFamilyName();
- String getProjectVersionMetadataModelFamilyName();
+ String getProjectVersionMetadataFamilyName();
- String getArtifactMetadataModelFamilyName();
+ String getArtifactMetadataFamilyName();
- String getMetadataFacetModelFamilyName();
+ String getMetadataFacetFamilyName();
String getMailingListFamilyName();
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=1581255&r1=1581254&r2=1581255&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
Tue Mar 25 06:28:43 2014
@@ -115,7 +115,7 @@ public class CassandraMetadataRepository
this.projectVersionMetadataModelTemplate =
new ThriftColumnFamilyTemplate<String, String>(
cassandraArchivaManager.getKeyspace(), //
-
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName(),
+
cassandraArchivaManager.getProjectVersionMetadataFamilyName(),
StringSerializer.get(), //
StringSerializer.get() );
@@ -127,14 +127,14 @@ public class CassandraMetadataRepository
this.artifactMetadataTemplate =
new ThriftColumnFamilyTemplate<String, String>(
cassandraArchivaManager.getKeyspace(), //
-
cassandraArchivaManager.getArtifactMetadataModelFamilyName(),
+
cassandraArchivaManager.getArtifactMetadataFamilyName(),
//
StringSerializer.get(), //
StringSerializer.get() );
this.metadataFacetTemplate =
new ThriftColumnFamilyTemplate<String, String>(
cassandraArchivaManager.getKeyspace(), //
-
cassandraArchivaManager.getMetadataFacetModelFamilyName(),
+
cassandraArchivaManager.getMetadataFacetFamilyName(),
//
StringSerializer.get(), //
StringSerializer.get() );
@@ -306,7 +306,7 @@ public class CassandraMetadataRepository
StringSerializer.get(), //
StringSerializer.get(), //
StringSerializer.get() ) //
- .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataFamilyName() ) //
.setColumnNames( "repositoryName" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "namespaceId", namespaceId ) //
@@ -323,7 +323,7 @@ public class CassandraMetadataRepository
StringSerializer.get(), //
StringSerializer.get(), //
StringSerializer.get() ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "repositoryName" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "namespaceId", namespaceId ) //
@@ -339,7 +339,7 @@ public class CassandraMetadataRepository
StringSerializer.get(), //
StringSerializer.get(), //
StringSerializer.get() ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "repositoryName" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "namespaceId", namespaceId ) //
@@ -411,7 +411,7 @@ public class CassandraMetadataRepository
StringSerializer.get(), //
StringSerializer.get(), //
StringSerializer.get() ) //
- .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataFamilyName() ) //
.setColumnNames( "repositoryName" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.execute();
@@ -427,7 +427,7 @@ public class CassandraMetadataRepository
StringSerializer.get(), //
StringSerializer.get(), //
StringSerializer.get() ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "repositoryName" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.execute();
@@ -442,7 +442,7 @@ public class CassandraMetadataRepository
StringSerializer.get(), //
StringSerializer.get(), //
StringSerializer.get() ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "repositoryName" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.execute();
@@ -653,7 +653,7 @@ public class CassandraMetadataRepository
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataFamilyName() ) //
.setColumnNames( "id" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "namespaceId", namespaceId ) //
@@ -668,7 +668,7 @@ public class CassandraMetadataRepository
result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "projectId" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "namespaceId", namespaceId ) //
@@ -690,7 +690,7 @@ public class CassandraMetadataRepository
StringSerializer ss = StringSerializer.get();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataFamilyName() ) //
.setColumnNames( "projectVersion" ) //
.addEqualsExpression( "repositoryName", repoId ) //
.addEqualsExpression( "namespaceId", namespace ) //
@@ -800,7 +800,7 @@ public class CassandraMetadataRepository
Keyspace keyspace = cassandraArchivaManager.getKeyspace();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataFamilyName() ) //
.setColumnNames( "projectVersion" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "namespaceId", namespaceId ) //
@@ -840,7 +840,7 @@ public class CassandraMetadataRepository
// FIXME nested objects to store!!!
if ( creation )
{
- String cf =
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName();
+ String cf =
cassandraArchivaManager.getProjectVersionMetadataFamilyName();
Mutator<String> mutator =
projectVersionMetadataModelTemplate.createMutator()
// values
.addInsertion( key, cf, column( "projectId", projectId ) ) //
@@ -1043,7 +1043,7 @@ public class CassandraMetadataRepository
Keyspace keyspace = cassandraArchivaManager.getKeyspace();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "facetId", "key", "value", "name" ) //
.addEqualsExpression( "repositoryName", repoId ) //
.addEqualsExpression( "namespaceId", namespace ) //
@@ -1212,7 +1212,7 @@ public class CassandraMetadataRepository
}
else
{
- String cf =
this.cassandraArchivaManager.getArtifactMetadataModelFamilyName();
+ String cf =
this.cassandraArchivaManager.getArtifactMetadataFamilyName();
// create
this.artifactMetadataTemplate.createMutator() //
.addInsertion( key, cf, column( "id", artifactMeta.getId() )
)//
@@ -1241,7 +1241,7 @@ public class CassandraMetadataRepository
projectVersionMetadataModel.setId( projectVersion );
projectVersionMetadataModel.setNamespace( namespace );
- String cf =
this.cassandraArchivaManager.getProjectVersionMetadataModelFamilyName();
+ String cf =
this.cassandraArchivaManager.getProjectVersionMetadataFamilyName();
projectVersionMetadataModelTemplate.createMutator() //
.addInsertion( key, cf, column( "namespaceId",
namespace.getName() ) ) //
@@ -1277,7 +1277,7 @@ public class CassandraMetadataRepository
StringSerializer ss = StringSerializer.get();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getProjectVersionMetadataFamilyName() ) //
.setColumnNames( "projectVersion" ) //
.addEqualsExpression( "repositoryName", repoId ) //
.addEqualsExpression( "namespaceId", namespace ) //
@@ -1307,7 +1307,7 @@ public class CassandraMetadataRepository
{
Keyspace keyspace = cassandraArchivaManager.getKeyspace();
StringSerializer ss = StringSerializer.get();
- String cf = cassandraArchivaManager.getMetadataFacetModelFamilyName();
+ String cf = cassandraArchivaManager.getMetadataFacetFamilyName();
for ( final String facetId : metadataFacetFactories.keySet() )
{
@@ -1365,7 +1365,7 @@ public class CassandraMetadataRepository
StringSerializer ss = StringSerializer.get();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "name" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "facetId", facetId ) //
@@ -1402,7 +1402,7 @@ public class CassandraMetadataRepository
StringSerializer ss = StringSerializer.get();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "key", "value" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "facetId", facetId ) //
@@ -1446,7 +1446,7 @@ public class CassandraMetadataRepository
}
else
{
- String cf =
this.cassandraArchivaManager.getMetadataFacetModelFamilyName();
+ String cf =
this.cassandraArchivaManager.getMetadataFacetFamilyName();
this.metadataFacetTemplate.createMutator() //
.addInsertion( key, cf, column( "repositoryName",
repositoryId ) ) //
.addInsertion( key, cf, column( "facetId",
metadataFacet.getFacetId() ) ) //
@@ -1476,7 +1476,7 @@ public class CassandraMetadataRepository
//metadataFacetModel.setFacetId(
metadataFacet.getFacetId() );
//metadataFacetModel.setName( metadataFacet.getName() );
- String cf =
this.cassandraArchivaManager.getMetadataFacetModelFamilyName();
+ String cf =
this.cassandraArchivaManager.getMetadataFacetFamilyName();
this.metadataFacetTemplate.createMutator() //
.addInsertion( key, cf, column( "repositoryName",
repositoryId ) ) //
.addInsertion( key, cf, column( "facetId",
metadataFacet.getFacetId() ) ) //
@@ -1504,7 +1504,7 @@ public class CassandraMetadataRepository
StringSerializer ss = StringSerializer.get();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "key", "value" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "facetId", facetId ) //
@@ -1525,7 +1525,7 @@ public class CassandraMetadataRepository
StringSerializer ss = StringSerializer.get();
QueryResult<OrderedRows<String, String, String>> result = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "key", "value" ) //
.addEqualsExpression( "repositoryName", repositoryId ) //
.addEqualsExpression( "facetId", facetId ) //
@@ -1549,7 +1549,7 @@ public class CassandraMetadataRepository
LongSerializer ls = LongSerializer.get();
RangeSlicesQuery<String, String, Long> query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ls ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "namespaceId", "size", "id", "fileLastModified",
"md5", "project", "projectVersion",
"repositoryName", "version", "whenGathered",
"sha1" ); //
@@ -1634,7 +1634,7 @@ public class CassandraMetadataRepository
RangeSlicesQuery<String, String, String> query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "namespaceId", "size", "id", "fileLastModified",
"md5", "project", "projectVersion",
"repositoryName", "version", "whenGathered",
"sha1" ); //
@@ -1652,7 +1652,7 @@ public class CassandraMetadataRepository
query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "namespaceId", "size", "id", "fileLastModified",
"md5", "project", "projectVersion",
"repositoryName", "version", "whenGathered",
"sha1" ); //
@@ -1720,7 +1720,7 @@ public class CassandraMetadataRepository
RangeSlicesQuery<String, String, String> query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "namespaceId" ); //
query = query.addEqualsExpression( "repositoryName", repositoryId ) //
@@ -1748,7 +1748,7 @@ public class CassandraMetadataRepository
RangeSlicesQuery<String, String, String> query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "namespaceId", "size", "id", "fileLastModified",
"md5", "project", "projectVersion",
"repositoryName", "version", "whenGathered",
"sha1" ); //
@@ -1796,7 +1796,7 @@ public class CassandraMetadataRepository
RangeSlicesQuery<String, String, String> query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "namespaceId" ); //
query = query.addEqualsExpression( "repositoryName", repoId ) //
@@ -1825,7 +1825,7 @@ public class CassandraMetadataRepository
QueryResult<OrderedRows<String, String, String>> result =
HFactory.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getArtifactMetadataFamilyName() ) //
.setColumnNames( "id", "repositoryName", "namespaceId",
"project", "projectVersion", "version",
"fileLastModified", "size", "md5", "sha1",
"whenGathered" )//
.setRowCount( Integer.MAX_VALUE ) //
@@ -1865,7 +1865,7 @@ public class CassandraMetadataRepository
}
result = HFactory.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
- .setColumnFamily(
cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+ .setColumnFamily(
cassandraArchivaManager.getMetadataFacetFamilyName() ) //
.setColumnNames( "facetId", "name", "value", "key",
"projectVersion" ) //
.setRowCount( Integer.MAX_VALUE ) //
.addEqualsExpression( "repositoryName", repoId ) //
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java?rev=1581255&r1=1581254&r2=1581255&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
Tue Mar 25 06:28:43 2014
@@ -75,11 +75,11 @@ public class DefaultCassandraArchivaMana
private String projectFamilyName = "project";
- private String projectVersionMetadataModelFamilyName =
"projectversionmetadatamodel";
+ private String projectVersionMetadataFamilyName = "projectversionmetadata";
- private String artifactMetadataModelFamilyName = "artifactmetadatamodel";
+ private String artifactMetadataFamilyName = "artifactmetadatamodel";
- private String metadataFacetModelFamilyName = "metadatafacetmodel";
+ private String metadataFacetFamilyName = "metadatafacetmodel";
private String mailingListFamilyName = "mailinglist";
@@ -194,7 +194,7 @@ public class DefaultCassandraArchivaMana
final ColumnFamilyDefinition projectVersionMetadataModel =
HFactory.createColumnFamilyDefinition(
keyspace.getKeyspaceName(), //
-
getProjectVersionMetadataModelFamilyName(), //
+
getProjectVersionMetadataFamilyName(), //
ComparatorType.UTF8TYPE
);
cfds.add( projectVersionMetadataModel );
@@ -235,7 +235,7 @@ public class DefaultCassandraArchivaMana
final ColumnFamilyDefinition artifactMetadataModel =
HFactory.createColumnFamilyDefinition(
keyspace.getKeyspaceName(), //
-
getArtifactMetadataModelFamilyName(), //
+
getArtifactMetadataFamilyName(), //
ComparatorType.UTF8TYPE
);
cfds.add( artifactMetadataModel );
@@ -311,7 +311,7 @@ public class DefaultCassandraArchivaMana
{
final ColumnFamilyDefinition metadataFacetModel =
HFactory.createColumnFamilyDefinition(
keyspace.getKeyspaceName(), //
-
getMetadataFacetModelFamilyName(), //
+
getMetadataFacetFamilyName(), //
ComparatorType.UTF8TYPE
);
cfds.add( metadataFacetModel );
@@ -439,19 +439,19 @@ public class DefaultCassandraArchivaMana
return projectFamilyName;
}
- public String getProjectVersionMetadataModelFamilyName()
+ public String getProjectVersionMetadataFamilyName()
{
- return projectVersionMetadataModelFamilyName;
+ return projectVersionMetadataFamilyName;
}
- public String getArtifactMetadataModelFamilyName()
+ public String getArtifactMetadataFamilyName()
{
- return artifactMetadataModelFamilyName;
+ return artifactMetadataFamilyName;
}
- public String getMetadataFacetModelFamilyName()
+ public String getMetadataFacetFamilyName()
{
- return metadataFacetModelFamilyName;
+ return metadataFacetFamilyName;
}
public String getMailingListFamilyName()
