Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-06 00:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add @Override on matching methods

Browse Source
This commit is contained in:
Robert Scholte 2015-01-24 20:43:42 +01:00
parent eea4252f5d
commit 786285f1f4
43 changed files with 147 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java
View File

@ -28,6 +28,7 @@ public class AbstractModelBuildingListener
implements ModelBuildingListener
{
@Override
public void buildExtensionsAssembled( ModelBuildingEvent event )
{
// default does nothing

2
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -228,6 +228,7 @@ public DefaultModelBuilder setReportingConverter( ReportingConverter reportingCo
return this;
}
@Override
public ModelBuildingResult build( ModelBuildingRequest request )
throws ModelBuildingException
{
@ -400,6 +401,7 @@ else if ( !parentIds.add( parentData.getId() ) )
return result;
}
@Override
public ModelBuildingResult build( ModelBuildingRequest request, ModelBuildingResult result )
throws ModelBuildingException
{

1
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
View File

@ -233,6 +233,7 @@ private static class StubLifecycleBindingsInjector
implements LifecycleBindingsInjector
{
@Override
public void injectLifecycleBindings( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
}

3
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
View File

@ -43,16 +43,19 @@ public DefaultModelBuildingEvent( Model model, ModelBuildingRequest request, Mod
this.problems = problems;
}
@Override
public Model getModel()
{
return model;
}
@Override
public ModelBuildingRequest getRequest()
{
return request;
}
@Override
public ModelProblemCollector getProblems()
{
return problems;

30
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
View File

@ -97,11 +97,13 @@ public DefaultModelBuildingRequest( ModelBuildingRequest request )
setModelCache( request.getModelCache() );
}
@Override
public File getPomFile()
{
return pomFile;
}
@Override
public DefaultModelBuildingRequest setPomFile( File pomFile )
{
this.pomFile = ( pomFile != null ) ? pomFile.getAbsoluteFile() : null;
@ -109,6 +111,7 @@ public DefaultModelBuildingRequest setPomFile( File pomFile )
return this;
}
@Override
public synchronized ModelSource getModelSource()
{
if ( modelSource == null && pomFile != null )
@ -118,6 +121,7 @@ public synchronized ModelSource getModelSource()
return modelSource;
}
@Override
public DefaultModelBuildingRequest setModelSource( ModelSource modelSource )
{
this.modelSource = modelSource;
@ -125,11 +129,13 @@ public DefaultModelBuildingRequest setModelSource( ModelSource modelSource )
return this;
}
@Override
public int getValidationLevel()
{
return validationLevel;
}
@Override
public DefaultModelBuildingRequest setValidationLevel( int validationLevel )
{
this.validationLevel = validationLevel;
@ -137,11 +143,13 @@ public DefaultModelBuildingRequest setValidationLevel( int validationLevel )
return this;
}
@Override
public boolean isProcessPlugins()
{
return processPlugins;
}
@Override
public DefaultModelBuildingRequest setProcessPlugins( boolean processPlugins )
{
this.processPlugins = processPlugins;
@ -149,11 +157,13 @@ public DefaultModelBuildingRequest setProcessPlugins( boolean processPlugins )
return this;
}
@Override
public boolean isTwoPhaseBuilding()
{
return twoPhaseBuilding;
}
@Override
public DefaultModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding )
{
this.twoPhaseBuilding = twoPhaseBuilding;
@ -161,11 +171,13 @@ public DefaultModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding
return this;
}
@Override
public boolean isLocationTracking()
{
return locationTracking;
}
@Override
public DefaultModelBuildingRequest setLocationTracking( boolean locationTracking )
{
this.locationTracking = locationTracking;
@ -173,6 +185,7 @@ public DefaultModelBuildingRequest setLocationTracking( boolean locationTracking
return this;
}
@Override
public List<Profile> getProfiles()
{
if ( profiles == null )
@ -183,6 +196,7 @@ public List<Profile> getProfiles()
return profiles;
}
@Override
public DefaultModelBuildingRequest setProfiles( List<Profile> profiles )
{
if ( profiles != null )
@ -197,6 +211,7 @@ public DefaultModelBuildingRequest setProfiles( List<Profile> profiles )
return this;
}
@Override
public List<String> getActiveProfileIds()
{
if ( activeProfileIds == null )
@ -207,6 +222,7 @@ public List<String> getActiveProfileIds()
return activeProfileIds;
}
@Override
public DefaultModelBuildingRequest setActiveProfileIds( List<String> activeProfileIds )
{
if ( activeProfileIds != null )
@ -221,6 +237,7 @@ public DefaultModelBuildingRequest setActiveProfileIds( List<String> activeProfi
return this;
}
@Override
public List<String> getInactiveProfileIds()
{
if ( inactiveProfileIds == null )
@ -231,6 +248,7 @@ public List<String> getInactiveProfileIds()
return inactiveProfileIds;
}
@Override
public DefaultModelBuildingRequest setInactiveProfileIds( List<String> inactiveProfileIds )
{
if ( inactiveProfileIds != null )
@ -245,6 +263,7 @@ public DefaultModelBuildingRequest setInactiveProfileIds( List<String> inactiveP
return this;
}
@Override
public Properties getSystemProperties()
{
if ( systemProperties == null )
@ -255,6 +274,7 @@ public Properties getSystemProperties()
return systemProperties;
}
@Override
public DefaultModelBuildingRequest setSystemProperties( Properties systemProperties )
{
if ( systemProperties != null )
@ -270,6 +290,7 @@ public DefaultModelBuildingRequest setSystemProperties( Properties systemPropert
return this;
}
@Override
public Properties getUserProperties()
{
if ( userProperties == null )
@ -280,6 +301,7 @@ public Properties getUserProperties()
return userProperties;
}
@Override
public DefaultModelBuildingRequest setUserProperties( Properties userProperties )
{
if ( userProperties != null )
@ -295,11 +317,13 @@ public DefaultModelBuildingRequest setUserProperties( Properties userProperties
return this;
}
@Override
public Date getBuildStartTime()
{
return buildStartTime;
}
@Override
public ModelBuildingRequest setBuildStartTime( Date buildStartTime )
{
this.buildStartTime = buildStartTime;
@ -307,11 +331,13 @@ public ModelBuildingRequest setBuildStartTime( Date buildStartTime )
return this;
}
@Override
public ModelResolver getModelResolver()
{
return this.modelResolver;
}
@Override
public DefaultModelBuildingRequest setModelResolver( ModelResolver modelResolver )
{
this.modelResolver = modelResolver;
@ -319,11 +345,13 @@ public DefaultModelBuildingRequest setModelResolver( ModelResolver modelResolver
return this;
}
@Override
public ModelBuildingListener getModelBuildingListener()
{
return modelBuildingListener;
}
@Override
public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener modelBuildingListener )
{
this.modelBuildingListener = modelBuildingListener;
@ -331,11 +359,13 @@ public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener mode
return this;
}
@Override
public ModelCache getModelCache()
{
return this.modelCache;
}
@Override
public DefaultModelBuildingRequest setModelCache( ModelCache modelCache )
{
this.modelCache = modelCache;

7
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
View File

@ -57,6 +57,7 @@ public DefaultModelBuildingResult()
problems = new ArrayList<ModelProblem>();
}
@Override
public Model getEffectiveModel()
{
return effectiveModel;
@ -69,6 +70,7 @@ public DefaultModelBuildingResult setEffectiveModel( Model model )
return this;
}
@Override
public List<String> getModelIds()
{
return modelIds;
@ -86,11 +88,13 @@ public DefaultModelBuildingResult addModelId( String modelId )
return this;
}
@Override
public Model getRawModel()
{
return rawModels.get( modelIds.get( 0 ) );
}
@Override
public Model getRawModel( String modelId )
{
return rawModels.get( modelId );
@ -108,6 +112,7 @@ public DefaultModelBuildingResult setRawModel( String modelId, Model rawModel )
return this;
}
@Override
public List<Profile> getActivePomProfiles( String modelId )
{
return activePomProfiles.get( modelId );
@ -132,6 +137,7 @@ public DefaultModelBuildingResult setActivePomProfiles( String modelId, List<Pro
return this;
}
@Override
public List<Profile> getActiveExternalProfiles()
{
return activeExternalProfiles;
@ -151,6 +157,7 @@ public DefaultModelBuildingResult setActiveExternalProfiles( List<Profile> activ
return this;
}
@Override
public List<ModelProblem> getProblems()
{
return problems;

8
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
View File

@ -95,31 +95,37 @@ public DefaultModelProblem( String message, Severity severity, Version version,
this.version = version;
}
@Override
public String getSource()
{
return source;
}
@Override
public int getLineNumber()
{
return lineNumber;
}
@Override
public int getColumnNumber()
{
return columnNumber;
}
@Override
public String getModelId()
{
return modelId;
}
@Override
public Exception getException()
{
return exception;
}
@Override
public String getMessage()
{
String msg;
@ -141,11 +147,13 @@ public String getMessage()
return msg;
}
@Override
public Severity getSeverity()
{
return severity;
}
@Override
public Version getVersion()
{
return version;

2
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
View File

@ -72,6 +72,7 @@ public boolean hasErrors()
return severities.contains( ModelProblem.Severity.ERROR ) || severities.contains( ModelProblem.Severity.FATAL );
}
@Override
public List<ModelProblem> getProblems()
{
return problems;
@ -140,6 +141,7 @@ public void addAll( List<ModelProblem> problems )
}
}
@Override
public void add( ModelProblemCollectorRequest req )
{
int line = -1;

4
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
View File

@ -54,23 +54,27 @@ public DefaultModelProcessor setModelReader( ModelReader reader )
return this;
}
@Override
public File locatePom( File projectDirectory )
{
return locator.locatePom( projectDirectory );
}
@Override
public Model read( File input, Map<String, ?> options )
throws IOException
{
return reader.read( input, options );
}
@Override
public Model read( Reader input, Map<String, ?> options )
throws IOException
{
return reader.read( input, options );
}
@Override
public Model read( InputStream input, Map<String, ?> options )
throws IOException
{

30
maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
View File

@ -44,11 +44,13 @@ public FilterModelBuildingRequest( ModelBuildingRequest request )
this.request = request;
}
@Override
public File getPomFile()
{
return request.getPomFile();
}
@Override
public FilterModelBuildingRequest setPomFile( File pomFile )
{
request.setPomFile( pomFile );
@ -56,11 +58,13 @@ public FilterModelBuildingRequest setPomFile( File pomFile )
return this;
}
@Override
public ModelSource getModelSource()
{
return request.getModelSource();
}
@Override
public FilterModelBuildingRequest setModelSource( ModelSource modelSource )
{
request.setModelSource( modelSource );
@ -68,11 +72,13 @@ public FilterModelBuildingRequest setModelSource( ModelSource modelSource )
return this;
}
@Override
public int getValidationLevel()
{
return request.getValidationLevel();
}
@Override
public FilterModelBuildingRequest setValidationLevel( int validationLevel )
{
request.setValidationLevel( validationLevel );
@ -80,11 +86,13 @@ public FilterModelBuildingRequest setValidationLevel( int validationLevel )
return this;
}
@Override
public boolean isProcessPlugins()
{
return request.isProcessPlugins();
}
@Override
public FilterModelBuildingRequest setProcessPlugins( boolean processPlugins )
{
request.setProcessPlugins( processPlugins );
@ -92,11 +100,13 @@ public FilterModelBuildingRequest setProcessPlugins( boolean processPlugins )
return this;
}
@Override
public boolean isTwoPhaseBuilding()
{
return request.isTwoPhaseBuilding();
}
@Override
public FilterModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding )
{
request.setTwoPhaseBuilding( twoPhaseBuilding );
@ -104,11 +114,13 @@ public FilterModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding
return this;
}
@Override
public boolean isLocationTracking()
{
return request.isLocationTracking();
}
@Override
public FilterModelBuildingRequest setLocationTracking( boolean locationTracking )
{
request.setLocationTracking( locationTracking );
@ -116,11 +128,13 @@ public FilterModelBuildingRequest setLocationTracking( boolean locationTracking
return this;
}
@Override
public List<Profile> getProfiles()
{
return request.getProfiles();
}
@Override
public FilterModelBuildingRequest setProfiles( List<Profile> profiles )
{
request.setProfiles( profiles );
@ -128,11 +142,13 @@ public FilterModelBuildingRequest setProfiles( List<Profile> profiles )
return this;
}
@Override
public List<String> getActiveProfileIds()
{
return request.getActiveProfileIds();
}
@Override
public FilterModelBuildingRequest setActiveProfileIds( List<String> activeProfileIds )
{
request.setActiveProfileIds( activeProfileIds );
@ -140,11 +156,13 @@ public FilterModelBuildingRequest setActiveProfileIds( List<String> activeProfil
return this;
}
@Override
public List<String> getInactiveProfileIds()
{
return request.getInactiveProfileIds();
}
@Override
public FilterModelBuildingRequest setInactiveProfileIds( List<String> inactiveProfileIds )
{
request.setInactiveProfileIds( inactiveProfileIds );
@ -152,11 +170,13 @@ public FilterModelBuildingRequest setInactiveProfileIds( List<String> inactivePr
return this;
}
@Override
public Properties getSystemProperties()
{
return request.getSystemProperties();
}
@Override
public FilterModelBuildingRequest setSystemProperties( Properties systemProperties )
{
request.setSystemProperties( systemProperties );
@ -164,11 +184,13 @@ public FilterModelBuildingRequest setSystemProperties( Properties systemProperti
return this;
}
@Override
public Properties getUserProperties()
{
return request.getUserProperties();
}
@Override
public FilterModelBuildingRequest setUserProperties( Properties userProperties )
{
request.setUserProperties( userProperties );
@ -176,11 +198,13 @@ public FilterModelBuildingRequest setUserProperties( Properties userProperties )
return this;
}
@Override
public Date getBuildStartTime()
{
return request.getBuildStartTime();
}
@Override
public ModelBuildingRequest setBuildStartTime( Date buildStartTime )
{
request.setBuildStartTime( buildStartTime );
@ -188,11 +212,13 @@ public ModelBuildingRequest setBuildStartTime( Date buildStartTime )
return this;
}
@Override
public ModelResolver getModelResolver()
{
return request.getModelResolver();
}
@Override
public FilterModelBuildingRequest setModelResolver( ModelResolver modelResolver )
{
request.setModelResolver( modelResolver );
@ -200,11 +226,13 @@ public FilterModelBuildingRequest setModelResolver( ModelResolver modelResolver
return this;
}
@Override
public ModelBuildingListener getModelBuildingListener()
{
return request.getModelBuildingListener();
}
@Override
public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener modelBuildingListener )
{
request.setModelBuildingListener( modelBuildingListener );
@ -212,11 +240,13 @@ public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener mode
return this;
}
@Override
public ModelCache getModelCache()
{
return request.getModelCache();
}
@Override
public FilterModelBuildingRequest setModelCache( ModelCache modelCache )
{
request.setModelCache( modelCache );

1
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java
View File

@ -38,6 +38,7 @@ interface ModelBuildingEventCatapult
ModelBuildingEventCatapult BUILD_EXTENSIONS_ASSEMBLED = new ModelBuildingEventCatapult()
{
@Override
public void fire( ModelBuildingListener listener, ModelBuildingEvent event )
{
listener.buildExtensionsAssembled( event );

8
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
View File

@ -70,22 +70,26 @@ interface ModelCacheTag<T>
ModelCacheTag<ModelData> RAW = new ModelCacheTag<ModelData>()
{
@Override
public String getName()
{
return "raw";
}
@Override
public Class<ModelData> getType()
{
return ModelData.class;
}
@Override
public ModelData intoCache( ModelData data )
{
Model model = ( data.getModel() != null ) ? data.getModel().clone() : null;
return new ModelData( data.getSource(), model, data.getGroupId(), data.getArtifactId(), data.getVersion() );
}
@Override
public ModelData fromCache( ModelData data )
{
return intoCache( data );
@ -99,21 +103,25 @@ public ModelData fromCache( ModelData data )
ModelCacheTag<DependencyManagement> IMPORT = new ModelCacheTag<DependencyManagement>()
{
@Override
public String getName()
{
return "import";
}
@Override
public Class<DependencyManagement> getType()
{
return DependencyManagement.class;
}
@Override
public DependencyManagement intoCache( DependencyManagement data )
{
return ( data != null ) ? data.clone() : null;
}
@Override
public DependencyManagement fromCache( DependencyManagement data )
{
return intoCache( data );

1
maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
View File

@ -41,6 +41,7 @@ public class DefaultDependencyManagementImporter
implements DependencyManagementImporter
{
@Override
public void importManagement( Model target, List<? extends DependencyManagement> sources,
ModelBuildingRequest request, ModelProblemCollector problems )
{

1
maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
View File

@ -48,6 +48,7 @@ public class DefaultInheritanceAssembler
private InheritanceModelMerger merger = new InheritanceModelMerger();
@Override
public void assembleModelInheritance( Model child, Model parent, ModelBuildingRequest request,
ModelProblemCollector problems )
{

3
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
View File

@ -133,6 +133,7 @@ protected List<ValueSource> createValueSources( final Model model, final File pr
{
ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false )
{
@Override
public Object getValue( String expression )
{
if ( "basedir".equals( expression ) )
@ -146,6 +147,7 @@ public Object getValue( String expression )
ValueSource baseUriValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false )
{
@Override
public Object getValue( String expression )
{
if ( "baseUri".equals( expression ) )
@ -169,6 +171,7 @@ public Object getValue( String expression )
valueSources.add( new AbstractValueSource( false )
{
@Override
public Object getValue( String expression )
{
return config.getSystemProperties().getProperty( "env." + expression );

1
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
View File

@ -35,6 +35,7 @@ public BuildTimestampValueSource( Date startTime, Properties properties )
this.mavenBuildTimestamp = new MavenBuildTimestamp( startTime, properties );
}
@Override
public Object getValue( String expression )
{
if ( "build.timestamp".equals( expression ) || "maven.build.timestamp".equals( expression ) )

1
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java
View File

@ -48,6 +48,7 @@ public PathTranslatingPostProcessor( List<String> expressionPrefixes, Collection
this.pathTranslator = pathTranslator;
}
@Override
public Object execute( String expression, Object value )
{
if ( value != null )

3
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
View File

@ -53,6 +53,7 @@ public ProblemDetectingValueSource( ValueSource valueSource, String bannedPrefix
this.problems = problems;
}
@Override
public Object getValue( String expression )
{
Object value = valueSource.getValue( expression );
@ -70,12 +71,14 @@ public Object getValue( String expression )
return value;
}
@Override
@SuppressWarnings( "unchecked" )
public List getFeedback()
{
return valueSource.getFeedback();
}
@Override
public void clearFeedback()
{
valueSource.clearFeedback();

3
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -54,6 +54,7 @@ public class StringSearchModelInterpolator
// Empirical data from 3.x, actual =40
@Override
public Model interpolateModel( Model model, File projectDir, ModelBuildingRequest config,
ModelProblemCollector problems )
{
@ -82,6 +83,7 @@ protected void interpolateObject( Object obj, Model model, File projectDir, Mode
}
}
@Override
protected Interpolator createInterpolator()
{
StringSearchInterpolator interpolator = new StringSearchInterpolator();
@ -120,6 +122,7 @@ public InterpolateObjectAction( Object target, List<? extends ValueSource> value
this.problems = problems;
}
@Override
public Object run()
{
while ( !interpolationTargets.isEmpty() )

1
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
View File

@ -55,6 +55,7 @@ public UrlNormalizingPostProcessor( UrlNormalizer normalizer )
this.normalizer = normalizer;
}
@Override
public Object execute( String expression, Object value )
{
if ( value != null && URL_EXPRESSIONS.contains( expression ) )

3
maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
View File

@ -45,6 +45,7 @@ public class DefaultModelReader
implements ModelReader
{
@Override
public Model read( File input, Map<String, ?> options )
throws IOException
{
@ -60,6 +61,7 @@ public Model read( File input, Map<String, ?> options )
return model;
}
@Override
public Model read( Reader input, Map<String, ?> options )
throws IOException
{
@ -78,6 +80,7 @@ public Model read( Reader input, Map<String, ?> options )
}
}
@Override
public Model read( InputStream input, Map<String, ?> options )
throws IOException
{

3
maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
View File

@ -42,6 +42,7 @@ public class DefaultModelWriter
implements ModelWriter
{
@Override
public void write( File output, Map<String, Object> options, Model model )
throws IOException
{
@ -60,6 +61,7 @@ public void write( File output, Map<String, Object> options, Model model )
write( WriterFactory.newXmlWriter( output ), options, model );
}
@Override
public void write( Writer output, Map<String, Object> options, Model model )
throws IOException
{
@ -84,6 +86,7 @@ public void write( Writer output, Map<String, Object> options, Model model )
}
}
@Override
public void write( OutputStream output, Map<String, Object> options, Model model )
throws IOException
{

1
maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
View File

@ -33,6 +33,7 @@ public class DefaultModelLocator
implements ModelLocator
{
@Override
public File locatePom( File projectDirectory )
{
return new File( projectDirectory, "pom.xml" );

1
maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
View File

@ -45,6 +45,7 @@ public class DefaultDependencyManagementInjector
private ManagementModelMerger merger = new ManagementModelMerger();
@Override
public void injectManagement( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
merger.mergeManagedDependencies( model );

1
maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
View File

@ -48,6 +48,7 @@ public class DefaultPluginManagementInjector
private ManagementModelMerger merger = new ManagementModelMerger();
@Override
public void injectManagement( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
merger.mergeManagedBuildPlugins( model );

1
maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
View File

@ -314,6 +314,7 @@ protected void mergeModelBase_Repositories( ModelBase target, ModelBase source,
}
}
@Override
protected void mergeModelBase_PluginRepositories( ModelBase target, ModelBase source, boolean sourceDominant,
Map<Object, Object> context )
{

2
maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
View File

@ -47,6 +47,7 @@ public class DefaultModelNormalizer
private DuplicateMerger merger = new DuplicateMerger();
@Override
public void mergeDuplicates( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
Build build = model.getBuild();
@ -104,6 +105,7 @@ public void mergePlugin( Plugin target, Plugin source )
}
@Override
public void injectDefaultValues( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
injectDependencyDefaults( model.getDependencies() );

1
maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
View File

@ -50,6 +50,7 @@ public DefaultModelPathTranslator setPathTranslator( PathTranslator pathTranslat
return this;
}
@Override
public void alignToBaseDirectory( Model model, File basedir, ModelBuildingRequest request )
{
if ( model == null || basedir == null )

1
maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
View File

@ -47,6 +47,7 @@ public DefaultModelUrlNormalizer setUrlNormalizer( UrlNormalizer urlNormalizer )
return this;
}
@Override
public void normalize( Model model, ModelBuildingRequest request )
{
if ( model == null )

1
maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
View File

@ -33,6 +33,7 @@ public class DefaultPathTranslator
implements PathTranslator
{
@Override
public String alignToBaseDirectory( String path, File basedir )
{
String result = path;

1
maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java
View File

@ -31,6 +31,7 @@ public class DefaultUrlNormalizer
implements UrlNormalizer
{
@Override
public String normalize( String url )
{
String result = url;

1
maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
View File

@ -41,6 +41,7 @@ public class DefaultPluginConfigurationExpander
implements PluginConfigurationExpander
{
@Override
public void expandPluginConfiguration( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
Build build = model.getBuild();

1
maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java
View File

@ -38,6 +38,7 @@ public class DefaultReportConfigurationExpander
implements ReportConfigurationExpander
{
@Override
public void expandPluginConfiguration( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
Reporting reporting = model.getReporting();

1
maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
View File

@ -42,6 +42,7 @@ public class DefaultReportingConverter
implements ReportingConverter
{
@Override
public void convertReporting( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
{
Reporting reporting = model.getReporting();

6
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
View File

@ -48,6 +48,7 @@ public class DefaultProfileActivationContext
private File projectDirectory;
@Override
public List<String> getActiveProfileIds()
{
return activeProfileIds;
@ -73,6 +74,7 @@ public DefaultProfileActivationContext setActiveProfileIds( List<String> activeP
return this;
}
@Override
public List<String> getInactiveProfileIds()
{
return inactiveProfileIds;
@ -98,6 +100,7 @@ public DefaultProfileActivationContext setInactiveProfileIds( List<String> inact
return this;
}
@Override
public Map<String, String> getSystemProperties()
{
return systemProperties;
@ -146,6 +149,7 @@ public DefaultProfileActivationContext setSystemProperties( Map<String, String>
return this;
}
@Override
public Map<String, String> getUserProperties()
{
return userProperties;
@ -196,6 +200,7 @@ public DefaultProfileActivationContext setUserProperties( Map<String, String> us
return this;
}
@Override
public File getProjectDirectory()
{
return projectDirectory;
@ -215,6 +220,7 @@ public DefaultProfileActivationContext setProjectDirectory( File projectDirector
return this;
}
@Override
public Map<String, String> getProjectProperties()
{
return projectProperties;

1
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
View File

@ -53,6 +53,7 @@ public class DefaultProfileInjector
private ProfileModelMerger merger = new ProfileModelMerger();
@Override
public void injectProfile( Model model, Profile profile, ModelBuildingRequest request,
ModelProblemCollector problems )
{

1
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
View File

@ -56,6 +56,7 @@ public DefaultProfileSelector addProfileActivator( ProfileActivator profileActiv
return this;
}
@Override
public List<Profile> getActiveProfiles( Collection<Profile> profiles, ProfileActivationContext context,
ModelProblemCollector problems )
{

2
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
View File

@ -63,6 +63,7 @@ public FileProfileActivator setPathTranslator( PathTranslator pathTranslator )
return this;
}
@Override
public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems )
{
Activation activation = profile.getActivation();
@ -105,6 +106,7 @@ else if ( StringUtils.isNotEmpty( file.getMissing() ) )
{
interpolator.addValueSource( new AbstractValueSource( false )
{
@Override
public Object getValue( String expression )
{
/*

2
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
View File

@ -43,6 +43,7 @@ public class JdkVersionProfileActivator
implements ProfileActivator
{
@Override
public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems )
{
Activation activation = profile.getActivation();
@ -213,6 +214,7 @@ private static class RangeValue
this.closed = closed;
}
@Override
public String toString()
{
return value;

1
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
View File

@ -38,6 +38,7 @@ public class OperatingSystemProfileActivator
implements ProfileActivator
{
@Override
public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems )
{
Activation activation = profile.getActivation();

1
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
View File

@ -41,6 +41,7 @@ public class PropertyProfileActivator
implements ProfileActivator
{
@Override
public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems )
{
Activation activation = profile.getActivation();

1
maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
View File

@ -53,6 +53,7 @@ public DefaultSuperPomProvider setModelProcessor( ModelProcessor modelProcessor
return this;
}
@Override
public Model getSuperModel( String version )
{
if ( superModel == null )

2
maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
View File

@ -74,6 +74,7 @@ public class DefaultModelValidator
private static final String ILLEGAL_REPO_ID_CHARS = ILLEGAL_FS_CHARS;
@Override
public void validateRawModel( Model m, ModelBuildingRequest request, ModelProblemCollector problems )
{
Parent parent = m.getParent();
@ -286,6 +287,7 @@ private void validate20RawPlugins( ModelProblemCollector problems, List<Plugin>
}
}
@Override
public void validateEffectiveModel( Model m, ModelBuildingRequest request, ModelProblemCollector problems )
{
validateStringNotEmpty( "modelVersion", problems, Severity.ERROR, Version.BASE, m.getModelVersion(), m );