Java 17 Upgrade

[policy/models.git] / models-interactions / model-simulators / src / main / java / org / onap / policy / simulators / Util.java

diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java
index 8b85262..bbe1a36 100644 (file)
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java
@@ -3,7 +3,7 @@
  * simulators
  * ================================================================================
  * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,20 +34,19 @@ import org.onap.policy.common.utils.network.NetworkUtil;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup;
 import org.onap.policy.models.sim.dmaap.provider.DmaapSimProvider;
-import org.onap.policy.models.sim.dmaap.rest.DmaapSimRestServer;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class Util {
     public static final String AAISIM_SERVER_NAME = "aaiSim";
     public static final String SOSIM_SERVER_NAME = "soSim";
     public static final String VFCSIM_SERVER_NAME = "vfcSim";
-    public static final String GUARDSIM_SERVER_NAME = "guardSim";
+    public static final String XACMLSIM_SERVER_NAME = "xacmlSim";
     public static final String SDNCSIM_SERVER_NAME = "sdncSim";
 
     public static final int AAISIM_SERVER_PORT = 6666;
     public static final int SOSIM_SERVER_PORT = 6667;
     public static final int VFCSIM_SERVER_PORT = 6668;
-    public static final int GUARDSIM_SERVER_PORT = 6669;
+    public static final int XACMLSIM_SERVER_PORT = 6669;
     public static final int SDNCSIM_SERVER_PORT = 6670;
     public static final int CDSSIM_SERVER_PORT = 6671;
     public static final int DMAAPSIM_SERVER_PORT = 3904;
@@ -102,7 +101,7 @@ public final class Util {
 
 
     /**
-     * Build an SO simulator.
+     * Build a SO simulator.
      *
      * @return the simulator
      * @throws InterruptedException if a thread is interrupted
@@ -138,38 +137,57 @@ public final class Util {
      * @throws InterruptedException if a thread is interrupted
      */
     public static HttpServletServer buildGuardSim() throws InterruptedException {
-        HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(GUARDSIM_SERVER_NAME,
-                LOCALHOST, GUARDSIM_SERVER_PORT, "/", false, true);
-        testServer.addServletClass("/*", GuardSimulatorJaxRs.class.getName());
+        return buildXacmlSim();
+    }
+
+    /**
+     * Build a xacml simulator.
+     *
+     * @return the simulator
+     * @throws InterruptedException if a thread is interrupted
+     */
+    public static HttpServletServer buildXacmlSim() throws InterruptedException {
+        HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(XACMLSIM_SERVER_NAME,
+                LOCALHOST, XACMLSIM_SERVER_PORT, "/", false, true);
+        testServer.addServletClass("/*", XacmlSimulatorJaxRs.class.getName());
         testServer.waitedStart(5000);
         waitForServerToListen(testServer.getPort());
         return testServer;
     }
 
     /**
-     * Build a DMaaP simulator.
+     * Builds an unauthenticated HTTP DMaaP simulator.
      *
      * @return the simulator
      * @throws InterruptedException if a thread is interrupted
      */
     public static HttpServletServer buildDmaapSim() throws InterruptedException {
-        var json = ResourceUtils.getResourceAsString("org/onap/policy/simulators/dmaap/DmaapParameters.json");
-        DmaapSimParameterGroup params = null;
+        return buildDmaapSim("org/onap/policy/simulators/dmaap/DmaapParameters.json");
+    }
+
+    /**
+     * Build a DMaaP simulator from a properties file.
+     *
+     * @param resourceName the name of the properties file
+     * @return the simulator
+     * @throws InterruptedException if a thread is interrupted
+     */
+    public static HttpServletServer buildDmaapSim(String resourceName) throws InterruptedException {
+        var json = ResourceUtils.getResourceAsString(resourceName);
+        DmaapSimParameterGroup params;
         try {
             params = new StandardCoder().decode(json, DmaapSimParameterGroup.class);
         } catch (CoderException ce) {
             throw new ParameterRuntimeException(
-                    CANNOT_PROCESS_PARAMETERS + "org/onap/policy/simulators/dmaap/DmaapParameters.json", ce);
+                    CANNOT_PROCESS_PARAMETERS + resourceName, ce);
         }
 
         DmaapSimProvider.setInstance(new DmaapSimProvider(params));
 
-        var props = DmaapSimRestServer.getServerProperties(params.getRestServerParameters());
+        var props = params.getRestServerParameters().getServerProperties();
 
         final String svcpfx = PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "."
                 + params.getRestServerParameters().getName();
-        props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX,
-                Integer.toString(DMAAPSIM_SERVER_PORT));
         props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "true");
 
         HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(props).get(0);