Java 17 Upgrade

[policy/models.git] / models-sim / policy-models-sim-pdp / src / main / java / org / onap / policy / models / sim / pdp / handler / PdpMessageHandler.java

diff --git a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java
index 855919e..ad1a32d 100644 (file)
--- a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java
+++ b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/handler/PdpMessageHandler.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2020 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (C) 2019-2021, 2023 Nordix Foundation.
+ *  Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ package org.onap.policy.models.sim.pdp.handler;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.onap.policy.common.utils.services.Registry;
 import org.onap.policy.models.pdp.concepts.PdpResponseDetails;
 import org.onap.policy.models.pdp.concepts.PdpStatus;
@@ -32,10 +31,8 @@ import org.onap.policy.models.pdp.enums.PdpResponseStatus;
 import org.onap.policy.models.pdp.enums.PdpState;
 import org.onap.policy.models.sim.pdp.PdpSimulatorConstants;
 import org.onap.policy.models.sim.pdp.parameters.PdpStatusParameters;
-import org.onap.policy.models.sim.pdp.parameters.ToscaPolicyTypeIdentifierParameters;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
 
 /**
  * This class supports the handling of pdp messages.
@@ -54,7 +51,8 @@ public class PdpMessageHandler {
      */
     public PdpStatus createPdpStatusFromParameters(final String instanceId,
             final PdpStatusParameters pdpStatusParameters) {
-        final PdpStatus pdpStatus = new PdpStatus();
+        final var pdpStatus = new PdpStatus();
+        pdpStatus.setPdpGroup(pdpStatusParameters.getPdpGroup());
         pdpStatus.setPdpType(pdpStatusParameters.getPdpType());
         pdpStatus.setState(PdpState.PASSIVE);
         pdpStatus.setHealthy(PdpHealthStatus.HEALTHY);
@@ -63,32 +61,14 @@ public class PdpMessageHandler {
         return pdpStatus;
     }
 
-    /**
-     * Method to get supported policy types from the parameters.
-     *
-     * @param pdpStatusParameters pdp status parameters
-     * @return supportedPolicyTypes list of PolicyTypeIdent
-     */
-    private List<ToscaPolicyTypeIdentifier> getSupportedPolicyTypesFromParameters(
-            final PdpStatusParameters pdpStatusParameters) {
-        final List<ToscaPolicyTypeIdentifier> supportedPolicyTypes =
-                new ArrayList<>(pdpStatusParameters.getSupportedPolicyTypes().size());
-        for (final ToscaPolicyTypeIdentifierParameters policyTypeIdentParameters : pdpStatusParameters
-                .getSupportedPolicyTypes()) {
-            supportedPolicyTypes.add(new ToscaPolicyTypeIdentifier(policyTypeIdentParameters.getName(),
-                    policyTypeIdentParameters.getVersion()));
-        }
-        return supportedPolicyTypes;
-    }
-
     /**
      * Method to create PdpStatus message from the context, which is to be sent by pdp simulator to pap.
      *
      * @return PdpStatus the pdp status message
      */
     public PdpStatus createPdpStatusFromContext() {
-        final PdpStatus pdpStatusContext = Registry.get(PdpSimulatorConstants.REG_PDP_STATUS_OBJECT, PdpStatus.class);
-        final PdpStatus pdpStatus = new PdpStatus();
+        final var pdpStatusContext = Registry.get(PdpSimulatorConstants.REG_PDP_STATUS_OBJECT, PdpStatus.class);
+        final var pdpStatus = new PdpStatus();
         pdpStatus.setName(pdpStatusContext.getName());
         pdpStatus.setPdpType(pdpStatusContext.getPdpType());
         pdpStatus.setState(pdpStatusContext.getState());
@@ -106,7 +86,7 @@ public class PdpMessageHandler {
      * @return PdpStatus the pdp status message
      */
     public PdpStatus getTerminatedPdpStatus() {
-        final PdpStatus pdpStatusInContext = Registry.get(PdpSimulatorConstants.REG_PDP_STATUS_OBJECT, PdpStatus.class);
+        final var pdpStatusInContext = Registry.get(PdpSimulatorConstants.REG_PDP_STATUS_OBJECT, PdpStatus.class);
         pdpStatusInContext.setState(PdpState.TERMINATED);
         pdpStatusInContext.setDescription("Pdp Simulator shutting down.");
         return createPdpStatusFromContext();
@@ -121,9 +101,9 @@ public class PdpMessageHandler {
      *
      * @return PdpResponseDetails
      */
-    public PdpResponseDetails createPdpResonseDetails(final String requestId, final PdpResponseStatus status,
-            final String responseMessage) {
-        final PdpResponseDetails pdpResponseDetails = new PdpResponseDetails();
+    public PdpResponseDetails createPdpResponseDetails(final String requestId, final PdpResponseStatus status,
+                                                       final String responseMessage) {
+        final var pdpResponseDetails = new PdpResponseDetails();
         pdpResponseDetails.setResponseTo(requestId);
         pdpResponseDetails.setResponseStatus(status);
         pdpResponseDetails.setResponseMessage(responseMessage);
@@ -137,11 +117,11 @@ public class PdpMessageHandler {
      *
      * @return policyTypeIdentifiers
      */
-    public List<ToscaPolicyIdentifier> getToscaPolicyIdentifiers(final List<ToscaPolicy> policies) {
-        final List<ToscaPolicyIdentifier> policyIdentifiers = new ArrayList<>(policies.size());
+    public List<ToscaConceptIdentifier> getToscaPolicyIdentifiers(final List<ToscaPolicy> policies) {
+        final List<ToscaConceptIdentifier> policyIdentifiers = new ArrayList<>(policies.size());
         for (final ToscaPolicy policy : policies) {
             if (null != policy.getName() && null != policy.getVersion()) {
-                policyIdentifiers.add(new ToscaPolicyIdentifier(policy.getName(), policy.getVersion()));
+                policyIdentifiers.add(new ToscaConceptIdentifier(policy.getName(), policy.getVersion()));
             }
         }
         return policyIdentifiers;