SONAR-10116 Better scalability of loading of project measures

4 files changed, 9 insertions, 34 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
index 58dec513e16..2d9eceb4190 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
@@ -60,7 +60,6 @@ public class Measure<G extends Serializable> implements Serializable {
   protected Double variation4;
   protected Double variation5;
   protected String url;
-  protected Integer personId;
   protected PersistenceMode persistenceMode = PersistenceMode.FULL;
 
   public Measure(String metricKey) {
@@ -609,17 +608,20 @@ public class Measure<G extends Serializable> implements Serializable {
 
   /**
    * @since 2.14
+   * @deprecated in 6.5 with end of support of Developer cockpit plugin. Always return {@code null}.
    */
   @CheckForNull
+  @Deprecated
   public Integer getPersonId() {
-    return personId;
+    return null;
   }
 
   /**
    * @since 2.14
+   * @deprecated in 6.5 with end of support of Developer cockpit plugin.
    */
+  @Deprecated
   public Measure<G> setPersonId(@Nullable Integer i) {
-    this.personId = i;
     return this;
   }
 
@@ -663,17 +665,12 @@ public class Measure<G extends Serializable> implements Serializable {
     }
 
     Measure measure = (Measure) o;
-    if (metricKey != null ? !metricKey.equals(measure.metricKey) : (measure.metricKey != null)) {
-      return false;
-    }
-    return !(personId != null ? !personId.equals(measure.personId) : (measure.personId != null));
+    return metricKey != null ? metricKey.equals(measure.metricKey) : (measure.metricKey == null);
   }
 
   @Override
   public int hashCode() {
-    int result = metricKey != null ? metricKey.hashCode() : 0;
-    result = 31 * result + (personId != null ? personId.hashCode() : 0);
-    return result;
+    return metricKey != null ? metricKey.hashCode() : 0;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java
index 7049e46d852..37bc32af4ab 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeasuresFilters.java
@@ -64,8 +64,7 @@ public final class MeasuresFilters {
         }
         for (Measure measure : measures) {
           if (measure.getClass().equals(Measure.class) &&
-            measure.getMetricKey().equals(metricKey) &&
-            measure.getPersonId() == null) {
+            measure.getMetricKey().equals(metricKey)) {
             return measure;
           }
         }
@@ -107,7 +106,7 @@ public final class MeasuresFilters {
 
       private boolean apply(Measure measure) {
         return measure instanceof RuleMeasure && metric.equals(measure.getMetric())
-          && measure.getPersonId() == null && ((RuleMeasure) measure).ruleKey() != null;
+          && ((RuleMeasure) measure).ruleKey() != null;
       }
 
       @Override
@@ -157,7 +156,6 @@ public final class MeasuresFilters {
     private boolean apply(Measure measure) {
       return measure instanceof RuleMeasure
         && filterOnMetricKey().equals(measure.getMetricKey())
-        && measure.getPersonId() == null
         && doApply((RuleMeasure) measure);
     }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java
index 26abdc18b84..6956b04b490 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java
@@ -133,7 +133,6 @@ public class RuleMeasure extends Measure {
     RuleMeasure other = (RuleMeasure) obj;
     return new EqualsBuilder()
       .append(getMetric(), other.getMetric())
-      .append(personId, other.personId)
       .append(ruleKey, other.ruleKey)
       .isEquals();
   }
@@ -147,7 +146,6 @@ public class RuleMeasure extends Measure {
   public int hashCode() {
     return new HashCodeBuilder(17, 37)
       .append(getMetric())
-      .append(personId)
       .append(ruleKey)
       .toHashCode();
   }
@@ -156,7 +154,6 @@ public class RuleMeasure extends Measure {
   public String toString() {
     return new ToStringBuilder(this)
       .append("metric", metric)
-      .append("personId", personId)
       .append("ruleKey", ruleKey)
       .append("value", value)
       .append("data", data)
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
index af76fcdc2f5..8e3d97f8658 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
@@ -114,23 +114,6 @@ public class MeasureTest {
     assertThat(measure2.equals(measure1)).isTrue();
     assertThat(measure1.hashCode()).isEqualTo(measure2.hashCode());
 
-    // different committer
-    measure1.setPersonId(1);
-    assertThat(measure1.equals(measure2)).isFalse();
-    assertThat(measure2.equals(measure1)).isFalse();
-    assertThat(measure1.hashCode()).isNotEqualTo(measure2.hashCode());
-
-    measure2.setPersonId(2);
-    assertThat(measure1.equals(measure2)).isFalse();
-    assertThat(measure2.equals(measure1)).isFalse();
-    assertThat(measure1.hashCode()).isNotEqualTo(measure2.hashCode());
-
-    // same committer
-    measure2.setPersonId(1);
-    assertThat(measure1.equals(measure2)).isTrue();
-    assertThat(measure2.equals(measure1)).isTrue();
-    assertThat(measure1.hashCode()).isEqualTo(measure2.hashCode());
-
     // value doesn't matter
     measure1.setValue(1.0);
     measure2.setValue(2.0);