Skip to content

Commit 751dd9e

Browse files
gvagenasgvagenas
committed
Rename ExtensionConfiguration to ExtensionRules
This close #RESTCOMM-2099
1 parent e0f5e34 commit 751dd9e

19 files changed

Lines changed: 400 additions & 401 deletions

File tree

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,35 @@
2222
<!--
2323
@author gvagenas@telestax.com (George Vagenas)
2424
-->
25-
<mapper namespace="org.restcomm.connect.dao.ExtensionsConfigurationDao">
26-
<insert id="addConfiguration" parameterType="map">
25+
<mapper namespace="org.restcomm.connect.dao.ExtensionsRulesDao">
26+
<insert id="addExtensionRules" parameterType="map">
2727
INSERT INTO restcomm_extensions_configuration (sid, extension, configuration_data, configuration_type,
2828
date_created, date_updated, enabled) VALUES (#{sid}, #{extension}, #{configuration_data}, #{configuration_type},
2929
#{date_created}, #{date_updated}, #{enabled});
3030
</insert>
3131

32-
<update id="updateConfiguration" parameterType="map">
32+
<update id="updateExtensionRules" parameterType="map">
3333
UPDATE restcomm_extensions_configuration SET configuration_data=#{configuration_data}, configuration_type=#{configuration_type}, date_updated=#{date_updated}, enabled=#{enabled}
3434
WHERE sid=#{sid}
3535
</update>
3636

37-
<select id="getConfigurationByName" parameterType="map" resultType="hashmap">
37+
<select id="getExtensionRulesByName" parameterType="map" resultType="hashmap">
3838
SELECT * FROM restcomm_extensions_configuration WHERE extension=#{extension};
3939
</select>
4040

41-
<select id="getConfigurationBySid" parameterType="map" resultType="hashmap">
41+
<select id="getExtensionRulesBySid" parameterType="map" resultType="hashmap">
4242
SELECT * FROM restcomm_extensions_configuration WHERE sid=#{sid};
4343
</select>
4444

45-
<select id="getAllConfiguration" parameterType="map" resultType="hashmap">
45+
<select id="getAllExtensionRules" parameterType="map" resultType="hashmap">
4646
SELECT * FROM restcomm_extensions_configuration;
4747
</select>
4848

49-
<delete id="deleteConfigurationBySid" parameterType="string">
49+
<delete id="deleteExtensionRulesBySid" parameterType="string">
5050
DELETE FROM restcomm_extensions_configuration WHERE sid=#{sid};
5151
</delete>
5252

53-
<delete id="deleteConfigurationByName" parameterType="string">
53+
<delete id="deleteExtensionRulesByName" parameterType="string">
5454
DELETE FROM restcomm_extensions_configuration WHERE extension=#{extension};
5555
</delete>
5656

@@ -62,22 +62,22 @@
6262
SELECT date_updated FROM restcomm_extensions_configuration WHERE sid=#{sid};
6363
</select>
6464

65-
<select id="getAccountExtensionConfiguration" parameterType="map" resultType="hashmap">
65+
<select id="getAccountExtensionRules" parameterType="map" resultType="hashmap">
6666
SELECT configuration_data, account_sid AS "sid", extension_sid AS "extension" FROM restcomm_accounts_extensions
6767
WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
6868
</select>
6969

70-
<insert id="addAccountExtensionConfiguration" parameterType="map">
70+
<insert id="addAccountExtensionRules" parameterType="map">
7171
INSERT INTO restcomm_accounts_extensions (account_sid, extension_sid, configuration_data)
7272
VALUES (#{account_sid}, #{extension_sid}, #{configuration_data});
7373
</insert>
7474

75-
<update id="updateAccountExtensionConfiguration" parameterType="map">
75+
<update id="updateAccountExtensionRules" parameterType="map">
7676
UPDATE restcomm_accounts_extensions SET configuration_data=#{configuration_data}
7777
WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
7878
</update>
7979

80-
<delete id="deleteAccountExtensionConfiguration" parameterType="map">
80+
<delete id="deleteAccountExtensionRules" parameterType="map">
8181
DELETE FROM restcomm_accounts_extensions
8282
WHERE account_sid=#{account_sid} AND extension_sid=#{extension_sid};
8383
</delete>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,35 @@
2828
<!--
2929
@author gvagenas@telestax.com (George Vagenas)
3030
-->
31-
<mapper namespace="org.restcomm.connect.dao.ExtensionsConfigurationDao">
32-
<insert id="addConfiguration" parameterType="map">
31+
<mapper namespace="org.restcomm.connect.dao.ExtensionsRulesDao">
32+
<insert id="addExtensionRules" parameterType="map">
3333
INSERT INTO "restcomm_extensions_configuration" ("sid", "extension", "configuration_data", "configuration_type",
3434
"date_created", "date_updated", "enabled") VALUES (#{sid}, #{extension}, #{configuration_data}, #{configuration_type},
3535
#{date_created}, #{date_updated}, #{enabled});
3636
</insert>
3737

38-
<update id="updateConfiguration" parameterType="map">
38+
<update id="updateExtensionRules" parameterType="map">
3939
UPDATE "restcomm_extensions_configuration" SET "configuration_data"=#{configuration_data}, "configuration_type"=#{configuration_type}, "date_updated"=#{date_updated}, "enabled"=#{enabled}
4040
WHERE "sid"=#{sid}
4141
</update>
4242

43-
<select id="getConfigurationByName" parameterType="map" resultType="hashmap">
43+
<select id="getExtensionRulesByName" parameterType="map" resultType="hashmap">
4444
SELECT * FROM "restcomm_extensions_configuration" WHERE "extension"=#{extension};
4545
</select>
4646

47-
<select id="getConfigurationBySid" parameterType="map" resultType="hashmap">
47+
<select id="getExtensionRulesBySid" parameterType="map" resultType="hashmap">
4848
SELECT * FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
4949
</select>
5050

51-
<select id="getAllConfiguration" parameterType="map" resultType="hashmap">
51+
<select id="getAllExtensionRules" parameterType="map" resultType="hashmap">
5252
SELECT * FROM "restcomm_extensions_configuration";
5353
</select>
5454

55-
<delete id="deleteConfigurationBySid" parameterType="string">
55+
<delete id="deleteExtensionRulesBySid" parameterType="string">
5656
DELETE FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
5757
</delete>
5858

59-
<delete id="deleteConfigurationByName" parameterType="string">
59+
<delete id="deleteExtensionRulesByName" parameterType="string">
6060
DELETE FROM "restcomm_extensions_configuration" WHERE "extension"=#{extension};
6161
</delete>
6262

@@ -68,22 +68,22 @@
6868
SELECT "date_updated" FROM "restcomm_extensions_configuration" WHERE "sid"=#{sid};
6969
</select>
7070

71-
<select id="getAccountExtensionConfiguration" parameterType="map" resultType="hashmap">
71+
<select id="getAccountExtensionRules" parameterType="map" resultType="hashmap">
7272
SELECT "configuration_data", "account_sid" AS "sid", "extension_sid" AS "extension" FROM "restcomm_accounts_extensions"
7373
WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
7474
</select>
7575

76-
<insert id="addAccountExtensionConfiguration" parameterType="map">
76+
<insert id="addAccountExtensionRules" parameterType="map">
7777
INSERT INTO "restcomm_accounts_extensions" ("account_sid", "extension_sid", "configuration_data")
7878
VALUES (#{account_sid}, #{extension_sid}, #{configuration_data});
7979
</insert>
8080

81-
<update id="updateAccountExtensionConfiguration" parameterType="map">
81+
<update id="updateAccountExtensionRules" parameterType="map">
8282
UPDATE "restcomm_accounts_extensions" SET "configuration_data"=#{configuration_data}
8383
WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
8484
</update>
8585

86-
<delete id="deleteAccountExtensionConfiguration" parameterType="map">
86+
<delete id="deleteAccountExtensionRules" parameterType="map">
8787
DELETE FROM "restcomm_accounts_extensions"
8888
WHERE "account_sid"=#{account_sid} AND "extension_sid"=#{extension_sid};
8989
</delete>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public interface DaoManager extends Configurable, LifeCycle {
6868

6969
MediaResourceBrokerDao getMediaResourceBrokerDao();
7070

71-
ExtensionsConfigurationDao getExtensionsConfigurationDao();
71+
ExtensionsRulesDao getExtensionsRulesDao ();
7272

7373
GeolocationDao getGeolocationDao();
7474

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,57 +22,57 @@
2222
import org.joda.time.DateTime;
2323
import org.restcomm.connect.commons.dao.Sid;
2424
import org.restcomm.connect.extension.api.ConfigurationException;
25-
import org.restcomm.connect.extension.api.ExtensionConfiguration;
25+
import org.restcomm.connect.extension.api.ExtensionRules;
2626

2727
import java.util.List;
2828

2929
/**
3030
* Created by gvagenas on 11/10/2016.
3131
*/
32-
public interface ExtensionsConfigurationDao {
32+
public interface ExtensionsRulesDao {
3333
/**
34-
* Add a new ExtensionConfiguration
35-
* @param extensionConfiguration
34+
* Add a new ExtensionRules
35+
* @param extensionRules
3636
*/
37-
void addConfiguration(ExtensionConfiguration extensionConfiguration) throws ConfigurationException;
37+
void addExtensionRules (ExtensionRules extensionRules) throws ConfigurationException;
3838

3939
/**
40-
* Update an existing ExtensionConfiguration
41-
* @param extensionConfiguration
40+
* Update an existing ExtensionRules
41+
* @param extensionRules
4242
*/
43-
void updateConfiguration(ExtensionConfiguration extensionConfiguration) throws ConfigurationException;
43+
void updateExtensionRules (ExtensionRules extensionRules) throws ConfigurationException;
4444

4545
/**
4646
* Get extension configuration by extension name
4747
* @param extensionName
48-
* @return ExtensionConfiguration
48+
* @return ExtensionRules
4949
*/
50-
ExtensionConfiguration getConfigurationByName(String extensionName);
50+
ExtensionRules getExtensionRulesByName (String extensionName);
5151

5252
/**
5353
* Get extension configuration by Sid
5454
* @param extensionSid
55-
* @return ExtensionConfiguration
55+
* @return ExtensionRules
5656
*/
57-
ExtensionConfiguration getConfigurationBySid(Sid extensionSid);
57+
ExtensionRules getExtensionRulesBySid (Sid extensionSid);
5858

5959
/**
6060
* Get all extension configuration
61-
* @return List<ExtensionConfiguration>
61+
* @return List<ExtensionRules>
6262
*/
63-
List<ExtensionConfiguration> getAllConfiguration();
63+
List<ExtensionRules> getAllExtensionRules ();
6464

6565
/**
6666
* Delete extension configuration by extension name
6767
* @param extensionName
6868
*/
69-
void deleteConfigurationByName(String extensionName);
69+
void deleteExtensionRulesByName (String extensionName);
7070

7171
/**
7272
* Delete extension configuration by Sid
7373
* @param extensionSid
7474
*/
75-
void deleteConfigurationBySid(Sid extensionSid);
75+
void deleteExtensionRulesBySid (Sid extensionSid);
7676

7777
/**
7878
* Check if there is a newer version of the configuration in the DB using extension name
@@ -93,37 +93,37 @@ public interface ExtensionsConfigurationDao {
9393

9494
/**
9595
* Validate extension configuration based on the type of the configuration data
96-
* @param extensionConfiguration
96+
* @param extensionRules
9797
* @return
9898
*/
99-
boolean validate(ExtensionConfiguration extensionConfiguration);
99+
boolean validate(ExtensionRules extensionRules);
100100

101101
/**
102-
* Get account specific ExtensionConfiguration
102+
* Get account specific ExtensionRules
103103
* @param accountSid
104104
* @param extensionSid
105-
* @return ExtensionConfiguration
105+
* @return ExtensionRules
106106
*/
107-
ExtensionConfiguration getAccountExtensionConfiguration(String accountSid, String extensionSid);
107+
ExtensionRules getAccountExtensionRules (String accountSid, String extensionSid);
108108

109109
/**
110-
* Add a new account specific ExtensionConfiguration
111-
* @param extensionConfiguration
110+
* Add a new account specific ExtensionRules
111+
* @param extensionRules
112112
* @param accountSid
113113
*/
114-
void addAccountExtensionConfiguration(ExtensionConfiguration extensionConfiguration, Sid accountSid) throws ConfigurationException;
114+
void addAccountExtensionRules (ExtensionRules extensionRules, Sid accountSid) throws ConfigurationException;
115115

116116
/**
117-
* Update an existing account specific ExtensionConfiguration
118-
* @param extensionConfiguration
117+
* Update an existing account specific ExtensionRules
118+
* @param extensionRules
119119
* @param accountSid
120120
*/
121-
void updateAccountExtensionConfiguration(ExtensionConfiguration extensionConfiguration, Sid accountSid) throws ConfigurationException;
121+
void updateAccountExtensionRules (ExtensionRules extensionRules, Sid accountSid) throws ConfigurationException;
122122

123123
/**
124-
* Delete account specific ExtensionConfiguration
124+
* Delete account specific ExtensionRules
125125
* @param accountSid
126126
* @param extensionSid
127127
*/
128-
void deleteAccountExtensionConfiguration(String accountSid, String extensionSid);
128+
void deleteAccountExtensionRules (String accountSid, String extensionSid);
129129
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.restcomm.connect.dao.ClientsDao;
3838
import org.restcomm.connect.dao.ConferenceDetailRecordsDao;
3939
import org.restcomm.connect.dao.DaoManager;
40-
import org.restcomm.connect.dao.ExtensionsConfigurationDao;
40+
import org.restcomm.connect.dao.ExtensionsRulesDao;
4141
import org.restcomm.connect.dao.GatewaysDao;
4242
import org.restcomm.connect.dao.GeolocationDao;
4343
import org.restcomm.connect.dao.HttpCookiesDao;
@@ -90,7 +90,7 @@ public final class MybatisDaoManager implements DaoManager {
9090
private InstanceIdDao instanceIdDao;
9191
private MediaServersDao mediaServersDao;
9292
private MediaResourceBrokerDao mediaResourceBrokerDao;
93-
private ExtensionsConfigurationDao extensionsConfigurationDao;
93+
private ExtensionsRulesDao extensionsRulesDao;
9494
private GeolocationDao geolocationDao;
9595
private ProfileAssociationsDao profileAssociationsDao;
9696
private OrganizationsDao organizationsDao;
@@ -216,8 +216,8 @@ public MediaResourceBrokerDao getMediaResourceBrokerDao() {
216216
}
217217

218218
@Override
219-
public ExtensionsConfigurationDao getExtensionsConfigurationDao() {
220-
return extensionsConfigurationDao;
219+
public ExtensionsRulesDao getExtensionsRulesDao () {
220+
return extensionsRulesDao;
221221
}
222222

223223
@Override
@@ -311,7 +311,7 @@ public void start(final SqlSessionFactory sessions) {
311311
instanceIdDao = new MybatisInstanceIdDao(sessions);
312312
mediaServersDao = new MybatisMediaServerDao(sessions);
313313
mediaResourceBrokerDao = new MybatisMediaResourceBrokerDao(sessions);
314-
extensionsConfigurationDao = new MybatisExtensionsConfigurationDao(sessions);
314+
extensionsRulesDao = new MybatisExtensionsRulesDao(sessions);
315315
geolocationDao = new MybatisGeolocationDao(sessions);
316316
profileAssociationsDao = new MybatisProfileAssociationsDao(sessions);
317317
organizationsDao = new MybatisOrganizationDao(sessions);

0 commit comments

Comments
 (0)