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 db864d7..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,8 +2,8 @@
  * ============LICENSE_START=======================================================\r
  * ONAP Policy API\r
  * ================================================================================\r
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.\r
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.\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
  * you may not use this file except in compliance with the License.\r
@@ -28,9 +28,7 @@ import java.util.HashMap;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.function.BiConsumer;\r
-\r
 import javax.ws.rs.core.Response;\r
-\r
 import org.apache.commons.lang3.tuple.Pair;\r
 import org.onap.policy.api.main.parameters.ApiParameterGroup;\r
 import org.onap.policy.common.parameters.ParameterService;\r
@@ -43,8 +41,7 @@ import org.onap.policy.models.pdp.enums.PdpState;
 import org.onap.policy.models.provider.PolicyModelsProvider;\r
 import org.onap.policy.models.provider.PolicyModelsProviderFactory;\r
 import org.onap.policy.models.provider.PolicyModelsProviderParameters;\r
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier;\r
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;\r
+import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;\r
 \r
 /**\r
  * Super class for providers that use a model provider.\r
@@ -124,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
@@ -133,9 +129,9 @@ public class CommonModelProvider implements AutoCloseable {
      */\r
     private List<PdpGroup> getPolicyTypeFilteredPdpGroups(PfConceptKey policyType) throws PfModelException {\r
 \r
-        List<ToscaPolicyTypeIdentifier> policyTypes = new ArrayList<>();\r
-        policyTypes.add(new ToscaPolicyTypeIdentifier(policyType.getName(), policyType.getVersion()));\r
-        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes).groupState(PdpState.ACTIVE)\r
+        List<ToscaConceptIdentifier> policyTypes = new ArrayList<>();\r
+        policyTypes.add(new ToscaConceptIdentifier(policyType.getName(), policyType.getVersion()));\r
+        var pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes).groupState(PdpState.ACTIVE)\r
                 .pdpState(PdpState.ACTIVE).build();\r
         return modelsProvider.getFilteredPdpGroups(pdpGroupFilter);\r
     }\r
@@ -160,8 +156,8 @@ public class CommonModelProvider implements AutoCloseable {
 \r
         Map<Pair<String, String>, T> deployedPolicyMap = new HashMap<>();\r
         for (PdpGroup pdpGroup : pdpGroups) {\r
-            List<ToscaPolicyIdentifier> policyIdentifiers = extractPolicyIdentifiers(policyId, pdpGroup, policyType);\r
-            T deployedPolicies = getDeployedPolicies(policyIdentifiers, policyType, getter, consumer, data);\r
+            List<ToscaConceptIdentifier> policyIdentifiers = extractPolicyIdentifiers(policyId, pdpGroup, policyType);\r
+            var deployedPolicies = getDeployedPolicies(policyIdentifiers, policyType, getter, consumer, data);\r
             deployedPolicyMap.put(Pair.of(pdpGroup.getName(), pdpGroup.getVersion()), deployedPolicies);\r
         }\r
         return deployedPolicyMap;\r
@@ -178,12 +174,12 @@ public class CommonModelProvider implements AutoCloseable {
      *\r
      * @throws PfModelException the PfModel parsing exception\r
      */\r
-    private List<ToscaPolicyIdentifier> extractPolicyIdentifiers(String policyId, PdpGroup pdpGroup,\r
+    private List<ToscaConceptIdentifier> extractPolicyIdentifiers(String policyId, PdpGroup pdpGroup,\r
             PfConceptKey policyType) throws PfModelException {\r
 \r
-        List<ToscaPolicyIdentifier> policyIdentifiers = new ArrayList<>();\r
+        List<ToscaConceptIdentifier> policyIdentifiers = new ArrayList<>();\r
         for (PdpSubGroup pdpSubGroup : pdpGroup.getPdpSubgroups()) {\r
-            for (ToscaPolicyIdentifier policyIdentifier : pdpSubGroup.getPolicies()) {\r
+            for (ToscaConceptIdentifier policyIdentifier : pdpSubGroup.getPolicies()) {\r
                 if (policyId.equalsIgnoreCase(policyIdentifier.getName())) {\r
                     policyIdentifiers.add(policyIdentifier);\r
                 }\r
@@ -209,11 +205,11 @@ public class CommonModelProvider implements AutoCloseable {
      *\r
      * @throws PfModelException the PfModel parsing exception\r
      */\r
-    private <T, R> T getDeployedPolicies(List<ToscaPolicyIdentifier> policyIdentifiers, PfConceptKey policyType,\r
+    private <T, R> T getDeployedPolicies(List<ToscaConceptIdentifier> policyIdentifiers, PfConceptKey policyType,\r
             BiFunctionWithEx<String, String, R> getter, BiConsumer<T, R> consumer, T data) throws PfModelException {\r
 \r
-        for (ToscaPolicyIdentifier policyIdentifier : policyIdentifiers) {\r
-            R result = getter.apply(policyIdentifier.getName(),\r
+        for (ToscaConceptIdentifier policyIdentifier : policyIdentifiers) {\r
+            var result = getter.apply(policyIdentifier.getName(),\r
                     getTrimedVersionForLegacyType(policyIdentifier.getVersion(), policyType));\r
             consumer.accept(data, result);\r
         }\r