Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PomClassicTransformer now inheriting from PomTransformer. Removed some of the duplicate methods. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720281 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-11-24 20:35:39 +00:00
parent f312012e8a
commit 0b4c2c9222
2 changed files with 3 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
View File

@ -28,7 +28,7 @@ import java.util.*;
/** /**
* Provides methods for transforming model properties into a domain model for the pom classic format and vice versa. * Provides methods for transforming model properties into a domain model for the pom classic format and vice versa.
*/ */
public final class PomTransformer public class PomTransformer
implements ModelTransformer implements ModelTransformer
{ {

181
maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
View File

@ -32,152 +32,16 @@ import java.util.*;
* Provides methods for transforming model properties into a domain model for the pom classic format and vice versa. * Provides methods for transforming model properties into a domain model for the pom classic format and vice versa.
*/ */
public final class PomClassicTransformer public final class PomClassicTransformer
implements ModelTransformer extends PomTransformer
{ {
private final DomainModelFactory factory;
public PomClassicTransformer(DomainModelFactory factory) public PomClassicTransformer(DomainModelFactory factory)
{ {
this.factory = factory; super(factory);
} }
private static Map<String, List<ModelProperty>> cache = new HashMap<String, List<ModelProperty>>(); private static Map<String, List<ModelProperty>> cache = new HashMap<String, List<ModelProperty>>();
/**
* @see ModelTransformer#transformToDomainModel(java.util.List, java.util.List)
*/
public DomainModel transformToDomainModel( List<ModelProperty> properties, List<ModelEventListener> eventListeners)
throws IOException
{
if ( properties == null )
{
throw new IllegalArgumentException( "properties: null" );
}
if( eventListeners == null )
{
eventListeners = new ArrayList<ModelEventListener>();
}
else
{
eventListeners = new ArrayList<ModelEventListener>(eventListeners);
}
List<ModelProperty> props = new ArrayList<ModelProperty>( properties );
//dependency management
ModelDataSource source = new DefaultModelDataSource();
source.init( props, Arrays.asList( new ArtifactModelContainerFactory(), new IdModelContainerFactory() ) );
for ( ModelContainer dependencyContainer : source.queryFor( ProjectUri.Dependencies.Dependency.xUri ) )
{
for ( ModelContainer managementContainer : source.queryFor(
ProjectUri.DependencyManagement.Dependencies.Dependency.xUri ) )
{
managementContainer = new ArtifactModelContainerFactory().create(
transformDependencyManagement( managementContainer.getProperties() ) );
ModelContainerAction action = dependencyContainer.containerAction( managementContainer );
if ( action.equals( ModelContainerAction.JOIN ) || action.equals( ModelContainerAction.DELETE ) )
{
source.join( dependencyContainer, managementContainer );
}
}
}
for ( ModelContainer dependencyContainer : source.queryFor( ProjectUri.Build.Plugins.Plugin.xUri ) )
{
for ( ModelContainer managementContainer : source.queryFor(
ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri ) )
{
managementContainer = new ArtifactModelContainerFactory().create(
transformPluginManagement( managementContainer.getProperties() ) );
//Remove duplicate executions tags
boolean hasExecutionsTag = false;
for ( ModelProperty mp : dependencyContainer.getProperties() )
{
if ( mp.getUri().equals( ProjectUri.Build.Plugins.Plugin.Executions.xUri ) )
{
hasExecutionsTag = true;
break;
}
}
List<ModelProperty> pList = new ArrayList<ModelProperty>();
if ( !hasExecutionsTag )
{
pList = managementContainer.getProperties();
}
else
{
for ( ModelProperty mp : managementContainer.getProperties() )
{
if ( !mp.getUri().equals( ProjectUri.Build.Plugins.Plugin.Executions.xUri ) )
{
pList.add( mp );
}
}
}
managementContainer = new ArtifactModelContainerFactory().create( pList );
ModelContainerAction action = dependencyContainer.containerAction( managementContainer );
if ( action.equals( ModelContainerAction.JOIN ) || action.equals( ModelContainerAction.DELETE ) )
{
// ModelContainer reverseSortedContainer = new ArtifactModelContainerFactory().create(
// ModelTransformerContext.sort(dependencyContainer.getProperties(), ProjectUri.Build.Plugins.Plugin.xUri) );
source.join( dependencyContainer, managementContainer );
}
}
}
props = source.getModelProperties();
//Rule: Do not join plugin executions without ids
Set<ModelProperty> removeProperties = new HashSet<ModelProperty>();
ModelDataSource dataSource = new DefaultModelDataSource();
dataSource.init( props, Arrays.asList( new ArtifactModelContainerFactory(), new IdModelContainerFactory() ) );
List<ModelContainer> containers = dataSource.queryFor( ProjectUri.Build.Plugins.Plugin.xUri );
for ( ModelContainer pluginContainer : containers )
{
ModelDataSource executionSource = new DefaultModelDataSource();
executionSource.init( pluginContainer.getProperties(),
Arrays.asList( new ArtifactModelContainerFactory(), new PluginExecutionIdModelContainerFactory() ) );
List<ModelContainer> executionContainers =
executionSource.queryFor( ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri );
if ( executionContainers.size() < 2 )
{
continue;
}
boolean hasAtLeastOneWithoutId = true;
for ( ModelContainer executionContainer : executionContainers )
{
if ( hasAtLeastOneWithoutId )
{
hasAtLeastOneWithoutId = hasExecutionId( executionContainer );
}
if ( !hasAtLeastOneWithoutId && !hasExecutionId( executionContainer ) &&
executionContainers.indexOf( executionContainer ) > 0 )
{
removeProperties.addAll( executionContainer.getProperties() );
}
}
}
props.removeAll( removeProperties );
for(ModelEventListener listener : eventListeners)
{
ModelDataSource ds = new DefaultModelDataSource();
ds.init( props, listener.getModelContainerFactories() );
for(String uri : listener.getUris() )
{
listener.fire(ds.queryFor(uri));
}
}
return factory.createDomainModel( props );
}
/** /**
* @see ModelTransformer#transformToModelProperties(java.util.List) * @see ModelTransformer#transformToModelProperties(java.util.List)
*/ */
@ -482,18 +346,6 @@ public final class PomClassicTransformer
ProjectBuilder.Interpolator.interpolateModelProperties( modelProperties, interpolatorProperties, (PomClassicDomainModel) domainModel); ProjectBuilder.Interpolator.interpolateModelProperties( modelProperties, interpolatorProperties, (PomClassicDomainModel) domainModel);
} }
private static boolean hasExecutionId( ModelContainer executionContainer )
{
for ( ModelProperty mp : executionContainer.getProperties() )
{
if ( mp.getUri().equals( ProjectUri.Build.Plugins.Plugin.Executions.Execution.id ) )
{
return true;
}
}
return false;
}
public List<ModelProperty> preprocessModelProperties(List<ModelProperty> modelProperties) public List<ModelProperty> preprocessModelProperties(List<ModelProperty> modelProperties)
{ {
return new ArrayList<ModelProperty>(modelProperties); return new ArrayList<ModelProperty>(modelProperties);
@ -561,35 +413,6 @@ public final class PomClassicTransformer
return null; return null;
} }
private static List<ModelProperty> transformDependencyManagement( List<ModelProperty> modelProperties )
{
List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>();
for ( ModelProperty mp : modelProperties )
{
if ( mp.getUri().startsWith( ProjectUri.DependencyManagement.xUri ) )
{
transformedProperties.add( new ModelProperty(
mp.getUri().replace( ProjectUri.DependencyManagement.xUri, ProjectUri.xUri ), mp.getResolvedValue() ) );
}
}
return transformedProperties;
}
private static List<ModelProperty> transformPluginManagement( List<ModelProperty> modelProperties )
{
List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>();
for ( ModelProperty mp : modelProperties )
{
if ( mp.getUri().startsWith( ProjectUri.Build.PluginManagement.xUri ) )
{
transformedProperties.add( new ModelProperty(
mp.getUri().replace( ProjectUri.Build.PluginManagement.xUri, ProjectUri.Build.xUri ),
mp.getResolvedValue() ) );
}
}
return transformedProperties;
}
private static List<ModelProperty> transformPlugin( List<ModelProperty> modelProperties ) private static List<ModelProperty> transformPlugin( List<ModelProperty> modelProperties )
{ {
List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>(); List<ModelProperty> transformedProperties = new ArrayList<ModelProperty>();