Merge "Fix checkstyle issues in policy-core"

17 files changed, 46 insertions, 77 deletions

diff --git a/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java b/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java
index f5f728f1..1872a3a9 100644
--- a/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java
+++ b/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java
@@ -29,7 +29,7 @@ import java.util.Properties;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.onap.policy.drools.core.PolicySessionFeatureAPI;
+import org.onap.policy.drools.core.PolicySessionFeatureApi;
 import org.onap.policy.drools.features.PolicyEngineFeatureApi;
 import org.onap.policy.drools.statemanagement.StateManagementFeatureAPI;
 import org.onap.policy.drools.system.PolicyEngine;
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  * a separate optional feature.
  */
 public class ActiveStandbyFeature implements ActiveStandbyFeatureAPI, 
-    PolicySessionFeatureAPI, PolicyEngineFeatureApi {
+    PolicySessionFeatureApi, PolicyEngineFeatureApi {
     // get an instance of logger
     private static final Logger logger =
             LoggerFactory.getLogger(ActiveStandbyFeature.class);
diff --git a/feature-active-standby-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI b/feature-active-standby-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
index 5296f8b7..5296f8b7 100644
--- a/feature-active-standby-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI
+++ b/feature-active-standby-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
diff --git a/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/AllSeemsWellTest.java b/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/AllSeemsWellTest.java
index 75a65f61..ea9418bf 100644
--- a/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/AllSeemsWellTest.java
+++ b/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/AllSeemsWellTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * feature-active-standby-management
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ import org.onap.policy.drools.activestandby.DroolsPdpImpl;
 import org.onap.policy.drools.activestandby.DroolsPdpsConnector;
 import org.onap.policy.drools.activestandby.DroolsPdpsElectionHandler;
 import org.onap.policy.drools.activestandby.JpaDroolsPdpsConnector;
-import org.onap.policy.drools.core.PolicySessionFeatureAPI;
+import org.onap.policy.drools.core.PolicySessionFeatureApi;
 import org.onap.policy.drools.statemanagement.StateManagementFeatureAPI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -236,7 +236,7 @@ public class AllSeemsWellTest {
 
         StateManagementFeatureAPI stateManagementFeatureApi = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             stateManagementFeatureApi = feature;
             logger.debug("testAllSeemsWell stateManagementFeature.getResourceName(): {}",
                 stateManagementFeatureApi.getResourceName());
@@ -256,7 +256,7 @@ public class AllSeemsWellTest {
         // that has been created.
         ActiveStandbyFeatureAPI activeStandbyFeature = null;
         for (ActiveStandbyFeatureAPI feature : ActiveStandbyFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             activeStandbyFeature = feature;
             logger.debug("testAllSeemsWell activeStandbyFeature.getResourceName(): {}",
                     activeStandbyFeature.getResourceName());
diff --git a/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/StandbyStateManagementTest.java b/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/StandbyStateManagementTest.java
index aca2021d..1a52456e 100644
--- a/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/StandbyStateManagementTest.java
+++ b/feature-active-standby-management/src/test/java/org/onap/policy/drools/controller/test/StandbyStateManagementTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * feature-active-standby-management
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ import org.onap.policy.drools.activestandby.DroolsPdpsConnector;
 import org.onap.policy.drools.activestandby.DroolsPdpsElectionHandler;
 import org.onap.policy.drools.activestandby.JpaDroolsPdpsConnector;
 import org.onap.policy.drools.activestandby.PMStandbyStateChangeNotifier;
-import org.onap.policy.drools.core.PolicySessionFeatureAPI;
+import org.onap.policy.drools.core.PolicySessionFeatureApi;
 import org.onap.policy.drools.statemanagement.StateManagementFeatureAPI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -353,7 +353,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI stateManagementFeature = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             stateManagementFeature = feature;
             logger.debug("testColdStandby stateManagementFeature.getResourceName(): {}", 
                     stateManagementFeature.getResourceName());
@@ -472,7 +472,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI stateManagementFeature = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             stateManagementFeature = feature;
             logger.debug("testComputeMostRecentPrimary stateManagementFeature.getResourceName(): {}", 
                     stateManagementFeature.getResourceName());
@@ -654,7 +654,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI stateManagementFeature = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             stateManagementFeature = feature;
             logger.debug("testComputeDesignatedPdp stateManagementFeature.getResourceName(): {}", 
                     stateManagementFeature.getResourceName());
@@ -794,7 +794,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI smf = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             smf = feature;
             logger.debug("testColdStandby stateManagementFeature.getResourceName(): {}", smf.getResourceName());
             break;
@@ -812,7 +812,7 @@ public class StandbyStateManagementTest {
         // that has been created.
         ActiveStandbyFeatureAPI activeStandbyFeature = null;
         for (ActiveStandbyFeatureAPI feature : ActiveStandbyFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             activeStandbyFeature = feature;
             logger.debug("testColdStandby activeStandbyFeature.getResourceName(): {}", 
                     activeStandbyFeature.getResourceName());
@@ -925,7 +925,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI smf = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             smf = feature;
             logger.debug("testHotStandby1 stateManagementFeature.getResourceName(): {}", smf.getResourceName());
             break;
@@ -943,7 +943,7 @@ public class StandbyStateManagementTest {
         // that has been created.
         ActiveStandbyFeatureAPI activeStandbyFeature = null;
         for (ActiveStandbyFeatureAPI feature : ActiveStandbyFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             activeStandbyFeature = feature;
             logger.debug("testHotStandby1 activeStandbyFeature.getResourceName(): {}", 
                     activeStandbyFeature.getResourceName());
@@ -1082,7 +1082,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI sm2 = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             sm2 = feature;
             logger.debug("testHotStandby2 stateManagementFeature.getResourceName(): {}", sm2.getResourceName());
             break;
@@ -1100,7 +1100,7 @@ public class StandbyStateManagementTest {
         // that has been created.
         ActiveStandbyFeatureAPI activeStandbyFeature = null;
         for (ActiveStandbyFeatureAPI feature : ActiveStandbyFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             activeStandbyFeature = feature;
             logger.debug("testHotStandby2 activeStandbyFeature.getResourceName(): {}", 
                     activeStandbyFeature.getResourceName());
@@ -1239,7 +1239,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI sm = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             sm = feature;
             logger.debug("testLocking1 stateManagementFeature.getResourceName(): {}", sm.getResourceName());
             break;
@@ -1257,7 +1257,7 @@ public class StandbyStateManagementTest {
         // that has been created.
         ActiveStandbyFeatureAPI activeStandbyFeature = null;
         for (ActiveStandbyFeatureAPI feature : ActiveStandbyFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             activeStandbyFeature = feature;
             logger.debug("testLocking1 activeStandbyFeature.getResourceName(): {}", 
                     activeStandbyFeature.getResourceName());
@@ -1487,7 +1487,7 @@ public class StandbyStateManagementTest {
 
         StateManagementFeatureAPI sm = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             sm = feature;
             logger.debug("testLocking2 stateManagementFeature.getResourceName(): {}", sm.getResourceName());
             break;
@@ -1505,7 +1505,7 @@ public class StandbyStateManagementTest {
         // that has been created.
         ActiveStandbyFeatureAPI activeStandbyFeature = null;
         for (ActiveStandbyFeatureAPI feature : ActiveStandbyFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             activeStandbyFeature = feature;
             logger.debug("testLocking2 activeStandbyFeature.getResourceName(): {}", 
                     activeStandbyFeature.getResourceName());
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 5757090f..e280d6a5 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
@@ -45,7 +45,7 @@ import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.KieSessionConfiguration;
 import org.onap.policy.drools.core.PolicyContainer;
 import org.onap.policy.drools.core.PolicySession;
-import org.onap.policy.drools.core.PolicySessionFeatureAPI;
+import org.onap.policy.drools.core.PolicySessionFeatureApi;
 import org.onap.policy.drools.features.PolicyEngineFeatureApi;
 import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
  * <p>The bulk of the code here was once in other classes, such as 'PolicyContainer' and 'Main'. It
  * was moved here as part of making this a separate optional feature.
  */
-public class PersistenceFeature implements PolicySessionFeatureAPI, PolicyEngineFeatureApi {
+public class PersistenceFeature implements PolicySessionFeatureApi, PolicyEngineFeatureApi {
 
     private static final Logger logger = LoggerFactory.getLogger(PersistenceFeature.class);
     
diff --git a/feature-session-persistence/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI b/feature-session-persistence/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
index 26366fd3..26366fd3 100644
--- a/feature-session-persistence/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI
+++ b/feature-session-persistence/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
index 68f5aa29..e1abefc6 100644
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
@@ -26,7 +26,7 @@ import java.util.Properties;
 
 import org.onap.policy.common.im.AllSeemsWellException;
 import org.onap.policy.common.im.StateManagement;
-import org.onap.policy.drools.core.PolicySessionFeatureAPI;
+import org.onap.policy.drools.core.PolicySessionFeatureApi;
 import org.onap.policy.drools.features.PolicyEngineFeatureApi;
 import org.onap.policy.drools.utils.PropertyUtil;
 import org.slf4j.Logger;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 
 public class StateManagementFeature implements StateManagementFeatureAPI, 
-    PolicySessionFeatureAPI, PolicyEngineFeatureApi {
+    PolicySessionFeatureApi, PolicyEngineFeatureApi {
     // get an instance of logger
     private static final Logger logger =
             LoggerFactory.getLogger(StateManagementFeature.class);
diff --git a/feature-state-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI b/feature-state-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
index 9ffef571..9ffef571 100644
--- a/feature-state-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI
+++ b/feature-state-management/src/main/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
diff --git a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
index 5c69284f..1da0866a 100644
--- a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
+++ b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-persistence
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.im.StateManagement;
-import org.onap.policy.drools.core.PolicySessionFeatureAPI;
+import org.onap.policy.drools.core.PolicySessionFeatureApi;
 import org.onap.policy.drools.statemanagement.DbAudit;
 import org.onap.policy.drools.statemanagement.IntegrityMonitorRestManager;
 import org.onap.policy.drools.statemanagement.RepositoryAudit;
@@ -116,7 +116,7 @@ public class StateManagementTest {
 
         StateManagementFeatureAPI stateManagementFeature = null;
         for (StateManagementFeatureAPI feature : StateManagementFeatureAPI.impl.getList()) {
-            ((PolicySessionFeatureAPI) feature).globalInit(null, configDir);
+            ((PolicySessionFeatureApi) feature).globalInit(null, configDir);
             stateManagementFeature = feature;
             logger.debug("testStateManagementOperation stateManagementFeature.getResourceName(): " 
                 + stateManagementFeature.getResourceName());
diff --git a/policy-core/checkstyle-suppressions.xml b/policy-core/checkstyle-suppressions.xml
deleted file mode 100644
index d771a027..00000000
--- a/policy-core/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 AT&T Technologies. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<!DOCTYPE suppressions PUBLIC
-     "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-     "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
- 
-<suppressions>
-  <suppress checks="AbbreviationAsWordInName"
-    files="PolicyResourceLockFeatureAPI.java|PolicySessionFeatureAPI.java"
-    lines="1-9999"/>
-</suppressions>
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 1a0626c9..c6866174 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -149,7 +149,6 @@
                             <includeTestResources>true</includeTestResources>
                             <excludes>
                             </excludes>
-                            <suppressionsLocation>${project.baseUri}checkstyle-suppressions.xml</suppressionsLocation>
                             <consoleOutput>true</consoleOutput>
                             <failsOnViolation>true</failsOnViolation>
                             <violationSeverity>warning</violationSeverity>
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
index 2c5d87f8..3b5c360f 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-core
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -258,7 +258,7 @@ public class PolicyContainer implements Startable {
 
             // loop through all of the features, and give each one
             // a chance to create the 'KieSession'
-            for (PolicySessionFeatureAPI feature : PolicySessionFeatureAPI.impl.getList()) {
+            for (PolicySessionFeatureApi feature : PolicySessionFeatureApi.impl.getList()) {
                 try {
                     if ((kieSession = feature.activatePolicySession(this, name, kieBaseName)) != null) {
                         break;
@@ -280,7 +280,7 @@ public class PolicyContainer implements Startable {
                 sessions.put(name, session);
 
                 // notify features
-                for (PolicySessionFeatureAPI feature : PolicySessionFeatureAPI.impl.getList()) {
+                for (PolicySessionFeatureApi feature : PolicySessionFeatureApi.impl.getList()) {
                     try {
                         feature.newPolicySession(session);
                     } catch (Exception e) {
@@ -350,7 +350,7 @@ public class PolicyContainer implements Startable {
             sessions.put(name, policySession);
 
             // notify features
-            for (PolicySessionFeatureAPI feature : PolicySessionFeatureAPI.impl.getList()) {
+            for (PolicySessionFeatureApi feature : PolicySessionFeatureApi.impl.getList()) {
                 try {
                     feature.newPolicySession(policySession);
                 } catch (Exception e) {
@@ -430,7 +430,7 @@ public class PolicyContainer implements Startable {
         // KLUDGE WARNING: this is a temporary workaround -- if there are
         // no features, we don't have persistence, and 'activate' is never
         // called. In this case, make sure the container is started.
-        if (PolicySessionFeatureAPI.impl.getList().isEmpty()) {
+        if (PolicySessionFeatureApi.impl.getList().isEmpty()) {
             start();
         }
 
@@ -562,7 +562,7 @@ public class PolicyContainer implements Startable {
             session.getKieSession().dispose();
 
             // notify features
-            for (PolicySessionFeatureAPI feature : PolicySessionFeatureAPI.impl.getList()) {
+            for (PolicySessionFeatureApi feature : PolicySessionFeatureApi.impl.getList()) {
                 try {
                     feature.disposeKieSession(session);
                 } catch (Exception e) {
@@ -625,7 +625,7 @@ public class PolicyContainer implements Startable {
             session.getKieSession().destroy();
 
             // notify features
-            for (PolicySessionFeatureAPI feature : PolicySessionFeatureAPI.impl.getList()) {
+            for (PolicySessionFeatureApi feature : PolicySessionFeatureApi.impl.getList()) {
                 try {
                     feature.destroyKieSession(session);
                 } catch (Exception e) {
@@ -685,7 +685,7 @@ public class PolicyContainer implements Startable {
         logger.info("PolicyContainer.main: configDir={}", configDir);
 
         // invoke 'globalInit' on all of the features
-        for (PolicySessionFeatureAPI feature : PolicySessionFeatureAPI.impl.getList()) {
+        for (PolicySessionFeatureApi feature : PolicySessionFeatureApi.impl.getList()) {
             try {
                 feature.globalInit(args, configDir);
             } catch (Exception e) {
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
index 95da2865..f27bb4ab 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-core
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -142,8 +142,8 @@ public class PolicySession
 
         // loop through all of the features, and give each one
         // a chance to create the 'ThreadModel'
-        for (PolicySessionFeatureAPI feature :
-                PolicySessionFeatureAPI.impl.getList()) {
+        for (PolicySessionFeatureApi feature :
+                PolicySessionFeatureApi.impl.getList()) {
             try {
                 if ((threadModel = feature.selectThreadModel(this)) != null) {
                     break;
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureApi.java
index 56595901..3d259954 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureApi.java
@@ -32,13 +32,13 @@ import org.onap.policy.common.utils.services.OrderedServiceImpl;
  * return a 'void' value. In other cases, such as 'activatePolicySession',
  * may
  */
-public interface PolicySessionFeatureAPI extends OrderedService {
+public interface PolicySessionFeatureApi extends OrderedService {
     /**
      * 'FeatureAPI.impl.getList()' returns an ordered list of objects
      * implementing the 'FeatureAPI' interface.
      */
-    public static OrderedServiceImpl<PolicySessionFeatureAPI> impl =
-            new OrderedServiceImpl<>(PolicySessionFeatureAPI.class);
+    public static OrderedServiceImpl<PolicySessionFeatureApi> impl =
+            new OrderedServiceImpl<>(PolicySessionFeatureApi.class);
 
     /**
      * This method is called during initialization at a point right after
diff --git a/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiMock.java b/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiMock.java
index d838f6bd..fbd81391 100644
--- a/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiMock.java
+++ b/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiMock.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-core
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.kie.api.runtime.KieSession;
  * 'PolicySessionFeatureAPI', and providing a means to indicate
  * which hooks have been invoked.
  */
-public class PolicySessionFeatureApiMock implements PolicySessionFeatureAPI {
+public class PolicySessionFeatureApiMock implements PolicySessionFeatureApi {
     // contains the log entries since the most recent 'getLog()' call
     private static ArrayList<String> log = new ArrayList<>();
 
diff --git a/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiTest.java b/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiTest.java
index df2c1398..1d1ca0ff 100644
--- a/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiTest.java
+++ b/policy-core/src/test/java/org/onap/policy/drools/core/PolicySessionFeatureApiTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ public class PolicySessionFeatureApiTest {
 
     @Test
     public void test() {
-        PolicySessionFeatureAPI api = new PolicySessionFeatureAPI() {
+        PolicySessionFeatureApi api = new PolicySessionFeatureApi() {
             @Override
             public int getSequenceNumber() {
                 return 0;
diff --git a/policy-core/src/test/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI b/policy-core/src/test/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi
index 3af9beea..3af9beea 100644
--- a/policy-core/src/test/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureAPI
+++ b/policy-core/src/test/resources/META-INF/services/org.onap.policy.drools.core.PolicySessionFeatureApi