Author: hboutemy
Date: Fri Feb 20 00:41:01 2009
New Revision: 746072
URL: http://svn.apache.org/viewvc?rev=746072&view=rev
Log:
o used exception chaining as much as possible
o added generics to PomProcessor
o fixed code style
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=746072&r1=746071&r2=746072&view=diff
==============================================================================
---
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
(original)
+++
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
Fri Feb 20 00:41:01 2009
@@ -91,7 +91,9 @@
byte[] superBytes = mdReader.readMetadata( bmd );
if ( superBytes == null || superBytes.length < 1 )
+ {
throw new DependencyProcessorException( "cannot read metadata
for " + bmd.getGAV() );
+ }
MavenDomainModel domainModel = new MavenDomainModel( superBytes );
domainModels.add( domainModel );
@@ -104,15 +106,17 @@
}
List<DomainModel> parentModels = getParentsOfDomainModel(
domainModel, mdReader );
-
- if( parentModels == null )
+
+ if ( parentModels == null )
+ {
throw new DependencyProcessorException( "cannot read parent
for " + bmd.getGAV() );
-
+ }
+
domainModels.addAll( parentModels );
}
catch ( IOException e )
{
- throw new MetadataReaderException( "Failed to create domain model.
Message = " + e.getMessage() );
+ throw new MetadataReaderException( "Failed to create domain model.
Message = " + e.getMessage(), e );
}
PomTransformer transformer = new PomTransformer( new
MavenDomainModelFactory() );
@@ -128,7 +132,7 @@
}
catch ( IOException e )
{
- throw new MetadataReaderException( "Unable to transform model" );
+ throw new MetadataReaderException( "Unable to transform model", e
);
}
}
@@ -141,10 +145,11 @@
byte[] b = mdReader.readMetadata( domainModel.getParentMetadata()
);
if ( b == null || b.length < 1 )
+ {
throw new DependencyProcessorException( "cannot read metadata
for " + domainModel.getParentMetadata() );
+ }
- MavenDomainModel parentDomainModel =
- new MavenDomainModel( b );
+ MavenDomainModel parentDomainModel = new MavenDomainModel( b );
domainModels.add( parentDomainModel );
domainModels.addAll( getParentsOfDomainModel( parentDomainModel,
mdReader ) );
}
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=746072&r1=746071&r2=746072&view=diff
==============================================================================
---
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
(original)
+++
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
Fri Feb 20 00:41:01 2009
@@ -63,7 +63,7 @@
/**
* Constructor
- *
+ *
* @throws IOException if there is a problem constructing the model
*/
public MavenDomainModel( byte[] bytes )
@@ -74,7 +74,7 @@
/**
* Constructor
- *
+ *
* @throws IOException if there is a problem constructing the model
*/
public MavenDomainModel( InputStream inputStream )
@@ -85,7 +85,7 @@
/**
* Constructor
- *
+ *
* @throws IOException if there is a problem constructing the model
*/
public MavenDomainModel( List<ModelProperty> modelProperties )
@@ -247,7 +247,7 @@
}
ModelDataSource dataSource = new DefaultModelDataSource(
container.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(),
- new
ExclusionModelContainerFactory() ));
+ new
ExclusionModelContainerFactory() ) );
List<ArtifactBasicMetadata> exclusions = new
ArrayList<ArtifactBasicMetadata>();
for ( ModelContainer exclusion : dataSource.queryFor(
ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.xUri ) )
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java?rev=746072&r1=746071&r2=746072&view=diff
==============================================================================
---
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
(original)
+++
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessor.java
Fri Feb 20 00:41:01 2009
@@ -10,6 +10,7 @@
public interface PomProcessor
{
- List<ModelProperty> getRawPom(ArtifactBasicMetadata bmd, MetadataReader
mdReader, Map env, Map sysProps)
+ List<ModelProperty> getRawPom(ArtifactBasicMetadata bmd, MetadataReader
mdReader, Map<String, String> env,
+ Map<String, String> sysProps)
throws MetadataReaderException, PomProcessorException;
}
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java?rev=746072&r1=746071&r2=746072&view=diff
==============================================================================
---
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
(original)
+++
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/PomProcessorException.java
Fri Feb 20 00:41:01 2009
@@ -1,6 +1,7 @@
package org.apache.maven.mercury;
-public class PomProcessorException extends Exception
+public class PomProcessorException
+ extends Exception
{
static final long serialVersionUID = 980457843528974352L;
