Author: khmarbaise
Date: Sun Aug 20 21:19:47 2017
New Revision: 1805584
URL: http://svn.apache.org/viewvc?rev=1805584&view=rev
Log:
Sync merge from trunk
Added:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/deploy/
- copied from r1805578,
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/deploy/
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
- copied, changed from r1805578,
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/ (props changed)
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
Propchange: maven/shared/branches/maven-artifact-transfer-MSHARED-656/
------------------------------------------------------------------------------
svn:mergeinfo = /maven/shared/trunk/maven-artifact-transfer:1805551-1805578
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java?rev=1805584&r1=1805583&r2=1805584&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
Sun Aug 20 21:19:47 2017
@@ -35,6 +35,9 @@ public interface ArtifactDeployer
* @param request {@link ProjectBuildingRequest}
* @param mavenArtifacts {@link Artifact}
* @throws ArtifactDeployerException in case of an error.
+ * @throws IllegalArgumentException in case of parameter
<code>request</code> is <code>null</code> or parameter
+ * <code>mavenArtifacts</code> is <code>null</code> or
<code>mavenArtifacts.isEmpty()</code> is
+ * <code>true</code>.
*/
void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
throws ArtifactDeployerException;
@@ -45,9 +48,12 @@ public interface ArtifactDeployer
* used.
* @param mavenArtifacts the artifacts to deploy
* @throws ArtifactDeployerException in case of an error.
+ * @throws IllegalArgumentException in case of parameter
<code>request</code> is <code>null</code> or parameter
+ * <code>mavenArtifacts</code> is <code>null</code> or
<code>mavenArtifacts.isEmpty()</code> is
+ * <code>true</code>.
*/
void deploy( ProjectBuildingRequest request, ArtifactRepository
remoteRepository,
Collection<Artifact> mavenArtifacts )
- throws ArtifactDeployerException;
+ throws ArtifactDeployerException;
}
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java?rev=1805584&r1=1805583&r2=1805584&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
Sun Aug 20 21:19:47 2017
@@ -43,11 +43,13 @@ public class DefaultArtifactDeployer
{
private PlexusContainer container;
-
+
@Override
public void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
throws ArtifactDeployerException
{
+ validateParameters( request, mavenArtifacts );
+
try
{
String hint = isMaven31() ? "maven31" : "maven3";
@@ -65,8 +67,9 @@ public class DefaultArtifactDeployer
@Override
public void deploy( ProjectBuildingRequest request, ArtifactRepository
remoteRepository,
Collection<Artifact> mavenArtifacts )
- throws ArtifactDeployerException
+ throws ArtifactDeployerException
{
+ validateParameters( request, mavenArtifacts );
try
{
String hint = isMaven31() ? "maven31" : "maven3";
@@ -80,6 +83,23 @@ public class DefaultArtifactDeployer
throw new ArtifactDeployerException( e.getMessage(), e );
}
}
+
+ private void validateParameters( ProjectBuildingRequest request,
Collection<Artifact> mavenArtifacts )
+ {
+ if ( request == null )
+ {
+ throw new IllegalArgumentException( "The parameter request is not
allowed to be null." );
+ }
+ if ( mavenArtifacts == null )
+ {
+ throw new IllegalArgumentException( "The parameter mavenArtifacts
is not allowed to be null." );
+ }
+ if ( mavenArtifacts.isEmpty() )
+ {
+ throw new IllegalArgumentException( "The collection mavenArtifacts
is not allowed to be empty." );
+ }
+ }
+
/**
* @return true if the current Maven version is Maven 3.1.
*/
@@ -105,7 +125,7 @@ public class DefaultArtifactDeployer
/**
* Injects the Plexus content.
*
- * @param context Plexus context to inject.
+ * @param context Plexus context to inject.
* @throws ContextException if the PlexusContainer could not be located.
*/
public void contextualize( Context context )
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java?rev=1805584&r1=1805583&r2=1805584&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
Sun Aug 20 21:19:47 2017
@@ -48,6 +48,10 @@ public interface ArtifactInstaller
* @param mavenArtifacts Collection of {@link Artifact MavenArtifacts}
* @throws ArtifactInstallerException In case of an error which can be the
a given artifact can not be found or the
* installation has failed.
+ * @throws IllegalArgumentException in case of parameter
<code>request</code> is <code>null</code> or parameter
+ * <code>localRepository</code> is <code>null</code> or
<code>localRepository</code> is not a directory
+ * or parameter <code>mavenArtifacts</code> is
<code>null</code> or
+ * <code>mavenArtifacts.isEmpty()</code> is <code>true</code>.
*/
void install( ProjectBuildingRequest request, File localRepository,
Collection<Artifact> mavenArtifacts )
throws ArtifactInstallerException;
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java?rev=1805584&r1=1805583&r2=1805584&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
Sun Aug 20 21:19:47 2017
@@ -48,19 +48,7 @@ public class DefaultArtifactInstaller
public void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
throws ArtifactInstallerException, IllegalArgumentException
{
- if ( request == null )
- {
- throw new IllegalArgumentException( "The parameter request is not
allowed to be null." );
- }
- if ( mavenArtifacts == null )
- {
- throw new IllegalArgumentException( "The parameter mavenArtifacts
is not allowed to be null." );
- }
- if ( mavenArtifacts.isEmpty() )
- {
- throw new IllegalArgumentException( "The collection mavenArtifacts
is not allowed to be empty." );
- }
-
+ validateParameters( request, mavenArtifacts );
try
{
String hint = isMaven31() ? "maven31" : "maven3";
@@ -79,10 +67,7 @@ public class DefaultArtifactInstaller
public void install( ProjectBuildingRequest request, File localRepositry,
Collection<Artifact> mavenArtifacts )
throws ArtifactInstallerException
{
- if ( request == null )
- {
- throw new IllegalArgumentException( "The parameter request is not
allowed to be null." );
- }
+ validateParameters( request, mavenArtifacts );
if ( localRepositry == null )
{
throw new IllegalArgumentException( "The parameter localRepository
is not allowed to be null." );
@@ -91,14 +76,8 @@ public class DefaultArtifactInstaller
{
throw new IllegalArgumentException( "The parameter localRepository
must be a directory." );
}
- if ( mavenArtifacts == null )
- {
- throw new IllegalArgumentException( "The parameter mavenArtifacts
is not allowed to be null." );
- }
- if ( mavenArtifacts.isEmpty() )
- {
- throw new IllegalArgumentException( "The collection mavenArtifacts
is not allowed to be empty." );
- }
+
+ // TODO: Should we check for exists() ?
try
{
@@ -114,6 +93,22 @@ public class DefaultArtifactInstaller
}
}
+ private void validateParameters( ProjectBuildingRequest request,
Collection<Artifact> mavenArtifacts )
+ {
+ if ( request == null )
+ {
+ throw new IllegalArgumentException( "The parameter request is not
allowed to be null." );
+ }
+ if ( mavenArtifacts == null )
+ {
+ throw new IllegalArgumentException( "The parameter mavenArtifacts
is not allowed to be null." );
+ }
+ if ( mavenArtifacts.isEmpty() )
+ {
+ throw new IllegalArgumentException( "The collection mavenArtifacts
is not allowed to be empty." );
+ }
+ }
+
/**
* @return true if the current Maven version is Maven 3.1.
*/
Copied:
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
(from r1805578,
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java)
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java?p2=maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java&p1=maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java&r1=1805578&r2=1805584&rev=1805584&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-656/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
Sun Aug 20 21:19:47 2017
@@ -112,7 +112,7 @@ public class DefaultArtifactInstallerTes
DefaultArtifactInstaller dai = new DefaultArtifactInstaller();
thrown.expect( IllegalArgumentException.class );
- thrown.expectMessage( "The parameter mavenArtifacts is not allowed to
be null." );
+ thrown.expectMessage( "The parameter localRepository must be a
directory." );
ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
List<Artifact> singleEntryList = Collections.singletonList( mock(
Artifact.class ) );
