From 591771c0c465c516d837e61fa8bc5232e3af2183 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 26 Mar 2014 06:01:42 +0000 Subject: [PATCH] fix naming git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1581700 13f79535-47bb-0310-9956-ffa450edef68 --- .../cassandra/CassandraMetadataRepository.java | 6 +++--- .../cassandra/model/ProjectVersionMetadataModel.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) 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 db913362b..caab3f71c 100644 --- 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 @@ -858,7 +858,7 @@ public class CassandraMetadataRepository .withNamespace( namespaceId ) // .withProjectId( projectId ) // .withProjectVersion( versionMetadata.getVersion() ) // - .withVersion( versionMetadata.getId() ) // + .withId( versionMetadata.getId() ) // .build(); // FIXME nested objects to store!!! @@ -1441,7 +1441,7 @@ public class CassandraMetadataRepository .withNamespace( namespace ) // .withProjectId( projectId ) // .withProjectVersion( projectVersion ) // - .withVersion( artifactMeta.getId() ) // + .withId( artifactMeta.getId() ) // .build(); Keyspace keyspace = cassandraArchivaManager.getKeyspace(); @@ -1917,7 +1917,7 @@ public class CassandraMetadataRepository .withNamespace( namespace ) // .withProjectId( project ) // .withProjectVersion( version ) // - .withVersion( id ) // + .withId( id ) // .build(); this.projectVersionMetadataModelTemplate.deleteRow( key ); diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java index faacbc14f..4a01647a7 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java @@ -44,7 +44,7 @@ public class ProjectVersionMetadataModel private Namespace namespace; /** - * id is the version + * id is the id */ @Column(name = "id") private String id; @@ -259,7 +259,7 @@ public class ProjectVersionMetadataModel private String projectVersion; - private String version; + private String id; public KeyBuilder() { @@ -297,9 +297,9 @@ public class ProjectVersionMetadataModel return this; } - public KeyBuilder withVersion( String version ) + public KeyBuilder withId( String id ) { - this.version = version; + this.id = id; return this; } @@ -307,7 +307,7 @@ public class ProjectVersionMetadataModel { // FIXME add some controls return CassandraUtils.generateKey( this.repositoryName, this.namespace, this.projectId, this.projectVersion, - this.version ); + this.id ); } } } -- 2.39.5