Skip to content

Commit 8a860dc

Browse files
Rewrite getRuntimeJars to be more succinct
1 parent 7281737 commit 8a860dc

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

src/main/java/org/sonarqube/gradle/SonarUtils.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
import java.util.LinkedHashSet;
3030
import java.util.List;
3131
import java.util.Map;
32+
import java.util.Objects;
3233
import java.util.Optional;
3334
import java.util.Set;
3435
import java.util.regex.Pattern;
3536
import java.util.stream.Collectors;
37+
import java.util.stream.Stream;
3638
import java.util.stream.StreamSupport;
3739
import javax.annotation.Nullable;
3840
import org.gradle.api.Project;
@@ -409,19 +411,7 @@ public static String constructPrefixedProjectName(String projectPath) {
409411
* Returns the collection of Java and Java FX runtime jars, if available.
410412
*/
411413
public static Collection<File> getRuntimeJars() {
412-
List<File> libraries = new ArrayList<>(2);
413-
414-
File runtimeJar = getRuntimeJar();
415-
if (runtimeJar != null) {
416-
libraries.add(runtimeJar);
417-
}
418-
419-
File fxRuntimeJar = getFxRuntimeJar();
420-
if (fxRuntimeJar != null) {
421-
libraries.add(fxRuntimeJar);
422-
}
423-
424-
return libraries;
414+
return Stream.of(getRuntimeJar(), getFxRuntimeJar()).filter(Objects::nonNull).collect(Collectors.toList());
425415
}
426416

427417
@Nullable

0 commit comments

Comments
 (0)