Address level 4-6 security issues

Remove commons-compress and chage version of dom4j

Also fix checkstyle in affected modules

Issue-ID: POLICY-1065
Change-Id: Id37e54a54997656674af37dfd924aec5f69e410a
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

1 files changed, 38 insertions, 39 deletions

diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java
index 087535d6b..19ad01054 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java
@@ -57,15 +57,15 @@ public class HibernateApexDao extends DefaultApexDao {
      * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey)
      */
     @Override
-    public <T extends AxConcept> void delete(final Class<T> aClass, final AxArtifactKey key) {
+    public <T extends AxConcept> void delete(final Class<T> clazz, final AxArtifactKey key) {
         if (key == null) {
             return;
         }
         final EntityManager mg = getEntityManager();
         try {
             mg.getTransaction().begin();
-            mg.createQuery(DELETE_FROM + aClass.getSimpleName() + WHERE_KEY_NAME + key.getName() + AND_KEY_VERSION
-                    + key.getVersion() + "'").executeUpdate();
+            mg.createQuery(DELETE_FROM + clazz.getSimpleName() + WHERE_KEY_NAME + key.getName() + AND_KEY_VERSION
+                            + key.getVersion() + "'").executeUpdate();
             mg.getTransaction().commit();
         } finally {
             mg.close();
@@ -79,16 +79,16 @@ public class HibernateApexDao extends DefaultApexDao {
      * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey)
      */
     @Override
-    public <T extends AxConcept> void delete(final Class<T> aClass, final AxReferenceKey key) {
+    public <T extends AxConcept> void delete(final Class<T> clazz, final AxReferenceKey key) {
         if (key == null) {
             return;
         }
         final EntityManager mg = getEntityManager();
         try {
             mg.getTransaction().begin();
-            mg.createQuery(DELETE_FROM + aClass.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME + key.getParentKeyName()
-                    + AND_KEY_PARENT_KEY_VERSION + key.getParentKeyVersion() + AND_KEY_LOCAL_NAME + key.getLocalName()
-                    + "'").executeUpdate();
+            mg.createQuery(DELETE_FROM + clazz.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME + key.getParentKeyName()
+                            + AND_KEY_PARENT_KEY_VERSION + key.getParentKeyVersion() + AND_KEY_LOCAL_NAME
+                            + key.getLocalName() + "'").executeUpdate();
             mg.getTransaction().commit();
         } finally {
             mg.close();
@@ -102,7 +102,7 @@ public class HibernateApexDao extends DefaultApexDao {
      * java.util.Collection)
      */
     @Override
-    public <T extends AxConcept> int deleteByArtifactKey(final Class<T> aClass, final Collection<AxArtifactKey> keys) {
+    public <T extends AxConcept> int deleteByArtifactKey(final Class<T> clazz, final Collection<AxArtifactKey> keys) {
         if (keys == null || keys.isEmpty()) {
             return 0;
         }
@@ -111,8 +111,8 @@ public class HibernateApexDao extends DefaultApexDao {
         try {
             mg.getTransaction().begin();
             for (final AxArtifactKey key : keys) {
-                deletedCount += mg.createQuery(DELETE_FROM + aClass.getSimpleName() + WHERE_KEY_NAME + key.getName()
-                        + AND_KEY_VERSION + key.getVersion() + "'").executeUpdate();
+                deletedCount += mg.createQuery(DELETE_FROM + clazz.getSimpleName() + WHERE_KEY_NAME + key.getName()
+                                + AND_KEY_VERSION + key.getVersion() + "'").executeUpdate();
             }
             mg.getTransaction().commit();
         } finally {
@@ -127,8 +127,7 @@ public class HibernateApexDao extends DefaultApexDao {
      * @see org.onap.policy.apex.core.model.dao.ApexDao#deleteByContextUsageKey(java.lang.Class, java.util.Collection)
      */
     @Override
-    public <T extends AxConcept> int deleteByReferenceKey(final Class<T> aClass,
-            final Collection<AxReferenceKey> keys) {
+    public <T extends AxConcept> int deleteByReferenceKey(final Class<T> clazz, final Collection<AxReferenceKey> keys) {
         if (keys == null || keys.isEmpty()) {
             return 0;
         }
@@ -137,9 +136,9 @@ public class HibernateApexDao extends DefaultApexDao {
         try {
             mg.getTransaction().begin();
             for (final AxReferenceKey key : keys) {
-                deletedCount += mg.createQuery(DELETE_FROM + aClass.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME
-                        + key.getParentKeyName() + AND_KEY_PARENT_KEY_VERSION + key.getParentKeyVersion()
-                        + AND_KEY_LOCAL_NAME + key.getLocalName() + "'").executeUpdate();
+                deletedCount += mg.createQuery(DELETE_FROM + clazz.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME
+                                + key.getParentKeyName() + AND_KEY_PARENT_KEY_VERSION + key.getParentKeyVersion()
+                                + AND_KEY_LOCAL_NAME + key.getLocalName() + "'").executeUpdate();
             }
             mg.getTransaction().commit();
         } finally {
@@ -154,11 +153,11 @@ public class HibernateApexDao extends DefaultApexDao {
      * @see org.onap.policy.apex.core.model.dao.ApexDao#deleteAll(java.lang.Class)
      */
     @Override
-    public <T extends AxConcept> void deleteAll(final Class<T> aClass) {
+    public <T extends AxConcept> void deleteAll(final Class<T> clazz) {
         final EntityManager mg = getEntityManager();
         try {
             mg.getTransaction().begin();
-            mg.createQuery(DELETE_FROM + aClass.getSimpleName()).executeUpdate();
+            mg.createQuery(DELETE_FROM + clazz.getSimpleName()).executeUpdate();
             mg.getTransaction().commit();
         } finally {
             mg.close();
@@ -171,21 +170,21 @@ public class HibernateApexDao extends DefaultApexDao {
      * @see org.onap.policy.apex.core.model.dao.ApexDao#getAll(java.lang.Class)
      */
     @Override
-    public <T extends AxConcept> List<T> getAll(final Class<T> aClass) {
-        if (aClass == null) {
+    public <T extends AxConcept> List<T> getAll(final Class<T> clazz) {
+        if (clazz == null) {
             return Collections.emptyList();
         }
         final EntityManager mg = getEntityManager();
         try {
-            final List<T> result = mg.createQuery(FROM + aClass.getSimpleName(), aClass).getResultList();
+            final List<T> result = mg.createQuery(FROM + clazz.getSimpleName(), clazz).getResultList();
             final List<T> cloneResult = new ArrayList<>();
             for (final T t : result) {
                 try {
-                    final T clonedT = aClass.newInstance();
+                    final T clonedT = clazz.newInstance();
                     t.copyTo(clonedT);
                     cloneResult.add(clonedT);
                 } catch (final Exception e) {
-                    LOGGER.warn("Could not clone object of class \"" + aClass.getCanonicalName() + "\"", e);
+                    LOGGER.warn("Could not clone object of class \"" + clazz.getCanonicalName() + "\"", e);
                     return cloneResult;
                 }
             }
@@ -202,14 +201,14 @@ public class HibernateApexDao extends DefaultApexDao {
      * org.onap.policy.apex.core.model.concepts.AxArtifactKey)
      */
     @Override
-    public <T extends AxConcept> List<T> getAll(final Class<T> aClass, final AxArtifactKey parentKey) {
-        if (aClass == null) {
+    public <T extends AxConcept> List<T> getAll(final Class<T> clazz, final AxArtifactKey parentKey) {
+        if (clazz == null) {
             return Collections.emptyList();
         }
         final EntityManager mg = getEntityManager();
         try {
-            return mg.createQuery(FROM + aClass.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME + parentKey.getName()
-                    + AND_KEY_PARENT_KEY_VERSION + parentKey.getVersion() + "'", aClass).getResultList();
+            return mg.createQuery(FROM + clazz.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME + parentKey.getName()
+                            + AND_KEY_PARENT_KEY_VERSION + parentKey.getVersion() + "'", clazz).getResultList();
         } finally {
             mg.close();
         }
@@ -222,15 +221,15 @@ public class HibernateApexDao extends DefaultApexDao {
      * org.onap.policy.apex.core.model.concepts.AxArtifactKey)
      */
     @Override
-    public <T extends AxConcept> T getArtifact(final Class<T> aClass, final AxArtifactKey key) {
-        if (aClass == null || key == null) {
+    public <T extends AxConcept> T getArtifact(final Class<T> clazz, final AxArtifactKey key) {
+        if (clazz == null || key == null) {
             return null;
         }
         final EntityManager mg = getEntityManager();
         List<T> ret;
         try {
-            ret = mg.createQuery(FROM + aClass.getSimpleName() + WHERE_KEY_NAME + key.getName() + AND_KEY_VERSION
-                    + key.getVersion() + "'", aClass).getResultList();
+            ret = mg.createQuery(FROM + clazz.getSimpleName() + WHERE_KEY_NAME + key.getName() + AND_KEY_VERSION
+                            + key.getVersion() + "'", clazz).getResultList();
         } finally {
             mg.close();
         }
@@ -238,8 +237,8 @@ public class HibernateApexDao extends DefaultApexDao {
             return null;
         }
         if (ret.size() > 1) {
-            throw new IllegalArgumentException("More than one result was returned for search for " + aClass
-                    + " with key " + key.getId() + ": " + ret);
+            throw new IllegalArgumentException("More than one result was returned for search for " + clazz
+                            + " with key " + key.getId() + ": " + ret);
         }
         return ret.get(0);
     }
@@ -251,16 +250,16 @@ public class HibernateApexDao extends DefaultApexDao {
      * org.onap.policy.apex.core.model.concepts.AxReferenceKey)
      */
     @Override
-    public <T extends AxConcept> T getArtifact(final Class<T> aClass, final AxReferenceKey key) {
-        if (aClass == null || key == null) {
+    public <T extends AxConcept> T getArtifact(final Class<T> clazz, final AxReferenceKey key) {
+        if (clazz == null || key == null) {
             return null;
         }
         final EntityManager mg = getEntityManager();
         List<T> ret;
         try {
-            ret = mg.createQuery(FROM + aClass.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME + key.getParentKeyName()
-                    + AND_KEY_PARENT_KEY_VERSION + key.getParentKeyVersion() + AND_KEY_LOCAL_NAME + key.getLocalName()
-                    + "'", aClass).getResultList();
+            ret = mg.createQuery(FROM + clazz.getSimpleName() + WHERE_KEY_PARENT_KEY_NAME + key.getParentKeyName()
+                            + AND_KEY_PARENT_KEY_VERSION + key.getParentKeyVersion() + AND_KEY_LOCAL_NAME
+                            + key.getLocalName() + "'", clazz).getResultList();
         } finally {
             mg.close();
         }
@@ -268,8 +267,8 @@ public class HibernateApexDao extends DefaultApexDao {
             return null;
         }
         if (ret.size() > 1) {
-            throw new IllegalArgumentException("More than one result was returned for search for " + aClass
-                    + " with key " + key.getId() + ": " + ret);
+            throw new IllegalArgumentException("More than one result was returned for search for " + clazz
+                            + " with key " + key.getId() + ": " + ret);
         }
         return ret.get(0);
     }