maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject [16/45] maven git commit: [MNG-6165] Deprecate and replace incorrectly spelled public API
Date Wed, 08 Mar 2017 17:05:50 GMT
[MNG-6165] Deprecate and replace incorrectly spelled public API

Spelling fixes:

* spelling: collector
* spelling: executions
* spelling: repositories
* spelling: workspace

This closes #101


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1be7ea89
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1be7ea89
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1be7ea89

Branch: refs/heads/MNG-6164
Commit: 1be7ea893e3db1e47a4cf84c0592e0aaea24a6c3
Parents: 23ceca3
Author: Josh Soref <jsoref@apache.org>
Authored: Mon Jan 23 04:57:23 2017 +0000
Committer: Michael Osipov <michaelo@apache.org>
Committed: Mon Feb 6 20:36:38 2017 +0100

----------------------------------------------------------------------
 .../repository/MetadataResolutionRequest.java     | 18 ++++++++++++++++++
 .../repository/legacy/LegacyRepositorySystem.java |  2 +-
 .../DelegatingLocalArtifactRepository.java        |  9 +++++++++
 .../LifecycleExecutionPlanCalculatorStub.java     | 13 ++++++++++++-
 .../AbstractModelInterpolatorTest.java            | 18 ++++++++++++++----
 5 files changed, 54 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/1be7ea89/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
index c98dd05..7593351 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
@@ -108,11 +108,24 @@ public class MetadataResolutionRequest
         return this;
     }
 
+    /**
+     * @deprecated instead use {@link #getRemoteRepositories()}
+     */
+    @Deprecated
     public List<ArtifactRepository> getRemoteRepostories()
     {
         return remoteRepositories;
     }
 
+    public List<ArtifactRepository> getRemoteRepositories()
+    {
+        return getRemoteRepostories();
+    }
+
+    /**
+     * @deprecated instead use {@link #setRemoteRepositories()}
+     */
+    @Deprecated
     public MetadataResolutionRequest setRemoteRepostories( List<ArtifactRepository>
remoteRepostories )
     {
         this.remoteRepositories = remoteRepostories;
@@ -120,6 +133,11 @@ public class MetadataResolutionRequest
         return this;
     }
 
+    public MetadataResolutionRequest setRemoteRepositories( List<ArtifactRepository>
remoteRepositories )
+    {
+        return setRemoteRepostories( remoteRepositories );
+    }
+
     public Map getManagedVersionMap()
     {
         return managedVersionMap;

http://git-wip-us.apache.org/repos/asf/maven/blob/1be7ea89/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index bd5988a..8d4d407 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -329,7 +329,7 @@ public class LegacyRepositorySystem
                 DelegatingLocalArtifactRepository delegatingLocalRepository =
                     (DelegatingLocalArtifactRepository) request.getLocalRepository();
 
-                LocalArtifactRepository orig = delegatingLocalRepository.getIdeWorspace();
+                LocalArtifactRepository orig = delegatingLocalRepository.getIdeWorkspace();
 
                 delegatingLocalRepository.setIdeWorkspace( ideWorkspace );
 

http://git-wip-us.apache.org/repos/asf/maven/blob/1be7ea89/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
index 90c1fa9..eb8f5ea 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
@@ -61,11 +61,20 @@ public class DelegatingLocalArtifactRepository
         this.ideWorkspace = localRepository;
     }
 
+    /**
+     * @deprecated instead use {@link #getIdeWorkspace()}
+     */
+    @Deprecated
     public LocalArtifactRepository getIdeWorspace()
     {
         return ideWorkspace;
     }
 
