Merging in bug fixes

[appc.git] / appc-dispatcher / appc-license-manager / appc-license-manager-core / src / main / java / org / openecomp / appc / licmgr / impl / LicenseDataAccessServiceImpl.java

diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
index 2eaf790..8e999c4 100644 (file)
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
@@ -1,10 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * openECOMP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                                             reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -84,7 +87,7 @@ public class LicenseDataAccessServiceImpl implements LicenseDataAccessService {
                     result.put(field, data.getString(field));
                 }
             } else {
-                String msg = "Missing license model for VNF_TYPE: " + vnfType + " and VNF_VERSION: " + vnfVersion + " in table " + Constants.ASDC_ARTIFACTS_TABLE_NAME;
+                String msg = "Missing license model for VNF_TYPE: " + vnfType + " and VNF_VERSION: " + vnfVersion + " in table " + Constants.ASDC_ARTIFACTS;
                 logger.info(msg);
             }
         } catch (SQLException e) {
@@ -96,70 +99,10 @@ public class LicenseDataAccessServiceImpl implements LicenseDataAccessService {
     }
 
     private String buildQueryStatement() {
-        return "select * " + "from " + Constants.ASDC_ARTIFACTS_TABLE_NAME + " " +
+        return "select * " + "from " + Constants.ASDC_ARTIFACTS + " " +
             "where " + ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME.name() + " = ?" +
              " AND " + ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION.name() + " = ?" +
              " AND " + ASDC_ARTIFACTS_FIELDS.ARTIFACT_TYPE.name() + " = ?";
     }
 
-    /**
-     * Implementation of storeArtifactPayload()
-     * @see LicenseDataAccessService
-     */
-    @Override
-    public void storeArtifactPayload(Map<String, String> parameters) throws RuntimeException {
-
-        if(parameters == null || parameters.isEmpty()) {
-            throw new RuntimeException("No parameters for insert are provided");
-        }
-
-        String insertStr = "INSERT INTO " + Constants.ASDC_ARTIFACTS_TABLE_NAME + "(";
-        String valuesStr = "VALUES(";
-        String insertStatementStr;
-
-        ArrayList<String> params = new ArrayList<>();
-        boolean firstTime = true;
-        for(Map.Entry<String, String> entry : parameters.entrySet()) {
-            if(!firstTime) {
-                insertStr += ",";
-                valuesStr += ",";
-            }
-            else {
-                firstTime = false;
-            }
-            insertStr += entry.getKey();
-            valuesStr += "?";
-
-            params.add(entry.getValue());
-        }
-
-        insertStr += ")";
-        valuesStr += ")";
-        insertStatementStr = insertStr + " " + valuesStr;
-
-        executeStoreArtifactPayload(insertStatementStr, params);
-    }
-
-    /**
-     * Exexutes insert statement for artifact payload
-     * @param insertStatementStr
-     * @param params
-     * @throws RuntimeException
-     */
-    private void executeStoreArtifactPayload(String insertStatementStr, ArrayList<String> params) throws RuntimeException {
-
-        try {
-            logger.info("used schema=" + this.schema);
-            logger.info("insert statement=" + insertStatementStr);
-
-            dbLibService.writeData(insertStatementStr, params, this.schema);
-
-            logger.info("finished to execute insert");
-
-        } catch (SQLException e) {
-            logger.error("Storing Artifact payload failed - " + insertStatementStr);
-            throw new RuntimeException("Storing Artifact payload failed - " + insertStatementStr);
-        }
-    }
-
 }