Author: oching
Date: Thu May 15 01:46:12 2008
New Revision: 656552
URL: http://svn.apache.org/viewvc?rev=656552&view=rev
Log:
[MRM-773]
-query only versions of artifacts with whenGathered != null
-created test
Added:
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
Modified:
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
Modified:
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java?rev=656552&r1=656551&r2=656552&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
(original)
+++
archiva/trunk/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
Thu May 15 01:46:12 2008
@@ -36,16 +36,17 @@
private String sortColumn = "repositoryId";
public ArtifactVersionsConstraint( String repoId, String groupId, String
artifactId )
- {
+ {
if( repoId != null )
- {
- whereClause = "repositoryId.equals(selectedRepoId) &&
groupId.equals(selectedGroupId) && artifactId.equals(selectedArtifactId)";
+ {
+ whereClause = "repositoryId.equals(selectedRepoId) &&
groupId.equals(selectedGroupId) && artifactId.equals(selectedArtifactId) " +
+ "&& whenGathered != null";
declParams = new String[] { "String selectedRepoId", "String
selectedGroupId", "String selectedArtifactId" };
params = new Object[] { repoId, groupId, artifactId };
}
else
{
- whereClause = "groupId.equals(selectedGroupId) &&
artifactId.equals(selectedArtifactId)";
+ whereClause = "groupId.equals(selectedGroupId) &&
artifactId.equals(selectedArtifactId) && this.whenGathered != null";
declParams = new String[] { "String selectedGroupId", "String
selectedArtifactId" };
params = new Object[] { groupId, artifactId };
}
Added:
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java?rev=656552&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
(added)
+++
archiva/trunk/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
Thu May 15 01:46:12 2008
@@ -0,0 +1,107 @@
+package org.apache.maven.archiva.database.constraints;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.maven.archiva.database.AbstractArchivaDatabaseTestCase;
+import org.apache.maven.archiva.database.ArchivaDAO;
+import org.apache.maven.archiva.database.ArtifactDAO;
+import org.apache.maven.archiva.model.ArchivaArtifact;
+
+/**
+ * ArtifactVersionsConstraintTest
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Maria Odea Ching</a>
+ * @version
+ */
+public class ArtifactVersionsConstraintTest
+ extends AbstractArchivaDatabaseTestCase
+{
+ private ArtifactDAO artifactDao;
+
+ public static final String TEST_REPO = "test-repo";
+
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ ArchivaDAO dao = (ArchivaDAO) lookup( ArchivaDAO.ROLE, "jdo" );
+ artifactDao = dao.getArtifactDAO();
+ }
+
+ private ArchivaArtifact createArtifact( String groupId, String artifactId,
String version )
+ {
+ ArchivaArtifact artifact = artifactDao.createArtifact( groupId,
artifactId, version, null, "jar" );
+ artifact.getModel().setLastModified( new Date() );
+ artifact.getModel().setRepositoryId( TEST_REPO );
+
+ return artifact;
+ }
+
+ private void populateDb()
+ throws Exception
+ {
+ Date whenGathered = Calendar.getInstance().getTime();
+ whenGathered.setTime( 123456789 );
+
+ ArchivaArtifact artifact = createArtifact( "org.apache.archiva",
"artifact-one", "1.0" );
+ artifact.getModel().setWhenGathered( null );
+ artifactDao.saveArtifact( artifact );
+
+ artifact = createArtifact( "org.apache.archiva", "artifact-one",
"1.0.1" );
+ artifact.getModel().setWhenGathered( whenGathered );
+ artifactDao.saveArtifact( artifact );
+
+ artifact = createArtifact( "org.apache.archiva", "artifact-one",
"1.0.2" );
+ artifact.getModel().setWhenGathered( whenGathered );
+ artifactDao.saveArtifact( artifact );
+
+ artifact = createArtifact( "org.apache.archiva", "artifact-one", "2.0"
);
+ artifact.getModel().setRepositoryId( "different-repo" );
+ artifact.getModel().setWhenGathered( whenGathered );
+ artifactDao.saveArtifact( artifact );
+ }
+
+ public void testQueryAllVersionsOfArtifactAcrossRepos() throws Exception
+ {
+ populateDb();
+ assertConstraint( "Artifacts By Repository", 3,
+ new ArtifactVersionsConstraint( null,
"org.apache.archiva", "artifact-one" ) );
+ }
+
+ public void testQueryAllVersionsOfArtifactInARepo() throws Exception
+ {
+ populateDb();
+ assertConstraint( "Artifacts By Repository", 2,
+ new ArtifactVersionsConstraint( TEST_REPO,
"org.apache.archiva", "artifact-one" ) );
+ }
+
+ private void assertConstraint( String msg, int count,
ArtifactVersionsConstraint constraint )
+ throws Exception
+ {
+ List<ArchivaArtifact> results = artifactDao.queryArtifacts( constraint
);
+ assertNotNull( msg + ": Not Null", results );
+ assertEquals( msg + ": Results.size", count, results.size() );
+ }
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java?rev=656552&r1=656551&r2=656552&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
Thu May 15 01:46:12 2008
@@ -20,7 +20,6 @@
*/
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.List;
import org.slf4j.Logger;
