Fix new checkstyle issues in policy-api

[policy/api.git] / main / src / main / java / org / onap / policy / api / main / rest / provider / CommonModelProvider.java

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