Author: olamy
Date: Mon Mar 24 06:15:34 2014
New Revision: 1580761
URL: http://svn.apache.org/r1580761
Log:
cleanup code
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.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=1580761&r1=1580760&r2=1580761&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
Mon Mar 24 06:15:34 2014
@@ -1096,43 +1096,8 @@ public class CassandraMetadataRepository
}
- key = new ArtifactMetadataModel.KeyBuilder().withNamespace( namespace
).withProject( projectId ).withId(
- artifactMeta.getId() ).withProjectVersion( projectVersion
).build();
ArtifactMetadataModel artifactMetadataModel = new
ArtifactMetadataModel();
- exists = this.artifactMetadataTemplate.isColumnsExist( key );
-
- if ( exists )
- {
- // updater
- ColumnFamilyUpdater<String, String> updater =
this.artifactMetadataTemplate.createUpdater( key );
- updater.setLong( "fileLastModified",
artifactMeta.getFileLastModified().getTime() );
- updater.setLong( "whenGathered",
artifactMeta.getWhenGathered().getTime() );
- updater.setLong( "size", artifactMeta.getSize() );
- updater.setString( "md5", artifactMeta.getMd5() );
- updater.setString( "sha1", artifactMeta.getSha1() );
- updater.setString( "version", artifactMeta.getVersion() );
- this.artifactMetadataTemplate.update( updater );
- }
- else
- {
- String cf =
this.cassandraArchivaManager.getArtifactMetadataModelFamilyName();
- // create
- this.artifactMetadataTemplate.createMutator() //
- .addInsertion( key, cf, column( "id", artifactMeta.getId() )
)//
- .addInsertion( key, cf, column( "repositoryName", repositoryId
) ) //
- .addInsertion( key, cf, column( "namespaceId", namespaceId ) )
//
- .addInsertion( key, cf, column( "project",
artifactMeta.getProject() ) ) //
- .addInsertion( key, cf, column( "projectVersion",
artifactMeta.getProjectVersion() ) ) //
- .addInsertion( key, cf, column( "version",
artifactMeta.getVersion() ) ) //
- .addInsertion( key, cf, column( "fileLastModified",
artifactMeta.getFileLastModified().getTime() ) ) //
- .addInsertion( key, cf, column( "size", artifactMeta.getSize()
) ) //
- .addInsertion( key, cf, column( "md5", artifactMeta.getMd5() )
) //
- .addInsertion( key, cf, column( "sha1", artifactMeta.getSha1()
) ) //
- .addInsertion( key, cf, column( "whenGathered",
artifactMeta.getWhenGathered().getTime() ) )//
- .execute();
- }
-
artifactMetadataModel.setRepositoryId( repositoryId );
artifactMetadataModel.setNamespace( namespaceId );
artifactMetadataModel.setProject( projectId );