drop deprecated and dead code in ProjectMeasuresStatistics

server/sonar-server-common/src/main/java/org/sonar/server/measure/index/ProjectMeasuresStatistics.java

@@ -22,17 +22,14 @@ package org.sonar.server.measure.index;
 import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
-import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY;
 
 public class ProjectMeasuresStatistics {
   private final long projectCount;
-  private final long ncloc;
   private final Map<String, Long> projectCountByLanguage;
   private final Map<String, Long> nclocByLanguage;
 
   private ProjectMeasuresStatistics(Builder builder) {
     projectCount = builder.projectCount;
-    ncloc = builder.ncloc;
     projectCountByLanguage = builder.projectCountByLanguage;
     nclocByLanguage = builder.nclocByLanguage;
   }
@@ -41,14 +38,6 @@ public class ProjectMeasuresStatistics {
     return projectCount;
   }
 
-  /**
-   * @deprecated since 7.2 Global Ncloc computation should rely on org.sonar.db.measure.LiveMeasureDao#countNcloc(org.sonar.db.DbSession)
-   */
-  @Deprecated
-  public long getNcloc() {
-    return ncloc;
-  }
-
   public Map<String, Long> getProjectCountByLanguage() {
     return projectCountByLanguage;
   }
@@ -63,7 +52,6 @@ public class ProjectMeasuresStatistics {
 
   public static class Builder {
     private Long projectCount;
-    private Long ncloc;
     private Map<String, Long> projectCountByLanguage;
     private Map<String, Long> nclocByLanguage;
 
@@ -76,15 +64,6 @@ public class ProjectMeasuresStatistics {
       return this;
     }
 
-    public Builder setSum(String metric, long value) {
-      if (NCLOC_KEY.equals(metric)) {
-        this.ncloc = value;
-      } else {
-        throw new IllegalStateException("Metric not supported: " + metric);
-      }
-      return this;
-    }
-
     public void setProjectCountByLanguage(Map<String, Long> projectCountByLanguage) {
       this.projectCountByLanguage = projectCountByLanguage;
     }
@@ -96,7 +75,6 @@ public class ProjectMeasuresStatistics {
 
     public ProjectMeasuresStatistics build() {
       requireNonNull(projectCount);
-      requireNonNull(ncloc);
       requireNonNull(projectCountByLanguage);
       requireNonNull(nclocByLanguage);
       return new ProjectMeasuresStatistics(this);

server/sonar-webserver-es/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java

@@ -40,7 +40,6 @@ import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation.Bucket;
-import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregator.KeyedFilter;
 import org.elasticsearch.search.aggregations.bucket.nested.Nested;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
@@ -212,15 +211,6 @@ public class ProjectMeasuresIndex {
 
     SearchResponse response = request.get();
     statistics.setProjectCount(response.getHits().getTotalHits());
-    Stream.of(NCLOC_KEY)
-      .map(metric -> (Nested) response.getAggregations().get(metric))
-      .map(nested -> (Filter) nested.getAggregations().get(nested.getName() + "_filter"))
-      .map(filter -> (Sum) filter.getAggregations().get(filter.getName() + "_sum"))
-      .forEach(sum -> {
-        String metric = sum.getName().replace("_filter_sum", "");
-        long value = Math.round(sum.getValue());
-        statistics.setSum(metric, value);
-      });
     statistics.setProjectCountByLanguage(termsToMap(response.getAggregations().get(FIELD_LANGUAGES)));
     Function<Terms.Bucket, Long> bucketToNcloc = bucket -> Math.round(((Sum) bucket.getAggregations().get(FIELD_DISTRIB_NCLOC)).getValue());
     Map<String, Long> nclocByLanguage = Stream.of((Nested) response.getAggregations().get(FIELD_NCLOC_LANGUAGE_DISTRIBUTION))