[MRESOLVER-24] Turn some IllegalArgumentExceptions into IllegalStateExceptions
The rationale is that the values in question were valid when they were passed or for themselves, but in combination with others they do not add up, an illegal state has been reached. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/a5d4da0d Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/a5d4da0d Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/a5d4da0d Branch: refs/heads/master Commit: a5d4da0dcc27486151115d81bf2249570267c2dd Parents: cd87137 Author: Michael Osipov <micha...@apache.org> Authored: Mon Nov 7 23:08:31 2016 +0100 Committer: Michael Osipov <micha...@apache.org> Committed: Tue May 23 00:17:26 2017 +0200 ---------------------------------------------------------------------- .../java/org/eclipse/aether/graph/DefaultDependencyNode.java | 6 +++--- .../org/eclipse/aether/internal/impl/DefaultInstaller.java | 4 ++-- .../aether/internal/test/util/DependencyGraphParser.java | 6 +++--- .../aether/transport/wagon/AbstractWagonTransporterTest.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a5d4da0d/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java ---------------------------------------------------------------------- diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java index db29fb7..ca142fa 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java +++ b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java @@ -147,7 +147,7 @@ public final class DefaultDependencyNode { if ( dependency == null ) { - throw new UnsupportedOperationException( "node does not have a dependency" ); + throw new IllegalStateException( "node does not have a dependency" ); } dependency = dependency.setArtifact( artifact ); this.artifact = dependency.getArtifact(); @@ -231,7 +231,7 @@ public final class DefaultDependencyNode { if ( dependency == null ) { - throw new UnsupportedOperationException( "node does not have a dependency" ); + throw new IllegalStateException( "node does not have a dependency" ); } dependency = dependency.setScope( scope ); } @@ -240,7 +240,7 @@ public final class DefaultDependencyNode { if ( dependency == null ) { - throw new UnsupportedOperationException( "node does not have a dependency" ); + throw new IllegalStateException( "node does not have a dependency" ); } dependency = dependency.setOptional( optional ); } http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a5d4da0d/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java ---------------------------------------------------------------------- diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java index 008f4b3..a419fc3 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java @@ -255,7 +255,7 @@ public class DefaultInstaller { if ( dstFile.equals( srcFile ) ) { - throw new IllegalArgumentException( "Cannot install " + dstFile + " to same path" ); + throw new IllegalStateException( "cannot install " + dstFile + " to same path" ); } boolean copy = @@ -305,7 +305,7 @@ public class DefaultInstaller { if ( dstFile.equals( metadata.getFile() ) ) { - throw new IllegalArgumentException( "Cannot install " + dstFile + " to same path" ); + throw new IllegalStateException( "cannot install " + dstFile + " to same path" ); } fileProcessor.copy( metadata.getFile(), dstFile ); } http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a5d4da0d/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java ---------------------------------------------------------------------- diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java index 82c6ac3..3bdeaa6 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java @@ -273,7 +273,7 @@ public class DependencyGraphParser DependencyNode child = nodes.get( reference ); if ( child == null ) { - throw new IllegalArgumentException( "undefined reference " + reference ); + throw new IllegalStateException( "undefined reference " + reference ); } node.getChildren().add( child ); } @@ -325,11 +325,11 @@ public class DependencyGraphParser NodeDefinition def = ctx.getDefinition(); if ( !isRoot && parent == null ) { - throw new IllegalArgumentException( "dangling node: " + def ); + throw new IllegalStateException( "dangling node: " + def ); } else if ( ctx.getLevel() == 0 && parent != null ) { - throw new IllegalArgumentException( "inconsistent leveling (parent for level 0?): " + def ); + throw new IllegalStateException( "inconsistent leveling (parent for level 0?): " + def ); } DefaultDependencyNode node; http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/a5d4da0d/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java ---------------------------------------------------------------------- diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java index 5a168d1..6f35529 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java +++ b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java @@ -105,7 +105,7 @@ public abstract class AbstractWagonTransporterTest { return newWagon(); } - throw new IllegalArgumentException( "Unknown wagon role: " + roleHint ); + throw new IllegalArgumentException( "unknown wagon role: " + roleHint ); } public void release( Wagon wagon )
