X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Frest%2Fprovider%2FCommonModelProvider.java;h=e555cd86441ecb590dc8dfdf1ccb5781498cb6ba;hb=a1a7d43c9779ba17e9333d95767fe0bee6d08f19;hp=cb20c04c56ea7c7f07d48ff193e5123f93236fd0;hpb=20379d580cd91dfb5d7d945dc46a627445c87aa6;p=policy%2Fapi.git

diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/CommonModelProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/CommonModelProvider.java
index cb20c04c..e555cd86 100644
--- a/main/src/main/java/org/onap/policy/api/main/rest/provider/CommonModelProvider.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/CommonModelProvider.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy API
  * ================================================================================
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -121,8 +121,7 @@ public class CommonModelProvider implements AutoCloseable {
     /**
      * Retrieves all pdp groups supporting specified policy type.
      *
-     * @param policyTypeId the ID of policy type
-     * @param policyTypeVersion the version of policy type
+     * @param policyType the policy type
      *
      * @return a list of pdp groups supporting specified policy type
      *
@@ -132,7 +131,7 @@ public class CommonModelProvider implements AutoCloseable {
 
         List<ToscaConceptIdentifier> policyTypes = new ArrayList<>();
         policyTypes.add(new ToscaConceptIdentifier(policyType.getName(), policyType.getVersion()));
-        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes).groupState(PdpState.ACTIVE)
+        var pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes).groupState(PdpState.ACTIVE)
                 .pdpState(PdpState.ACTIVE).build();
         return modelsProvider.getFilteredPdpGroups(pdpGroupFilter);
     }
@@ -158,7 +157,7 @@ public class CommonModelProvider implements AutoCloseable {
         Map<Pair<String, String>, T> deployedPolicyMap = new HashMap<>();
         for (PdpGroup pdpGroup : pdpGroups) {
             List<ToscaConceptIdentifier> policyIdentifiers = extractPolicyIdentifiers(policyId, pdpGroup, policyType);
-            T deployedPolicies = getDeployedPolicies(policyIdentifiers, policyType, getter, consumer, data);
+            var deployedPolicies = getDeployedPolicies(policyIdentifiers, policyType, getter, consumer, data);
             deployedPolicyMap.put(Pair.of(pdpGroup.getName(), pdpGroup.getVersion()), deployedPolicies);
         }
         return deployedPolicyMap;
@@ -210,7 +209,7 @@ public class CommonModelProvider implements AutoCloseable {
             BiFunctionWithEx<String, String, R> getter, BiConsumer<T, R> consumer, T data) throws PfModelException {
 
         for (ToscaConceptIdentifier policyIdentifier : policyIdentifiers) {
-            R result = getter.apply(policyIdentifier.getName(),
+            var result = getter.apply(policyIdentifier.getName(),
                     getTrimedVersionForLegacyType(policyIdentifier.getVersion(), policyType));
             consumer.accept(data, result);
         }