Fix sonar issues in PAP

Moved methods into nested class of PdpModifyRequestMap.  Note: they
will have to be moved back out when the broadcast capability is
added.
Removed extra "continue" from Publisher.
Rather than remove unused parameters and cause significant clutter
to the code, chose to use the parameters in a logger call for RequestImpl.
Removed unnecessary cast from UpdateReq.
Use version constant in PapRestControllerV1.
Log exception in PdpGroupQueryControllerV1.
Log exception in PdpGroupStateChangeControllerV1.
Shortened functional in PdpGroupDeleteProvider.
Removed unnecessary type parameters from PdpGroupDeployProvider.
Removed unneeded parameter and exception from ProviderBase.
Extracted common string from Main.
Shorted functionals in PapActivator.
Changed uses of getCanonicalName() to getName(); the former only has
limited use, while the latter is typically what is wanted and is
actually required whenever forClass(name) is used.
Fix junit tests broken by rename of ToscaPolicy version from
"typeVersion" to "type_version".

Change-Id: Ia00e1b3541c9e25b196a951e45681f67aa7f1bfe
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>

7 files changed, 7 insertions, 7 deletions

diff --git a/main/src/test/resources/simpleDeploy/createGroupNewPolicy.json b/main/src/test/resources/simpleDeploy/createGroupNewPolicy.json
index 285db315..9aa54cb9 100644
--- a/main/src/test/resources/simpleDeploy/createGroupNewPolicy.json
+++ b/main/src/test/resources/simpleDeploy/createGroupNewPolicy.json
@@ -4,7 +4,7 @@
             "name": "policyB",
             "version": "1.2.3",
             "type": "typeA",
-            "typeVersion": "100.2.3"
+            "type_version": "100.2.3"
         }
     ]
 }
diff --git a/main/src/test/resources/simpleDeploy/daoPolicyList.json b/main/src/test/resources/simpleDeploy/daoPolicyList.json
index 93ee9146..873cb711 100644
--- a/main/src/test/resources/simpleDeploy/daoPolicyList.json
+++ b/main/src/test/resources/simpleDeploy/daoPolicyList.json
@@ -4,7 +4,7 @@
             "name": "policyA",
             "version": "1.2.3",
             "type": "typeA",
-            "typeVersion": "100.2.3"
+            "type_version": "100.2.3"
         }
     ]
 }
diff --git a/main/src/test/resources/simpleDeploy/policy.json b/main/src/test/resources/simpleDeploy/policy.json
index 7786aab7..084aafcc 100644
--- a/main/src/test/resources/simpleDeploy/policy.json
+++ b/main/src/test/resources/simpleDeploy/policy.json
@@ -2,5 +2,5 @@
     "name": "policyA",
     "version": "1.2.3",
     "type": "typeA",
-    "typeVersion": "100.2.3"
+    "type_version": "100.2.3"
 }
diff --git a/main/src/test/resources/simpleDeploy/upgradeGroupDao.json b/main/src/test/resources/simpleDeploy/upgradeGroupDao.json
index 278b69a6..bee81bed 100644
--- a/main/src/test/resources/simpleDeploy/upgradeGroupDao.json
+++ b/main/src/test/resources/simpleDeploy/upgradeGroupDao.json
@@ -47,7 +47,7 @@
                             "name": "policyA",
                             "version": "1.2.3",
                             "type": "typeA",
-                            "typeVersion": "100.2.3"
+                            "type_version": "100.2.3"
                         }
                     ]
                 },
diff --git a/main/src/test/resources/simpleDeploy/upgradeGroupPolicy2.json b/main/src/test/resources/simpleDeploy/upgradeGroupPolicy2.json
index 3a13d0c3..54201b94 100644
--- a/main/src/test/resources/simpleDeploy/upgradeGroupPolicy2.json
+++ b/main/src/test/resources/simpleDeploy/upgradeGroupPolicy2.json
@@ -4,7 +4,7 @@
             "name": "policyB",
             "version": "1.2.3",
             "type": "typeB",
-            "typeVersion": "100.2.3"
+            "type_version": "100.2.3"
         }
     ]
 }
diff --git a/main/src/test/resources/simpleDeploy/upgradeGroupPolicy3.json b/main/src/test/resources/simpleDeploy/upgradeGroupPolicy3.json
index bf5602ea..57a8f849 100644
--- a/main/src/test/resources/simpleDeploy/upgradeGroupPolicy3.json
+++ b/main/src/test/resources/simpleDeploy/upgradeGroupPolicy3.json
@@ -4,7 +4,7 @@
             "name": "policyC",
             "version": "1.2.3",
             "type": "typeC",
-            "typeVersion": "100.2.3"
+            "type_version": "100.2.3"
         }
     ]
 }
diff --git a/main/src/test/resources/simpleDeploy/upgradeGroupPolicy4.json b/main/src/test/resources/simpleDeploy/upgradeGroupPolicy4.json
index 3c0fb72f..8b7c96c5 100644
--- a/main/src/test/resources/simpleDeploy/upgradeGroupPolicy4.json
+++ b/main/src/test/resources/simpleDeploy/upgradeGroupPolicy4.json
@@ -4,7 +4,7 @@
             "name": "policyD",
             "version": "1.2.3",
             "type": "typeA",
-            "typeVersion": "100.2.3"
+            "type_version": "100.2.3"
         }
     ]
 }