You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/03/27 09:18:03 UTC
[maven-artifact-transfer] branch MSHARED-869 created (now 641cee6)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHARED-869
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git.
at 641cee6 [MSHARED-869] - extract parameter validation logic o Introduce new methods with common logic. Avoid duplicating "The parameter root is not allowed to be null." literal.
This branch includes the following new commits:
new 641cee6 [MSHARED-869] - extract parameter validation logic o Introduce new methods with common logic. Avoid duplicating "The parameter root is not allowed to be null." literal.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-artifact-transfer] 01/01: [MSHARED-869] - extract parameter
validation logic o Introduce new methods with common logic. Avoid
duplicating "The parameter root is not allowed to be null." literal.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-869
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
commit 641cee6a4cf505c82763677c83b40cab067325d1
Author: Piotrek Żygieło <pz...@users.noreply.github.com>
AuthorDate: Fri Mar 27 10:13:08 2020 +0100
[MSHARED-869] - extract parameter validation logic
o Introduce new methods with common logic.
Avoid duplicating "The parameter root is not allowed to be null." literal.
---
.../internal/DefaultDependencyCollector.java | 18 ++++++++++++-----
.../internal/DefaultDependencyCollector.java | 23 +++++++++++-----------
2 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
index 62a8fb2..2c8151a 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
@@ -99,20 +99,23 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
private void validateParameters( ProjectBuildingRequest buildingRequest, DependableCoordinate root )
{
- validateBuildingRequest( buildingRequest );
- Objects.requireNonNull( root, "The parameter root is not allowed to be null." );
+ validateBuildingRequestAndRoot( buildingRequest, root );
}
private void validateParameters( ProjectBuildingRequest buildingRequest, Dependency root )
{
- validateBuildingRequest( buildingRequest );
- Objects.requireNonNull( root, "The parameter root is not allowed to be null." );
+ validateBuildingRequestAndRoot( buildingRequest, root );
}
private void validateParameters( ProjectBuildingRequest buildingRequest, Model root )
{
+ validateBuildingRequestAndRoot( buildingRequest, root );
+ }
+
+ private void validateBuildingRequestAndRoot( ProjectBuildingRequest buildingRequest, Object root )
+ {
validateBuildingRequest( buildingRequest );
- Objects.requireNonNull( root, "The parameter root is not allowed to be null." );
+ validateRoot( root );
}
private void validateBuildingRequest( ProjectBuildingRequest buildingRequest )
@@ -120,6 +123,11 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
Objects.requireNonNull( buildingRequest, "The parameter buildingRequest is not allowed to be null." );
}
+ private void validateRoot( Object root )
+ {
+ Objects.requireNonNull( root, "The parameter root is not allowed to be null." );
+ }
+
/**
* @return true if the current Maven version is Maven 3.1.
*/
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
index 3d50a66..0a61845 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
@@ -99,28 +99,19 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
private void validateParameters( ProjectBuildingRequest buildingRequest, DependableCoordinate root )
{
validateBuildingRequest( buildingRequest );
- if ( root == null )
- {
- throw new IllegalArgumentException( "The parameter root is not allowed to be null." );
- }
+ validateRoot( root );
}
private void validateParameters( ProjectBuildingRequest buildingRequest, Dependency root )
{
validateBuildingRequest( buildingRequest );
- if ( root == null )
- {
- throw new IllegalArgumentException( "The parameter root is not allowed to be null." );
- }
+ validateRoot( root );
}
private void validateParameters( ProjectBuildingRequest buildingRequest, Model root )
{
validateBuildingRequest( buildingRequest );
- if ( root == null )
- {
- throw new IllegalArgumentException( "The parameter root is not allowed to be null." );
- }
+ validateRoot( root );
}
private void validateBuildingRequest( ProjectBuildingRequest buildingRequest )
@@ -131,6 +122,14 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
}
}
+ private void validateRoot( Object root )
+ {
+ if ( root == null )
+ {
+ throw new IllegalArgumentException( "The parameter root is not allowed to be null." );
+ }
+ }
+
/**
* @return true if the current Maven version is Maven 3.1.
*/