Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 245F1D192 for ; Sat, 25 May 2013 12:49:11 +0000 (UTC) Received: (qmail 94865 invoked by uid 500); 25 May 2013 12:49:10 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 94786 invoked by uid 500); 25 May 2013 12:49:09 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 94748 invoked by uid 99); 25 May 2013 12:49:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 May 2013 12:49:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 May 2013 12:49:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F18CE23888E4; Sat, 25 May 2013 12:48:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1486321 - in /archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra: CassandraMetadataRepository.java model/ArtifactMetadataModel.java Date: Sat, 25 May 2013 12:48:43 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130525124843.F18CE23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Sat May 25 12:48:43 2013 New Revision: 1486321 URL: http://svn.apache.org/r1486321 Log: use same type to ease bean replication Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1486321&r1=1486320&r2=1486321&view=diff ============================================================================== --- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original) +++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Sat May 25 12:48:43 2013 @@ -552,12 +552,12 @@ public class CassandraMetadataRepository ArtifactMetadataModel artifactMetadataModel = artifactMetadataModelEntityManager.get( key ); if ( artifactMetadataModel == null ) { - artifactMetadataModel = - new ArtifactMetadataModel( key, projectId, repositoryId, namespaceId, artifactMeta.getProject(), - projectVersion, artifactMeta.getVersion(), - artifactMeta.getFileLastModified(), artifactMeta.getSize(), - artifactMeta.getMd5(), artifactMeta.getSha1(), - artifactMeta.getWhenGathered() ); + artifactMetadataModel = new ArtifactMetadataModel( key, artifactMeta.getId(), repositoryId, namespaceId, + artifactMeta.getProject(), projectVersion, + artifactMeta.getVersion(), + artifactMeta.getFileLastModified(), + artifactMeta.getSize(), artifactMeta.getMd5(), + artifactMeta.getSha1(), artifactMeta.getWhenGathered() ); artifactMetadataModelEntityManager.put( artifactMetadataModel ); } @@ -860,7 +860,8 @@ public class CassandraMetadataRepository { Date when = artifactMetadataModel.getWhenGathered(); - if ( when.getTime() >= startTime.getTime() && when.getTime() <= endTime.getTime() ) + if ( ( startTime != null ? when.getTime() >= startTime.getTime() : true ) && ( endTime != null ? + when.getTime() <= endTime.getTime() : true ) ) { artifactMetadataModels.add( artifactMetadataModel ); } Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java?rev=1486321&r1=1486320&r2=1486321&view=diff ============================================================================== --- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java (original) +++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java Sat May 25 12:48:43 2013 @@ -58,7 +58,7 @@ public class ArtifactMetadataModel private String version; @Column( name = "fileLastModified" ) - private Date fileLastModified; + private long fileLastModified; @Column( name = "size" ) private long size; @@ -88,7 +88,7 @@ public class ArtifactMetadataModel this.project = project; this.projectVersion = projectVersion; this.version = version; - this.fileLastModified = fileLastModified; + this.fileLastModified = fileLastModified.getTime(); this.size = size; this.md5 = md5; this.sha1 = sha1; @@ -165,12 +165,12 @@ public class ArtifactMetadataModel this.version = version; } - public Date getFileLastModified() + public long getFileLastModified() { return fileLastModified; } - public void setFileLastModified( Date fileLastModified ) + public void setFileLastModified( long fileLastModified ) { this.fileLastModified = fileLastModified; }