From 0c20d1c294fe146e1018f14b07a8d861c29fe527 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 8 Nov 2019 16:11:50 +0000 Subject: JUnit/SONAR/Checkstyle in ONAP-REST Third batch of JPA pojos (E-M), with JUnit added and SONAR/Checkstyle issues addressed. In cases where a class name change caused an update in another package, the license header on files for those knock on changes are not updated. Issue-ID: POLICY-2131 Change-Id: I4fee1e9fb9c8a69dd6f2f15d3e3a8844473b857b Signed-off-by: liamfallon --- .../java/org/onap/policy/controller/CreateFirewallController.java | 6 +++--- .../test/java/org/onap/policy/admin/PolicyRestControllerTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'POLICY-SDK-APP') diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java index cb0263f2f..446e124ed 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateFirewallController.java @@ -66,7 +66,7 @@ import org.onap.policy.rest.adapter.TermCollector; import org.onap.policy.rest.adapter.VendorSpecificData; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.AddressGroup; -import org.onap.policy.rest.jpa.FWTagPicker; +import org.onap.policy.rest.jpa.FwTagPicker; import org.onap.policy.rest.jpa.GroupServiceList; import org.onap.policy.rest.jpa.PolicyEntity; import org.onap.policy.rest.jpa.PrefixList; @@ -490,9 +490,9 @@ public class CreateFirewallController extends RestrictedBaseController { String networkRole = ""; for (String tag : tagCollectorList) { tags = new Tags(); - List tagListData = commonClassDao.getData(FWTagPicker.class); + List tagListData = commonClassDao.getData(FwTagPicker.class); for (int tagCounter = 0; tagCounter < tagListData.size(); tagCounter++) { - FWTagPicker jpaTagPickerList = (FWTagPicker) tagListData.get(tagCounter); + FwTagPicker jpaTagPickerList = (FwTagPicker) tagListData.get(tagCounter); if (jpaTagPickerList.getTagPickerName().equals(tag)) { String tagValues = jpaTagPickerList.getTagValues(); tagList = new ArrayList<>(); diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java index 0a24713a6..77d66367b 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java @@ -46,7 +46,7 @@ import org.onap.policy.controller.PolicyController; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.ActionList; import org.onap.policy.rest.jpa.AddressGroup; -import org.onap.policy.rest.jpa.FWTagPicker; +import org.onap.policy.rest.jpa.FwTagPicker; import org.onap.policy.rest.jpa.GroupServiceList; import org.onap.policy.rest.jpa.PrefixList; import org.onap.policy.rest.jpa.SecurityZone; @@ -198,11 +198,11 @@ public class PolicyRestControllerTest { when(commonClassDao.getData(GroupServiceList.class)).thenReturn(serviceGroupData); tagListData = new ArrayList<>(); - FWTagPicker fwPicker = new FWTagPicker(); + FwTagPicker fwPicker = new FwTagPicker(); fwPicker.setTagPickerName("Test"); fwPicker.setTagValues("Test:8080"); tagListData.add(fwPicker); - when(commonClassDao.getData(FWTagPicker.class)).thenReturn(tagListData); + when(commonClassDao.getData(FwTagPicker.class)).thenReturn(tagListData); termListData = new ArrayList<>(); TermList termList = new TermList(); -- cgit 1.2.3-korg