Rename ExtensionConfiguration to ExtensionRules

This close #RESTCOMM-2099

Author: gvagenas

restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/extensions-configuration.xml

@@ -22,35 +22,35 @@
 <!--
   @author [email protected] (George Vagenas)
 -->
-<mapper namespace="org.restcomm.connect.dao.ExtensionsConfigurationDao">
-  <insert id="addConfiguration" parameterType="map">
+<mapper namespace="org.restcomm.connect.dao.ExtensionsRulesDao">
+  <insert id="addExtensionRules" parameterType="map">
     INSERT INTO restcomm_extensions_configuration (sid, extension, configuration_data, configuration_type,
     date_created, date_updated, enabled) VALUES (#{sid}, #{extension}, #{configuration_data}, #{configuration_type},
     #{date_created}, #{date_updated}, #{enabled});
   </insert>
 
-  <update id="updateConfiguration" parameterType="map">
+  <update id="updateExtensionRules" parameterType="map">
     UPDATE restcomm_extensions_configuration SET configuration_data=#{configuration_data}, configuration_type=#{configuration_type}, date_updated=#{date_updated}, enabled=#{enabled}
     WHERE sid=#{sid}
   </update>
 
-  <select id="getConfigurationByName" parameterType="map" resultType="hashmap">
+  <select id="getExtensionRulesByName" parameterType="map" resultType="hashmap">
     SELECT * FROM restcomm_extensions_configuration WHERE extension=#{extension};
   </select>
 
-  <select id="getConfigurationBySid" parameterType="map" resultType="hashmap">
+  <select id="getExtensionRulesBySid" parameterType="map" resultType="hashmap">
     SELECT * FROM restcomm_extensions_configuration WHERE sid=#{sid};
   </select>
 
-  <select id="getAllConfiguration" parameterType="map" resultType="hashmap">
+  <select id="getAllExtensionRules" parameterType="map" resultType="hashmap">
     SELECT * FROM restcomm_extensions_configuration;
   </select>
 
-  <delete id="deleteConfigurationBySid" parameterType="string">
+  <delete id="deleteExtensionRulesBySid" parameterType="string">
     DELETE FROM restcomm_extensions_configuration WHERE sid=#{sid};
   </delete>
 
-  <delete id="deleteConfigurationByName" parameterType="string">
+  <delete id="deleteExtensionRulesByName" parameterType="string">
     DELETE FROM restcomm_extensions_configuration WHERE extension=#{extension};
   </delete>
 
@@ -62,22 +62,22 @@
     SELECT date_updated FROM restcomm_extensions_configuration WHERE sid=#{sid};
   </select>
 
-  <select id="getAccountExtensionConfiguration" parameterType="map" resultType="hashmap">
+  <select id="getAccountExtensionRules" parameterType="map" resultType="hashmap">
     SELECT configuration_data, account_sid AS "sid", extension_sid AS "extension" FROM restcomm_accounts_extensions
     WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
   </select>
 
-  <insert id="addAccountExtensionConfiguration" parameterType="map">
+  <insert id="addAccountExtensionRules" parameterType="map">
     INSERT INTO restcomm_accounts_extensions (account_sid, extension_sid, configuration_data)
     VALUES (#{account_sid}, #{extension_sid}, #{configuration_data});
   </insert>
 
-  <update id="updateAccountExtensionConfiguration" parameterType="map">
+  <update id="updateAccountExtensionRules" parameterType="map">
     UPDATE restcomm_accounts_extensions SET configuration_data=#{configuration_data}
     WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
   </update>
 
-  <delete id="deleteAccountExtensionConfiguration" parameterType="map">
+  <delete id="deleteAccountExtensionRules" parameterType="map">
     DELETE FROM restcomm_accounts_extensions
     WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
   </delete>

restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/extensions-configuration.xml

@@ -28,35 +28,35 @@
 <!--
   @author [email protected] (George Vagenas)
 -->
-<mapper namespace="org.restcomm.connect.dao.ExtensionsConfigurationDao">
-    <insert id="addConfiguration" parameterType="map">
+<mapper namespace="org.restcomm.connect.dao.ExtensionsRulesDao">
+    <insert id="addExtensionRules" parameterType="map">
         INSERT INTO "restcomm_extensions_configuration" ("sid", "extension", "configuration_data", "configuration_type",
         "date_created", "date_updated", "enabled") VALUES (#{sid}, #{extension}, #{configuration_data}, #{configuration_type},
         #{date_created}, #{date_updated}, #{enabled});
     </insert>
 
-    <update id="updateConfiguration" parameterType="map">
+    <update id="updateExtensionRules" parameterType="map">
         UPDATE "restcomm_extensions_configuration" SET "configuration_data"=#{configuration_data}, "configuration_type"=#{configuration_type}, "date_updated"=#{date_updated}, "enabled"=#{enabled}
         WHERE "sid"=#{sid}
     </update>
 
-    <select id="getConfigurationByName" parameterType="map" resultType="hashmap">
+    <select id="getExtensionRulesByName" parameterType="map" resultType="hashmap">
         SELECT * FROM "restcomm_extensions_configuration" WHERE "extension"=#{extension};
     </select>
 
-    <select id="getConfigurationBySid" parameterType="map" resultType="hashmap">
+    <select id="getExtensionRulesBySid" parameterType="map" resultType="hashmap">
         SELECT * FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
     </select>
 
-    <select id="getAllConfiguration" parameterType="map" resultType="hashmap">
+    <select id="getAllExtensionRules" parameterType="map" resultType="hashmap">
         SELECT * FROM "restcomm_extensions_configuration";
     </select>
 
-    <delete id="deleteConfigurationBySid" parameterType="string">
+    <delete id="deleteExtensionRulesBySid" parameterType="string">
         DELETE FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
     </delete>
 
-    <delete id="deleteConfigurationByName" parameterType="string">
+    <delete id="deleteExtensionRulesByName" parameterType="string">
         DELETE FROM "restcomm_extensions_configuration" WHERE "extension"=#{extension};
     </delete>
 
@@ -68,22 +68,22 @@
         SELECT "date_updated" FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
     </select>
 
-    <select id="getAccountExtensionConfiguration" parameterType="map" resultType="hashmap">
+    <select id="getAccountExtensionRules" parameterType="map" resultType="hashmap">
         SELECT "configuration_data", "account_sid" AS "sid", "extension_sid" AS "extension" FROM "restcomm_accounts_extensions"
         WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
     </select>
 
-    <insert id="addAccountExtensionConfiguration" parameterType="map">
+    <insert id="addAccountExtensionRules" parameterType="map">
         INSERT INTO "restcomm_accounts_extensions" ("account_sid", "extension_sid", "configuration_data")
         VALUES (#{account_sid}, #{extension_sid}, #{configuration_data});
     </insert>
 
-    <update id="updateAccountExtensionConfiguration" parameterType="map">
+    <update id="updateAccountExtensionRules" parameterType="map">
         UPDATE "restcomm_accounts_extensions" SET "configuration_data"=#{configuration_data}
         WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
     </update>
 
-    <delete id="deleteAccountExtensionConfiguration" parameterType="map">
+    <delete id="deleteAccountExtensionRules" parameterType="map">
         DELETE FROM "restcomm_accounts_extensions"
         WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
     </delete>

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/DaoManager.java

@@ -68,7 +68,7 @@ public interface DaoManager extends Configurable, LifeCycle {
 
     MediaResourceBrokerDao getMediaResourceBrokerDao();
 
-    ExtensionsConfigurationDao getExtensionsConfigurationDao();
+    ExtensionsRulesDao getExtensionsRulesDao ();
 
     GeolocationDao getGeolocationDao();
 

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/ExtensionsConfigurationDao.java renamed to restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/ExtensionsRulesDao.java

@@ -22,57 +22,57 @@
 import org.joda.time.DateTime;
 import org.restcomm.connect.commons.dao.Sid;
 import org.restcomm.connect.extension.api.ConfigurationException;
-import org.restcomm.connect.extension.api.ExtensionConfiguration;
+import org.restcomm.connect.extension.api.ExtensionRules;
 
 import java.util.List;
 
 /**
  * Created by gvagenas on 11/10/2016.
  */
-public interface ExtensionsConfigurationDao {
+public interface ExtensionsRulesDao {
     /**
-     * Add a new ExtensionConfiguration
-     * @param extensionConfiguration
+     * Add a new ExtensionRules
+     * @param extensionRules
      */
-    void addConfiguration(ExtensionConfiguration extensionConfiguration) throws ConfigurationException;
+    void addExtensionRules (ExtensionRules extensionRules) throws ConfigurationException;
 
     /**
-     * Update an existing ExtensionConfiguration
-     * @param extensionConfiguration
+     * Update an existing ExtensionRules
+     * @param extensionRules
      */
-    void updateConfiguration(ExtensionConfiguration extensionConfiguration) throws ConfigurationException;
+    void updateExtensionRules (ExtensionRules extensionRules) throws ConfigurationException;
 
     /**
      * Get extension configuration by extension name
      * @param extensionName
-     * @return ExtensionConfiguration
+     * @return ExtensionRules
      */
-    ExtensionConfiguration getConfigurationByName(String extensionName);
+    ExtensionRules getExtensionRulesByName (String extensionName);
 
     /**
      * Get extension configuration by Sid
      * @param extensionSid
-     * @return ExtensionConfiguration
+     * @return ExtensionRules
      */
-    ExtensionConfiguration getConfigurationBySid(Sid extensionSid);
+    ExtensionRules getExtensionRulesBySid (Sid extensionSid);
 
     /**
      * Get all extension configuration
-     * @return List<ExtensionConfiguration>
+     * @return List<ExtensionRules>
      */
-    List<ExtensionConfiguration> getAllConfiguration();
+    List<ExtensionRules> getAllExtensionRules ();
 
     /**
      * Delete extension configuration by extension name
      * @param extensionName
      */
-    void deleteConfigurationByName(String extensionName);
+    void deleteExtensionRulesByName (String extensionName);
 
     /**
      * Delete extension configuration by Sid
      * @param extensionSid
      */
-    void deleteConfigurationBySid(Sid extensionSid);
+    void deleteExtensionRulesBySid (Sid extensionSid);
 
     /**
      * Check if there is a newer version of the configuration in the DB using extension name
@@ -93,37 +93,37 @@ public interface ExtensionsConfigurationDao {
 
     /**
      * Validate extension configuration based on the type of the configuration data
-     * @param extensionConfiguration
+     * @param extensionRules
      * @return
      */
-    boolean validate(ExtensionConfiguration extensionConfiguration);
+    boolean validate(ExtensionRules extensionRules);
 
     /**
-     * Get account specific ExtensionConfiguration
+     * Get account specific ExtensionRules
      * @param accountSid
      * @param extensionSid
-     * @return ExtensionConfiguration
+     * @return ExtensionRules
      */
-    ExtensionConfiguration getAccountExtensionConfiguration(String accountSid, String extensionSid);
+    ExtensionRules getAccountExtensionRules (String accountSid, String extensionSid);
 
     /**
-     * Add a new account specific ExtensionConfiguration
-     * @param extensionConfiguration
+     * Add a new account specific ExtensionRules
+     * @param extensionRules
      * @param accountSid
      */
-    void addAccountExtensionConfiguration(ExtensionConfiguration extensionConfiguration, Sid accountSid) throws ConfigurationException;
+    void addAccountExtensionRules (ExtensionRules extensionRules, Sid accountSid) throws ConfigurationException;
 
     /**
-     * Update an existing account specific ExtensionConfiguration
-     * @param extensionConfiguration
+     * Update an existing account specific ExtensionRules
+     * @param extensionRules
      * @param accountSid
      */
-    void updateAccountExtensionConfiguration(ExtensionConfiguration extensionConfiguration, Sid accountSid) throws ConfigurationException;
+    void updateAccountExtensionRules (ExtensionRules extensionRules, Sid accountSid) throws ConfigurationException;
 
     /**
-     * Delete account specific ExtensionConfiguration
+     * Delete account specific ExtensionRules
      * @param accountSid
      * @param extensionSid
      */
-    void deleteAccountExtensionConfiguration(String accountSid, String extensionSid);
+    void deleteAccountExtensionRules (String accountSid, String extensionSid);
 }

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisDaoManager.java

@@ -37,7 +37,7 @@
 import org.restcomm.connect.dao.ClientsDao;
 import org.restcomm.connect.dao.ConferenceDetailRecordsDao;
 import org.restcomm.connect.dao.DaoManager;
-import org.restcomm.connect.dao.ExtensionsConfigurationDao;
+import org.restcomm.connect.dao.ExtensionsRulesDao;
 import org.restcomm.connect.dao.GatewaysDao;
 import org.restcomm.connect.dao.GeolocationDao;
 import org.restcomm.connect.dao.HttpCookiesDao;
@@ -90,7 +90,7 @@ public final class MybatisDaoManager implements DaoManager {
     private InstanceIdDao instanceIdDao;
     private MediaServersDao mediaServersDao;
     private MediaResourceBrokerDao mediaResourceBrokerDao;
-    private ExtensionsConfigurationDao extensionsConfigurationDao;
+    private ExtensionsRulesDao extensionsRulesDao;
     private GeolocationDao geolocationDao;
     private ProfileAssociationsDao profileAssociationsDao;
     private OrganizationsDao organizationsDao;
@@ -216,8 +216,8 @@ public MediaResourceBrokerDao getMediaResourceBrokerDao() {
     }
 
     @Override
-    public ExtensionsConfigurationDao getExtensionsConfigurationDao() {
-        return extensionsConfigurationDao;
+    public ExtensionsRulesDao getExtensionsRulesDao () {
+        return extensionsRulesDao;
     }
 
     @Override
@@ -311,7 +311,7 @@ public void start(final SqlSessionFactory sessions) {
         instanceIdDao = new MybatisInstanceIdDao(sessions);
         mediaServersDao = new MybatisMediaServerDao(sessions);
         mediaResourceBrokerDao = new MybatisMediaResourceBrokerDao(sessions);
-        extensionsConfigurationDao = new MybatisExtensionsConfigurationDao(sessions);
+        extensionsRulesDao = new MybatisExtensionsRulesDao(sessions);
         geolocationDao = new MybatisGeolocationDao(sessions);
         profileAssociationsDao = new MybatisProfileAssociationsDao(sessions);
         organizationsDao = new MybatisOrganizationDao(sessions);