Clean up minor checkstyle/sonar issues

A few minor eclipse warnings and checkstyle warnings in policy models.

Issue-ID: POLICY-1910
Change-Id: I612c6514fa7d88cb8658a7ee1618869a525e48d7
Signed-off-by: liamfallon <liam.fallon@est.tech>

3 files changed, 32 insertions, 23 deletions

diff --git a/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_Test.yaml b/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_Test.yaml
index 73486b08b..de2590c15 100644
--- a/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_Test.yaml
+++ b/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_Test.yaml
@@ -1,5 +1,5 @@
 # Copyright 2018 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019-2020 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 controlLoop:
   controlLoopName: ControlLoop-TEST-5dfa8fce-bd7a-4424-b60d-ee2ad2f254a3
   version: 1.0.0
-  services: 
+  services:
     - serviceName: Foo Service
-  resources: 
+  resources:
     - resourceName: Bar VNF
       resourceType: VF
   trigger_policy: unique-policy-id-1-restart
@@ -29,7 +29,8 @@ policies:
     description:
     actor: APPC
     recipe: Restart
-    target: VM
+    target:
+      type: VM
     retry: 2
     timeout: 300
     success: unique-policy-id-2-healthcheck-restart
@@ -37,13 +38,14 @@ policies:
     failure_timeout: unique-policy-id-3-rebuild
     failure_retries: unique-policy-id-3-rebuild
     failure_exception: final_failure_exception
-  
+
   - id: unique-policy-id-2-healthcheck-restart
     name: HealthCheck Policy
     description:
     actor: APPC
     recipe: HealthCheck
-    target: VM
+    target:
+      type: VM
     retry: 2
     timeout: 300
     success: final_success
@@ -51,13 +53,14 @@ policies:
     failure_timeout: unique-policy-id-3-rebuild
     failure_retries: unique-policy-id-3-rebuild
     failure_exception: final_failure_exception
-  
+
   - id: unique-policy-id-3-rebuild
     name: Rebuild Policy
     description:
     actor: APPC
     recipe: Rebuild
-    target: VM
+    target:
+      type: VM
     retry: 0
     timeout: 600
     success: unique-policy-id-4-healthcheck-rebuild
@@ -65,13 +68,14 @@ policies:
     failure_timeout: unique-policy-id-5-migrate
     failure_retries: unique-policy-id-5-migrate
     failure_exception: final_failure_exception
-  
+
   - id: unique-policy-id-4-healthcheck-rebuild
     name: HealthCheck the Rebuild Policy
     description:
     actor: APPC
     recipe: HealthCheck
-    target: VM
+    target:
+      type: VM
     retry: 2
     timeout: 300
     success: final_success
@@ -79,13 +83,14 @@ policies:
     failure_timeout: unique-policy-id-5-migrate
     failure_retries: unique-policy-id-5-migrate
     failure_exception: final_failure_exception
-  
+
   - id: unique-policy-id-5-migrate
     name: Migrate Policy
     description:
     actor: APPC
     recipe: Migrate
-    target: VM
+    target:
+      type: VM
     retry: 0
     timeout: 600
     success: unique-policy-id-6-healthcheck-migrate
@@ -99,7 +104,8 @@ policies:
     description:
     actor: APPC
     recipe: HealthCheck
-    target: VM
+    target:
+      type: VM
     retry: 2
     timeout: 300
     success: final_success
diff --git a/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_vService.yaml b/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_vService.yaml
index 009a49c19..44c081cb7 100644
--- a/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_vService.yaml
+++ b/models-interactions/model-yaml/src/test/resources/v1.0.0/policy_vService.yaml
@@ -1,5 +1,5 @@
 # Copyright 2018 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019-2020 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 controlLoop:
   version: 1.0.0
   controlLoopName: ControlLoop-vUSP-vCTS-cbed919f-2212-4ef7-8051-fe6308da1bda
-  services: 
+  services:
     - serviceName: vUSP
-  resources: 
+  resources:
     - resourceName: vCTS
       resourceType: VF
     - resourceName: vCOM
@@ -37,7 +37,8 @@ policies:
     description:
     actor: APPC
     recipe: Restart
-    target: VM
+    target:
+      type: VM
     retry: 2
     timeout: 300
     success: final_success
@@ -45,13 +46,14 @@ policies:
     failure_timeout: unique-policy-id-2-rebuild
     failure_retries: unique-policy-id-2-rebuild
     failure_exception: final_failure_exception
-  
+
   - id: unique-policy-id-2-rebuild
     name: Rebuild Policy
     description:
     actor: APPC
     recipe: Rebuild
-    target: VM
+    target:
+      type: VM
     retry: 0
     timeout: 600
     success: final_success
@@ -59,13 +61,14 @@ policies:
     failure_timeout: unique-policy-id-3-migrate
     failure_retries: unique-policy-id-3-migrate
     failure_exception: final_failure_exception
-  
+
   - id: unique-policy-id-3-migrate
     name: Migrate Policy
     description:
     actor: APPC
     recipe: Migrate
-    target: VM
+    target:
+      type: VM
     retry: 0
     timeout: 600
     success: final_success
diff --git a/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml b/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml
index 00b9b4cb1..feaba64cf 100644
--- a/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml
+++ b/models-interactions/model-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml
@@ -1,5 +1,5 @@
 # Copyright 2018-2019 AT&T Intellectual Property. All rights reserved
-# Modifications Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019-2020 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ policies:
     target:
       resourceID: Eace933104d443b496b8.nodes.heat.vpg
     payload:
-      generic-vnf.vnf-id: {generic-vnf.vnf-id}
+      generic-vnf.vnf-id: '{generic-vnf.vnf-id}'
       streams: '{"active-streams":5}'
     retry: 0
     timeout: 300