Code Improvements-Vnfsdk-refrepo sonar issue fixes

[vnfsdk/refrepo.git] / vnfmarket-be / vnf-sdk-marketplace / src / main / java / org / onap / vnfsdk / marketplace / db / impl / MarketplaceDaoImpl.java

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java
index 67cfb35..eac1dc2 100644 (file)
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java
@@ -17,6 +17,7 @@
 package org.onap.vnfsdk.marketplace.db.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.PersistenceException;
 
@@ -32,9 +33,9 @@ import org.slf4j.LoggerFactory;
 /**
  * This class is the implementation for the DAO Layer for Driver Manager.
  * <br/>
- * 
+ *
  * @author
- * @version  
+ * @version
  */
 public class MarketplaceDaoImpl implements IMarketplaceDao {
 
@@ -42,13 +43,15 @@ public class MarketplaceDaoImpl implements IMarketplaceDao {
 
     private SqlSessionFactory sqlSessionFactory = null;
 
+    private static final String EXCEPTION = "Exception caught {}";
+
     /**
-     * 
+     *
      * Constructor<br/>
      * <p>
      * </p>
-     * 
-     * @since   
+     *
+     * @since
      */
     public MarketplaceDaoImpl() {
         sqlSessionFactory = ConnectionUtil.getSession();
@@ -57,21 +60,36 @@ public class MarketplaceDaoImpl implements IMarketplaceDao {
     /**
      * get all package data.
      * <br/>
-     * 
+     *
      * @return
-     * @since    
+     * @since
      */
+    @Override
     public List<PackageData> getAllPackageData() {
         SqlSession session = sqlSessionFactory.openSession();
-        List<PackageData> csars = null; 
+        List<PackageData> csars = null;
         try {
             IMarketplaceMapper mapper = session.getMapper(IMarketplaceMapper.class);
             csars = mapper.getAllPackageData();
             session.commit();
         } catch(PersistenceException e) {
-            LOGGER.error("Exception caught {}", e);
-//            throw new DriverManagerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-//                    ErrorCode.INVALID_DB);
+            LOGGER.error(EXCEPTION, e);
+        } finally {
+            session.close();
+        }
+        return csars;
+    }
+
+    @Override
+    public List<PackageData> getPackageDataSubset(Map<String, String> paramsMap) {
+        SqlSession session = sqlSessionFactory.openSession();
+        List<PackageData> csars = null;
+        try {
+            IMarketplaceMapper mapper = session.getMapper(IMarketplaceMapper.class);
+            csars = mapper.getPackageDataSubset(paramsMap);
+            session.commit();
+        } catch(PersistenceException e) {
+            LOGGER.error(EXCEPTION, e);
         } finally {
             session.close();
         }
@@ -81,59 +99,57 @@ public class MarketplaceDaoImpl implements IMarketplaceDao {
     /**
      * saving the package data object to the DB using the mybatis.
      * <br/>
-     * 
+     *
      * @param dirverInstance
-     * @since    
+     * @since
      */
-       public void savePackageData(PackageData lPackageData) {
-               SqlSession session = sqlSessionFactory.openSession();
+    @Override
+    public void savePackageData(PackageData lPackageData) {
+        SqlSession session = sqlSessionFactory.openSession();
         try {
             IMarketplaceMapper mapper = session.getMapper(IMarketplaceMapper.class);
             mapper.savePackageData(lPackageData);
             session.commit();
         } catch(PersistenceException e) {
-            LOGGER.error("Exception caught {}", e);
-//            throw new DriverManagerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-//                    ErrorCode.INVALID_DB);
+            LOGGER.error(EXCEPTION, e);
         } finally {
             session.close();
         }
-               
-       }
 
-       public List<PackageData> getPackageData(String csarId) {
+    }
+
+    @Override
+    public List<PackageData> getPackageData(String csarId) {
         SqlSession session = sqlSessionFactory.openSession();
-        List<PackageData> csars = null; 
+        List<PackageData> csars = null;
         try {
             IMarketplaceMapper mapper = session.getMapper(IMarketplaceMapper.class);
             csars = mapper.getPackageData(csarId);
             session.commit();
         } catch(PersistenceException e) {
-            LOGGER.error("Exception caught {}", e);
-//            throw new DriverManagerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-//                    ErrorCode.INVALID_DB);
+            LOGGER.error(EXCEPTION, e);
         } finally {
             session.close();
         }
         return csars;
-       }
+    }
 
-       public void deletePackageData(String csarId) {
-        SqlSession session = sqlSessionFactory.openSession();
+    @Override
+    public void deletePackageData(String csarId) {
+     SqlSession session = sqlSessionFactory.openSession();
         try {
             IMarketplaceMapper mapper = session.getMapper(IMarketplaceMapper.class);
             mapper.deletePackageData(csarId);
             session.commit();
         } catch(PersistenceException e) {
-            LOGGER.error("Exception caught {}", e);
-//                 throw new DriverManagerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-//                         ErrorCode.INVALID_DB);
+            LOGGER.error(EXCEPTION, e);
         } finally {
             session.close();
         }
-               
-       }
 
+    }
+
+    @Override
     public void updatePackageData(PackageData oPackageData) {
         SqlSession session = sqlSessionFactory.openSession();
         try {
@@ -141,10 +157,11 @@ public class MarketplaceDaoImpl implements IMarketplaceDao {
             mapper.updatePackageData(oPackageData);
             session.commit();
         } catch(PersistenceException e) {
-            LOGGER.error("Exception caught {}", e);
+            LOGGER.error(EXCEPTION, e);
         } finally {
             session.close();
         }
-        
-    }    
+
+    }
 }
+