Author: brett
Date: Tue Mar 17 15:53:37 2009
New Revision: 755290
URL: http://svn.apache.org/viewvc?rev=755290&view=rev
Log:
clean up warnings in reports modules
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingManager.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DynamicReportSource.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/ReportingManager.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGenerator.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/test/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGeneratorTest.java
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java
Tue Mar 17 15:53:37 2009
@@ -36,7 +36,7 @@
* <a href="mailto:[email protected]";>Maria Odea Ching</a>
*/
public class CorruptArtifactReport
- implements DynamicReportSource
+ implements DynamicReportSource<RepositoryProblem>
{
public static final String PROBLEM_TYPE_CORRUPT_ARTIFACT =
"corrupt-artifact";
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java
Tue Mar 17 15:53:37 2009
@@ -39,7 +39,7 @@
* role-hint="duplicate-artifacts"
*/
public class DuplicateArtifactReport
- implements DynamicReportSource
+ implements DynamicReportSource<RepositoryProblem>
{
public static final String PROBLEM_TYPE_DUPLICATE_ARTIFACTS =
"duplicate-artifacts";
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java
Tue Mar 17 15:53:37 2009
@@ -39,7 +39,7 @@
* role-hint="artifact-location"
*/
public class LocationArtifactsReport
- implements DynamicReportSource
+ implements DynamicReportSource<RepositoryProblem>
{
public static final String PROBLEM_TYPE_BAD_ARTIFACT_LOCATION =
"bad-artifact-location";
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java
Tue Mar 17 15:53:37 2009
@@ -38,7 +38,7 @@
* role-hint="old-artifacts"
*/
public class OldArtifactReport
- implements DynamicReportSource
+ implements DynamicReportSource<ArchivaArtifact>
{
/**
* @plexus.configuration default-value="Old Artifacts Report"
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java
Tue Mar 17 15:53:37 2009
@@ -38,7 +38,7 @@
* role-hint="old-snapshots"
*/
public class OldSnapshotArtifactReport
- implements DynamicReportSource
+ implements DynamicReportSource<ArchivaArtifact>
{
/**
* @plexus.configuration default-value="Old Snapshots Report"
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java
Tue Mar 17 15:53:37 2009
@@ -39,7 +39,7 @@
* role-hint="metadata"
*/
public class MetadataReport
- implements DynamicReportSource
+ implements DynamicReportSource<RepositoryProblem>
{
public static final String PROBLEM_TYPE_METADATA = "metadata";
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java
Tue Mar 17 15:53:37 2009
@@ -39,7 +39,7 @@
* role-hint="missing-dependencies"
*/
public class MissingDependenciesReport
- implements DynamicReportSource
+ implements DynamicReportSource<RepositoryProblem>
{
public static final String PROBLEM_TYPE_MISSING_DEPENDENCY =
"missing-dependency";
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingManager.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingManager.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingManager.java
Tue Mar 17 15:53:37 2009
@@ -35,14 +35,14 @@
/**
* @plexus.requirement
role="org.apache.maven.archiva.reporting.DynamicReportSource"
*/
- private Map reportSourceMap;
+ private Map<String, DynamicReportSource<?>> reportSourceMap;
- public DynamicReportSource getReport( String id )
+ public DynamicReportSource<?> getReport( String id )
{
- return (DynamicReportSource) reportSourceMap.get( id );
+ return reportSourceMap.get( id );
}
- public Map getAvailableReports()
+ public Map<String, DynamicReportSource<?>> getAvailableReports()
{
return reportSourceMap;
}
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DynamicReportSource.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DynamicReportSource.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DynamicReportSource.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/DynamicReportSource.java
Tue Mar 17 15:53:37 2009
@@ -19,17 +19,17 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.database.ObjectNotFoundException;
-import java.util.List;
-
/**
* DynamicReportSource
*
* @version $Id$
*/
-public interface DynamicReportSource
+public interface DynamicReportSource<T>
{
/**
* The human readable name of this report.
@@ -45,7 +45,7 @@
* @throws ArchivaDatabaseException if there was a fundamental issue with
accessing the database.
* @throws ObjectNotFoundException if no records were found.
*/
- public List getData() throws ObjectNotFoundException,
ArchivaDatabaseException;
+ public List<T> getData() throws ObjectNotFoundException,
ArchivaDatabaseException;
/**
* Get the entire list of values for this report.
@@ -57,5 +57,5 @@
* @throws ArchivaDatabaseException if there was a fundamental issue with
accessing the database.
* @throws ObjectNotFoundException if no records were found.
*/
- public List getData( DataLimits limits ) throws ObjectNotFoundException,
ArchivaDatabaseException;
+ public List<T> getData( DataLimits limits ) throws
ObjectNotFoundException, ArchivaDatabaseException;
}
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/ReportingManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/ReportingManager.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/ReportingManager.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/ReportingManager.java
Tue Mar 17 15:53:37 2009
@@ -28,7 +28,7 @@
*/
public interface ReportingManager
{
- public DynamicReportSource getReport( String id );
+ public DynamicReportSource<?> getReport( String id );
- public Map /*<String,DynamicReportSource>*/getAvailableReports();
+ public Map<String,DynamicReportSource<?>> getAvailableReports();
}
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGenerator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGenerator.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGenerator.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/main/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGenerator.java
Tue Mar 17 15:53:37 2009
@@ -27,6 +27,7 @@
import org.apache.maven.archiva.database.ArchivaDatabaseException;
import org.apache.maven.archiva.database.ArtifactDAO;
import
org.apache.maven.archiva.database.constraints.ArtifactsByRepositoryConstraint;
+import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.RepositoryContentStatistics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +122,7 @@
try
{
//TODO use the repo content stats whenGathered date instead of
endDate for single repo reports
- List types = artifactDao.queryArtifacts(
+ List<ArchivaArtifact> types = artifactDao.queryArtifacts(
new ArtifactsByRepositoryConstraint( repository,
JAR_TYPE, endDate, "whenGathered" ) );
repoStatistics.setJarCount( types.size() );
Modified:
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/test/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGeneratorTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/test/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGeneratorTest.java?rev=755290&r1=755289&r2=755290&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/test/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGeneratorTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-reporting/archiva-report-manager/src/test/java/org/apache/maven/archiva/reporting/SimpleRepositoryStatisticsReportGeneratorTest.java
Tue Mar 17 15:53:37 2009
@@ -342,7 +342,7 @@
try
{
- List<RepositoryStatistics> data = generator.generateReport(
repoContentStats, REPO, startDate, endDate, limits );
+ generator.generateReport( repoContentStats, REPO, startDate,
endDate, limits );
fail( "An ArchivaReportException should have been thrown." );
}
catch ( ArchivaReportException a )
