From 069dbb206cedae6c664972cfb8baf036989d61a0 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 25 Jun 2020 11:12:36 -0400 Subject: Use parent snapshot in drools-apps Fixed checkstyle issues that were subsequently reported. Also fixed a few eclipse warnings. Also fixed some of the sonar issues in the files that were touched: - use "{}" in logger calls - camelcase method names - use "" instead of generics - add serialization ID Issue-ID: POLICY-2188 Change-Id: I5c94a2e26dd74a61a0a919e1c3da17ab02a5bc9d Signed-off-by: Jim Hahn --- .../java/org/onap/policy/util/DroolsSessionCommonSerializable.java | 5 ++--- .../org/onap/policy/util/DroolsSessionCommonSerializableTest.java | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'controlloop/m2/util') diff --git a/controlloop/m2/util/src/main/java/org/onap/policy/util/DroolsSessionCommonSerializable.java b/controlloop/m2/util/src/main/java/org/onap/policy/util/DroolsSessionCommonSerializable.java index d8501fea8..0834026a0 100644 --- a/controlloop/m2/util/src/main/java/org/onap/policy/util/DroolsSessionCommonSerializable.java +++ b/controlloop/m2/util/src/main/java/org/onap/policy/util/DroolsSessionCommonSerializable.java @@ -20,11 +20,9 @@ package org.onap.policy.util; -import java.io.InvalidObjectException; import java.io.ObjectStreamException; import java.io.Serializable; import java.util.HashMap; - import org.onap.policy.drools.core.PolicySession; /** @@ -116,7 +114,7 @@ public class DroolsSessionCommonSerializable implements Serializable { session.setAdjunct(Adjunct.class, adjunct); } else { // found the adjunct -- return it - adjunct = (Adjunct)adj; + adjunct = (Adjunct) adj; //adjunct = Adjunct.class.cast(adj); } } @@ -132,5 +130,6 @@ public class DroolsSessionCommonSerializable implements Serializable { * warnings. */ private static class Adjunct extends HashMap { + private static final long serialVersionUID = 1L; } } diff --git a/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java b/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java index 2448d176b..24c04f70d 100644 --- a/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java +++ b/controlloop/m2/util/src/test/java/org/onap/policy/util/DroolsSessionCommonSerializableTest.java @@ -27,11 +27,8 @@ import static org.mockito.Mockito.when; import org.junit.Test; import org.junit.runner.RunWith; - import org.mockito.Mockito; - import org.onap.policy.drools.core.PolicySession; - import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -- cgit 1.2.3-korg