@harshavamsi i want to take on this issue.

@harshavamsi i have opened PR but dont merge it right now because i am going to make this kind of changes in other files.

Catch All Triage - 1

@JaySabva -- Since this is just code cleanup, the existing unit + integration tests should be sufficient. We expect no changes in behavior, just friendlier code.

👍

@msfroh I might sound silly but I have one question regarding this #17909 (review)

How to clean up code like this? I don't see any good way to do it. Please if you can guide me.

@msfroh I might sound silly but I have one question regarding this #17909 (review)

How to clean up code like this? I don't see any good way to do it. Please if you can guide me.

Oh... I don't think that's possible in the general case.

For the Util.java case, here's the best I can come up with, but IMO it's uglier than the if/else statements:

    public static FileTree getJavaTestAndMainSourceResources(Project project, Action<? super PatternFilterable> filter) {
        final Optional<FileTree> testFileTree = getJavaTestSourceSet(project).map(SourceSet::getResources).map(FileTree::getAsFileTree);
        final Optional<FileTree> mainFileTree = getJavaMainSourceSet(project).map(SourceSet::getResources).map(FileTree::getAsFileTree);
        return switch (new boolean[]{ mainFileTree.isPresent(), testFileTree.isPresent()}) {
            case boolean[] arr when arr[0] && arr[1] -> testFileTree.get().plus(mainFileTree.get()).matching(filter);
            case boolean[] arr when arr[0] -> mainFileTree.get().matching(filter);
            case boolean[] arr when arr[1] -> testFileTree.get().matching(filter);
            default -> null;
        };
    }

@owaiskazi19 -- did you have something else in mind? I'm new to Java's pattern-matching in switch statements, so maybe there's a trick that I'm missing.

@owaiskazi19 -- did you have something else in mind? I'm new to Java's pattern-matching in switch statements, so maybe there's a trick that I'm missing.

We could also use record pattern matching here

public static FileTree getJavaTestAndMainSourceResources(Project project, Action<? super PatternFilterable> filter) {
    var testFileTree = getJavaTestSourceSet(project).map(SourceSet::getResources).map(FileTree::getAsFileTree);
    var mainFileTree = getJavaMainSourceSet(project).map(SourceSet::getResources).map(FileTree::getAsFileTree);
    
    return switch (new Pair<>(testFileTree, mainFileTree)) {
        case Pair<Optional<FileTree>, Optional<FileTree>>(var test, var main) 
            when test.isPresent() && main.isPresent() -> 
            test.get().plus(main.get()).matching(filter);
        case Pair<Optional<FileTree>, Optional<FileTree>>(var test, var main) 
            when main.isPresent() -> 
            main.get().matching(filter);
        case Pair<Optional<FileTree>, Optional<FileTree>>(var test, var main) 
            when test.isPresent() -> 
            test.get().matching(filter);
        default -> null;
    };
}