diff --git a/src/main/java/org/eclipsefoundation/adopters/service/impl/DefaultAdopterService.java b/src/main/java/org/eclipsefoundation/adopters/service/impl/DefaultAdopterService.java index bc2ec62807eb9a3dcda55061220ec3eb0a8c72ac..85ebe2e6da825ce9c9c118db2d008328da342719 100644 --- a/src/main/java/org/eclipsefoundation/adopters/service/impl/DefaultAdopterService.java +++ b/src/main/java/org/eclipsefoundation/adopters/service/impl/DefaultAdopterService.java @@ -25,6 +25,7 @@ import java.nio.file.WatchKey; import java.nio.file.WatchService; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -43,8 +44,6 @@ import org.eclipsefoundation.adopters.service.AdopterService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Comparators; - import io.quarkus.runtime.Startup; /** @@ -207,14 +206,9 @@ public class DefaultAdopterService implements AdopterService { ap.setProjectId(p.getProjectId()); ap.setName(p.getName()); ap.setLogo(p.getLogo()); - ap.setUrl(p.getUrl()); - List<Adopter> projAdopters = getAdopters().stream().filter(a -> a.getProjects().contains(p.getProjectId())) - .collect(Collectors.toList()); - // natural sort by name field - projAdopters.sort((o1, o2) -> - o1.getName().toLowerCase().compareTo(o2.getName().toLowerCase()) - ); - ap.setAdopters(projAdopters); + ap.setUrl(p.getUrl()); + ap.setAdopters(getAdopters().stream().filter(a -> a.getProjects().contains(p.getProjectId())) + .sorted(Comparator.comparing(a -> a.getName().toLowerCase())).collect(Collectors.toList())); return ap; }