Fix quality flaws

server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java

@@ -22,9 +22,6 @@
 import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.sonar.api.server.ws.Request;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 
 public class BatchWs implements WebService {
@@ -59,15 +56,12 @@ private void defineIndexAction(NewController controller) {
       .setInternal(true)
       .setSince("4.4")
       .setDescription("List the JAR files to be downloaded by source analyzer")
-      .setHandler(new RequestHandler() {
-        @Override
-        public void handle(Request request, Response response) {
-          try {
-            response.stream().setMediaType("text/plain");
-            IOUtils.write(batchIndex.getIndex(), response.stream().output());
-          } catch (IOException e) {
-            throw new IllegalStateException(e);
-          }
+      .setHandler((request, response) -> {
+        try {
+          response.stream().setMediaType("text/plain");
+          IOUtils.write(batchIndex.getIndex(), response.stream().output());
+        } catch (IOException e) {
+          throw new IllegalStateException(e);
         }
       })
       .setResponseExample(getClass().getResource("batch-index-example.txt"));
@@ -79,16 +73,13 @@ private void defineFileAction(NewController controller) {
       .setSince("4.4")
       .setDescription("Download a JAR file required by source analyzer")
       .setResponseExample(getClass().getResource("batch-file-example.txt"))
-      .setHandler(new RequestHandler() {
-        @Override
-        public void handle(Request request, Response response) {
-          String filename = request.mandatoryParam("name");
-          try {
-            response.stream().setMediaType("application/java-archive");
-            FileUtils.copyFile(batchIndex.getFile(filename), response.stream().output());
-          } catch (IOException e) {
-            throw new IllegalStateException(e);
-          }
+      .setHandler((request, response) -> {
+        String filename = request.mandatoryParam("name");
+        try {
+          response.stream().setMediaType("application/java-archive");
+          FileUtils.copyFile(batchIndex.getFile(filename), response.stream().output());
+        } catch (IOException e) {
+          throw new IllegalStateException(e);
         }
       });
     action

server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java

@@ -54,20 +54,20 @@ private static ComponentProcessor getComponentProcessor(String sort) {
     throw new IllegalArgumentException("Cannot sort on field : " + sort);
   }
 
-  abstract static class ComponentProcessor {
-    abstract Function sortFieldFunction();
+  interface ComponentProcessor {
+    Function sortFieldFunction();
 
-    abstract Ordering sortFieldOrdering(boolean ascending);
+    Ordering sortFieldOrdering(boolean ascending);
 
-    final List<? extends Component> sort(Collection<? extends Component> components, boolean ascending) {
+    default List<? extends Component> sort(Collection<? extends Component> components, boolean ascending) {
       Ordering<Component> ordering = sortFieldOrdering(ascending).onResultOf(sortFieldFunction());
       return ordering.immutableSortedCopy(components);
     }
   }
 
-  abstract static class TextSort extends ComponentProcessor {
+  abstract static class TextSort implements ComponentProcessor {
     @Override
-    Function sortFieldFunction() {
+    public Function sortFieldFunction() {
       return new Function<Component, String>() {
         @Override
         public String apply(Component component) {
@@ -79,7 +79,7 @@ public String apply(Component component) {
     abstract String sortField(Component component);
 
     @Override
-    Ordering sortFieldOrdering(boolean ascending) {
+    public Ordering sortFieldOrdering(boolean ascending) {
       Ordering<String> ordering = Ordering.from(String.CASE_INSENSITIVE_ORDER).nullsLast();
       if (!ascending) {
         ordering = ordering.reverse();

server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java

@@ -62,11 +62,11 @@ private static Collection<Component> search(ComponentQuery query, List<? extends
     return newArrayList(Iterables.filter(allComponents, new MatchQuery(query)));
   }
 
-  abstract static class Filter {
+  interface Filter {
 
-    abstract String field(Component component);
+    String field(Component component);
 
-    final boolean accept(Component component, Collection<String> collections) {
+    default boolean accept(Component component, Collection<String> collections) {
       if (!collections.isEmpty()) {
         for (String item : collections) {
           if (field(component).toLowerCase().contains(item.toLowerCase())) {
@@ -79,16 +79,16 @@ final boolean accept(Component component, Collection<String> collections) {
     }
   }
 
-  static class NameFilter extends Filter {
+  static class NameFilter implements Filter {
     @Override
-    String field(Component component) {
+    public String field(Component component) {
       return component.name();
     }
   }
 
-  static class KeyFilter extends Filter {
+  static class KeyFilter implements Filter {
     @Override
-    String field(Component component) {
+    public String field(Component component) {
       return component.key();
     }
   }

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java

@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -49,8 +51,9 @@
 import org.sonar.server.computation.task.step.ComputationStep;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.FluentIterable.from;
 import static java.lang.String.format;
+import static java.util.function.Function.identity;
+import static org.sonar.core.util.stream.Collectors.uniqueIndex;
 import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY;
 import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW;
 import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER;
@@ -69,15 +72,6 @@ public class ComputeMeasureVariationsStep implements ComputationStep {
   private final MetricRepository metricRepository;
   private final MeasureRepository measureRepository;
 
-  private final Function<PastMeasureDto, MeasureKey> pastMeasureToMeasureKey = new Function<PastMeasureDto, MeasureKey>() {
-    @Nullable
-    @Override
-    public MeasureKey apply(@Nonnull PastMeasureDto input) {
-      Metric metric = metricRepository.getById((long)input.getMetricId());
-      return new MeasureKey(metric.getKey(), null);
-    }
-  };
-
   public ComputeMeasureVariationsStep(DbClient dbClient, TreeRootHolder treeRootHolder, PeriodsHolder periodsHolder, MetricRepository metricRepository,
     MeasureRepository measureRepository) {
     this.dbClient = dbClient;
@@ -91,7 +85,7 @@ public ComputeMeasureVariationsStep(DbClient dbClient, TreeRootHolder treeRootHo
   public void execute() {
     DbSession dbSession = dbClient.openSession(false);
     try {
-      List<Metric> metrics = from(metricRepository.getAll()).filter(NumericMetric.INSTANCE).toList();
+      List<Metric> metrics = StreamSupport.stream(metricRepository.getAll().spliterator(), false).filter(NumericMetric.INSTANCE::apply).collect(Collectors.toList());
       new DepthTraversalTypeAwareCrawler(new VariationMeasuresVisitor(dbSession, metrics))
         .visit(treeRootHolder.getRoot());
     } finally {
@@ -109,7 +103,7 @@ private class VariationMeasuresVisitor extends TypeAwareVisitorAdapter {
       // measures on files are currently purged, so past measures are not available on files
       super(CrawlerDepthLimit.reportMaxDepth(DIRECTORY).withViewsMaxDepth(SUBVIEW), PRE_ORDER);
       this.session = session;
-      this.metricIds = from(metrics).transform(MetricDtoToMetricId.INSTANCE).toSet();
+      this.metricIds = metrics.stream().map(MetricDtoToMetricId.INSTANCE::apply).collect(Collectors.toSet());
       this.metrics = metrics;
     }
 
@@ -130,7 +124,9 @@ private MeasuresWithVariationRepository computeMeasuresWithVariations(Component
     }
 
     private void setVariationMeasures(Component component, List<PastMeasureDto> pastMeasures, int period, MeasuresWithVariationRepository measuresWithVariationRepository) {
-      Map<MeasureKey, PastMeasureDto> pastMeasuresByMeasureKey = from(pastMeasures).uniqueIndex(pastMeasureToMeasureKey);
+      Map<MeasureKey, PastMeasureDto> pastMeasuresByMeasureKey = pastMeasures
+        .stream()
+        .collect(uniqueIndex(m -> new MeasureKey(metricRepository.getById((long) m.getMetricId()).getKey(), null), identity()));
       for (Metric metric : metrics) {
         Optional<Measure> measure = measureRepository.getRawMeasure(component, metric);
         if (measure.isPresent() && !measure.get().hasVariations()) {

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java

@@ -19,15 +19,16 @@
  */
 package org.sonar.server.computation.task.projectanalysis.step;
 
-import com.google.common.base.Function;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.event.EventDto;
 import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.task.projectanalysis.component.Component;
-import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor;
 import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit;
 import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler;
 import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder;
@@ -36,8 +37,6 @@
 import org.sonar.server.computation.task.projectanalysis.event.EventRepository;
 import org.sonar.server.computation.task.step.ComputationStep;
 
-import static com.google.common.collect.Iterables.transform;
-
 public class PersistEventsStep implements ComputationStep {
 
   private final DbClient dbClient;
@@ -68,55 +67,6 @@ public void execute() {
     }
   }
 
-  private void processEvents(DbSession session, Component component, Long analysisDate) {
-    Function<Event, EventDto> eventToEventDto = event -> newBaseEvent(component, analysisDate)
-      .setName(event.getName())
-      .setCategory(convertCategory(event.getCategory()))
-      .setDescription(event.getDescription())
-      .setData(event.getData());
-    // FIXME bulk insert
-    for (EventDto batchEventDto : transform(eventRepository.getEvents(component), eventToEventDto)) {
-      dbClient.eventDao().insert(session, batchEventDto);
-    }
-  }
-
-  private void saveVersionEvent(DbSession session, Component component, Long analysisDate) {
-    String version = component.getReportAttributes().getVersion();
-    if (version != null) {
-      deletePreviousEventsHavingSameVersion(session, version, component);
-      dbClient.eventDao().insert(session, newBaseEvent(component, analysisDate)
-        .setName(version)
-        .setCategory(EventDto.CATEGORY_VERSION));
-    }
-  }
-
-  private void deletePreviousEventsHavingSameVersion(DbSession session, String version, Component component) {
-    for (EventDto dto : dbClient.eventDao().selectByComponentUuid(session, component.getUuid())) {
-      if (dto.getCategory().equals(EventDto.CATEGORY_VERSION) && dto.getName().equals(version)) {
-        dbClient.eventDao().delete(session, dto.getId());
-      }
-    }
-  }
-
-  private EventDto newBaseEvent(Component component, Long analysisDate) {
-    return new EventDto()
-      .setAnalysisUuid(analysisMetadataHolder.getUuid())
-      .setComponentUuid(component.getUuid())
-      .setCreatedAt(system2.now())
-      .setDate(analysisDate);
-  }
-
-  private static String convertCategory(Event.Category category) {
-    switch (category) {
-      case ALERT:
-        return EventDto.CATEGORY_ALERT;
-      case PROFILE:
-        return EventDto.CATEGORY_PROFILE;
-      default:
-        throw new IllegalArgumentException(String.format("Unsupported category %s", category.name()));
-    }
-  }
-
   @Override
   public String getDescription() {
     return "Persist events";
@@ -126,8 +76,8 @@ private class PersistEventComponentVisitor extends TypeAwareVisitorAdapter {
     private final DbSession session;
     private final long analysisDate;
 
-    public PersistEventComponentVisitor(DbSession session, long analysisDate) {
-      super(CrawlerDepthLimit.PROJECT, ComponentVisitor.Order.PRE_ORDER);
+    PersistEventComponentVisitor(DbSession session, long analysisDate) {
+      super(CrawlerDepthLimit.PROJECT, Order.PRE_ORDER);
       this.session = session;
       this.analysisDate = analysisDate;
     }
@@ -138,5 +88,54 @@ public void visitProject(Component project) {
       saveVersionEvent(session, project, analysisDate);
     }
 
+    private void processEvents(DbSession session, Component component, Long analysisDate) {
+      Function<Event, EventDto> eventToEventDto = event -> newBaseEvent(component, analysisDate)
+        .setName(event.getName())
+        .setCategory(convertCategory(event.getCategory()))
+        .setDescription(event.getDescription())
+        .setData(event.getData());
+      // FIXME bulk insert
+      for (EventDto batchEventDto : StreamSupport.stream(eventRepository.getEvents(component).spliterator(), false).map(eventToEventDto).collect(Collectors.toList())) {
+        dbClient.eventDao().insert(session, batchEventDto);
+      }
+    }
+
+    private void saveVersionEvent(DbSession session, Component component, Long analysisDate) {
+      String version = component.getReportAttributes().getVersion();
+      if (version != null) {
+        deletePreviousEventsHavingSameVersion(session, version, component);
+        dbClient.eventDao().insert(session, newBaseEvent(component, analysisDate)
+          .setName(version)
+          .setCategory(EventDto.CATEGORY_VERSION));
+      }
+    }
+
+    private void deletePreviousEventsHavingSameVersion(DbSession session, String version, Component component) {
+      for (EventDto dto : dbClient.eventDao().selectByComponentUuid(session, component.getUuid())) {
+        if (dto.getCategory().equals(EventDto.CATEGORY_VERSION) && dto.getName().equals(version)) {
+          dbClient.eventDao().delete(session, dto.getId());
+        }
+      }
+    }
+
+    private EventDto newBaseEvent(Component component, Long analysisDate) {
+      return new EventDto()
+        .setAnalysisUuid(analysisMetadataHolder.getUuid())
+        .setComponentUuid(component.getUuid())
+        .setCreatedAt(system2.now())
+        .setDate(analysisDate);
+    }
+
+    private String convertCategory(Event.Category category) {
+      switch (category) {
+        case ALERT:
+          return EventDto.CATEGORY_ALERT;
+        case PROFILE:
+          return EventDto.CATEGORY_PROFILE;
+        default:
+          throw new IllegalArgumentException(String.format("Unsupported category %s", category.name()));
+      }
+    }
+
   }
 }

server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java

@@ -19,14 +19,12 @@
  */
 package org.sonar.server.computation.task.projectanalysis.step;
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nullable;
 import org.sonar.api.i18n.I18n;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
@@ -120,22 +118,19 @@ private void mergeLinks(DbSession session, String componentUuid, List<ScannerRep
           throw new IllegalArgumentException(String.format("Link of type '%s' has already been declared on component '%s'", type, componentUuid));
         }
 
-        ComponentLinkDto previousLink = Iterables.find(previousLinks, new Predicate<ComponentLinkDto>() {
-          @Override
-          public boolean apply(@Nullable ComponentLinkDto input) {
-            return input != null && input.getType().equals(convertType(link.getType()));
-          }
-        }, null);
-        if (previousLink == null) {
+        Optional<ComponentLinkDto> previousLink = previousLinks.stream()
+          .filter(input -> input != null && input.getType().equals(convertType(link.getType())))
+          .findFirst();
+        if (previousLink.isPresent()) {
+          previousLink.get().setHref(link.getHref());
+          dbClient.componentLinkDao().update(session, previousLink.get());
+        } else {
           dbClient.componentLinkDao().insert(session,
             new ComponentLinkDto()
               .setComponentUuid(componentUuid)
               .setType(type)
               .setName(i18n.message(Locale.ENGLISH, "project_links." + type, null))
               .setHref(link.getHref()));
-        } else {
-          previousLink.setHref(link.getHref());
-          dbClient.componentLinkDao().update(session, previousLink);
         }
       }