From 8fa0e0103d50a9cbbb6398e3fe1f6c0823431d4b Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 15 Dec 2015 11:21:34 +0100
Subject: [PATCH] Restore Java 7 compatibility

---
 .../initializr/metadata/InitializrMetadata.groovy      | 10 +++++-----
 .../support/DefaultDependencyMetadataProvider.groovy   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
index 92e7cffb..5812d75e 100644
--- a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
+++ b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
@@ -91,7 +91,7 @@ class InitializrMetadata {
 		dependencies.validate()
 
 		def repositories = configuration.env.repositories
-		dependencies.all.forEach { dependency ->
+		for (Dependency dependency : dependencies.all) {
 			def boms = configuration.env.boms
 			if (dependency.bom && !boms[dependency.bom]) {
 				throw new InvalidInitializrMetadataException("Dependency $dependency " +
@@ -103,15 +103,15 @@ class InitializrMetadata {
 						"defines an invalid repository id $dependency.repository, available repositores $repositories")
 			}
 		}
-		configuration.env.boms.values().forEach { bom ->
-			bom.repositories.forEach { r ->
+		for (BillOfMaterials bom : configuration.env.boms.values()) {
+			for (String r : bom.repositories) {
 				if (!repositories[r]) {
 					throw new InvalidInitializrMetadataException("$bom " +
 							"defines an invalid repository id $r, available repositores $repositories")
 				}
 			}
-			bom.mappings.forEach{  m ->
-				m.repositories.forEach { r ->
+			for (BillOfMaterials.Mapping m : bom.mappings) {
+				for (String r : m.repositories) {
 					if (!repositories[r]) {
 						throw new InvalidInitializrMetadataException("$m of $bom " +
 								"defines an invalid repository id $r, available repositores $repositories")
diff --git a/initializr/src/main/groovy/io/spring/initializr/support/DefaultDependencyMetadataProvider.groovy b/initializr/src/main/groovy/io/spring/initializr/support/DefaultDependencyMetadataProvider.groovy
index 2ccb0d30..4ee927fa 100644
--- a/initializr/src/main/groovy/io/spring/initializr/support/DefaultDependencyMetadataProvider.groovy
+++ b/initializr/src/main/groovy/io/spring/initializr/support/DefaultDependencyMetadataProvider.groovy
@@ -38,28 +38,28 @@ class DefaultDependencyMetadataProvider implements DependencyMetadataProvider {
 	@Cacheable(cacheNames = "dependency-metadata", key = "#p1")
 	DependencyMetadata get(InitializrMetadata metadata, Version bootVersion) {
 		Map<String, Dependency> dependencies = [:]
-		metadata.dependencies.getAll().forEach { d ->
+		for (Dependency d : metadata.dependencies.getAll()) {
 			if (d.match(bootVersion)) {
 				dependencies[d.id] = d.resolve(bootVersion)
 			}
 		}
 
 		Map<String, Repository> repositories = [:]
-		dependencies.values().forEach { d ->
+		for (Dependency d : dependencies.values()) {
 			if (d.repository) {
 				repositories[d.repository] = metadata.configuration.env.repositories[d.repository]
 			}
 		}
 
 		Map<String, BillOfMaterials> boms = [:]
-		dependencies.values().forEach { d ->
+		for (Dependency d : dependencies.values()) {
 			if (d.bom) {
 				boms[d.bom] = metadata.configuration.env.boms.get(d.bom).resolve(bootVersion)
 			}
 		}
 		// Each resolved bom may require additional repositories
-		boms.values().forEach { b ->
-			b.repositories.forEach { id ->
+		for (BillOfMaterials b : boms.values()) {
+			for (String id : b.repositories) {
 				repositories[id] = metadata.configuration.env.repositories[id]
 			}
 		}