SONAR-9664 Apply feedback

8 files changed, 22 insertions, 40 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDao.java
index 68705f81a33..d7196d7670d 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDao.java
@@ -42,10 +42,6 @@ public class PluginDao implements Dao {
     mapper(dbSession).update(dto);
   }
 
-  public void delete(DbSession dbSession, PluginDto dto) {
-    mapper(dbSession).delete(dto.getUuid());
-  }
-
   private static PluginMapper mapper(DbSession dbSession) {
     return dbSession.getMapper(PluginMapper.class);
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDto.java
index 13c512ff328..baeba50bc68 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/plugin/PluginDto.java
@@ -30,7 +30,7 @@ public class PluginDto {
   /** Base plugin key, can be null */
   private String basePluginKey;
   /** JAR file MD5 checksum, can't be null */
-  private String hash;
+  private String fileHash;
   /** Time plugin was first installed */
   private long createdAt;
   /** Time of last plugin update (=md5 change) */
@@ -64,12 +64,12 @@ public class PluginDto {
     return this;
   }
 
-  public String getHash() {
-    return hash;
+  public String getFileHash() {
+    return fileHash;
   }
 
-  public PluginDto setHash(String s) {
-    this.hash = s;
+  public PluginDto setFileHash(String s) {
+    this.fileHash = s;
     return this;
   }
 
@@ -97,7 +97,7 @@ public class PluginDto {
       .append("uuid", uuid)
       .append("key", kee)
       .append("basePluginKey", basePluginKey)
-      .append("jarMd5", hash)
+      .append("fileHash", fileHash)
       .append("createdAt", createdAt)
       .append("updatedAt", updatedAt)
       .toString();
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java
index 13c687305c1..47f2b72bb9f 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java
@@ -295,11 +295,12 @@ public class RuleDefinitionDto {
     return this;
   }
 
+  @CheckForNull
   public String getPluginKey() {
     return pluginKey;
   }
 
-  public RuleDefinitionDto setPluginKey(String pluginKey) {
+  public RuleDefinitionDto setPluginKey(@Nullable String pluginKey) {
     this.pluginKey = pluginKey;
     return this;
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java
index e5861debe31..c1c6a11cd99 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java
@@ -89,11 +89,12 @@ public class RuleDto {
     return this;
   }
 
+  @CheckForNull
   public String getPluginKey() {
     return definition.getPluginKey();
   }
 
-  public RuleDto setPluginKey(String s) {
+  public RuleDto setPluginKey(@Nullable String s) {
     definition.setPluginKey(s);
     return this;
   }
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/plugin/PluginMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/plugin/PluginMapper.xml
index a6fdb0c199a..0ff5f6cf543 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/plugin/PluginMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/plugin/PluginMapper.xml
@@ -8,7 +8,7 @@
     uuid,
     kee,
     base_plugin_key as basePluginKey,
-    hash,
+    file_hash as fileHash,
     created_at as createdAt,
     updated_at as updatedAt
   </sql>
@@ -30,14 +30,14 @@
     uuid,
     kee,
     base_plugin_key,
-    hash,
+    file_hash,
     created_at,
     updated_at
     ) values (
     #{uuid,jdbcType=VARCHAR},
     #{kee,jdbcType=VARCHAR},
     #{basePluginKey,jdbcType=VARCHAR},
-    #{hash,jdbcType=VARCHAR},
+    #{fileHash,jdbcType=VARCHAR},
     #{createdAt,jdbcType=TIMESTAMP},
     #{updatedAt,jdbcType=TIMESTAMP}
     )
@@ -46,15 +46,10 @@
   <update id="update" parameterType="org.sonar.db.plugin.PluginDto">
     update plugins set
       base_plugin_key=#{basePluginKey,jdbcType=VARCHAR},
-      hash=#{hash,jdbcType=VARCHAR},
+      file_hash=#{fileHash,jdbcType=VARCHAR},
       updated_at=#{updatedAt,jdbcType=BIGINT}
     where
       uuid=#{uuid,jdbcType=VARCHAR}
   </update>
 
-  <delete id="delete" parameterType="String">
-    delete from plugins
-    where
-    uuid = #{uuid,jdbcType=VARCHAR}
-  </delete>
 </mapper>
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoTest.java
index fda7a9581d1..bb646d180f4 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoTest.java
@@ -48,7 +48,7 @@ public class PluginDaoTest {
     assertThat(plugin.get().getUuid()).isEqualTo("a");
     assertThat(plugin.get().getKee()).isEqualTo("java");
     assertThat(plugin.get().getBasePluginKey()).isNull();
-    assertThat(plugin.get().getHash()).isEqualTo("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    assertThat(plugin.get().getFileHash()).isEqualTo("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
     assertThat(plugin.get().getCreatedAt()).isEqualTo(1500000000000L);
     assertThat(plugin.get().getUpdatedAt()).isEqualTo(1600000000000L);
   }
@@ -68,7 +68,7 @@ public class PluginDaoTest {
       .setUuid("c")
       .setKee("javascript")
       .setBasePluginKey("java")
-      .setHash("cccccccccccccccccccccccccccccccc")
+      .setFileHash("cccccccccccccccccccccccccccccccc")
       .setCreatedAt(1L)
       .setUpdatedAt(2L));
 
@@ -77,7 +77,7 @@ public class PluginDaoTest {
     assertThat(plugin.get().getUuid()).isEqualTo("c");
     assertThat(plugin.get().getKee()).isEqualTo("javascript");
     assertThat(plugin.get().getBasePluginKey()).isEqualTo("java");
-    assertThat(plugin.get().getHash()).isEqualTo("cccccccccccccccccccccccccccccccc");
+    assertThat(plugin.get().getFileHash()).isEqualTo("cccccccccccccccccccccccccccccccc");
     assertThat(plugin.get().getCreatedAt()).isEqualTo(1L);
     assertThat(plugin.get().getUpdatedAt()).isEqualTo(2L);
   }
@@ -89,7 +89,7 @@ public class PluginDaoTest {
     PluginDto plugin = underTest.selectByKey(db.getSession(), "java").get();
 
     plugin.setBasePluginKey("foo");
-    plugin.setHash("abc");
+    plugin.setFileHash("abc");
     plugin.setUpdatedAt(3L);
 
     underTest.update(db.getSession(), plugin);
@@ -98,19 +98,8 @@ public class PluginDaoTest {
     assertThat(plugin.getUuid()).isEqualTo("a");
     assertThat(plugin.getKee()).isEqualTo("java");
     assertThat(plugin.getBasePluginKey()).isEqualTo("foo");
-    assertThat(plugin.getHash()).isEqualTo("abc");
+    assertThat(plugin.getFileHash()).isEqualTo("abc");
     assertThat(plugin.getCreatedAt()).isEqualTo(1500000000000L);
     assertThat(plugin.getUpdatedAt()).isEqualTo(3L);
   }
-
-  @Test
-  public void delete() {
-    db.prepareDbUnit(getClass(), "shared.xml");
-
-    underTest.delete(db.getSession(), new PluginDto()
-      .setUuid("a"));
-
-    assertThat(underTest.selectAll(db.getSession())).hasSize(1);
-  }
-
 }
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginTesting.java b/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginTesting.java
index a8be4522258..d75e017ed4b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginTesting.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginTesting.java
@@ -38,7 +38,7 @@ public class PluginTesting {
     return new PluginDto()
       .setUuid(uuid)
       .setKee(uuid)
-      .setHash(randomAlphanumeric(32))
+      .setFileHash(randomAlphanumeric(32))
       .setCreatedAt(nextLong())
       .setUpdatedAt(nextLong());
   }
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/plugin/PluginDaoTest/shared.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/plugin/PluginDaoTest/shared.xml
index 016bddf0d08..a667eb84ae4 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/plugin/PluginDaoTest/shared.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/plugin/PluginDaoTest/shared.xml
@@ -3,7 +3,7 @@
   <plugins uuid="a"
          kee="java"
          base_plugin_key="[null]"
-         hash="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+         file_hash="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
          created_at="1500000000000"
          updated_at="1600000000000"
   />
@@ -11,7 +11,7 @@
   <plugins uuid="b"
          kee="javacustom"
          base_plugin_key="java"
-         hash="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+         file_hash="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
          created_at="1500000000000"
          updated_at="1600000000000"
   />