[MRM-1025] remove model fields that are not used for clarity

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@886101 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 3 insertions, 152 deletions

diff --git a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
index 5c234e209..324964c15 100644
--- a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
+++ b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
@@ -19,10 +19,10 @@ package org.apache.maven.archiva.database.constraints;
  * under the License.
  */
 
-import org.apache.maven.archiva.database.Constraint;
-
 import java.util.Date;
 
+import org.apache.maven.archiva.database.Constraint;
+
 /**
  * ArtifactsProcessedConstraint 
  *
@@ -34,18 +34,6 @@ public class ArtifactsProcessedConstraint
 {
     private String whereClause;
 
-    public ArtifactsProcessedConstraint( boolean isProcessed )
-    {
-        if ( isProcessed )
-        {
-            whereClause = "whenProcessed != null";
-        }
-        else
-        {
-            whereClause = "whenProcessed == null";
-        }
-    }
-
     /**
      * A Constraint showing artifacts processed since date provided.
      * @param since
diff --git a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
index f2394570b..a9b926e37 100644
--- a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
+++ b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
@@ -34,7 +34,6 @@ public class AllTests
     {
         TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.database.constraints" );
         //$JUnit-BEGIN$
-        suite.addTestSuite( ArtifactsProcessedConstraintTest.class );
         suite.addTestSuite( ArtifactsByChecksumConstraintTest.class );
         suite.addTestSuite( OlderArtifactsByAgeConstraintTest.class );
         suite.addTestSuite( UniqueGroupIdConstraintTest.class );
diff --git a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java
deleted file mode 100644
index 65719df90..000000000
--- a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-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.Date;
-import java.util.List;
-
-import org.apache.maven.archiva.database.AbstractArchivaDatabaseTestCase;
-import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-
-/**
- * ArtifactsProcessedConstraintTest 
- *
- * @version $Id$
- */
-public class ArtifactsProcessedConstraintTest
-    extends AbstractArchivaDatabaseTestCase
-{
-    public ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String whenProcessed )
-        throws Exception
-    {
-        ArchivaArtifact artifact = dao.getArtifactDAO().createArtifact( groupId, artifactId, version, "", "jar", "testrepo" );
-        assertNotNull( "Artifact should not be null.", artifact );
-        Date dateWhenProcessed = null;
-
-        if ( whenProcessed != null )
-        {
-            dateWhenProcessed = toDate( whenProcessed );
-        }
-
-        artifact.getModel().setWhenProcessed( dateWhenProcessed );
-
-        // Satisfy table / column requirements.
-        artifact.getModel().setLastModified( new Date() );
-
-        return artifact;
-    }
-
-    public void assertResults( String type, List<ArchivaArtifact> results, String expectedArtifacts[] )
-    {
-        assertNotNull( "Results[" + type + "] should not be null.", results );
-        assertEquals( "Results[" + type + "].size", expectedArtifacts.length, results.size() );
-
-        for ( int i = 0; i < expectedArtifacts.length; i++ )
-        {
-            String artifactId = expectedArtifacts[i];
-
-            int found = 0;
-            for ( ArchivaArtifact artifact : results )
-            {
-                if ( artifactId.equals( artifact.getArtifactId() ) )
-                {
-                    found++;
-                }
-            }
-
-            if ( found <= 0 )
-            {
-                fail( "Results[" + type + "] - Did not find expected artifact ID [" + artifactId + "]" );
-            }
-
-            if ( found > 1 )
-            {
-                fail( "Results[" + type + "] - Expected to find 1 copy of artifact ID [" + artifactId
-                    + "], yet found <" + found + "> instead." );
-            }
-        }
-    }
-
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-
-        ArtifactDAO adao = dao.getArtifactDAO();
-        assertNotNull( "Artifact DAO should not be null.", adao );
-
-        adao.saveArtifact( createArtifact( "org.apache.maven.archiva", "archiva-common", "1.0-SNAPSHOT", null ) );
-        adao.saveArtifact( createArtifact( "org.apache.maven.archiva", "archiva-utils", "1.0-SNAPSHOT",
-                                           "2006/08/22 19:01:00" ) );
-        adao.saveArtifact( createArtifact( "org.apache.maven.archiva", "archiva-old", "0.1", "2004/02/15 9:01:00" ) );
-        adao.saveArtifact( createArtifact( "org.apache.maven.archiva", "archiva-database", "1.0-SNAPSHOT", null ) );
-    }
-
-    public void testNotProcessed()
-        throws Exception
-    {
-        List<ArchivaArtifact> results = dao.getArtifactDAO().queryArtifacts( new ArtifactsProcessedConstraint( false ) );
-        assertResults( "not-processed", results, new String[] { "archiva-common", "archiva-database" } );
-    }
-
-    public void testProcessed()
-        throws Exception
-    {
-        List<ArchivaArtifact> results = dao.getArtifactDAO().queryArtifacts( new ArtifactsProcessedConstraint( true ) );
-        assertResults( "processed", results, new String[] { "archiva-utils", "archiva-old" } );
-    }
-
-    public void testSinceRecent()
-        throws Exception
-    {
-        Date since = toDate( "2006/01/01 12:00:00" );
-        List<ArchivaArtifact> results = dao.getArtifactDAO().queryArtifacts( new ArtifactsProcessedConstraint( since ) );
-        assertResults( "processed", results, new String[] { "archiva-utils" } );
-    }
-
-    public void testSinceOld()
-        throws Exception
-    {
-        Date since = toDate( "2001/01/01 12:00:00" );
-        List<ArchivaArtifact> results = dao.getArtifactDAO().queryArtifacts( new ArtifactsProcessedConstraint( since ) );
-        assertResults( "processed", results, new String[] { "archiva-utils", "archiva-old" } );
-    }
-}
diff --git a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
index a21e3ecb2..987880fbb 100644
--- a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
+++ b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.archiva.database.jdo;
 
 import java.util.Date;
 import java.util.List;
-
 import javax.jdo.JDOHelper;
 import javax.jdo.spi.JDOImplHelper;
 
@@ -67,7 +66,6 @@ public class JdoArtifactDAOTest
 
         // Set some mandatory values
         artifact.getModel().setLastModified( new Date() );
-        artifact.getModel().setOrigin( "test" );
 
         // Save it.
         ArchivaArtifact savedArtifact = artiDao.saveArtifact( artifact );
@@ -90,7 +88,7 @@ public class JdoArtifactDAOTest
         assertEquals( "jar", firstArtifact.getType() );
 
         // Change value and save.
-        savedArtifact.getModel().setOrigin( "changed" );
+        savedArtifact.getModel().setLastModified( new Date() );
         artiDao.saveArtifact( savedArtifact );
 
         // Test that only 1 object is saved.
@@ -103,7 +101,6 @@ public class JdoArtifactDAOTest
 
         // Test expected values.
         assertEquals( "archiva-test-module", actualArtifact.getArtifactId() );
-        assertEquals( "changed", actualArtifact.getModel().getOrigin() );
 
         // Test that only 1 object is saved.
         assertEquals( 1, artiDao.queryArtifacts( null ).size() );