From 5f8377f385a665ffe936d7bb16e96aa223bd42d3 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 3 Feb 2014 09:13:49 +0100
Subject: [PATCH] SONAR-4921 Remove management of baseId in MeasureFilter

---
 .../main/java/org/sonar/core/measure/MeasureFilter.java  | 9 ---------
 .../org/sonar/core/measure/MeasureFilterExecutor.java    | 3 ---
 .../org/sonar/core/measure/MeasureFilterFactory.java     | 4 ----
 .../java/org/sonar/core/measure/MeasureFilterTest.java   | 1 -
 4 files changed, 17 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
index 0e84c50e090..18fe67ceccb 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
@@ -65,15 +65,6 @@ public class MeasureFilter {
     return this;
   }
 
-  public Long getBaseResourceId() {
-    return baseResourceId;
-  }
-
-  public MeasureFilter setBaseResourceId(Long i) {
-    this.baseResourceId = i;
-    return this;
-  }
-
   public MeasureFilter setOnBaseResourceChildren(boolean b) {
     this.onBaseResourceChildren = b;
     return this;
diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java
index a80c621fcd5..fc1efc1e5f9 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterExecutor.java
@@ -76,14 +76,11 @@ public class MeasureFilterExecutor implements ServerComponent {
   private void prepareContext(MeasureFilterContext context, MeasureFilter filter, SqlSession session) {
     if (filter.getBaseResourceKey() != null) {
       context.setBaseSnapshot(resourceDao.getLastSnapshot(filter.getBaseResourceKey(), session));
-    } else if (filter.getBaseResourceId() != null) {
-      context.setBaseSnapshot(resourceDao.getLastSnapshotByResourceId(filter.getBaseResourceId(), session));
     }
   }
 
   static boolean isValid(MeasureFilter filter, MeasureFilterContext context) {
     boolean valid = Strings.isNullOrEmpty(filter.getBaseResourceKey()) || context.getBaseSnapshot()!=null;
-    valid &= filter.getBaseResourceId()==null || context.getBaseSnapshot()!=null;
     valid &= !(filter.isOnBaseResourceChildren() && context.getBaseSnapshot() == null);
     valid &= !(filter.isOnFavourites() && context.getUserId() == null);
     valid &= validateMeasureConditions(filter);
diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
index b1a10230726..47021ecf9bd 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
@@ -46,10 +46,6 @@ public class MeasureFilterFactory implements ServerComponent {
 
     MeasureFilter filter = new MeasureFilter();
     filter.setBaseResourceKey((String) properties.get("base"));
-    String baseId = "baseId";
-    if (properties.containsKey(baseId)) {
-      filter.setBaseResourceId(Long.valueOf((String) properties.get(baseId)));
-    }
     filter.setResourceScopes(toList(properties.get("scopes")));
     filter.setResourceQualifiers(toList(properties.get("qualifiers")));
     filter.setResourceLanguages(toList(properties.get("languages")));
diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java
index 9ed5b301a43..a80ef5ad755 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterTest.java
@@ -61,6 +61,5 @@ public class MeasureFilterTest {
   public void filter_is_not_empty_if_at_least_condition_on_root_resource() {
     assertThat(new MeasureFilter().isEmpty()).isTrue();
     assertThat(new MeasureFilter().setBaseResourceKey("foo").isEmpty()).isFalse();
-    assertThat(new MeasureFilter().setBaseResourceId(123L).isEmpty()).isFalse();
   }
 }
-- 
2.39.5