This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 047d09e4868a4248e6b5acb72a70187bc926ce18 Author: rfscholte <[email protected]> AuthorDate: Fri Jan 12 22:50:46 2018 +0100 simplify code, replace iterators with foreach loops --- .../config/PropertiesReleaseDescriptorStore.java | 34 +++++++--------------- .../release/phase/AbstractReleaseTestCase.java | 19 ++++-------- .../phase/CheckDependencySnapshotsPhaseTest.java | 3 +- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java index 9498e42..8162b5f 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java @@ -26,11 +26,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Iterator; import java.util.Map; -import java.util.Map.Entry; import java.util.Properties; -import java.util.Set; import org.apache.maven.model.Scm; import org.apache.maven.shared.release.scm.IdentifiedScm; @@ -237,22 +234,19 @@ public class PropertiesReleaseDescriptorStore // others boolean properties are not written to the properties file because the value from the caller is always // used - for ( Iterator<?> i = config.getReleaseVersions().entrySet().iterator(); i.hasNext(); ) + for ( Map.Entry<String, String> entry : config.getReleaseVersions().entrySet() ) { - Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next(); - properties.setProperty( "project.rel." + entry.getKey(), (String) entry.getValue() ); + properties.setProperty( "project.rel." + entry.getKey(), entry.getValue() ); } - for ( Iterator<?> i = config.getDevelopmentVersions().entrySet().iterator(); i.hasNext(); ) + for ( Map.Entry<String, String> entry : config.getDevelopmentVersions().entrySet() ) { - Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next(); properties.setProperty( "project.dev." + entry.getKey(), (String) entry.getValue() ); } - for ( Iterator<?> i = config.getOriginalScmInfo().entrySet().iterator(); i.hasNext(); ) + for ( Map.Entry<String, Scm> entry : config.getOriginalScmInfo().entrySet() ) { - Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next(); - Scm scm = (Scm) entry.getValue(); + Scm scm = entry.getValue(); String prefix = "project.scm." + entry.getKey(); if ( scm != null ) { @@ -304,22 +298,16 @@ public class PropertiesReleaseDescriptorStore } } - private void processResolvedDependencies( Properties prop, Map<?, ?> resolvedDependencies ) + private void processResolvedDependencies( Properties prop, Map<String, Map<String, String>> resolvedDependencies ) { - Set<?> entries = resolvedDependencies.entrySet(); - Iterator<?> iterator = entries.iterator(); - Entry<?, ?> currentEntry; - - while ( iterator.hasNext() ) + for ( Map.Entry<String, Map<String, String>> currentEntry : resolvedDependencies.entrySet() ) { - currentEntry = (Entry<?, ?>) iterator.next(); - - Map<?, ?> versionMap = (Map<?, ?>) currentEntry.getValue(); - + Map<String, String> versionMap = currentEntry.getValue(); + prop.setProperty( "dependency." + currentEntry.getKey() + ".release", - (String) versionMap.get( ReleaseDescriptor.RELEASE_KEY ) ); + versionMap.get( ReleaseDescriptor.RELEASE_KEY ) ); prop.setProperty( "dependency." + currentEntry.getKey() + ".development", - (String) versionMap.get( ReleaseDescriptor.DEVELOPMENT_KEY ) ); + versionMap.get( ReleaseDescriptor.DEVELOPMENT_KEY ) ); } } diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java index 506a880..2deaf8b 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java @@ -35,11 +35,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Stack; import org.apache.commons.lang.SystemUtils; import org.apache.maven.artifact.ArtifactUtils; @@ -140,14 +138,14 @@ public abstract class AbstractReleaseTestCase } }); - Stack<Path> projectFiles = new Stack<>(); + Path projectFile; if ( executionRoot == null ) { - projectFiles.push( Paths.get( "pom.xml" ) ); + projectFile = testCaseRootTo.resolve( "pom.xml" ); } else { - projectFiles.push( Paths.get( executionRoot, "pom.xml" ) ); + projectFile = testCaseRootTo.resolve( Paths.get( executionRoot, "pom.xml" ) ); } List<ArtifactRepository> repos = @@ -176,8 +174,7 @@ public abstract class AbstractReleaseTestCase buildingRequest.setResolveDependencies( true ); List<ProjectBuildingResult> buildingResults = - projectBuilder.build( Collections.singletonList( testCaseRootTo.resolve( projectFiles.peek() ).toFile() ), - true, buildingRequest ); + projectBuilder.build( Collections.singletonList( projectFile.toFile() ), true, buildingRequest ); List<MavenProject> reactorProjects = new ArrayList<>(); for ( ProjectBuildingResult buildingResult : buildingResults ) @@ -202,10 +199,8 @@ public abstract class AbstractReleaseTestCase protected static Map<String,MavenProject> getProjectsAsMap( List<MavenProject> reactorProjects ) { Map<String,MavenProject> map = new HashMap<>(); - for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); ) + for ( MavenProject project : reactorProjects ) { - MavenProject project = i.next(); - map.put( ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() ), project ); } return map; @@ -235,10 +230,8 @@ public abstract class AbstractReleaseTestCase protected void comparePomFiles( List<MavenProject> reactorProjects, String expectedFileSuffix, boolean normalizeLineEndings ) throws IOException { - for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); ) + for ( MavenProject project : reactorProjects ) { - MavenProject project = i.next(); - comparePomFiles( project, expectedFileSuffix, normalizeLineEndings ); } } diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java index 879b0c1..215513b 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java @@ -1092,8 +1092,7 @@ public class CheckDependencySnapshotsPhaseTest } // validate - @SuppressWarnings( "rawtypes" ) - Map versionsMap = releaseDescriptor.getResolvedSnapshotDependencies().get( "groupId:parent-external" ); + Map<String, String> versionsMap = releaseDescriptor.getResolvedSnapshotDependencies().get( "groupId:parent-external" ); assertNotNull( versionsMap ); assertEquals( "1.0-test", versionsMap.get( ReleaseDescriptor.DEVELOPMENT_KEY ) ); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
