BRMSGW HTTPS support for DMaaP/UEB interfaces
[policy/engine.git] / BRMSGateway / src / main / java / org / onap / policy / brms / api / BrmsPush.java
index 5a7b25e..8181c00 100644 (file)
@@ -3,6 +3,7 @@
  * ONAP Policy Engine
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +58,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Persistence;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.ws.rs.ProcessingException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringEscapeUtils;
@@ -72,10 +74,15 @@ import org.apache.maven.shared.invoker.InvocationRequest;
 import org.apache.maven.shared.invoker.InvocationResult;
 import org.apache.maven.shared.invoker.Invoker;
 import org.codehaus.plexus.util.IOUtil;
+
 import org.codehaus.plexus.util.WriterFactory;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.onap.policy.api.PEDependency;
 import org.onap.policy.api.PolicyException;
+import org.onap.policy.brms.api.nexus.NexusRestSearchParameters;
+import org.onap.policy.brms.api.nexus.NexusRestWrapper;
+import org.onap.policy.brms.api.nexus.NexusRestWrapperException;
+import org.onap.policy.brms.api.nexus.pojo.NexusArtifact;
 import org.onap.policy.brms.entity.BrmsGroupInfo;
 import org.onap.policy.brms.entity.BrmsPolicyInfo;
 import org.onap.policy.brms.entity.DependencyInfo;
@@ -89,11 +96,6 @@ import org.onap.policy.utils.BackUpMonitor;
 import org.onap.policy.utils.BusPublisher;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
-import org.sonatype.nexus.client.NexusClient;
-import org.sonatype.nexus.client.NexusClientException;
-import org.sonatype.nexus.client.NexusConnectionException;
-import org.sonatype.nexus.client.rest.NexusRestClient;
-import org.sonatype.nexus.rest.model.NexusArtifact;
 
 /**
  * BRMSPush: Application responsible to push policies to the BRMS PDP Policy Repository (PR).
@@ -102,7 +104,6 @@ import org.sonatype.nexus.rest.model.NexusArtifact;
  * @version 1.0
  */
 
