You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/12/30 21:12:11 UTC
svn commit: r360159 - in /maven/repository-manager/trunk:
maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/
maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/
maven-repository-reports-standard/src/ma...
Author: brett
Date: Fri Dec 30 12:11:56 2005
New Revision: 360159
URL: http://svn.apache.org/viewcvs?rev=360159&view=rev
Log:
privatising methods
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTest.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndex.java Fri Dec 30 12:11:56 2005
@@ -33,11 +33,11 @@
extends AbstractLogEnabled
implements RepositoryIndex
{
- protected String indexPath;
+ private String indexPath;
- protected boolean indexOpen;
+ private boolean indexOpen;
- protected IndexReader indexReader;
+ private IndexReader indexReader;
protected IndexWriter indexWriter;
@@ -131,7 +131,7 @@
}
}
- protected void getIndexReader()
+ private void getIndexReader()
throws IOException
{
if ( indexReader == null )
@@ -145,7 +145,7 @@
*
* @throws RepositoryIndexException if the given indexPath is not valid for this type of RepositoryIndex
*/
- protected void validateIndex()
+ private void validateIndex()
throws RepositoryIndexException, IOException
{
File indexDir = new File( indexPath );
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java Fri Dec 30 12:11:56 2005
@@ -50,13 +50,13 @@
private static final String FILES = "files";
- protected ArtifactRepositoryIndex indexer;
+ private ArtifactRepositoryIndex indexer;
- protected ArtifactFactory artifactFactory;
+ private ArtifactFactory artifactFactory;
- protected ArtifactRepository repository;
+ private ArtifactRepository repository;
- protected String indexPath;
+ private String indexPath;
protected void setUp()
throws Exception
@@ -213,7 +213,7 @@
assertEquals( 2, artifacts.size() );
}
- protected Artifact getArtifact( String groupId, String artifactId, String version )
+ private Artifact getArtifact( String groupId, String artifactId, String version )
throws Exception
{
if ( artifactFactory == null )
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java Fri Dec 30 12:11:56 2005
@@ -43,10 +43,14 @@
public class BadMetadataReportProcessor
implements MetadataReportProcessor
{
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private ArtifactFactory artifactFactory;
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private RepositoryQueryLayerFactory repositoryQueryLayerFactory;
/**
@@ -120,8 +124,8 @@
* @param repository the repository where the metadata was encountered
* @param reporter the ArtifactReporter to receive processing results
*/
- protected boolean checkPluginMetadata( RepositoryMetadata metadata, ArtifactRepository repository,
- ArtifactReporter reporter )
+ private boolean checkPluginMetadata( RepositoryMetadata metadata, ArtifactRepository repository,
+ ArtifactReporter reporter )
throws IOException
{
boolean hasFailures = false;
@@ -197,8 +201,8 @@
* @param repository the repository where the metadata was encountered
* @param reporter the ArtifactReporter to receive processing results
*/
- protected boolean checkSnapshotMetadata( RepositoryMetadata metadata, ArtifactRepository repository,
- ArtifactReporter reporter )
+ private boolean checkSnapshotMetadata( RepositoryMetadata metadata, ArtifactRepository repository,
+ ArtifactReporter reporter )
{
RepositoryQueryLayer repositoryQueryLayer =
repositoryQueryLayerFactory.createRepositoryQueryLayer( repository );
@@ -226,8 +230,8 @@
* @param repository the repository where the metadata was encountered
* @param reporter the ArtifactReporter to receive processing results
*/
- protected boolean checkMetadataVersions( RepositoryMetadata metadata, ArtifactRepository repository,
- ArtifactReporter reporter )
+ private boolean checkMetadataVersions( RepositoryMetadata metadata, ArtifactRepository repository,
+ ArtifactReporter reporter )
{
RepositoryQueryLayer repositoryQueryLayer =
repositoryQueryLayerFactory.createRepositoryQueryLayer( repository );
@@ -258,8 +262,8 @@
* @param repository the repository where the metadata was encountered
* @param reporter the ArtifactReporter to receive processing results
*/
- protected boolean checkRepositoryVersions( RepositoryMetadata metadata, ArtifactRepository repository,
- ArtifactReporter reporter )
+ private boolean checkRepositoryVersions( RepositoryMetadata metadata, ArtifactRepository repository,
+ ArtifactReporter reporter )
throws IOException
{
boolean hasFailures = false;
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java Fri Dec 30 12:11:56 2005
@@ -41,9 +41,9 @@
public class ChecksumArtifactReporter
implements ArtifactReportProcessor
{
- protected InputStream md5InputStream;
+ private InputStream md5InputStream;
- protected InputStream sha1InputStream;
+ private InputStream sha1InputStream;
private boolean isLocal = true;
@@ -260,7 +260,7 @@
* @param fileUrl The file to be validated.
* @param algo The checksum algorithm used.
*/
- protected boolean validateChecksum( String fileUrl, String algo )
+ private boolean validateChecksum( String fileUrl, String algo )
{
boolean valid = false;
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java Fri Dec 30 12:11:56 2005
@@ -61,7 +61,7 @@
}
}
- protected void processArtifact( Artifact artifact, ArtifactReporter reporter )
+ private void processArtifact( Artifact artifact, ArtifactReporter reporter )
{
boolean hasFailed = false;
if ( EMPTY_STRING.equals( artifact.getGroupId() ) || artifact.getGroupId() == null )
@@ -92,7 +92,7 @@
}
}
- protected void processDependencies( List dependencies, ArtifactReporter reporter )
+ private void processDependencies( List dependencies, ArtifactReporter reporter )
{
if ( dependencies.size() > 0 )
{
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java Fri Dec 30 12:11:56 2005
@@ -42,11 +42,11 @@
public abstract class AbstractChecksumArtifactReporterTestCase
extends AbstractRepositoryReportsTestCase
{
- protected static final String[] validArtifactChecksumJars = {"validArtifact-1.0"};
+ private static final String[] validArtifactChecksumJars = {"validArtifact-1.0"};
- protected static final String[] invalidArtifactChecksumJars = {"invalidArtifact-1.0"};
+ private static final String[] invalidArtifactChecksumJars = {"invalidArtifact-1.0"};
- protected static final String metadataChecksumFilename = "maven-metadata-repository";
+ private static final String metadataChecksumFilename = "maven-metadata-repository";
private static final int CHECKSUM_BUFFER_SIZE = 256;
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTest.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTest.java Fri Dec 30 12:11:56 2005
@@ -33,7 +33,7 @@
public abstract class AbstractRepositoryQueryLayerTest
extends PlexusTestCase
{
- protected ArtifactFactory artifactFactory;
+ private ArtifactFactory artifactFactory;
protected ArtifactRepository repository;
@@ -126,7 +126,7 @@
}
}
- protected Artifact getArtifact( String groupId, String artifactId, String version )
+ private Artifact getArtifact( String groupId, String artifactId, String version )
{
return artifactFactory.createBuildArtifact( groupId, artifactId, version, "pom" );
}
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java Fri Dec 30 12:11:56 2005
@@ -32,13 +32,13 @@
private static final String VALID = "temp";
- protected MockArtifactReporter reporter;
+ private MockArtifactReporter reporter;
- protected Artifact artifact;
+ private Artifact artifact;
- protected Model model;
+ private Model model;
- protected DefaultArtifactReportProcessor processor;
+ private DefaultArtifactReportProcessor processor;
protected void setUp()
throws Exception
@@ -443,14 +443,14 @@
super.tearDown();
}
- protected void setRequiredElements( Artifact artifact, String groupId, String artifactId, String version )
+ private void setRequiredElements( Artifact artifact, String groupId, String artifactId, String version )
{
artifact.setGroupId( groupId );
artifact.setArtifactId( artifactId );
artifact.setVersion( version );
}
- protected void setRequiredElements( Dependency dependency, String groupId, String artifactId, String version )
+ private void setRequiredElements( Dependency dependency, String groupId, String artifactId, String version )
{
dependency.setGroupId( groupId );
dependency.setArtifactId( artifactId );
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java Fri Dec 30 12:11:56 2005
@@ -29,17 +29,17 @@
public class ArtifactReporterTest
extends AbstractRepositoryReportsTestCase
{
- protected ArtifactReporter reporter;
+ private ArtifactReporter reporter;
- protected ArtifactFactory artifactFactory;
+ private ArtifactFactory artifactFactory;
- protected Artifact artifact;
+ private Artifact artifact;
- protected MockArtifactReportProcessor processor;
+ private MockArtifactReportProcessor processor;
- protected Versioning versioning;
+ private Versioning versioning;
- protected Model model;
+ private Model model;
protected void setUp()
throws Exception
Modified: maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java?rev=360159&r1=360158&r2=360159&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java Fri Dec 30 12:11:56 2005
@@ -34,7 +34,7 @@
public class BadMetadataReportProcessorTest
extends AbstractRepositoryReportsTestCase
{
- protected ArtifactFactory artifactFactory;
+ private ArtifactFactory artifactFactory;
private MetadataReportProcessor badMetadataReportProcessor;