Repository: maven Updated Branches: refs/heads/master eea4252f5 -> 786285f1f
Add @Override on matching methods Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/786285f1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/786285f1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/786285f1 Branch: refs/heads/master Commit: 786285f1f495f3f1df93cd404f132dd811909ec6 Parents: eea4252 Author: Robert Scholte <[email protected]> Authored: Sat Jan 24 20:43:42 2015 +0100 Committer: Robert Scholte <[email protected]> Committed: Sat Jan 24 20:45:25 2015 +0100 ---------------------------------------------------------------------- .../building/AbstractModelBuildingListener.java | 1 + .../model/building/DefaultModelBuilder.java | 2 ++ .../building/DefaultModelBuilderFactory.java | 1 + .../building/DefaultModelBuildingEvent.java | 3 ++ .../building/DefaultModelBuildingRequest.java | 30 ++++++++++++++++++++ .../building/DefaultModelBuildingResult.java | 7 +++++ .../model/building/DefaultModelProblem.java | 8 ++++++ .../building/DefaultModelProblemCollector.java | 2 ++ .../model/building/DefaultModelProcessor.java | 4 +++ .../building/FilterModelBuildingRequest.java | 30 ++++++++++++++++++++ .../building/ModelBuildingEventCatapult.java | 1 + .../maven/model/building/ModelCacheTag.java | 8 ++++++ .../DefaultDependencyManagementImporter.java | 1 + .../DefaultInheritanceAssembler.java | 1 + .../AbstractStringBasedModelInterpolator.java | 3 ++ .../BuildTimestampValueSource.java | 1 + .../PathTranslatingPostProcessor.java | 1 + .../ProblemDetectingValueSource.java | 3 ++ .../StringSearchModelInterpolator.java | 3 ++ .../UrlNormalizingPostProcessor.java | 1 + .../maven/model/io/DefaultModelReader.java | 3 ++ .../maven/model/io/DefaultModelWriter.java | 3 ++ .../model/locator/DefaultModelLocator.java | 1 + .../DefaultDependencyManagementInjector.java | 1 + .../DefaultPluginManagementInjector.java | 1 + .../maven/model/merge/MavenModelMerger.java | 1 + .../normalization/DefaultModelNormalizer.java | 2 ++ .../model/path/DefaultModelPathTranslator.java | 1 + .../model/path/DefaultModelUrlNormalizer.java | 1 + .../maven/model/path/DefaultPathTranslator.java | 1 + .../maven/model/path/DefaultUrlNormalizer.java | 1 + .../DefaultPluginConfigurationExpander.java | 1 + .../DefaultReportConfigurationExpander.java | 1 + .../model/plugin/DefaultReportingConverter.java | 1 + .../DefaultProfileActivationContext.java | 6 ++++ .../model/profile/DefaultProfileInjector.java | 1 + .../model/profile/DefaultProfileSelector.java | 1 + .../activation/FileProfileActivator.java | 2 ++ .../activation/JdkVersionProfileActivator.java | 2 ++ .../OperatingSystemProfileActivator.java | 1 + .../activation/PropertyProfileActivator.java | 1 + .../model/superpom/DefaultSuperPomProvider.java | 1 + .../model/validation/DefaultModelValidator.java | 2 ++ 43 files changed, 147 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java index bdb69ef..5138776 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java @@ -28,6 +28,7 @@ public class AbstractModelBuildingListener implements ModelBuildingListener { + @Override public void buildExtensionsAssembled( ModelBuildingEvent event ) { // default does nothing http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index 53aea6b..80effb1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -228,6 +228,7 @@ public class DefaultModelBuilder return this; } + @Override public ModelBuildingResult build( ModelBuildingRequest request ) throws ModelBuildingException { @@ -400,6 +401,7 @@ public class DefaultModelBuilder return result; } + @Override public ModelBuildingResult build( ModelBuildingRequest request, ModelBuildingResult result ) throws ModelBuildingException { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java index 6f7be63..36a0f46 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java @@ -233,6 +233,7 @@ public class DefaultModelBuilderFactory implements LifecycleBindingsInjector { + @Override public void injectLifecycleBindings( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) { } http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java index 4fb9b8a..f72403b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java @@ -43,16 +43,19 @@ class DefaultModelBuildingEvent this.problems = problems; } + @Override public Model getModel() { return model; } + @Override public ModelBuildingRequest getRequest() { return request; } + @Override public ModelProblemCollector getProblems() { return problems; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java index 513f4f6..bd4211a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java @@ -97,11 +97,13 @@ public class DefaultModelBuildingRequest 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 class DefaultModelBuildingRequest return this; } + @Override public synchronized ModelSource getModelSource() { if ( modelSource == null && pomFile != null ) @@ -118,6 +121,7 @@ public class DefaultModelBuildingRequest return modelSource; } + @Override public DefaultModelBuildingRequest setModelSource( ModelSource modelSource ) { this.modelSource = modelSource; @@ -125,11 +129,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public int getValidationLevel() { return validationLevel; } + @Override public DefaultModelBuildingRequest setValidationLevel( int validationLevel ) { this.validationLevel = validationLevel; @@ -137,11 +143,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public boolean isProcessPlugins() { return processPlugins; } + @Override public DefaultModelBuildingRequest setProcessPlugins( boolean processPlugins ) { this.processPlugins = processPlugins; @@ -149,11 +157,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public boolean isTwoPhaseBuilding() { return twoPhaseBuilding; } + @Override public DefaultModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding ) { this.twoPhaseBuilding = twoPhaseBuilding; @@ -161,11 +171,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public boolean isLocationTracking() { return locationTracking; } + @Override public DefaultModelBuildingRequest setLocationTracking( boolean locationTracking ) { this.locationTracking = locationTracking; @@ -173,6 +185,7 @@ public class DefaultModelBuildingRequest return this; } + @Override public List<Profile> getProfiles() { if ( profiles == null ) @@ -183,6 +196,7 @@ public class DefaultModelBuildingRequest return profiles; } + @Override public DefaultModelBuildingRequest setProfiles( List<Profile> profiles ) { if ( profiles != null ) @@ -197,6 +211,7 @@ public class DefaultModelBuildingRequest return this; } + @Override public List<String> getActiveProfileIds() { if ( activeProfileIds == null ) @@ -207,6 +222,7 @@ public class DefaultModelBuildingRequest return activeProfileIds; } + @Override public DefaultModelBuildingRequest setActiveProfileIds( List<String> activeProfileIds ) { if ( activeProfileIds != null ) @@ -221,6 +237,7 @@ public class DefaultModelBuildingRequest return this; } + @Override public List<String> getInactiveProfileIds() { if ( inactiveProfileIds == null ) @@ -231,6 +248,7 @@ public class DefaultModelBuildingRequest return inactiveProfileIds; } + @Override public DefaultModelBuildingRequest setInactiveProfileIds( List<String> inactiveProfileIds ) { if ( inactiveProfileIds != null ) @@ -245,6 +263,7 @@ public class DefaultModelBuildingRequest return this; } + @Override public Properties getSystemProperties() { if ( systemProperties == null ) @@ -255,6 +274,7 @@ public class DefaultModelBuildingRequest return systemProperties; } + @Override public DefaultModelBuildingRequest setSystemProperties( Properties systemProperties ) { if ( systemProperties != null ) @@ -270,6 +290,7 @@ public class DefaultModelBuildingRequest return this; } + @Override public Properties getUserProperties() { if ( userProperties == null ) @@ -280,6 +301,7 @@ public class DefaultModelBuildingRequest return userProperties; } + @Override public DefaultModelBuildingRequest setUserProperties( Properties userProperties ) { if ( userProperties != null ) @@ -295,11 +317,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public Date getBuildStartTime() { return buildStartTime; } + @Override public ModelBuildingRequest setBuildStartTime( Date buildStartTime ) { this.buildStartTime = buildStartTime; @@ -307,11 +331,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public ModelResolver getModelResolver() { return this.modelResolver; } + @Override public DefaultModelBuildingRequest setModelResolver( ModelResolver modelResolver ) { this.modelResolver = modelResolver; @@ -319,11 +345,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public ModelBuildingListener getModelBuildingListener() { return modelBuildingListener; } + @Override public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener modelBuildingListener ) { this.modelBuildingListener = modelBuildingListener; @@ -331,11 +359,13 @@ public class DefaultModelBuildingRequest return this; } + @Override public ModelCache getModelCache() { return this.modelCache; } + @Override public DefaultModelBuildingRequest setModelCache( ModelCache modelCache ) { this.modelCache = modelCache; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java index 998c694..61fb434 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java @@ -57,6 +57,7 @@ class DefaultModelBuildingResult problems = new ArrayList<ModelProblem>(); } + @Override public Model getEffectiveModel() { return effectiveModel; @@ -69,6 +70,7 @@ class DefaultModelBuildingResult return this; } + @Override public List<String> getModelIds() { return modelIds; @@ -86,11 +88,13 @@ class DefaultModelBuildingResult 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 @@ class DefaultModelBuildingResult return this; } + @Override public List<Profile> getActivePomProfiles( String modelId ) { return activePomProfiles.get( modelId ); @@ -132,6 +137,7 @@ class DefaultModelBuildingResult return this; } + @Override public List<Profile> getActiveExternalProfiles() { return activeExternalProfiles; @@ -151,6 +157,7 @@ class DefaultModelBuildingResult return this; } + @Override public List<ModelProblem> getProblems() { return problems; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java index 5da2ee7..0892f0a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java @@ -95,31 +95,37 @@ public class DefaultModelProblem 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 class DefaultModelProblem return msg; } + @Override public Severity getSeverity() { return severity; } + @Override public Version getVersion() { return version; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java index f434334..89d5cb2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java @@ -72,6 +72,7 @@ class DefaultModelProblemCollector return severities.contains( ModelProblem.Severity.ERROR ) || severities.contains( ModelProblem.Severity.FATAL ); } + @Override public List<ModelProblem> getProblems() { return problems; @@ -140,6 +141,7 @@ class DefaultModelProblemCollector } } + @Override public void add( ModelProblemCollectorRequest req ) { int line = -1; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java index c12f943..a4d5fa9 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java @@ -54,23 +54,27 @@ public class DefaultModelProcessor 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 { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java index 700b9cc..7074689 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java @@ -44,11 +44,13 @@ class FilterModelBuildingRequest this.request = request; } + @Override public File getPomFile() { return request.getPomFile(); } + @Override public FilterModelBuildingRequest setPomFile( File pomFile ) { request.setPomFile( pomFile ); @@ -56,11 +58,13 @@ class FilterModelBuildingRequest return this; } + @Override public ModelSource getModelSource() { return request.getModelSource(); } + @Override public FilterModelBuildingRequest setModelSource( ModelSource modelSource ) { request.setModelSource( modelSource ); @@ -68,11 +72,13 @@ class FilterModelBuildingRequest return this; } + @Override public int getValidationLevel() { return request.getValidationLevel(); } + @Override public FilterModelBuildingRequest setValidationLevel( int validationLevel ) { request.setValidationLevel( validationLevel ); @@ -80,11 +86,13 @@ class FilterModelBuildingRequest return this; } + @Override public boolean isProcessPlugins() { return request.isProcessPlugins(); } + @Override public FilterModelBuildingRequest setProcessPlugins( boolean processPlugins ) { request.setProcessPlugins( processPlugins ); @@ -92,11 +100,13 @@ class FilterModelBuildingRequest return this; } + @Override public boolean isTwoPhaseBuilding() { return request.isTwoPhaseBuilding(); } + @Override public FilterModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding ) { request.setTwoPhaseBuilding( twoPhaseBuilding ); @@ -104,11 +114,13 @@ class FilterModelBuildingRequest return this; } + @Override public boolean isLocationTracking() { return request.isLocationTracking(); } + @Override public FilterModelBuildingRequest setLocationTracking( boolean locationTracking ) { request.setLocationTracking( locationTracking ); @@ -116,11 +128,13 @@ class FilterModelBuildingRequest return this; } + @Override public List<Profile> getProfiles() { return request.getProfiles(); } + @Override public FilterModelBuildingRequest setProfiles( List<Profile> profiles ) { request.setProfiles( profiles ); @@ -128,11 +142,13 @@ class FilterModelBuildingRequest return this; } + @Override public List<String> getActiveProfileIds() { return request.getActiveProfileIds(); } + @Override public FilterModelBuildingRequest setActiveProfileIds( List<String> activeProfileIds ) { request.setActiveProfileIds( activeProfileIds ); @@ -140,11 +156,13 @@ class FilterModelBuildingRequest return this; } + @Override public List<String> getInactiveProfileIds() { return request.getInactiveProfileIds(); } + @Override public FilterModelBuildingRequest setInactiveProfileIds( List<String> inactiveProfileIds ) { request.setInactiveProfileIds( inactiveProfileIds ); @@ -152,11 +170,13 @@ class FilterModelBuildingRequest return this; } + @Override public Properties getSystemProperties() { return request.getSystemProperties(); } + @Override public FilterModelBuildingRequest setSystemProperties( Properties systemProperties ) { request.setSystemProperties( systemProperties ); @@ -164,11 +184,13 @@ class FilterModelBuildingRequest return this; } + @Override public Properties getUserProperties() { return request.getUserProperties(); } + @Override public FilterModelBuildingRequest setUserProperties( Properties userProperties ) { request.setUserProperties( userProperties ); @@ -176,11 +198,13 @@ class FilterModelBuildingRequest return this; } + @Override public Date getBuildStartTime() { return request.getBuildStartTime(); } + @Override public ModelBuildingRequest setBuildStartTime( Date buildStartTime ) { request.setBuildStartTime( buildStartTime ); @@ -188,11 +212,13 @@ class FilterModelBuildingRequest return this; } + @Override public ModelResolver getModelResolver() { return request.getModelResolver(); } + @Override public FilterModelBuildingRequest setModelResolver( ModelResolver modelResolver ) { request.setModelResolver( modelResolver ); @@ -200,11 +226,13 @@ class FilterModelBuildingRequest return this; } + @Override public ModelBuildingListener getModelBuildingListener() { return request.getModelBuildingListener(); } + @Override public ModelBuildingRequest setModelBuildingListener( ModelBuildingListener modelBuildingListener ) { request.setModelBuildingListener( modelBuildingListener ); @@ -212,11 +240,13 @@ class FilterModelBuildingRequest return this; } + @Override public ModelCache getModelCache() { return request.getModelCache(); } + @Override public FilterModelBuildingRequest setModelCache( ModelCache modelCache ) { request.setModelCache( modelCache ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java index 99584b2..092dc4e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java @@ -38,6 +38,7 @@ interface ModelBuildingEventCatapult ModelBuildingEventCatapult BUILD_EXTENSIONS_ASSEMBLED = new ModelBuildingEventCatapult() { + @Override public void fire( ModelBuildingListener listener, ModelBuildingEvent event ) { listener.buildExtensionsAssembled( event ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java index 14cb827..8452f96 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java @@ -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 @@ interface ModelCacheTag<T> 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 ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java index 71ec63c..5860af6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java @@ -41,6 +41,7 @@ public class DefaultDependencyManagementImporter implements DependencyManagementImporter { + @Override public void importManagement( Model target, List<? extends DependencyManagement> sources, ModelBuildingRequest request, ModelProblemCollector problems ) { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 0d1fc8d..609f441 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -48,6 +48,7 @@ public class DefaultInheritanceAssembler private InheritanceModelMerger merger = new InheritanceModelMerger(); + @Override public void assembleModelInheritance( Model child, Model parent, ModelBuildingRequest request, ModelProblemCollector problems ) { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java index 3ad2348..1390a4e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java @@ -133,6 +133,7 @@ public abstract class AbstractStringBasedModelInterpolator { ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false ) { + @Override public Object getValue( String expression ) { if ( "basedir".equals( expression ) ) @@ -146,6 +147,7 @@ public abstract class AbstractStringBasedModelInterpolator ValueSource baseUriValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false ) { + @Override public Object getValue( String expression ) { if ( "baseUri".equals( expression ) ) @@ -169,6 +171,7 @@ public abstract class AbstractStringBasedModelInterpolator valueSources.add( new AbstractValueSource( false ) { + @Override public Object getValue( String expression ) { return config.getSystemProperties().getProperty( "env." + expression ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java index 04b4cf6..30809b8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java @@ -35,6 +35,7 @@ class BuildTimestampValueSource this.mavenBuildTimestamp = new MavenBuildTimestamp( startTime, properties ); } + @Override public Object getValue( String expression ) { if ( "build.timestamp".equals( expression ) || "maven.build.timestamp".equals( expression ) ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java index 0283f99..1aeafdd 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java @@ -48,6 +48,7 @@ class PathTranslatingPostProcessor this.pathTranslator = pathTranslator; } + @Override public Object execute( String expression, Object value ) { if ( value != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java index 06ac3b4..be5b227 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java @@ -53,6 +53,7 @@ class ProblemDetectingValueSource this.problems = problems; } + @Override public Object getValue( String expression ) { Object value = valueSource.getValue( expression ); @@ -70,12 +71,14 @@ class ProblemDetectingValueSource return value; } + @Override @SuppressWarnings( "unchecked" ) public List getFeedback() { return valueSource.getFeedback(); } + @Override public void clearFeedback() { valueSource.clearFeedback(); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java index 0f56b7d..c40f9bd 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java @@ -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 @@ public class StringSearchModelInterpolator } } + @Override protected Interpolator createInterpolator() { StringSearchInterpolator interpolator = new StringSearchInterpolator(); @@ -120,6 +122,7 @@ public class StringSearchModelInterpolator this.problems = problems; } + @Override public Object run() { while ( !interpolationTargets.isEmpty() ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java index a4d2323..63fb82d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java @@ -55,6 +55,7 @@ class UrlNormalizingPostProcessor this.normalizer = normalizer; } + @Override public Object execute( String expression, Object value ) { if ( value != null && URL_EXPRESSIONS.contains( expression ) ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java index 5c1e58f..c927b60 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java @@ -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 class DefaultModelReader return model; } + @Override public Model read( Reader input, Map<String, ?> options ) throws IOException { @@ -78,6 +80,7 @@ public class DefaultModelReader } } + @Override public Model read( InputStream input, Map<String, ?> options ) throws IOException { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java index 25c9ebc..7294de3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java @@ -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 class DefaultModelWriter 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 class DefaultModelWriter } } + @Override public void write( OutputStream output, Map<String, Object> options, Model model ) throws IOException { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java b/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java index ff67f45..299da65 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java @@ -33,6 +33,7 @@ public class DefaultModelLocator implements ModelLocator { + @Override public File locatePom( File projectDirectory ) { return new File( projectDirectory, "pom.xml" ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java index a13dcca..bfeafcb 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java @@ -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 ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java index a13d4fd..75d7d87 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java @@ -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 ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java index b3ff3ea..2727a11 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java @@ -314,6 +314,7 @@ public class MavenModelMerger } } + @Override protected void mergeModelBase_PluginRepositories( ModelBase target, ModelBase source, boolean sourceDominant, Map<Object, Object> context ) { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java index 4307856..262dd3f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java @@ -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 class DefaultModelNormalizer } + @Override public void injectDefaultValues( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) { injectDependencyDefaults( model.getDependencies() ); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java index 469e623..51fa60e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java @@ -50,6 +50,7 @@ public class DefaultModelPathTranslator return this; } + @Override public void alignToBaseDirectory( Model model, File basedir, ModelBuildingRequest request ) { if ( model == null || basedir == null ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java index 0d40d48..2093f8f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java @@ -47,6 +47,7 @@ public class DefaultModelUrlNormalizer return this; } + @Override public void normalize( Model model, ModelBuildingRequest request ) { if ( model == null ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java index 7965253..1ad9d03 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java @@ -33,6 +33,7 @@ public class DefaultPathTranslator implements PathTranslator { + @Override public String alignToBaseDirectory( String path, File basedir ) { String result = path; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java index 54d8a36..120b02f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java @@ -31,6 +31,7 @@ public class DefaultUrlNormalizer implements UrlNormalizer { + @Override public String normalize( String url ) { String result = url; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java index 82430ed..dc7cf13 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java @@ -41,6 +41,7 @@ public class DefaultPluginConfigurationExpander implements PluginConfigurationExpander { + @Override public void expandPluginConfiguration( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) { Build build = model.getBuild(); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java index 6b28499..9c84299 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java @@ -38,6 +38,7 @@ public class DefaultReportConfigurationExpander implements ReportConfigurationExpander { + @Override public void expandPluginConfiguration( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) { Reporting reporting = model.getReporting(); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java index 9b81ccb..d918d9e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java @@ -42,6 +42,7 @@ public class DefaultReportingConverter implements ReportingConverter { + @Override public void convertReporting( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) { Reporting reporting = model.getReporting(); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java index 4fd0825..bb38a2e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java @@ -48,6 +48,7 @@ public class DefaultProfileActivationContext private File projectDirectory; + @Override public List<String> getActiveProfileIds() { return activeProfileIds; @@ -73,6 +74,7 @@ public class DefaultProfileActivationContext return this; } + @Override public List<String> getInactiveProfileIds() { return inactiveProfileIds; @@ -98,6 +100,7 @@ public class DefaultProfileActivationContext return this; } + @Override public Map<String, String> getSystemProperties() { return systemProperties; @@ -146,6 +149,7 @@ public class DefaultProfileActivationContext return this; } + @Override public Map<String, String> getUserProperties() { return userProperties; @@ -196,6 +200,7 @@ public class DefaultProfileActivationContext return this; } + @Override public File getProjectDirectory() { return projectDirectory; @@ -215,6 +220,7 @@ public class DefaultProfileActivationContext return this; } + @Override public Map<String, String> getProjectProperties() { return projectProperties; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java index bb6a079..aeed023 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java @@ -53,6 +53,7 @@ public class DefaultProfileInjector private ProfileModelMerger merger = new ProfileModelMerger(); + @Override public void injectProfile( Model model, Profile profile, ModelBuildingRequest request, ModelProblemCollector problems ) { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java index db2bf62..512476a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java @@ -56,6 +56,7 @@ public class DefaultProfileSelector return this; } + @Override public List<Profile> getActiveProfiles( Collection<Profile> profiles, ProfileActivationContext context, ModelProblemCollector problems ) { http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java index b0bda3f..c0dcce2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java @@ -63,6 +63,7 @@ public class FileProfileActivator return this; } + @Override public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems ) { Activation activation = profile.getActivation(); @@ -105,6 +106,7 @@ public class FileProfileActivator { interpolator.addValueSource( new AbstractValueSource( false ) { + @Override public Object getValue( String expression ) { /* http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java index 4dc5858..e981bfd 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java @@ -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 @@ public class JdkVersionProfileActivator this.closed = closed; } + @Override public String toString() { return value; http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java index 2d53621..30abb1f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java @@ -38,6 +38,7 @@ public class OperatingSystemProfileActivator implements ProfileActivator { + @Override public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems ) { Activation activation = profile.getActivation(); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java index 9a7c244..ba7886f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java @@ -41,6 +41,7 @@ public class PropertyProfileActivator implements ProfileActivator { + @Override public boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems ) { Activation activation = profile.getActivation(); http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java index 777a160..7d4f66a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java @@ -53,6 +53,7 @@ public class DefaultSuperPomProvider return this; } + @Override public Model getSuperModel( String version ) { if ( superModel == null ) http://git-wip-us.apache.org/repos/asf/maven/blob/786285f1/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 1ca75e8..def9c13 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -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 @@ public class DefaultModelValidator } } + @Override public void validateEffectiveModel( Model m, ModelBuildingRequest request, ModelProblemCollector problems ) { validateStringNotEmpty( "modelVersion", problems, Severity.ERROR, Version.BASE, m.getModelVersion(), m );