-@SuppressWarnings("deprecation")
 public class BrmsPush {
     private static final String GROUP_NAMES = "groupNames";
     private static final String DROOLS_APPS_TEMPLATE_GROUP =
@@ -118,7 +119,7 @@ public class BrmsPush {
     private static final Logger LOGGER = FlexLogger.getLogger(BrmsPush.class.getName());
     private static final String PROJECTSLOCATION = "RuleProjects";
     private static final String[] GOALS = {"clean", "deploy"};
-    private static final String DEFAULT_VERSION = "1.2.1-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.3.0-SNAPSHOT";
     private static final String DEPENDENCY_FILE = "dependency.json";
     private static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml";
 
@@ -341,7 +342,7 @@ public class BrmsPush {
             uebList = uebList.trim();
             pubTopic = pubTopic.trim();
             pubBuilder = new CambriaClientBuilders.PublisherBuilder();
-            pubBuilder.usingHosts(uebList).onTopic(pubTopic);
+            pubBuilder.usingHosts(uebList).onTopic(pubTopic).usingHttps(true);
             String apiKey = config.getProperty("UEB_API_KEY");
             String apiSecret = config.getProperty("UEB_API_SECRET");
             if (apiKey != null && !apiKey.isEmpty() && apiSecret != null && !apiSecret.isEmpty()) {
@@ -424,27 +425,9 @@ public class BrmsPush {
                 }
                 // Check User Specific values.
                 if ("$controller:".equals(key)) {
-                    try {
-                        final PEDependency dependency = PolicyUtils.jsonStringToObject(value, PEDependency.class);
-                        userControllerName = key.replaceFirst("$controller:", "");
-                        LOGGER.info("addRule: userControllerName - " + userControllerName + ", dependency: - "
-                                + dependency);
-                        addToGroup(userControllerName, dependency);
-                    } catch (final Exception e) {
-                        LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while resolving Controller: " + e);
-                    }
-
+                    userControllerName = getUserControllerName(key, value);
                 } else if ("$dependency$".equals(key) && value.startsWith("[") && value.endsWith("]")) {
-                    value = value.substring(1, value.length() - 1).trim();
-                    final List<String> dependencyStrings = Arrays.asList(value.split(Pattern.quote("},{")));
-                    for (final String dependencyString : dependencyStrings) {
-                        try {
-                            userDependencies.add(PolicyUtils.jsonStringToObject(dependencyString, PEDependency.class));
-                        } catch (final Exception e) {
-                            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while resolving Dependencies: "
-                                    + e);
-                        }
-                    }
+                    updateUserDependencies(userDependencies, value);
                 }
             }
             if (userControllerName != null) {
@@ -479,34 +462,71 @@ public class BrmsPush {
         }
     }
 
+    private String getUserControllerName(String key, String value) {
+        String userControllerName = null;
+        // Check User Specific values.
+        try {
+            final PEDependency dependency = PolicyUtils.jsonStringToObject(value, PEDependency.class);
+            userControllerName = key.replaceFirst("$controller:", "");
+            LOGGER.info("addRule: userControllerName - " + userControllerName + ", dependency: - "
+                    + dependency);
+            addToGroup(userControllerName, dependency);
+        } catch (final Exception e) {
+            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while resolving Controller: " + e);
+        }
+        return userControllerName;
+    }
+
+    private void updateUserDependencies(ArrayList<PEDependency> userDependencies, String value) {
+        //update the user dependencies supplied as parameter to this method
+        value = value.substring(1, value.length() - 1).trim();
+        final List<String> dependencyStrings = Arrays.asList(value.split(Pattern.quote("},{")));
+        for (final String dependencyString : dependencyStrings) {
+            try {
+                userDependencies.add(PolicyUtils.jsonStringToObject(dependencyString, PEDependency.class));
+            } catch (final Exception e) {
+                LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while resolving Dependencies: "
+                        + e);
+            }
+        }
+    }
+
     private void syncGroupInfo() {
         // Sync DB to JMemory.
         final EntityTransaction et = em.getTransaction();
-        et.begin();
-        Query query = em.createQuery("select b from BrmsGroupInfo AS b");
-        List<?> result = query.getResultList();
-        if (result.size() != groupMap.size()) {
-            for (final Object value : result) {
-                final BrmsGroupInfo brmsGroupInfo = (BrmsGroupInfo) value;
-                final PEDependency dependency = new PEDependency();
-                dependency.setArtifactId(brmsGroupInfo.getArtifactId());
-                dependency.setGroupId(brmsGroupInfo.getGroupId());
-                dependency.setVersion(brmsGroupInfo.getVersion());
-                final ArrayList<Object> values = new ArrayList<>();
-                values.add(dependency);
-                groupMap.put(brmsGroupInfo.getControllerName(), values);
+        try {
+            et.begin();
+            final TypedQuery<BrmsGroupInfo> groupInfoQuery =
+                    em.createQuery("select b from BrmsGroupInfo AS b", BrmsGroupInfo.class);
+            final List<BrmsGroupInfo> groupInfoResult = groupInfoQuery.getResultList();
+            if (groupInfoResult.size() != groupMap.size()) {
+                for (final BrmsGroupInfo brmsGroupInfo : groupInfoResult) {
+                    final PEDependency dependency = new PEDependency();
+                    dependency.setArtifactId(brmsGroupInfo.getArtifactId());
+                    dependency.setGroupId(brmsGroupInfo.getGroupId());
+                    dependency.setVersion(brmsGroupInfo.getVersion());
+                    final ArrayList<Object> values = new ArrayList<>();
+                    values.add(dependency);
+                    groupMap.put(brmsGroupInfo.getControllerName(), values);
+                }
             }
-        }
-        query = em.createQuery("select g from BrmsPolicyInfo AS g");
-        result = query.getResultList();
-        if (result.size() != policyMap.size()) {
-            for (final Object value : result) {
-                final BrmsPolicyInfo brmsPolicyInfo = (BrmsPolicyInfo) value;
-                policyMap.put(brmsPolicyInfo.getPolicyName(), brmsPolicyInfo.getControllerName().getControllerName());
+
+            final TypedQuery<BrmsPolicyInfo> policyInfoQuery =
+                    em.createQuery("select g from BrmsPolicyInfo AS g", BrmsPolicyInfo.class);
+            final List<BrmsPolicyInfo> policyInfoResult = policyInfoQuery.getResultList();
+            if (policyInfoResult.size() != policyMap.size()) {
+                for (final BrmsPolicyInfo brmsPolicyInfo : policyInfoResult) {
+                    policyMap.put(brmsPolicyInfo.getPolicyName(),
+                            brmsPolicyInfo.getControllerName().getControllerName());
+                }
             }
+            et.commit();
+            LOGGER.info("Updated Local Memory values with values from database.");
+        } catch (final Exception exception) {
+            LOGGER.error("Unable to sync group info", exception);
+            et.rollback();
+            throw exception;
         }
-        et.commit();
-        LOGGER.info("Updated Local Memory values with values from database.");
     }
 
     private void manageProject(final String selectedName, final String ksessionName, final String name,
@@ -525,37 +545,47 @@ public class BrmsPush {
      * Add Policy to JMemory and DataBase.
      */
     private void addToPolicy(final String policyName, final String controllerName) {
-        policyMap.put(policyName, controllerName);
+
         final EntityTransaction et = em.getTransaction();
-        et.begin();
-        Query query = em.createQuery("select b from BrmsPolicyInfo as b where b.policyName = :pn");
-        query.setParameter("pn", policyName);
-        final List<?> pList = query.getResultList();
-        boolean create = false;
-        BrmsPolicyInfo brmsPolicyInfo = new BrmsPolicyInfo();
-        if (!pList.isEmpty()) {
-            // Already exists.
-            brmsPolicyInfo = (BrmsPolicyInfo) pList.get(0);
-            if (!brmsPolicyInfo.getControllerName().getControllerName().equals(controllerName)) {
+        try {
+            et.begin();
+            boolean create = false;
+            final TypedQuery<BrmsPolicyInfo> policyInfoQuery =
+                    em.createQuery("select b from BrmsPolicyInfo as b where b.policyName = :pn", BrmsPolicyInfo.class);
+            policyInfoQuery.setParameter("pn", policyName);
+            final List<BrmsPolicyInfo> policyInfoResultList = policyInfoQuery.getResultList();
+            BrmsPolicyInfo brmsPolicyInfo = new BrmsPolicyInfo();
+            if (!policyInfoResultList.isEmpty()) {
+                // Already exists.
+                brmsPolicyInfo = policyInfoResultList.get(0);
+                if (!brmsPolicyInfo.getControllerName().getControllerName().equals(controllerName)) {
+                    create = true;
+                }
+            } else {
                 create = true;
             }
-        } else {
-            create = true;
-        }
-        if (create) {
-            query = em.createQuery("select b from BrmsGroupInfo as b where b.controllerName = :cn");
-            query.setParameter("cn", controllerName);
-            final List<?> bList = query.getResultList();
-            BrmsGroupInfo brmsGroupInfo = new BrmsGroupInfo();
-            if (!bList.isEmpty()) {
-                brmsGroupInfo = (BrmsGroupInfo) bList.get(0);
+            if (create) {
+                final TypedQuery<BrmsGroupInfo> groupInfoQuery = em.createQuery(
+                        "select b from BrmsGroupInfo as b where b.controllerName = :cn", BrmsGroupInfo.class);
+                groupInfoQuery.setParameter("cn", controllerName);
+                final List<BrmsGroupInfo> groupInfoResultList = groupInfoQuery.getResultList();
+                BrmsGroupInfo brmsGroupInfo = new BrmsGroupInfo();
+                if (!groupInfoResultList.isEmpty()) {
+                    brmsGroupInfo = groupInfoResultList.get(0);
+                }
+                brmsPolicyInfo.setPolicyName(policyName);
+                brmsPolicyInfo.setControllerName(brmsGroupInfo);
+                em.persist(brmsPolicyInfo);
+                em.flush();
             }
-            brmsPolicyInfo.setPolicyName(policyName);
-            brmsPolicyInfo.setControllerName(brmsGroupInfo);
-            em.persist(brmsPolicyInfo);
-            em.flush();
+            et.commit();
+
+            policyMap.put(policyName, controllerName);
+        } catch (final Exception exception) {
+            LOGGER.error("Unable add policy to database", exception);
+            et.rollback();
+            throw exception;
         }
-        et.commit();
     }
 
     private void syncProject(final String selectedName) {
@@ -587,7 +617,7 @@ public class BrmsPush {
         URL website;
         final String fileName = "rule.jar";
         try {
-            website = new URL(artifact.getResourceURI());
+            website = new URL(artifact.getUrlPath() + ".jar");
             try (ReadableByteChannel rbc = Channels.newChannel(website.openStream());
                     FileOutputStream fos = new FileOutputStream(fileName)) {
                 fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
@@ -606,45 +636,49 @@ public class BrmsPush {
         try (JarFile jar = new JarFile(jarFileName)) {
             final Enumeration<?> enumEntries = jar.entries();
             while (enumEntries.hasMoreElements()) {
-                final JarEntry jarEntry = (JarEntry) enumEntries.nextElement();
-                File file = null;
-                final String fileName = jarEntry.getName().substring(jarEntry.getName().lastIndexOf("/") + 1);
-                if (jarEntry.getName().endsWith(".drl")) {
-                    final String path = PROJECTSLOCATION + File.separator + artifactId + File.separator + "src"
-                            + File.separator + "main" + File.separator + RESOURCES + File.separator + RULES;
-                    new File(path).mkdirs();
-                    if (syncFlag && policyMap.containsKey(fileName.replace(".drl", ""))) {
-                        file = new File(path + File.separator + fileName);
-                    } else {
-                        file = new File(path + File.separator + fileName);
-                    }
-                } else if (jarEntry.getName().endsWith(POM_XML_FILE)) {
-                    final String path = PROJECTSLOCATION + File.separator + artifactId;
-                    new File(path).mkdirs();
-                    file = new File(path + File.separator + fileName);
-                } else if (jarEntry.getName().endsWith(KMODULE_XML_FILE)) {
-                    final String path = PROJECTSLOCATION + File.separator + artifactId + File.separator + "src"
-                            + File.separator + "main" + File.separator + RESOURCES + File.separator + META_INF;
-                    new File(path).mkdirs();
-                    file = new File(path + File.separator + fileName);
-                }
-                if (file != null) {
-                    try (InputStream is = jar.getInputStream(jarEntry);
-                            FileOutputStream fos = new FileOutputStream(file)) {
-                        while (is.available() > 0) {
-                            fos.write(is.read());
-                        }
-                        LOGGER.info(fileName + " Created..");
-                    } catch (final IOException e) {
-                        LOGGER.info("exception Occured" + e);
-                    }
-                }
+                parseJarContents(artifactId, jar, enumEntries);
             }
         } catch (final IOException e) {
             LOGGER.info("exception Occured" + e);
         }
     }
 
+    private void parseJarContents(String artifactId, JarFile jar, Enumeration<?> enumEntries) {
+        final JarEntry jarEntry = (JarEntry) enumEntries.nextElement();
+        File file = null;
+        final String fileName = jarEntry.getName().substring(jarEntry.getName().lastIndexOf("/") + 1);
+        if (jarEntry.getName().endsWith(".drl")) {
+            final String path = PROJECTSLOCATION + File.separator + artifactId + File.separator + "src"
+                    + File.separator + "main" + File.separator + RESOURCES + File.separator + RULES;
+            new File(path).mkdirs();
+            if (syncFlag && policyMap.containsKey(fileName.replace(".drl", ""))) {
+                file = new File(path + File.separator + fileName);
+            } else {
+                file = new File(path + File.separator + fileName);
+            }
+        } else if (jarEntry.getName().endsWith(POM_XML_FILE)) {
+            final String path = PROJECTSLOCATION + File.separator + artifactId;
+            new File(path).mkdirs();
+            file = new File(path + File.separator + fileName);
+        } else if (jarEntry.getName().endsWith(KMODULE_XML_FILE)) {
+            final String path = PROJECTSLOCATION + File.separator + artifactId + File.separator + "src"
+                    + File.separator + "main" + File.separator + RESOURCES + File.separator + META_INF;
+            new File(path).mkdirs();
+            file = new File(path + File.separator + fileName);
+        }
+        if (file != null) {
+            try (InputStream is = jar.getInputStream(jarEntry);
+                 FileOutputStream fos = new FileOutputStream(file)) {
+                while (is.available() > 0) {
+                    fos.write(is.read());
+                }
+                LOGGER.info(fileName + " Created..");
+            } catch (final IOException e) {
+                LOGGER.info("exception Occured" + e);
+            }
+        }
+    }
+
     private NexusArtifact getLatestArtifactFromNexus(final String selectedName) {
         final List<NexusArtifact> artifacts = getArtifactFromNexus(selectedName, null);
         int bigNum = 0;
@@ -685,34 +719,30 @@ public class BrmsPush {
     }
 
     private List<NexusArtifact> getArtifactFromNexus(final String selectedName, final String version) {
-        final NexusClient client = new NexusRestClient();
+        NexusRestWrapper restWrapper = null;
         int index = 0;
         boolean flag = false;
         while (index < repUrlList.size()) {
             try {
                 final String repUrl = repUrlList.get(0);
-                client.connect(repUrl.substring(0, repUrl.indexOf(repUrl.split(":[0-9]+\\/nexus")[1])), repUserName,
-                        repPassword);
-                final NexusArtifact template = new NexusArtifact();
-                template.setGroupId(getGroupId(selectedName));
-                template.setArtifactId(getArtifactId(selectedName));
-                if (version != null) {
-                    template.setVersion(version);
-                }
-                final List<NexusArtifact> resultList = client.searchByGAV(template);
+                restWrapper =
+                        new NexusRestWrapper(repUrl.substring(0, repUrl.indexOf(repUrl.split(":[0-9]+\\/nexus")[1])),
+                                repUserName, repPassword);
+                final NexusRestSearchParameters searchParameters = new NexusRestSearchParameters();
+                searchParameters.useFilterSearch(getGroupId(selectedName), getArtifactId(selectedName), version, null,
+                        null);
+
+                final List<NexusArtifact> resultList = restWrapper.findArtifact(searchParameters).getArtifactList();
                 if (resultList != null) {
                     flag = true;
                     return resultList;
                 }
-            } catch (NexusClientException | NexusConnectionException | NullPointerException e) {
+            } catch (NexusRestWrapperException | ProcessingException e) {
                 LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Connection to remote Nexus has failed. "
                         + e.getMessage(), e);
             } finally {
-                try {
-                    client.disconnect();
-                } catch (NexusClientException | NexusConnectionException e) {
-                    LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "failed to disconnect Connection from Nexus."
-                            + e.getMessage(), e);
+                if (null != restWrapper) {
+                    restWrapper.close();
                 }
                 if (!flag) {
                     Collections.rotate(repUrlList, -1);
@@ -757,42 +787,7 @@ public class BrmsPush {
             LOGGER.error("Error while starting Transaction " + e);
         }
         if (!modifiedGroups.isEmpty()) {
-            Boolean flag = false;
-            for (final Map.Entry<String, String> entry : modifiedGroups.entrySet()) {
-                InvocationResult result = null;
-                final String group = entry.getKey();
-                try {
-                    LOGGER.info("PushRules: ModifiedGroups, Key: " + group + ", Value: " + entry.getValue());
-                    final InvocationRequest request = new DefaultInvocationRequest();
-                    setVersion(group);
-                    createPom(group);
-                    request.setPomFile(new File(
-                            PROJECTSLOCATION + File.separator + getArtifactId(group) + File.separator + POM_XML_FILE));
-                    request.setGoals(Arrays.asList(GOALS));
-                    final Invoker invoker = new DefaultInvoker();
-                    result = invoker.execute(request);
-                    if (result.getExecutionException() != null) {
-                        LOGGER.error(result.getExecutionException());
-                    } else if (result.getExitCode() != 0) {
-                        LOGGER.error("Maven Invocation failure..!");
-                    }
-                } catch (final Exception e) {
-                    LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Maven Invocation issue for "
-                            + getArtifactId(group) + e.getMessage(), e);
-                }
-                if (result != null && result.getExitCode() == 0) {
-                    LOGGER.info("Build Completed..!");
-                    if (createFlag) {
-                        addNotification(group, "create");
-                    } else {
-                        addNotification(group, entry.getValue());
-                    }
-                    flag = true;
-                } else {
-                    throw new PolicyException(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Maven Invocation failure!");
-                }
-            }
-            if (flag) {
+            if (buildAndGenerateJarFile()) {
                 sendNotification(controllers);
             }
         }
@@ -814,6 +809,45 @@ public class BrmsPush {
         getNameAndSetRemove(controllerName, name);
     }
 
+    private Boolean buildAndGenerateJarFile() throws PolicyException {
+        Boolean flag = false;
+        for (final Map.Entry<String, String> entry : modifiedGroups.entrySet()) {
+            InvocationResult result = null;
+            final String group = entry.getKey();
+            try {
+                LOGGER.info("PushRules: ModifiedGroups, Key: " + group + ", Value: " + entry.getValue());
+                final InvocationRequest request = new DefaultInvocationRequest();
+                setVersion(group);
+                createPom(group);
+                request.setPomFile(new File(
+                        PROJECTSLOCATION + File.separator + getArtifactId(group) + File.separator + POM_XML_FILE));
+                request.setGoals(Arrays.asList(GOALS));
+                final Invoker invoker = new DefaultInvoker();
+                result = invoker.execute(request);
+                if (result.getExecutionException() != null) {
+                    LOGGER.error(result.getExecutionException());
+                } else if (result.getExitCode() != 0) {
+                    LOGGER.error("Maven Invocation failure..!");
+                }
+            } catch (final Exception e) {
+                LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Maven Invocation issue for "
+                        + getArtifactId(group) + e.getMessage(), e);
+            }
+            if (result != null && result.getExitCode() == 0) {
+                LOGGER.info("Build Completed..!");
+                if (createFlag) {
+                    addNotification(group, "create");
+                } else {
+                    addNotification(group, entry.getValue());
+                }
+                flag = true;
+            } else {
+                throw new PolicyException(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Maven Invocation failure!");
+            }
+        }
+        return flag;
+    }
+
     private String getGroupName(final String name) {
         if (policyMap.containsKey(name)) {
             return policyMap.get(name);
@@ -1088,29 +1122,37 @@ public class BrmsPush {
     }
 
     private void addToGroup(final String name, final PEDependency dependency) {
-        final ArrayList<Object> values = new ArrayList<>();
-        values.add(dependency);
-        groupMap.put(name, values);
         final EntityTransaction et = em.getTransaction();
-        et.begin();
-        final Query query = em.createQuery("select b from BrmsGroupInfo as b where b.controllerName = :cn");
-        query.setParameter("cn", name);
-        final List<?> groupList = query.getResultList();
-        BrmsGroupInfo brmsGroupInfo = null;
-        if (!groupList.isEmpty()) {
-            LOGGER.info("Controller name already Existing in DB. Will be updating the DB Values" + name);
-            brmsGroupInfo = (BrmsGroupInfo) groupList.get(0);
-        }
-        if (brmsGroupInfo == null) {
-            brmsGroupInfo = new BrmsGroupInfo();
+        try {
+            et.begin();
+            final TypedQuery<BrmsGroupInfo> query = em
+                    .createQuery("select b from BrmsGroupInfo as b where b.controllerName = :cn", BrmsGroupInfo.class);
+            query.setParameter("cn", name);
+            final List<BrmsGroupInfo> groupList = query.getResultList();
+            BrmsGroupInfo brmsGroupInfo = null;
+            if (!groupList.isEmpty()) {
+                LOGGER.info("Controller name already Existing in DB. Will be updating the DB Values" + name);
+                brmsGroupInfo = groupList.get(0);
+            }
+            if (brmsGroupInfo == null) {
+                brmsGroupInfo = new BrmsGroupInfo();
+            }
+            brmsGroupInfo.setControllerName(name);
+            brmsGroupInfo.setGroupId(dependency.getGroupId());
+            brmsGroupInfo.setArtifactId(dependency.getArtifactId());
+            brmsGroupInfo.setVersion(dependency.getVersion());
+            em.persist(brmsGroupInfo);
+            em.flush();
+            et.commit();
+
+            final ArrayList<Object> values = new ArrayList<>();
+            values.add(dependency);
+            groupMap.put(name, values);
+        } catch (final Exception exception) {
+            LOGGER.error("Unable add/update policy group to database for controller name: " + name, exception);
+            et.rollback();
+            throw exception;
         }
-        brmsGroupInfo.setControllerName(name);
-        brmsGroupInfo.setGroupId(dependency.getGroupId());
-        brmsGroupInfo.setArtifactId(dependency.getArtifactId());
-        brmsGroupInfo.setVersion(dependency.getVersion());
-        em.persist(brmsGroupInfo);
-        em.flush();
-        et.commit();
     }
 
     private String getArtifactId(final String name) {
@@ -1144,22 +1186,29 @@ public class BrmsPush {
 
     // Removes Policy from Memory and Database.
     private void removePolicyFromGroup(final String policyName, final String controllerName) {
-        policyMap.remove(policyName);
         final EntityTransaction et = em.getTransaction();
-        et.begin();
-        final Query query = em.createQuery("select b from BrmsPolicyInfo as b where b.policyName = :pn");
-        query.setParameter("pn", policyName);
-        final List<?> pList = query.getResultList();
-        BrmsPolicyInfo brmsPolicyInfo;
-        if (!pList.isEmpty()) {
-            // Already exists.
-            brmsPolicyInfo = (BrmsPolicyInfo) pList.get(0);
-            if (brmsPolicyInfo.getControllerName().getControllerName().equals(controllerName)) {
-                em.remove(brmsPolicyInfo);
-                em.flush();
+        try {
+            et.begin();
+            final TypedQuery<BrmsPolicyInfo> query =
+                    em.createQuery("select b from BrmsPolicyInfo as b where b.policyName = :pn", BrmsPolicyInfo.class);
+            query.setParameter("pn", policyName);
+            final List<BrmsPolicyInfo> pList = query.getResultList();
+            BrmsPolicyInfo brmsPolicyInfo;
+            if (!pList.isEmpty()) {
+                // Already exists.
+                brmsPolicyInfo = pList.get(0);
+                if (brmsPolicyInfo.getControllerName().getControllerName().equals(controllerName)) {
+                    em.remove(brmsPolicyInfo);
+                    em.flush();
+                }
             }
+            et.commit();
+            policyMap.remove(policyName);
+        } catch (final Exception exception) {
+            LOGGER.error("Unable remove policy from group to database for policy name: " + policyName, exception);
+            et.rollback();
+            throw exception;
         }
-        et.commit();
     }
 
     private void setVersion(final String selectedName) {