SONAR-7676 removing dead code from Properties related classes

PropertiesDao, PropertiesMapper, Persistentsettings and their tests

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java b/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java
index 373ae90e168a9a5b46d6bc7dc8e186e18e82d9bc..b33bbff2ec86e15b01aaf092d12a9cfc67909b76 100644 (file)
--- a/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/db/ReadOnlyPropertiesDao.java
@@ -69,11 +69,6 @@ public class ReadOnlyPropertiesDao extends PropertiesDao {
     // do nothing
   }
 
-  @Override
-  public void deleteGlobalProperties() {
-    // do nothing
-  }
-
   @Override
   public void deleteGlobalProperty(String key, DbSession session) {
     // do nothing
@@ -84,11 +79,6 @@ public class ReadOnlyPropertiesDao extends PropertiesDao {
     // do nothing
   }
 
-  @Override
-  public void deleteAllProperties(String key) {
-    // do nothing
-  }
-
   @Override
   public void insertGlobalProperties(Map<String, String> properties) {
     // do nothing
@@ -99,16 +89,6 @@ public class ReadOnlyPropertiesDao extends PropertiesDao {
     // do nothing
   }
 
-  @Override
-  public void updateProperties(String key, String oldValue, String newValue) {
-    // do nothing
-  }
-
-  @Override
-  public void updateProperties(String key, String oldValue, String newValue, DbSession session) {
-    // do nothing
-  }
-
   @Override
   public void setProperty(org.sonar.core.properties.PropertyDto property) {
     // do nothing

diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java
index bcb0549bc18a70362c32d92ce62a94f09d832a7e..68cb9b4635077c9eca4e6a54993bbfcf8d9e4bd8 100644 (file)
--- a/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/db/ReadOnlyPropertiesDaoTest.java
@@ -80,14 +80,6 @@ public class ReadOnlyPropertiesDaoTest {
 
   }
 
-  @Test
-  public void deleteGlobalProperties() {
-    underTest.deleteGlobalProperties();
-
-    assertNoInteraction();
-
-  }
-
   @Test
   public void deleteGlobalProperty() {
     underTest.deleteGlobalProperty(null);
@@ -104,14 +96,6 @@ public class ReadOnlyPropertiesDaoTest {
 
   }
 
-  @Test
-  public void deleteAllProperties() {
-    underTest.deleteAllProperties(null);
-
-    assertNoInteraction();
-
-  }
-
   @Test
   public void insertGlobalProperties() {
     underTest.insertGlobalProperties(null);
@@ -128,22 +112,6 @@ public class ReadOnlyPropertiesDaoTest {
 
   }
 
-  @Test
-  public void updateProperties() {
-    underTest.updateProperties(null, null, null);
-
-    assertNoInteraction();
-
-  }
-
-  @Test
-  public void updateProperties1() {
-    underTest.updateProperties(null, null, null, dbSession);
-
-    assertNoInteraction();
-
-  }
-
   @Test
   public void setProperty() {
     underTest.setProperty(oldPropertyDto);

diff --git a/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java b/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java
index 16f22aba05d02a09e86cb13087a26afe7cd439b0..86d8c594e96f4552fb0666a0336a891afbd02e50 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java
@@ -206,13 +206,6 @@ public class PropertiesDao implements Dao {
     }
   }
 
-  public void deleteGlobalProperties() {
-    try (DbSession session = mybatis.openSession(false)) {
-      getMapper(session).deleteGlobalProperties();
-      session.commit();
-    }
-  }
-
   public void deleteGlobalProperty(String key, DbSession session) {
     getMapper(session).deleteGlobalProperty(key);
   }
@@ -224,13 +217,6 @@ public class PropertiesDao implements Dao {
     }
   }
 
-  public void deleteAllProperties(String key) {
-    try (DbSession session = mybatis.openSession(false)) {
-      getMapper(session).deleteAllProperties(key);
-      session.commit();
-    }
-  }
-
   public void insertGlobalProperties(Map<String, String> properties) {
     try (DbSession session = mybatis.openSession(false)) {
       PropertiesMapper mapper = getMapper(session);
@@ -260,20 +246,6 @@ public class PropertiesDao implements Dao {
     }
   }
 
-  /**
-   * Update all properties (global and projects ones) with a given key and value to a new value
-   */
-  public void updateProperties(String key, String oldValue, String newValue) {
-    try (DbSession session = mybatis.openSession(false)) {
-      updateProperties(key, oldValue, newValue, session);
-      session.commit();
-    }
-  }
-
-  public void updateProperties(String key, String oldValue, String newValue, DbSession session) {
-    getMapper(session).updateProperties(key, oldValue, newValue);
-  }
-
   private static PropertiesMapper getMapper(DbSession session) {
     return session.getMapper(PropertiesMapper.class);
   }

diff --git a/sonar-db/src/main/java/org/sonar/db/property/PropertiesMapper.java b/sonar-db/src/main/java/org/sonar/db/property/PropertiesMapper.java
index 781c1ecb79e3dd55541367d5152268946a03b530..bb58987065d37545cc5d5d0437a1b1df8fa26dca 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/property/PropertiesMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/property/PropertiesMapper.java
@@ -33,10 +33,6 @@ public interface PropertiesMapper {
 
   List<PropertyDto> selectProjectProperties(String resourceKey);
 
-  List<PropertyDto> selectProjectPropertiesByResourceId(Long resourceId);
-
-  List<PropertyDto> selectSetOfResourceProperties(@Param("rId") Long projectId, @Param("propKeys") List<String> propertyKeys);
-
   PropertyDto selectByKey(PropertyDto key);
 
   List<PropertyDto> selectByKeys(@Param("keys") List<String> keys, @Nullable @Param("componentId") Long componentId);
@@ -60,11 +56,6 @@ public interface PropertiesMapper {
 
   void deleteGlobalProperty(String key);
 
-  void deleteAllProperties(String key);
-
-  void deleteGlobalProperties();
-
   void renamePropertyKey(@Param("oldKey") String oldKey, @Param("newKey") String newKey);
 
-  void updateProperties(@Param("key") String key, @Param("oldValue") String oldValue, @Param("newValue") String newValue);
 }

diff --git a/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml b/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml
index 6c8f3d3336a111e3449b98cf99b86661ed27c867..e94a1cc31d1ba8bda3252aa872d49fefc24ddb70 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml
@@ -41,12 +41,6 @@
     where p.resource_id=r.id and p.user_id is null and r.kee=#{resourceKey}
   </select>
 
-  <select id="selectProjectPropertiesByResourceId" parameterType="Long" resultType="Property">
-    select p.id as id, p.prop_key as "key", p.text_value as value, p.resource_id as resourceId, p.user_id as userId
-    from properties p
-    where p.resource_id=#{resourceId} and p.user_id is null
-  </select>
-
   <select id="selectDescendantModuleProperties" parameterType="String" resultType="Property">
     SELECT prop.id as id, prop.prop_key as "key", prop.text_value as value, prop.resource_id as resourceId, prop.user_id
     as userId
@@ -56,13 +50,6 @@
     WHERE prop.user_id IS NULL
   </select>
 
-  <select id="selectSetOfResourceProperties" parameterType="map" resultType="Property">
-    select p.id as id, p.prop_key as "key", p.text_value as value, p.resource_id as resourceId, p.user_id as userId
-    from properties p
-    where p.resource_id=#{rId} and p.prop_key in
-    <foreach item="propKey" index="index" collection="propKeys" open="(" separator="," close=")">#{propKey}</foreach>
-  </select>
-
   <select id="selectByKey" parameterType="map" resultType="Property">
     select p.id as id, p.prop_key as "key", p.text_value as value, p.resource_id as resourceId, p.user_id as userId
     from properties p
@@ -165,16 +152,8 @@
     delete from properties where resource_id is null and user_id is null
   </delete>
 
-  <delete id="deleteAllProperties" parameterType="string">
-    delete from properties where prop_key=#{id}
-  </delete>
-
   <update id="renamePropertyKey" parameterType="map">
     update properties set prop_key=#{newKey} where prop_key=#{oldKey}
   </update>
 
-  <update id="updateProperties" parameterType="map">
-    update properties set text_value=#{newValue} where text_value LIKE #{oldValue} and prop_key=#{key}
-  </update>
-
 </mapper>

diff --git a/sonar-db/src/test/java/org/sonar/db/property/PropertiesDaoTest.java b/sonar-db/src/test/java/org/sonar/db/property/PropertiesDaoTest.java
index 5cab133a4e8fbfdcfaa51e6ec219617184cffa31..2a0b8c1b6bf3ca6fea4a1eed60c376493b563c37 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/property/PropertiesDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/property/PropertiesDaoTest.java
@@ -387,15 +387,6 @@ public class PropertiesDaoTest {
     dbTester.assertDbUnit(getClass(), "delete_project_properties-result.xml", "properties");
   }
 
-  @Test
-  public void deleteGlobalProperties() {
-    dbTester.prepareDbUnit(getClass(), "deleteGlobalProperties.xml");
-
-    underTest.deleteGlobalProperties();
-
-    dbTester.assertDbUnit(getClass(), "deleteGlobalProperties-result.xml", "properties");
-  }
-
   @Test
   public void deleteGlobalProperty() {
     dbTester.prepareDbUnit(getClass(), "deleteGlobalProperty.xml");
@@ -405,15 +396,6 @@ public class PropertiesDaoTest {
     dbTester.assertDbUnit(getClass(), "deleteGlobalProperty-result.xml", "properties");
   }
 
-  @Test
-  public void deleteAllProperties() {
-    dbTester.prepareDbUnit(getClass(), "deleteAllProperties.xml");
-
-    underTest.deleteAllProperties("to_be_deleted");
-
-    dbTester.assertDbUnit(getClass(), "deleteAllProperties-result.xml", "properties");
-  }
-
   @Test
   public void insertGlobalProperties() {
     dbTester.prepareDbUnit(getClass(), "insertGlobalProperties.xml");
@@ -462,15 +444,6 @@ public class PropertiesDaoTest {
     underTest.renamePropertyKey(null, "foo");
   }
 
-  @Test
-  public void updatePropertiesFromKeyAndValueToNewValue() {
-    dbTester.prepareDbUnit(getClass(), "updatePropertiesFromKeyAndValueToNewValue.xml");
-
-    underTest.updateProperties("sonar.profile.java", "Sonar Way", "Default");
-
-    dbTester.assertDbUnitTable(getClass(), "updatePropertiesFromKeyAndValueToNewValue-result.xml", "properties", "prop_key", "text_value", "resource_id", "user_id");
-  }
-
   private PropertyDto findById(List<PropertyDto> properties, int id) {
     for (PropertyDto property : properties) {
       if (property.getId() == id) {