+    public LocalArtifactRepository getIdeWorkspace()
+    {
+        return getIdeWorspace();
+    }
+
     @Override
     public Artifact find( Artifact artifact )
     {

http://git-wip-us.apache.org/repos/asf/maven/blob/1be7ea89/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
index ad08549..43aa47c 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
@@ -87,7 +87,10 @@ public class LifecycleExecutionPlanCalculatorStub
 
     public final static MojoDescriptor SITE_DEPLOY = createMojoDescriptor( "site-deploy"
);
 
-
+    /**
+     * @deprecated instead use {@link #getNumberOfExecutions()}
+     */
+    @Deprecated
     public int getNumberOfExceutions( ProjectBuildList projectBuildList )
         throws InvalidPluginDescriptorException, PluginVersionResolutionException, PluginDescriptorParsingException,
         NoPluginFoundForPrefixException, MojoNotFoundException, PluginNotFoundException,
PluginResolutionException,
@@ -103,6 +106,14 @@ public class LifecycleExecutionPlanCalculatorStub
         return result;
     }
 
+    public int getNumberOfExecutions( ProjectBuildList projectBuildList )
+        throws InvalidPluginDescriptorException, PluginVersionResolutionException, PluginDescriptorParsingException,
+        NoPluginFoundForPrefixException, MojoNotFoundException, PluginNotFoundException,
PluginResolutionException,
+        LifecyclePhaseNotFoundException, LifecycleNotFoundException
+    {
+        return getNumberOfExceutions( projectBuildList );
+    }
+
     public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session
)
         throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
         PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,

http://git-wip-us.apache.org/repos/asf/maven/blob/1be7ea89/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
index b56bc15..d8b54b8 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
@@ -67,6 +67,10 @@ public abstract class AbstractModelInterpolatorTest
         assertEquals( "Expected no fatals", 0, collector.getFatals().size() );
     }
 
+    /**
+     * @deprecated instead use {@link #assertCollectorState()}
+     */
+    @Deprecated
     protected void assertColllectorState( int numFatals, int numErrors, int numWarnings,
                                           SimpleProblemCollector collector )
     {
@@ -75,6 +79,12 @@ public abstract class AbstractModelInterpolatorTest
         assertEquals( "Fatals", numFatals, collector.getFatals().size() );
     }
 
+    protected void assertCollectorState( int numFatals, int numErrors, int numWarnings,
+                                          SimpleProblemCollector collector )
+    {
+        assertColllectorState(numFatals, numErrors, numWarnings, collector);
+    }
+
     private ModelBuildingRequest createModelBuildingRequest( Properties p )
     {
         ModelBuildingRequest config = new DefaultModelBuildingRequest();
@@ -178,7 +188,7 @@ public abstract class AbstractModelInterpolatorTest
 
             final SimpleProblemCollector collector = new SimpleProblemCollector();
             interpolator.interpolateModel( model, null, createModelBuildingRequest( context
), collector );
-            assertColllectorState(  0, 1, 0, collector );
+            assertCollectorState(  0, 1, 0, collector );
         }
         catch ( Exception e )
         {
@@ -247,7 +257,7 @@ public abstract class AbstractModelInterpolatorTest
         final SimpleProblemCollector collector = new SimpleProblemCollector();
         Model out =
             interpolator.interpolateModel( model, new File( "." ), createModelBuildingRequest(
context ), collector );
-        assertColllectorState(0, 0, 1, collector );
+        assertCollectorState(0, 0, 1, collector );
 
         assertEquals( "3.8.1", ( out.getDependencies().get( 0 ) ).getVersion() );
     }
@@ -305,7 +315,7 @@ public abstract class AbstractModelInterpolatorTest
         final SimpleProblemCollector collector = new SimpleProblemCollector();
         Model out =
             interpolator.interpolateModel( model, new File( "." ), createModelBuildingRequest(
context ), collector );
-        assertColllectorState( 0, 0, 2, collector );
+        assertCollectorState( 0, 0, 2, collector );
 
         assertEquals( "foo-3.8.1", ( out.getDependencies().get( 0 ) ).getVersion() );
     }
@@ -450,7 +460,7 @@ public abstract class AbstractModelInterpolatorTest
 
         final SimpleProblemCollector collector = new SimpleProblemCollector();
         Model out = interpolator.interpolateModel( model, null, createModelBuildingRequest(
context ), collector );
-        assertColllectorState( 0, 0, 2, collector );
+        assertCollectorState( 0, 0, 2, collector );
 
 
         List<Resource> outResources = out.getBuild().getResources();


Mime
View raw message