From 56a15039437ba5bf5d0fb422551bfb12e1f59eb1 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 19 Jun 2020 14:32:10 -0400 Subject: Address checkstyle version issues in drools-pdp Also added serializationId to several classes to address eclipse warnings. Issue-ID: POLICY-2188 Change-Id: I3df5e8abaad8da9261c0d5cd19a93ed68dceb870 Signed-off-by: Jim Hahn --- .../org/onap/policy/drools/persistence/DroolsSessionEntity.java | 1 - .../onap/policy/drools/persistence/JpaDroolsSessionConnector.java | 1 - .../org/onap/policy/drools/persistence/PersistenceFeature.java | 4 +--- .../onap/policy/drools/persistence/DroolsSessionEntityTest.java | 4 +--- .../policy/drools/persistence/JpaDroolsSessionConnectorTest.java | 7 +------ .../org/onap/policy/drools/persistence/PersistenceFeatureTest.java | 2 -- 6 files changed, 3 insertions(+), 16 deletions(-) (limited to 'feature-session-persistence') diff --git a/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/DroolsSessionEntity.java b/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/DroolsSessionEntity.java index 447835a6..ec9e5b76 100644 --- a/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/DroolsSessionEntity.java +++ b/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/DroolsSessionEntity.java @@ -22,7 +22,6 @@ package org.onap.policy.drools.persistence; import java.io.Serializable; import java.util.Date; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnector.java b/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnector.java index b85a6854..d682e563 100644 --- a/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnector.java +++ b/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnector.java @@ -22,7 +22,6 @@ package org.onap.policy.drools.persistence; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/PersistenceFeature.java b/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/PersistenceFeature.java index a4965888..ed427255 100644 --- a/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/PersistenceFeature.java +++ b/feature-session-persistence/src/main/java/org/onap/policy/drools/persistence/PersistenceFeature.java @@ -29,13 +29,11 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; import javax.transaction.UserTransaction; - import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.dbcp2.BasicDataSourceFactory; import org.hibernate.cfg.AvailableSettings; @@ -833,7 +831,7 @@ public class PersistenceFeature implements PolicySessionFeatureApi, PolicyEngine } } - /** Factory for various items. Methods can be overridden for junit testing. */ + /* Factory for various items. Methods can be overridden for junit testing. */ /** * Gets the transaction manager. diff --git a/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/DroolsSessionEntityTest.java b/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/DroolsSessionEntityTest.java index 5fbb905b..8853edf2 100644 --- a/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/DroolsSessionEntityTest.java +++ b/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/DroolsSessionEntityTest.java @@ -25,9 +25,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Date; - import org.junit.Test; -import org.onap.policy.drools.persistence.DroolsSessionEntity; public class DroolsSessionEntityTest { @@ -103,7 +101,7 @@ public class DroolsSessionEntityTest { @Test public void testEqualsObject() { DroolsSessionEntity entity = makeEnt("mynameA", 1); - + // diff object type assertFalse(entity.equals("hello")); diff --git a/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnectorTest.java b/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnectorTest.java index d1962b60..c1fe08a1 100644 --- a/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnectorTest.java +++ b/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/JpaDroolsSessionConnectorTest.java @@ -29,19 +29,14 @@ import static org.mockito.Mockito.when; import java.util.HashMap; import java.util.Map; - import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.EntityTransaction; import javax.persistence.Persistence; - import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.onap.policy.drools.persistence.DroolsSessionEntity; -import org.onap.policy.drools.persistence.EntityMgrTrans; -import org.onap.policy.drools.persistence.JpaDroolsSessionConnector; public class JpaDroolsSessionConnectorTest { @@ -56,7 +51,7 @@ public class JpaDroolsSessionConnectorTest { /** * Setup. - * + * * @throws Exception exception */ @Before diff --git a/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/PersistenceFeatureTest.java b/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/PersistenceFeatureTest.java index 20ae13d0..25f805d7 100644 --- a/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/PersistenceFeatureTest.java +++ b/feature-session-persistence/src/test/java/org/onap/policy/drools/persistence/PersistenceFeatureTest.java @@ -52,13 +52,11 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; import javax.transaction.UserTransaction; - import org.apache.commons.dbcp2.BasicDataSource; import org.junit.After; import org.junit.Before; -- cgit 1.2.3-korg