diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java index 374aa1351f20..2197047a5181 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java @@ -16459,12 +16459,13 @@ public void addAPIProductResourceMappings(List productResour Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); insertOperationPolicyMappingStatement.setInt(1, rs.getInt(1)); insertOperationPolicyMappingStatement .setString(2, clonedPoliciesMap.get(policy.getPolicyId())); insertOperationPolicyMappingStatement.setString(3, policy.getDirection()); - insertOperationPolicyMappingStatement.setString(4, paramJSON); + insertOperationPolicyMappingStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); insertOperationPolicyMappingStatement.setInt(5, policy.getOrder()); insertOperationPolicyMappingStatement.addBatch(); } @@ -20451,11 +20452,12 @@ public void addAPIProductRevision(APIRevision apiRevision) throws APIManagementE apiRevision.getRevisionUUID(), clonedPoliciesMap, toBeClonedPolicyDetails); Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); insertOperationPolicyMappingStatement.setInt(1, rs.getInt(1)); insertOperationPolicyMappingStatement.setString(2, clonedPoliciesMap.get(policy.getPolicyId())); insertOperationPolicyMappingStatement.setString(3, policy.getDirection()); - insertOperationPolicyMappingStatement.setString(4, paramJSON); + insertOperationPolicyMappingStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); insertOperationPolicyMappingStatement.setInt(5, policy.getOrder()); insertOperationPolicyMappingStatement.addBatch(); } @@ -20699,11 +20701,12 @@ public void restoreAPIProductRevision(APIRevision apiRevision, String organizati Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); addOperationPolicyStatement.setInt(1, rs.getInt(1)); addOperationPolicyStatement.setString(2, clonedPoliciesMap.get(policy.getPolicyName())); addOperationPolicyStatement.setString(3, policy.getDirection()); - addOperationPolicyStatement.setString(4, paramJSON); + addOperationPolicyStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); addOperationPolicyStatement.setInt(5, policy.getOrder()); addOperationPolicyStatement.executeUpdate(); } @@ -21260,10 +21263,11 @@ public void addOperationPolicyMapping(Set uriTemplates, Connection for (OperationPolicy operationPolicy : operationPolicies){ Gson gson = new Gson(); String paramJSON = gson.toJson(operationPolicy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); preparedStatement.setInt(1, uriTemplate.getId()); preparedStatement.setString(2,operationPolicy.getPolicyId()); preparedStatement.setString(3, operationPolicy.getDirection()); - preparedStatement.setString(4, paramJSON); + preparedStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); preparedStatement.setInt(5, operationPolicy.getOrder()); preparedStatement.addBatch(); } @@ -22915,7 +22919,7 @@ private OperationPolicy populateOperationPolicyWithRS(ResultSet rs) throws SQLEx operationPolicy.setPolicyId(rs.getString("POLICY_UUID")); operationPolicy.setOrder(rs.getInt("POLICY_ORDER")); operationPolicy.setDirection(rs.getString("DIRECTION")); - operationPolicy.setParameters(APIMgtDBUtil.convertJSONStringToMap(rs.getString("PARAMETERS"))); + operationPolicy.setParameters(APIMgtDBUtil.convertJSONStringToMap(APIMgtDBUtil.getStringFromInputStream(rs.getBinaryStream("PARAMETERS")))); return operationPolicy; } @@ -23033,6 +23037,7 @@ private void addAPIPoliciesMapping(String apiUUID, Set uriTemplate, usedClonedPolicies, toBeClonedPolicyDetails); Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Adding operation policy " + policy.getPolicyName() + " for API " + apiUUID + " to URL mapping Id " + template.getId()); @@ -23041,7 +23046,7 @@ private void addAPIPoliciesMapping(String apiUUID, Set uriTemplate, operationPolicyMappingStatement.setInt(1, template.getId()); operationPolicyMappingStatement.setString(2, updatedPoliciesMap.get(policy.getPolicyId())); operationPolicyMappingStatement.setString(3, policy.getDirection()); - operationPolicyMappingStatement.setString(4, paramJSON); + operationPolicyMappingStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); operationPolicyMappingStatement.setInt(5, policy.getOrder()); operationPolicyMappingStatement.addBatch(); } @@ -23055,6 +23060,7 @@ private void addAPIPoliciesMapping(String apiUUID, Set uriTemplate, usedClonedPolicies, toBeClonedPolicyDetails); Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Adding API level policy " + policy.getPolicyName() + ":" @@ -23065,7 +23071,7 @@ private void addAPIPoliciesMapping(String apiUUID, Set uriTemplate, apiLevelPolicyMappingStatement.setString(2, null); apiLevelPolicyMappingStatement.setString(3, updatedPoliciesMap.get(policy.getPolicyId())); apiLevelPolicyMappingStatement.setString(4, policy.getDirection()); - apiLevelPolicyMappingStatement.setString(5, paramJSON); + apiLevelPolicyMappingStatement.setBinaryStream(5, paramInputStream, paramJSON.length()); apiLevelPolicyMappingStatement.setInt(6, policy.getOrder()); apiLevelPolicyMappingStatement.addBatch(); } @@ -23269,6 +23275,7 @@ private void addAPILevelPolicies(List policies, String apiUUID, Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Adding API level policy " + policy.getPolicyName() + ":" @@ -23279,7 +23286,7 @@ private void addAPILevelPolicies(List policies, String apiUUID, statement.setString(2, revisionUUID); statement.setString(3, updatedPoliciesMap.get(policy.getPolicyId())); statement.setString(4, policy.getDirection()); - statement.setString(5, paramJSON); + statement.setBinaryStream(5, paramInputStream, paramJSON.length()); statement.setInt(6, policy.getOrder()); statement.addBatch(); } @@ -23465,6 +23472,7 @@ private void revisionAPIPolicies(APIRevision apiRevision, String tenantDomain, apiRevision.getRevisionUUID(), clonedPolicyMap, toBeClonedPolicyDetails); Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Adding operation policy " + policy.getPolicyName() + ":" @@ -23474,7 +23482,7 @@ private void revisionAPIPolicies(APIRevision apiRevision, String tenantDomain, operationPolicyMappingStatement.setInt(1, urlMapping.getId()); operationPolicyMappingStatement.setString(2, clonedPolicyMap.get(policy.getPolicyId())); operationPolicyMappingStatement.setString(3, policy.getDirection()); - operationPolicyMappingStatement.setString(4, paramJSON); + operationPolicyMappingStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); operationPolicyMappingStatement.setInt(5, policy.getOrder()); operationPolicyMappingStatement.addBatch(); } @@ -23488,6 +23496,7 @@ private void revisionAPIPolicies(APIRevision apiRevision, String tenantDomain, clonedPolicyMap, toBeClonedPolicyDetails); Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Adding API level policy " + policy.getPolicyName() + ":" @@ -23498,7 +23507,7 @@ private void revisionAPIPolicies(APIRevision apiRevision, String tenantDomain, apiLevelPolicyMappingStatement.setString(2, apiRevision.getRevisionUUID()); apiLevelPolicyMappingStatement.setString(3, clonedPolicyMap.get(policy.getPolicyId())); apiLevelPolicyMappingStatement.setString(4, policy.getDirection()); - apiLevelPolicyMappingStatement.setString(5, paramJSON); + apiLevelPolicyMappingStatement.setBinaryStream(5, paramInputStream, paramJSON.length()); apiLevelPolicyMappingStatement.setInt(6, policy.getOrder()); apiLevelPolicyMappingStatement.addBatch(); } @@ -23613,6 +23622,7 @@ private void restoreAPIPolicies(APIRevision apiRevision, String tenantDomain, Ma Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Restored operation policy " + policy.getPolicyName() + ":" + policy.getPolicyVersion() + " from API revision " + apiRevision.getRevisionUUID()); @@ -23621,7 +23631,7 @@ private void restoreAPIPolicies(APIRevision apiRevision, String tenantDomain, Ma operationPolicyMappingStatement.setInt(1, urlMapping.getId()); operationPolicyMappingStatement.setString(2, restoredPolicyMap.get(policy.getPolicyName())); operationPolicyMappingStatement.setString(3, policy.getDirection()); - operationPolicyMappingStatement.setString(4, paramJSON); + operationPolicyMappingStatement.setBinaryStream(4, paramInputStream, paramJSON.length()); operationPolicyMappingStatement.setInt(5, policy.getOrder()); operationPolicyMappingStatement.addBatch(); } @@ -23644,7 +23654,7 @@ private void restoreAPIPolicies(APIRevision apiRevision, String tenantDomain, Ma Gson gson = new Gson(); String paramJSON = gson.toJson(policy.getParameters()); - + InputStream paramInputStream = new ByteArrayInputStream(paramJSON.getBytes(StandardCharsets.UTF_8)); if (log.isDebugEnabled()) { log.debug("Restored API level policy " + policy.getPolicyName() + ":" + policy.getPolicyVersion() + " from API revision " + apiRevision.getRevisionUUID()); @@ -23654,7 +23664,7 @@ private void restoreAPIPolicies(APIRevision apiRevision, String tenantDomain, Ma apiLevelPolicyMappingStatement.setString(2, null); apiLevelPolicyMappingStatement.setString(3, restoredPolicyMap.get(policy.getPolicyName())); apiLevelPolicyMappingStatement.setString(4, policy.getDirection()); - apiLevelPolicyMappingStatement.setString(5, paramJSON); + apiLevelPolicyMappingStatement.setBinaryStream(5, paramInputStream, paramJSON.length()); apiLevelPolicyMappingStatement.setInt(6, policy.getOrder()); apiLevelPolicyMappingStatement.addBatch(); } diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/SubscriptionValidationDAO.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/SubscriptionValidationDAO.java index 01bd082376ae..4c62ec6e4663 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/SubscriptionValidationDAO.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/SubscriptionValidationDAO.java @@ -55,7 +55,9 @@ import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; +import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -1357,7 +1359,8 @@ private void attachPolicies(Connection connection, String revisionId, API api) t String policyVersion = resultSet.getString("POLICY_VERSION"); String operationPolicyDirection = resultSet.getString("OPERATION_POLICY_DIRECTION"); String operationPolicyID = resultSet.getString("OPERATION_POLICY_UUID"); - String parameters = resultSet.getString("OPERATION_PARAMS"); + String parameters = APIMgtDBUtil.getStringFromInputStream(resultSet.getBinaryStream("OPERATION_PARAMS")); + URLMapping urlMapping = null; if (StringUtils.isNotEmpty(httpMethod) && StringUtils.isNotEmpty(urlPattern)) { urlMapping = api.getResource(urlPattern, httpMethod); @@ -1401,8 +1404,9 @@ private void attachPolicies(Connection connection, String revisionId, API api) t String apiPolicyUUID = resultSet.getString("API_POLICY_UUID"); // We get parameters of the policies separately. However, this can be retrieved from the AM_API_OPERATION_POLICY_MAPPING as it contains both API and Operation Policies - String operationParameters = resultSet.getString("OPERATION_PARAMS"); - String apiParams = resultSet.getString("API_PARAMS"); + String operationParameters = APIMgtDBUtil.getStringFromInputStream(resultSet.getBinaryStream("OPERATION_PARAMS")); + String apiParams = APIMgtDBUtil.getStringFromInputStream(resultSet.getBinaryStream("API_PARAMS")); + URLMapping urlMapping = null; if (StringUtils.isNotEmpty(httpMethod) && StringUtils.isNotEmpty(urlPattern)) { urlMapping = api.getResource(urlPattern, httpMethod); diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables.sql index 9204a3d96625..a76202b707c5 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables.sql @@ -2298,7 +2298,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2311,7 +2311,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables_23c.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables_23c.sql index c5f01ec67743..2e52b6abb7a5 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables_23c.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables_23c.sql @@ -2298,7 +2298,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2311,7 +2311,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/Postgresql/apimgt/tables.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/Postgresql/apimgt/tables.sql index 69df6f2b6bae..3ba7d000bb80 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/Postgresql/apimgt/tables.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/Postgresql/apimgt/tables.sql @@ -2819,7 +2819,7 @@ CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2835,7 +2835,7 @@ CREATE TABLE IF NOT EXISTS AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/SQLServer/mssql/apimgt/tables.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/SQLServer/mssql/apimgt/tables.sql index 017fb176389a..97265c456dce 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/SQLServer/mssql/apimgt/tables.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/SQLServer/mssql/apimgt/tables.sql @@ -2700,7 +2700,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2714,7 +2714,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql index 53f83ad90498..40ba14eced9f 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql @@ -3233,7 +3233,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -3247,7 +3247,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql index 12f2944e33eb..d49f20c7cb33 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql @@ -2439,7 +2439,7 @@ CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2452,7 +2452,7 @@ CREATE TABLE IF NOT EXISTS AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql index 903e543c57f4..1f1034b41fd2 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql @@ -2723,7 +2723,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS VARBINARY(MAX) NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2737,7 +2737,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS VARBINARY(MAX), FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql index 02d8e487696e..c9a6a3665ef5 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql @@ -2475,7 +2475,7 @@ CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS LONGBLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2488,7 +2488,7 @@ CREATE TABLE IF NOT EXISTS AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS LONGBLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql index 3dc43be2a6e1..51f1282e1745 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql @@ -2626,7 +2626,7 @@ CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS LONGBLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2639,7 +2639,7 @@ CREATE TABLE IF NOT EXISTS AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS LONGBLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql index 8d07930e3532..c1f20c4c2899 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql @@ -3786,7 +3786,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -3800,7 +3800,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_23c.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_23c.sql index 3c1d5523ee4f..7041917d68ef 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_23c.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_23c.sql @@ -3787,7 +3787,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -3801,7 +3801,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql index 78df10c60fd6..90a25d229b79 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql @@ -3519,7 +3519,7 @@ CREATE TABLE AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -3532,7 +3532,7 @@ CREATE TABLE AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BLOB NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID) diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql index 334972eb66dd..134f53740756 100644 --- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql +++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql @@ -2810,7 +2810,7 @@ CREATE TABLE IF NOT EXISTS AM_API_OPERATION_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BYTEA NOT NULL, FOREIGN KEY (URL_MAPPING_ID) REFERENCES AM_API_URL_MAPPING(URL_MAPPING_ID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(OPERATION_POLICY_MAPPING_ID) @@ -2824,7 +2824,7 @@ CREATE TABLE IF NOT EXISTS AM_API_POLICY_MAPPING ( POLICY_UUID VARCHAR(45) NOT NULL, POLICY_ORDER INTEGER NOT NULL, DIRECTION VARCHAR(10) NOT NULL, - PARAMETERS VARCHAR(2048) NOT NULL, + PARAMETERS BYTEA NOT NULL, FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE, FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE, PRIMARY KEY(API_POLICY_MAPPING_ID)