X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-sim%2Fpolicy-models-simulators%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fsimulators%2FSimulatorParameters.java;h=0ae3a17e707b21d24f98575fdaaade64e36f3959;hb=49f07db935d114b72a44e446867b16262dd552aa;hp=4b60d5e4593ea71a7c0a7d39ac6c255d9d0a6984;hpb=e54ce7a34fe5ae1425336aa461d70eee9386d90a;p=policy%2Fmodels.git

diff --git a/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/SimulatorParameters.java b/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/SimulatorParameters.java
index 4b60d5e45..0ae3a17e7 100644
--- a/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/SimulatorParameters.java
+++ b/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/SimulatorParameters.java
@@ -2,8 +2,9 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2024 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +25,7 @@ package org.onap.policy.models.simulators;
 import java.util.LinkedList;
 import java.util.List;
 import lombok.Getter;
-import org.onap.policy.common.endpoints.parameters.TopicParameters;
-import org.onap.policy.common.parameters.BeanValidationResult;
-import org.onap.policy.common.parameters.BeanValidator;
-import org.onap.policy.common.parameters.ObjectValidationResult;
-import org.onap.policy.common.parameters.ValidationStatus;
-import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup;
+import org.onap.policy.common.parameters.annotations.Valid;
 
 /**
  * Simulator parameters.
@@ -37,67 +33,12 @@ import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup;
 @Getter
 public class SimulatorParameters {
 
-    /**
-     * Note: this is only used to capture the provider's parameters; the rest server
-     * parameters that it contains are ignored. Instead, the parameters for the rest
-     * server are contained within the {@link #restServers} entry having the same name as
-     * the provider parameters.
-     */
-    private DmaapSimParameterGroup dmaapProvider;
-
-    private CdsServerParameters grpcServer;
+    private @Valid CdsServerParameters grpcServer;
 
     /**
      * Parameters for the REST server simulators that are to be started.
      */
-    private List<ClassRestServerParameters> restServers = new LinkedList<>();
-
-    /**
-     * Topic sinks that are used by {@link #topicServers}.
-     */
-    private List<TopicParameters> topicSinks = new LinkedList<>();
-
-    /**
-     * Topic sources that are used by {@link #topicServers}.
-     */
-    private List<TopicParameters> topicSources = new LinkedList<>();
-
-    /**
-     * Parameters for the TOPIC server simulators that are to be started.
-     */
-    private List<TopicServerParameters> topicServers = new LinkedList<>();
-
-
-    /**
-     * Validates the parameters.
-     *
-     * @param containerName name of the parameter container
-     * @return the validation result
-     */
-    public BeanValidationResult validate(String containerName) {
-        BeanValidationResult result = new BeanValidator().validateTop(containerName, this);
-
-        if (dmaapProvider != null) {
-            // do not want full validation of the provider, so validate the relevant
-            // fields ourselves
-            BeanValidationResult subResult = new BeanValidationResult("dmaapProvider", dmaapProvider);
-            subResult.validateNotNull("name", dmaapProvider.getName());
-            if (dmaapProvider.getTopicSweepSec() < 1) {
-                ObjectValidationResult fieldResult =
-                                new ObjectValidationResult("topicSweepSec", dmaapProvider.getTopicSweepSec(),
-                                                ValidationStatus.INVALID, "is below the minimum value: 1");
-                subResult.addResult(fieldResult);
-            }
-            result.addResult(subResult);
-        }
-
-        if (grpcServer != null) {
-            result.addResult(grpcServer.validate());
-        }
+    private List<@Valid ClassRestServerParameters> restServers = new LinkedList<>();
 
-        result.validateList("restServers", restServers, params -> params.validate("restServers"));
-        result.validateList("topicServers", topicServers, params -> params.validate("topicServers"));
 
-        return result;
-    }
 }