refactor code

Author: DDH13

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java

@@ -22918,13 +22918,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"));
-        InputStream policyParametersStream = rs.getBinaryStream("PARAMETERS");
-        try{
-            String parameters = new String(policyParametersStream.readAllBytes(), StandardCharsets.UTF_8);
-            operationPolicy.setParameters(APIMgtDBUtil.convertJSONStringToMap(parameters));
-        } catch (IOException e) {
-            log.error("Error while converting policy specification attributes for the policy");
-        }
+        operationPolicy.setParameters(APIMgtDBUtil.convertJSONStringToMap(APIMgtDBUtil.getStringFromInputStream(rs.getBinaryStream("PARAMETERS"))));
         return operationPolicy;
     }
 

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/SubscriptionValidationDAO.java

@@ -1359,14 +1359,7 @@ 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");
-                        InputStream parametersStream = resultSet.getBinaryStream("OPERATION_PARAMS");
-                        String parameters = null;
-                        try{
-                            parameters = new String(parametersStream.readAllBytes(), StandardCharsets.UTF_8);
-                        }
-                        catch (IOException e) {
-                            log.error("Error while reading policy specification attributes for the policy", e);
-                        }
+                        String parameters = APIMgtDBUtil.getStringFromInputStream(resultSet.getBinaryStream("OPERATION_PARAMS"));
 
                         URLMapping urlMapping = null;
                         if (StringUtils.isNotEmpty(httpMethod) && StringUtils.isNotEmpty(urlPattern)) {
@@ -1411,17 +1404,8 @@ 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
-                    InputStream operationParametersStream = resultSet.getBinaryStream("OPERATION_PARAMS");
-                    InputStream apiParamsStream = resultSet.getBinaryStream("API_PARAMS");
-                    String operationParameters = null;
-                    String apiParams = null;
-                    try {
-                        operationParameters = new String(operationParametersStream.readAllBytes(), StandardCharsets.UTF_8);
-                        apiParams = new String(apiParamsStream.readAllBytes(), StandardCharsets.UTF_8);
-                    } catch (IOException e) {
-                        log.error("Error while reading policy specification attributes for the policy", e);
-                    }
-
+                    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)) {