Uplift code base to java21

Issue-ID: POLICY-5466
Change-Id: I7136602235f512d342b131322031b57a2c49bea8
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
index 47f9045..eaaf56d 100644 (file)
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.

- *  Modifications Copyright (C) 2019-2020,2024 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020,2024-2025 OpenInfra Foundation Europe.

  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -123,7 +123,7 @@ class ApexRestRequestorConsumerTest {
         consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
 
         consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
 

-        rrctp.setUrl("http://www.{site}.{site}.{net}");
+        rrctp.setUrl("http://www.onap.onap.org");

         consumerParameters.setPeerTimeout(EventHandlerPeeredMode.REQUESTOR, 2000);
         Properties properties = new Properties();
         properties.put("site", "onap");
         consumerParameters.setPeerTimeout(EventHandlerPeeredMode.REQUESTOR, 2000);
         Properties properties = new Properties();
         properties.put("site", "onap");


@@ -149,7 +149,7 @@ class ApexRestRequestorConsumerTest {
         consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
 
         consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
 

-        rrctp.setUrl("http://www.{site}.{net}");
+        rrctp.setUrl("http://www.onap.org");

         consumerParameters.setPeerTimeout(EventHandlerPeeredMode.REQUESTOR, 2000);
         Properties properties = new Properties();
         properties.put("site", "onap");
         consumerParameters.setPeerTimeout(EventHandlerPeeredMode.REQUESTOR, 2000);
         Properties properties = new Properties();
         properties.put("site", "onap");

diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/events/Context_AvroEventAlbum_EventOutCompare.json b/testsuites/integration/integration-uservice-test/src/test/resources/events/Context_AvroEventAlbum_EventOutCompare.json
index 6c13b1f..dee91c4 100644 (file)
--- a/testsuites/integration/integration-uservice-test/src/test/resources/events/Context_AvroEventAlbum_EventOutCompare.json
+++ b/testsuites/integration/integration-uservice-test/src/test/resources/events/Context_AvroEventAlbum_EventOutCompare.json
@@ -16,7 +16,7 @@
     "AvroBoolean": true,
     "AvroByte": -127.0,
     "AvroDouble": 1.2345E67,
     "AvroBoolean": true,
     "AvroByte": -127.0,
     "AvroDouble": 1.2345E67,

-    "AvroFloat": 1.9999999999999998E23,
+    "AvroFloat": 2.0E23,

     "AvroInteger": 1234568.0,
     "AvroLong": 1.234567890124E12,
     "AvroMap": {
     "AvroInteger": 1234568.0,
     "AvroLong": 1.234567890124E12,
     "AvroMap": {