You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/25 20:04:24 UTC
svn commit: r797809 - in
/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building:
DefaultModelBuilder.java DefaultModelBuildingResult.java ModelData.java
Author: bentmann
Date: Sat Jul 25 18:04:24 2009
New Revision: 797809
URL: http://svn.apache.org/viewvc?rev=797809&view=rev
Log:
o Refactored code
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=797809&r1=797808&r2=797809&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Sat Jul 25 18:04:24 2009
@@ -171,6 +171,37 @@
resultModel = interpolateModel( resultModel, request, problems );
resultData.setModel( resultModel );
+ resultData.setGroupId( resultModel.getGroupId() );
+ resultData.setArtifactId( resultModel.getArtifactId() );
+ resultData.setVersion( resultModel.getVersion() );
+
+ result.setProblems( problems );
+
+ result.setEffectiveModel( resultModel );
+
+ result.setActiveExternalProfiles( activeExternalProfiles );
+
+ for ( ModelData currentData : lineage )
+ {
+ String modelId = ( currentData != superData ) ? currentData.getId() : "";
+
+ result.addModelId( modelId );
+ result.setActivePomProfiles( modelId, currentData.getActiveProfiles() );
+ result.setRawModel( modelId, currentData.getRawModel() );
+ }
+
+ build( request, result );
+
+ return result;
+ }
+
+ public ModelBuildingResult build( ModelBuildingRequest request, ModelBuildingResult result )
+ throws ModelBuildingException
+ {
+ Model resultModel = result.getEffectiveModel();
+
+ List<ModelProblem> problems = result.getProblems();
+
modelPathTranslator.alignToBaseDirectory( resultModel, resultModel.getProjectDirectory(), request );
pluginManagementInjector.injectBasicManagement( resultModel, request );
@@ -203,25 +234,6 @@
throw new ModelBuildingException( problems );
}
- resultData.setGroupId( resultModel.getGroupId() );
- resultData.setArtifactId( resultModel.getArtifactId() );
- resultData.setVersion( resultModel.getVersion() );
-
- result.setProblems( problems );
-
- result.setEffectiveModel( resultModel );
-
- result.setActiveExternalProfiles( activeExternalProfiles );
-
- for ( ModelData currentData : lineage )
- {
- String modelId = ( currentData != superData ) ? currentData.getId() : "";
-
- result.addModelId( modelId );
- result.setActivePomProfiles( modelId, currentData.getActiveProfiles() );
- result.setRawModel( modelId, currentData.getRawModel() );
- }
-
return result;
}
@@ -625,7 +637,7 @@
private String toSourceHint( Model model )
{
- StringBuilder buffer = new StringBuilder( 128 );
+ StringBuilder buffer = new StringBuilder( 192 );
buffer.append( toId( model ) );
@@ -640,72 +652,42 @@
private String toId( Model model )
{
- StringBuilder buffer = new StringBuilder( 64 );
-
- if ( model.getGroupId() != null )
+ String groupId = model.getGroupId();
+ if ( groupId == null && model.getParent() != null )
{
- buffer.append( model.getGroupId() );
- }
- else if ( model.getParent() != null && model.getParent().getGroupId() != null )
- {
- buffer.append( model.getParent().getGroupId() );
- }
- else
- {
- buffer.append( "[unknown-group-id]" );
+ groupId = model.getParent().getGroupId();
}
- buffer.append( ':' );
+ String artifactId = model.getArtifactId();
- if ( model.getArtifactId() != null )
+ String version = model.getVersion();
+ if ( version == null && model.getParent() != null )
{
- buffer.append( model.getArtifactId() );
- }
- else
- {
- buffer.append( "[unknown-artifact-id]" );
+ version = model.getParent().getVersion();
}
- buffer.append( ':' );
-
- if ( model.getVersion() != null )
- {
- buffer.append( model.getVersion() );
- }
- else if ( model.getParent() != null && model.getParent().getVersion() != null )
- {
- buffer.append( model.getParent().getVersion() );
- }
- else
- {
- buffer.append( "[unknown-version]" );
- }
-
- return buffer.toString();
+ return toId( groupId, artifactId, version );
}
private String toId( Parent parent )
{
- StringBuilder buffer = new StringBuilder( 64 );
-
- buffer.append( parent.getGroupId() );
- buffer.append( ':' );
- buffer.append( parent.getArtifactId() );
- buffer.append( ':' );
- buffer.append( parent.getVersion() );
-
- return buffer.toString();
+ return toId( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
}
private String toId( Dependency dependency )
{
- StringBuilder buffer = new StringBuilder( 64 );
+ return toId( dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() );
+ }
+
+ private String toId( String groupId, String artifactId, String version )
+ {
+ StringBuilder buffer = new StringBuilder( 96 );
- buffer.append( dependency.getGroupId() );
+ buffer.append( ( groupId != null ) ? groupId : "[unknown-group-id]" );
buffer.append( ':' );
- buffer.append( dependency.getArtifactId() );
+ buffer.append( ( artifactId != null ) ? artifactId : "[unknown-artifact-id]" );
buffer.append( ':' );
- buffer.append( dependency.getVersion() );
+ buffer.append( ( version != null ) ? version : "[unknown-version]" );
return buffer.toString();
}
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java?rev=797809&r1=797808&r2=797809&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java Sat Jul 25 18:04:24 2009
@@ -20,7 +20,6 @@
*/
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -72,7 +71,7 @@
public List<String> getModelIds()
{
- return Collections.unmodifiableList( modelIds );
+ return modelIds;
}
public DefaultModelBuildingResult addModelId( String modelId )
@@ -111,8 +110,7 @@
public List<Profile> getActivePomProfiles( String modelId )
{
- List<Profile> profiles = this.activePomProfiles.get( modelId );
- return ( profiles != null ) ? Collections.unmodifiableList( profiles ) : null;
+ return activePomProfiles.get( modelId );
}
public DefaultModelBuildingResult setActivePomProfiles( String modelId, List<Profile> activeProfiles )
@@ -136,7 +134,7 @@
public List<Profile> getActiveExternalProfiles()
{
- return Collections.unmodifiableList( activeExternalProfiles );
+ return activeExternalProfiles;
}
public DefaultModelBuildingResult setActiveExternalProfiles( List<Profile> activeProfiles )
@@ -155,7 +153,7 @@
public List<ModelProblem> getProblems()
{
- return Collections.unmodifiableList( problems );
+ return problems;
}
public DefaultModelBuildingResult setProblems( List<ModelProblem> problems )
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java?rev=797809&r1=797808&r2=797809&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java Sat Jul 25 18:04:24 2009
@@ -198,7 +198,7 @@
*/
public String getId()
{
- StringBuilder buffer = new StringBuilder( 64 );
+ StringBuilder buffer = new StringBuilder( 96 );
buffer.append( getGroupId() ).append( ':' ).append( getArtifactId() ).append( ':' ).append( getVersion() );