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

fix naming 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1581700 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2014-03-26 06:01:42 +00:00
parent 1754cb76e0
commit 591771c0c4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 );

10
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
View File

@ -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 );
}
}
}