Merge branch '2.1.x' into 2.2.x

Closes gh-20501

Author: wilkinsona

spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,7 +143,6 @@ protected boolean canAdd() {
 						if (DependencyCustomizer.this.loader.getResource(path) == null) {
 							return false;
 						}
-						return true;
 					}
 					catch (Exception ex) {
 						// swallow exception and continue

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,6 +138,48 @@ void allMissingClassesWithAllClassesMissingPerformsAdd() {
 		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).hasSize(1);
 	}
 
+	@Test
+	void allResourcesPresentWithAllResourcesPresentPerformsAdd() {
+		this.dependencyCustomizer.ifAllResourcesPresent("dependency-customizer-tests/resource1.txt",
+				"dependency-customizer-tests/resource2.txt").add("spring-boot-starter-logging");
+		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).hasSize(1);
+	}
+
+	@Test
+	void allResourcesPresentWithSomeResourcesPresentDoesNotPerformAdd() {
+		this.dependencyCustomizer.ifAllResourcesPresent("dependency-customizer-tests/resource1.txt",
+				"dependency-customizer-tests/does-not-exist.txt").add("spring-boot-starter-logging");
+		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).isEmpty();
+	}
+
+	@Test
+	void allResourcesPresentWithNoResourcesPresentDoesNotPerformAdd() {
+		this.dependencyCustomizer.ifAllResourcesPresent("dependency-customizer-tests/does-not-exist",
+				"dependency-customizer-tests/does-not-exist-either.txt").add("spring-boot-starter-logging");
+		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).isEmpty();
+	}
+
+	@Test
+	void anyResourcesPresentWithAllResourcesPresentPerformsAdd() {
+		this.dependencyCustomizer.ifAnyResourcesPresent("dependency-customizer-tests/resource1.txt",
+				"dependency-customizer-tests/resource2.txt").add("spring-boot-starter-logging");
+		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).hasSize(1);
+	}
+
+	@Test
+	void anyResourcesPresentWithSomeResourcesPresentPerforms() {
+		this.dependencyCustomizer.ifAnyResourcesPresent("dependency-customizer-tests/resource1.txt",
+				"dependency-customizer-tests/does-not-exist.txt").add("spring-boot-starter-logging");
+		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).hasSize(1);
+	}
+
+	@Test
+	void anyResourcesPresentWithNoResourcesPresentDoesNotPerformAdd() {
+		this.dependencyCustomizer.ifAnyResourcesPresent("dependency-customizer-tests/does-not-exist",
+				"dependency-customizer-tests/does-not-exist-either.txt").add("spring-boot-starter-logging");
+		assertThat(this.classNode.getAnnotations(new ClassNode(Grab.class))).isEmpty();
+	}
+
 	private void assertGrabAnnotation(AnnotationNode annotationNode, String group, String module, String version,
 			String classifier, String type, boolean transitive) {
 		assertThat(getMemberValue(annotationNode, "group")).isEqualTo(group);