SONARCLOUD-78 remove ambiguity on ComponentQuery#analyzedAfter

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentQuery.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentQuery.java
index 42c97fcc66cf2dd6a921fcaea0c0a1c75f4ce847..b5afda44e30a184c9abd76bc2893340e1b70d019 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentQuery.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentQuery.java
@@ -39,7 +39,7 @@ public class ComponentQuery {
   private final Set<String> componentUuids;
   private final Set<String> componentKeys;
   private final Long analyzedBefore;
-  private final Long analyzedAfter;
+  private final Long anyBranchAnalyzedAfter;
   private final Date createdAfter;
   private final boolean onProvisionedOnly;
 
@@ -52,7 +52,7 @@ public class ComponentQuery {
     this.componentKeys = builder.componentKeys;
     this.isPrivate = builder.isPrivate;
     this.analyzedBefore = builder.analyzedBefore;
-    this.analyzedAfter = builder.analyzedAfter;
+    this.anyBranchAnalyzedAfter = builder.anyBranchAnalyzedAfter;
     this.createdAfter = builder.createdAfter;
     this.onProvisionedOnly = builder.onProvisionedOnly;
   }
@@ -107,8 +107,8 @@ public class ComponentQuery {
   }
 
   @CheckForNull
-  public Long getAnalyzedAfter() {
-    return analyzedAfter;
+  public Long getAnyBranchAnalyzedAfter() {
+    return anyBranchAnalyzedAfter;
   }
 
   @CheckForNull
@@ -138,7 +138,7 @@ public class ComponentQuery {
     private Set<String> componentUuids;
     private Set<String> componentKeys;
     private Long analyzedBefore;
-    private Long analyzedAfter;
+    private Long anyBranchAnalyzedAfter;
     private Date createdAfter;
     private boolean onProvisionedOnly = false;
 
@@ -190,8 +190,8 @@ public class ComponentQuery {
      * account. For example the analysis of a short-lived branch is included in the filter
      * even if the main branch has never been analyzed.
      */
-    public Builder setAnalyzedAfter(@Nullable Long l) {
-      this.analyzedAfter = l;
+    public Builder setAnyBranchAnalyzedAfter(@Nullable Long l) {
+      this.anyBranchAnalyzedAfter = l;
       return this;
     }
 

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
index 74689541611c7c2c5a186ac9787c86f1c7a7c025..2bf6826e053d8dc70b12bfa107f2d31aabbcc51d 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
@@ -413,7 +413,7 @@
           where pb.project_uuid = p.uuid
         )
       </if>
-      <if test="query.analyzedAfter != null">
+      <if test="query.anyBranchAnalyzedAfter != null">
         and (
           exists(
             -- branches of projects
@@ -422,7 +422,7 @@
             where pb.project_uuid = p.uuid
             and s.status='P'
             and s.islast = ${_true}
-            and s.created_at &gt;= #{query.analyzedAfter,jdbcType=BIGINT}
+            and s.created_at &gt;= #{query.anyBranchAnalyzedAfter,jdbcType=BIGINT}
           )
           or exists (
             -- applications, portfolios
@@ -430,7 +430,7 @@
             where s.component_uuid = p.uuid
             and s.status='P'
             and s.islast = ${_true}
-            and s.created_at &gt;= #{query.analyzedAfter,jdbcType=BIGINT}
+            and s.created_at &gt;= #{query.anyBranchAnalyzedAfter,jdbcType=BIGINT}
           )
         )
       </if>

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index 859f280c75aabc933ad5ff6325c98a1380026aad..13bce57e910b1a6a6dc1bada3f2e684d7e950781 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -1614,11 +1614,11 @@ public class ComponentDaoTest {
       .containsExactlyInAnyOrder(oldProject.uuid(), recentProject.uuid());
 
     // after date
-    assertThat(selectProjectUuidsByQuery(q -> q.setAnalyzedAfter(recentTime - 1_000L)))
+    assertThat(selectProjectUuidsByQuery(q -> q.setAnyBranchAnalyzedAfter(recentTime - 1_000L)))
       .containsExactlyInAnyOrder(recentProject.uuid());
-    assertThat(selectProjectUuidsByQuery(q -> q.setAnalyzedAfter(recentTime + 1_000L)))
+    assertThat(selectProjectUuidsByQuery(q -> q.setAnyBranchAnalyzedAfter(recentTime + 1_000L)))
       .isEmpty();
-    assertThat(selectProjectUuidsByQuery(q -> q.setAnalyzedAfter(aLongTimeAgo)))
+    assertThat(selectProjectUuidsByQuery(q -> q.setAnyBranchAnalyzedAfter(aLongTimeAgo)))
       .containsExactlyInAnyOrder(oldProject.uuid(), recentProject.uuid());
   }
 
@@ -1638,11 +1638,11 @@ public class ComponentDaoTest {
     db.components().insertSnapshot(recentProjectBranch, s -> s.setCreatedAt(aLongTimeAgo).setLast(false));
 
     // after date
-    assertThat(selectProjectUuidsByQuery(q -> q.setAnalyzedAfter(recentTime - 1_000L)))
+    assertThat(selectProjectUuidsByQuery(q -> q.setAnyBranchAnalyzedAfter(recentTime - 1_000L)))
       .containsExactlyInAnyOrder(recentProject.uuid());
-    assertThat(selectProjectUuidsByQuery(q -> q.setAnalyzedAfter(recentTime + 1_000L)))
+    assertThat(selectProjectUuidsByQuery(q -> q.setAnyBranchAnalyzedAfter(recentTime + 1_000L)))
       .isEmpty();
-    assertThat(selectProjectUuidsByQuery(q -> q.setAnalyzedAfter(aLongTimeAgo)))
+    assertThat(selectProjectUuidsByQuery(q -> q.setAnyBranchAnalyzedAfter(aLongTimeAgo)))
       .containsExactlyInAnyOrder(oldProject.uuid(), recentProject.uuid());
   }
 

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java
index e9d060978ac22b9ab2b3b1790d551eacb2b1a639..f619b5fe09fa4d8f4023e0a12449b81ba25c7b07 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java
@@ -40,7 +40,7 @@ public class ComponentQueryTest {
     ComponentQuery underTest = ComponentQuery.builder()
       .setNameOrKeyQuery("key")
       .setAnalyzedBefore(100L)
-      .setAnalyzedAfter(200L)
+      .setAnyBranchAnalyzedAfter(200L)
       .setCreatedAfter(new Date(300L))
       .setQualifiers(PROJECT)
       .build();
@@ -48,7 +48,7 @@ public class ComponentQueryTest {
     assertThat(underTest.getNameOrKeyQuery()).isEqualTo("key");
     assertThat(underTest.getQualifiers()).containsOnly(PROJECT);
     assertThat(underTest.getAnalyzedBefore()).isEqualTo(100L);
-    assertThat(underTest.getAnalyzedAfter()).isEqualTo(200L);
+    assertThat(underTest.getAnyBranchAnalyzedAfter()).isEqualTo(200L);
     assertThat(underTest.getCreatedAfter().getTime()).isEqualTo(300L);
     assertThat(underTest.isOnProvisionedOnly()).isFalse();
     assertThat(underTest.isPartialMatchOnKey()).isFalse();