[MNG-6029] Duplicate conditional and body in MetadataResolutionResult.java The `requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime` case is repeated three times. One should be removed, and the other looks like it should be `requestType.equals( MetadataResolutionRequestTypeEnum.classpathTest`
Signed-off-by: Michael Osipov <micha...@apache.org> This closes #79 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/12a1eb2e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12a1eb2e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12a1eb2e Branch: refs/heads/slf4j-gossip Commit: 12a1eb2efb308c575b6aad458adff819139eabb2 Parents: 79c81ce Author: kilida <kilidapa...@gmail.com> Authored: Thu Mar 24 22:13:45 2016 -0400 Committer: Michael Osipov <micha...@apache.org> Committed: Sat May 28 00:16:26 2016 +0200 ---------------------------------------------------------------------- .../maven/repository/metadata/MetadataResolutionResult.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/12a1eb2e/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java index 1d9e9c4..74a3427 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java @@ -115,11 +115,7 @@ public class MetadataResolutionResult { return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.runtime ); } - else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime ) ) - { - return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test ); - } - else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime ) ) + else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathTest ) ) { return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test ); }
