From bc80c460c83a8515b303b106cf22928de1f2ad11 Mon Sep 17 00:00:00 2001
From: jhh <jorge.hernandez-herrero@att.com>
Date: Wed, 17 Aug 2022 19:06:09 -0500
Subject: Support of onap.policies.monitoring.tcagen2 2.0.0

Issue-ID: POLICY-4317
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I1b1e2d4baa2ec82462e32cb79cc18bb183f7ded6
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---
 .../onap/policy/pdpx/main/rest/XacmlPdpApplicationManager.java | 10 +++++-----
 .../policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java  |  6 ++----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'main')

diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManager.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManager.java
index 10f2046a..996d2276 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManager.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManager.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2022 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,10 +50,10 @@ public class XacmlPdpApplicationManager {
     @Setter
     private static XacmlPdpApplicationManager current;
 
-    private ServiceLoader<XacmlApplicationServiceProvider> applicationLoader;
-    private Map<String, XacmlApplicationServiceProvider> providerActionMap = new HashMap<>();
-    private List<ToscaConceptIdentifier> toscaPolicyTypeIdents = new ArrayList<>();
-    private Map<ToscaPolicy, XacmlApplicationServiceProvider> mapLoadedPolicies = new HashMap<>();
+    private final ServiceLoader<XacmlApplicationServiceProvider> applicationLoader;
+    private final Map<String, XacmlApplicationServiceProvider> providerActionMap = new HashMap<>();
+    private final List<ToscaConceptIdentifier> toscaPolicyTypeIdents = new ArrayList<>();
+    private final Map<ToscaPolicy, XacmlApplicationServiceProvider> mapLoadedPolicies = new HashMap<>();
 
 
     /**
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java
index b6c84b1f..b04f44fb 100644
--- a/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java
@@ -55,7 +55,7 @@ public class XacmlPdpApplicationManagerTest {
     private static final StandardYamlCoder yamlCoder = new StandardYamlCoder();
     private static Path appsDirectory;
     private static ToscaServiceTemplate completedJtst;
-    private static CommonTestData testData = new CommonTestData();
+    private static final CommonTestData testData = new CommonTestData();
 
     @ClassRule
     public static final TemporaryFolder appsFolder = new TemporaryFolder();
@@ -97,9 +97,7 @@ public class XacmlPdpApplicationManagerTest {
         //
         Path src = Paths.get("src/test/resources/apps");
         File apps = appsFolder.newFolder("apps");
-        Files.walk(src).forEach(source -> {
-            copy(source, apps.toPath().resolve(src.relativize(source)));
-        });
+        Files.walk(src).forEach(source -> copy(source, apps.toPath().resolve(src.relativize(source))));
         appsDirectory = apps.toPath();
     }
 
-- 
cgit 1.2.3-korg