Renaming 'result' to 'resultReason' and 'type' to 'artifactType' as result/type are...

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@518022 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java
index 0eee93b4fb1fd7bed6ed211c8b88601231f5297e..26fbeff45b63c7a724e3418a54f4e6308a7ce585 100644 (file)
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/AbstractResultsDatabase.java
@@ -19,7 +19,7 @@ package org.apache.maven.archiva.reporting.database;
  * under the License.
  */
 
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 
 /**
  * AbstractResultsDatabase 
@@ -69,9 +69,9 @@ public abstract class AbstractResultsDatabase
      */
     public abstract int getNumNotices();
     
-    protected static Result createResult( String processor, String problem, String reason )
+    protected static ResultReason createResultReason( String processor, String problem, String reason )
     {
-        Result result = new Result();
+        ResultReason result = new ResultReason();
         result.setProcessor( processor );
         result.setProblem( problem );
         result.setReason( reason );

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java
index 4314372b040fe6d3972134c7b7dd761271fde3e5..791b56bf89b52059711a43ee762a7c7d95c17b87 100644 (file)
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.reporting.database;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.ArtifactResultsKey;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.Artifact;
 
 import java.util.Collections;
@@ -54,7 +54,7 @@ public class ArtifactResultsDatabase
     public void addFailure( Artifact artifact, String processor, String problem, String reason )
     {
         ArtifactResults results = getArtifactResults( artifact );
-        Result result = createResult( processor, problem, reason );
+        ResultReason result = createResultReason( processor, problem, reason );
 
         if ( !results.getFailures().contains( result ) )
         {
@@ -67,7 +67,7 @@ public class ArtifactResultsDatabase
     public void addNotice( Artifact artifact, String processor, String problem, String reason )
     {
         ArtifactResults results = getArtifactResults( artifact );
-        Result result = createResult( processor, problem, reason );
+        ResultReason result = createResultReason( processor, problem, reason );
 
         if ( !results.getNotices().contains( result ) )
         {
@@ -80,7 +80,7 @@ public class ArtifactResultsDatabase
     public void addWarning( Artifact artifact, String processor, String problem, String reason )
     {
         ArtifactResults results = getArtifactResults( artifact );
-        Result result = createResult( processor, problem, reason );
+        ResultReason result = createResultReason( processor, problem, reason );
 
         if ( !results.getWarnings().contains( result ) )
         {
@@ -211,7 +211,7 @@ public class ArtifactResultsDatabase
         results.setGroupId( StringUtils.defaultString( artifact.getGroupId() ) );
         results.setArtifactId( StringUtils.defaultString( artifact.getArtifactId() ) );
         results.setVersion( StringUtils.defaultString( artifact.getVersion() ) );
-        results.setType( StringUtils.defaultString( artifact.getType() ) );
+        results.setArtifactType( StringUtils.defaultString( artifact.getType() ) );
         results.setClassifier( StringUtils.defaultString( artifact.getClassifier() ) );
 
         return results;
@@ -241,7 +241,7 @@ public class ArtifactResultsDatabase
         key.groupId = StringUtils.defaultString( artifact.getGroupId() );
         key.artifactId = StringUtils.defaultString( artifact.getArtifactId() );
         key.version = StringUtils.defaultString( artifact.getVersion() );
-        key.type = StringUtils.defaultString( artifact.getType() );
+        key.artifactType = StringUtils.defaultString( artifact.getType() );
         key.classifier = StringUtils.defaultString( artifact.getClassifier() );
 
         return (ArtifactResults) getObjectByKey( ArtifactResults.class, key );

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java
index 82e62f1ee8cd4b171da523f95d070208f206e705..934cc6941584e058125150337944bb60fd3291ee 100644 (file)
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/MetadataResultsDatabase.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.reporting.database;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.reporting.model.MetadataResults;
 import org.apache.maven.archiva.reporting.model.MetadataResultsKey;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 
 import java.util.Collections;
@@ -47,7 +47,7 @@ public class MetadataResultsDatabase
     public void addFailure( RepositoryMetadata metadata, String processor, String problem, String reason )
     {
         MetadataResults results = getMetadataResults( metadata );
-        Result result = createResult( processor, problem, reason );
+        ResultReason result = createResultReason( processor, problem, reason );
 
         if ( !results.getFailures().contains( result ) )
         {
@@ -60,7 +60,7 @@ public class MetadataResultsDatabase
     public void addWarning( RepositoryMetadata metadata, String processor, String problem, String reason )
     {
         MetadataResults results = getMetadataResults( metadata );
-        Result result = createResult( processor, problem, reason );
+        ResultReason result = createResultReason( processor, problem, reason );
 
         if ( !results.getWarnings().contains( result ) )
         {
@@ -73,7 +73,7 @@ public class MetadataResultsDatabase
     public void addNotice( RepositoryMetadata metadata, String processor, String problem, String reason )
     {
         MetadataResults results = getMetadataResults( metadata );
-        Result result = createResult( processor, problem, reason );
+        ResultReason result = createResultReason( processor, problem, reason );
 
         if ( !results.getNotices().contains( result ) )
         {

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java
index 3494479304082579b948f3c410ced77d93bbe5a4..d41e119b20e1dae8eb932254e80ddf11d672f1fe 100644 (file)
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/model/ArtifactResultsKey.java
@@ -38,7 +38,7 @@ public class ArtifactResultsKey
 
     public String version = "";
 
-    public String type = "";
+    public String artifactType = "";
 
     public String classifier = "";
 
@@ -53,13 +53,13 @@ public class ArtifactResultsKey
         groupId = parts[0];
         artifactId = parts[1];
         version = parts[2];
-        type = parts[3];
+        artifactType = parts[3];
         classifier = parts[4];
     }
 
     public String toString()
     {
-        return StringUtils.join( new String[] { groupId, artifactId, version, type, classifier }, ':' );
+        return StringUtils.join( new String[] { groupId, artifactId, version, artifactType, classifier }, ':' );
     }
 
     public int hashCode()
@@ -69,7 +69,7 @@ public class ArtifactResultsKey
         result = PRIME * result + ( ( groupId == null ) ? 0 : groupId.hashCode() );
         result = PRIME * result + ( ( artifactId == null ) ? 0 : artifactId.hashCode() );
         result = PRIME * result + ( ( version == null ) ? 0 : version.hashCode() );
-        result = PRIME * result + ( ( type == null ) ? 0 : type.hashCode() );
+        result = PRIME * result + ( ( artifactType == null ) ? 0 : artifactType.hashCode() );
         result = PRIME * result + ( ( classifier == null ) ? 0 : classifier.hashCode() );
         return result;
     }
@@ -129,14 +129,14 @@ public class ArtifactResultsKey
             return false;
         }
 
-        if ( type == null )
+        if ( artifactType == null )
         {
-            if ( other.type != null )
+            if ( other.artifactType != null )
             {
                 return false;
             }
         }
-        else if ( !type.equals( other.type ) )
+        else if ( !artifactType.equals( other.artifactType ) )
         {
             return false;
         }

diff --git a/archiva-reports-standard/src/main/mdo/reporting.mdo b/archiva-reports-standard/src/main/mdo/reporting.mdo
index 8b41251ca2c3582e76e5fc87cd04f1c53d9d8a1a..37ebd5615df0a926a446116c84b9e4642cff3101 100644 (file)
--- a/archiva-reports-standard/src/main/mdo/reporting.mdo
+++ b/archiva-reports-standard/src/main/mdo/reporting.mdo
@@ -103,7 +103,7 @@
                jpox.primary-key="true" 
                jpox.value-strategy="off" 
                jpox.persistence-modifier="persistent">
-          <name>type</name>
+          <name>artifactType</name>
           <version>1.0.0</version>
           <type>String</type>
           <identity>true</identity>
@@ -134,7 +134,7 @@
                        jpox.dependent="true"
                        java.generate-break="false"
                        java.generate-create="false">
-            <type>Result</type>
+            <type>ResultReason</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -147,7 +147,7 @@
                        jpox.dependent="true"
                        java.generate-break="false"
                        java.generate-create="false">
-            <type>Result</type>
+            <type>ResultReason</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -160,7 +160,7 @@
                        jpox.dependent="true"
                        java.generate-break="false"
                        java.generate-create="false">
-            <type>Result</type>
+            <type>ResultReason</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -221,7 +221,7 @@
                        jpox.dependent="true"
                        java.generate-break="false"
                        java.generate-create="false">
-            <type>Result</type>
+            <type>ResultReason</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -234,7 +234,7 @@
                        jpox.dependent="true"
                        java.generate-break="false"
                        java.generate-create="false">
-            <type>Result</type>
+            <type>ResultReason</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -247,7 +247,7 @@
                        jpox.dependent="true"
                        java.generate-break="false"
                        java.generate-create="false">
-            <type>Result</type>
+            <type>ResultReason</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -263,7 +263,7 @@
       </fields>
     </class>
     <class stash.storable="true">
-      <name>Result</name>
+      <name>ResultReason</name>
       <version>1.0.0</version>
       <fields>
         <field xml.attribute="true">
@@ -302,13 +302,13 @@
           <code><![CDATA[
             public boolean equals( Object obj )
             {
-                if ( obj instanceof Result )
+                if ( obj instanceof ResultReason )
                 {
                     if ( this == obj )
                     {
                         return true;
                     }
-                    Result rhs = (Result) obj;
+                    ResultReason rhs = (ResultReason) obj;
                     return new org.apache.commons.lang.builder.EqualsBuilder()
                         .append( problem, rhs.problem )
                         .append( processor, rhs.processor )

diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java
index feebb72d01faa87b06b43d41277aeb2ff1741469..fb9ff2581935688486d1c02b96cce49779070ba0 100644 (file)
--- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
 import org.apache.maven.archiva.reporting.database.MetadataResultsDatabase;
 import org.apache.maven.archiva.reporting.model.MetadataResults;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
@@ -87,7 +87,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( metadata, results );
         assertEquals( "check reason", "Missing lastUpdated element inside the metadata.", result.getReason() );
         assertFalse( "check no more failures", failures.hasNext() );
@@ -107,9 +107,9 @@ public class BadMetadataReportProcessorTest
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
         assertMetadata( metadata, results );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( "check reason", "Missing lastUpdated element inside the metadata.", result.getReason() );
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         boolean alpha1First = false;
         if ( result.getReason().indexOf( "alpha-1" ) > 0 )
         {
@@ -127,7 +127,7 @@ public class BadMetadataReportProcessorTest
                           "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
                               .getReason() );
         }
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         if ( !alpha1First )
         {
             assertEquals( "check reason",
@@ -158,7 +158,7 @@ public class BadMetadataReportProcessorTest
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
         assertMetadata( metadata, results );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( "check reason", "Missing lastUpdated element inside the metadata.", result.getReason() );
         assertFalse( "check no more failures", failures.hasNext() );
     }
@@ -197,7 +197,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( metadata, results );
         // TODO: should be more robust
         assertEquals( "check reason",
@@ -225,7 +225,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( metadata, results );
         // TODO: should be more robust
         assertEquals( "check reason",
@@ -252,14 +252,14 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( metadata, results );
         // TODO: should be more robust
         assertEquals( "check reason",
                       "Artifact version 1.0-alpha-3 is present in metadata but missing in the repository.", result
                           .getReason() );
         assertTrue( "check there is a 2nd failure", failures.hasNext() );
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason",
                       "Artifact version 1.0-alpha-2 found in the repository but missing in the metadata.", result
@@ -293,7 +293,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Metadata plugin missing-plugin not found in the repository", result.getReason() );
         assertFalse( "check no more failures", failures.hasNext() );
@@ -311,7 +311,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Plugin snapshot-artifact is present in the repository but "
             + "missing in the metadata.", result.getReason() );
@@ -333,12 +333,12 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default3", result
             .getReason() );
         assertTrue( "check there is a 2nd failure", failures.hasNext() );
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Missing or empty artifactId in group metadata for plugin default4", result
             .getReason() );
@@ -358,11 +358,11 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Missing or empty plugin prefix for artifactId artifactId.", result.getReason() );
         assertTrue( "check there is a 2nd failure", failures.hasNext() );
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Missing or empty plugin prefix for artifactId snapshot-artifact.", result
             .getReason() );
@@ -382,7 +382,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         // TODO: should be more robust
         assertEquals( "check reason", "Duplicate plugin prefix found: default.", result.getReason() );
         assertFalse( "check no more failures", failures.hasNext() );
@@ -423,7 +423,7 @@ public class BadMetadataReportProcessorTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( metadata, results );
         // TODO: should be more robust
         assertEquals( "check reason", "Snapshot artifact 1.0-alpha-1-20050611.202024-2 does not exist.", result

diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java
index afbb2037a9c59308985eec68db5130f9dd552bf9..a1598edaf8aa0f0a10b9e1f3dab77141ef91286a 100644 (file)
--- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.reporting.processor;
 import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
 import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.model.Dependency;
@@ -91,7 +91,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( "Artifact does not exist in the repository", result.getReason() );
     }
 
@@ -161,7 +161,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( getDependencyNotFoundMessage( createDependency( INVALID, INVALID, INVALID ) ), result.getReason() );
     }
 
@@ -181,7 +181,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( getDependencyNotFoundMessage( dependency ), result.getReason() );
     }
 
@@ -210,7 +210,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( getDependencyNotFoundMessage( dependency ), result.getReason() );
     }
 
@@ -229,7 +229,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( getDependencyNotFoundMessage( dependency ), result.getReason() );
     }
 
@@ -249,7 +249,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( getDependencyVersionInvalidMessage( dependency, "[" ), result.getReason() );
     }
 
@@ -282,7 +282,7 @@ public class DependencyArtifactReportProcessorTest
         ArtifactResults results = (ArtifactResults) failures.next();
         assertFalse( failures.hasNext() );
         failures = results.getFailures().iterator();
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertEquals( getDependencyVersionInvalidMessage( dependency, null ), result.getReason() );
     }
 

diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java
index 325ba6a34970e794251914c4a7ce53b0787100ee..affabb19bb687439013b830feab0112e88b4afd8 100644 (file)
--- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.reporting.processor;
 import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
 import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -61,7 +61,7 @@ public class OldArtifactReportProcessorTest
         assertEquals( artifact.getVersion(), results.getVersion() );
         assertEquals( 1, results.getNotices().size() );
         Iterator i = results.getNotices().iterator();
-        Result result = (Result) i.next();
+        ResultReason result = (ResultReason) i.next();
         assertEquals( "old-artifact", result.getProcessor() );
     }
 

diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
index 680373ea33db85272e73a69833121b09510c9e7f..440b631493130360bf25a4f5ec7555cd9fa803c9 100644 (file)
--- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
@@ -23,7 +23,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
 import org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase;
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.Artifact;
 
 import java.io.File;
@@ -76,7 +76,7 @@ public class OldSnapshotArtifactReportProcessorTest
         assertFalse( artifact.getVersion().indexOf( "SNAPSHOT" ) >= 0 );
         assertEquals( 1, results.getNotices().size() );
         Iterator i = results.getNotices().iterator();
-        Result result = (Result) i.next();
+        ResultReason result = (ResultReason) i.next();
         assertEquals( "old-snapshot-artifact", result.getProcessor() );
     }
 

diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java
index 5c4c426149670d788e08e5b1f2e27f5066ec866f..7d91d6f19d146ed90df7efb3750f5a5bda0018f3 100644 (file)
--- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java
@@ -24,7 +24,7 @@ import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
 import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.MetadataResults;
-import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.model.ResultReason;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
@@ -90,7 +90,7 @@ public class DefaultArtifactReporterTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( results );
         assertEquals( "check failure reason", "Single Failure Reason", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -126,13 +126,13 @@ public class DefaultArtifactReporterTest
         MetadataResults results = (MetadataResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertMetadata( results );
         assertEquals( "check failure reason", "First Failure Reason", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
         assertTrue( "must have 2nd failure", failures.hasNext() );
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         assertEquals( "check failure reason", "Second Failure Reason", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -151,7 +151,7 @@ public class DefaultArtifactReporterTest
         MetadataResults results = (MetadataResults) warnings.next();
         warnings = results.getWarnings().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertMetadata( results );
         assertEquals( "check failure reason", "Single Warning Message", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -172,13 +172,13 @@ public class DefaultArtifactReporterTest
         MetadataResults results = (MetadataResults) warnings.next();
         warnings = results.getWarnings().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertMetadata( results );
         assertEquals( "check failure reason", "First Warning", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
         assertTrue( "must have 2nd warning", warnings.hasNext() );
-        result = (Result) warnings.next();
+        result = (ResultReason) warnings.next();
         assertEquals( "check failure reason", "Second Warning", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -197,7 +197,7 @@ public class DefaultArtifactReporterTest
         MetadataResults results = (MetadataResults) warnings.next();
         warnings = results.getNotices().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertMetadata( results );
         assertEquals( "check failure reason", "Single Notice Message", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -218,13 +218,13 @@ public class DefaultArtifactReporterTest
         MetadataResults results = (MetadataResults) warnings.next();
         warnings = results.getNotices().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertMetadata( results );
         assertEquals( "check failure reason", "First Notice", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
         assertTrue( "must have 2nd warning", warnings.hasNext() );
-        result = (Result) warnings.next();
+        result = (ResultReason) warnings.next();
         assertEquals( "check failure reason", "Second Notice", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -243,7 +243,7 @@ public class DefaultArtifactReporterTest
         ArtifactResults results = (ArtifactResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertArtifact( results );
         assertEquals( "check failure reason", "Single Failure Reason", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -266,7 +266,7 @@ public class DefaultArtifactReporterTest
         assertEquals( "check failure cause", StringUtils.defaultString( artifact.getVersion() ), results.getVersion() );
         assertEquals( "check failure cause", StringUtils.defaultString( artifact.getClassifier() ), results
             .getClassifier() );
-        assertEquals( "check failure cause", StringUtils.defaultString( artifact.getType() ), results.getType() );
+        assertEquals( "check failure cause", StringUtils.defaultString( artifact.getType() ), results.getArtifactType() );
     }
 
     public void testArtifactMultipleFailures()
@@ -282,13 +282,13 @@ public class DefaultArtifactReporterTest
         ArtifactResults results = (ArtifactResults) failures.next();
         failures = results.getFailures().iterator();
         assertTrue( "check there is a failure", failures.hasNext() );
-        Result result = (Result) failures.next();
+        ResultReason result = (ResultReason) failures.next();
         assertArtifact( results );
         assertEquals( "check failure reason", "First Failure Reason", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
         assertTrue( "must have 2nd failure", failures.hasNext() );
-        result = (Result) failures.next();
+        result = (ResultReason) failures.next();
         assertEquals( "check failure reason", "Second Failure Reason", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -307,7 +307,7 @@ public class DefaultArtifactReporterTest
         ArtifactResults results = (ArtifactResults) warnings.next();
         warnings = results.getWarnings().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertArtifact( results );
         assertEquals( "check failure reason", "Single Warning Message", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -328,13 +328,13 @@ public class DefaultArtifactReporterTest
         ArtifactResults results = (ArtifactResults) warnings.next();
         warnings = results.getWarnings().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertArtifact( results );
         assertEquals( "check failure reason", "First Warning", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
         assertTrue( "must have 2nd warning", warnings.hasNext() );
-        result = (Result) warnings.next();
+        result = (ResultReason) warnings.next();
         assertEquals( "check failure reason", "Second Warning", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
@@ -353,7 +353,7 @@ public class DefaultArtifactReporterTest
         ArtifactResults results = (ArtifactResults) warnings.next();
         warnings = results.getNotices().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertArtifact( results );
         assertEquals( "check failure reason", "Single Notice Message", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
@@ -374,13 +374,13 @@ public class DefaultArtifactReporterTest
         ArtifactResults results = (ArtifactResults) warnings.next();
         warnings = results.getNotices().iterator();
         assertTrue( "check there is a failure", warnings.hasNext() );
-        Result result = (Result) warnings.next();
+        ResultReason result = (ResultReason) warnings.next();
         assertArtifact( results );
         assertEquals( "check failure reason", "First Notice", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );
         assertTrue( "must have 2nd warning", warnings.hasNext() );
-        result = (Result) warnings.next();
+        result = (ResultReason) warnings.next();
         assertEquals( "check failure reason", "Second Notice", result.getReason() );
         assertEquals( "check failure parameters", PROCESSOR, result.getProcessor() );
         assertEquals( "check failure parameters", PROBLEM, result.getProblem() );