code changes to support openJdk17

pom.xml

@@ -16,7 +16,7 @@
         <relativePath /> <!-- .. lookup parent from repository -->
     </parent>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <springmvcRamlVersion>2.0.5</springmvcRamlVersion>
         <outputRelativePath>src/main/java</outputRelativePath>
         <ramlPath>src/main/resources/public/raml/eiffel-intelligence.raml</ramlPath>
@@ -310,9 +310,16 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+       </dependency>
 
         <dependency>
             <groupId>org.jongo</groupId>
@@ -393,21 +400,21 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
-            <version>2.4.0</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java</artifactId>
-            <version>2.4.0</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-spring</artifactId>
-            <version>2.4.0</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -643,7 +650,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
+                <version>0.8.8</version>
                 <configuration>
                     <excludes>
                         <exclude>com/ericsson/ei/controller/model/*</exclude>

src/functionaltests/java/com/ericsson/ei/encryption/EncryptionSteps.java

@@ -26,9 +26,10 @@
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
 import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
 
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/encryption/TestEncryptionRunner.java

@@ -3,8 +3,10 @@
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/encryption.feature", glue = {

src/functionaltests/java/com/ericsson/ei/notifications/trigger/SubscriptionNotificationSteps.java

@@ -8,7 +8,6 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.io.IOException;
-import java.net.BindException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,12 +16,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.bson.Document;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Ignore;
-import org.mockito.InjectMocks;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.integration.ClientAndServer;
 import org.mockserver.model.Format;
@@ -36,20 +33,18 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.SocketUtils;
 
-import com.dumbster.smtp.SimpleSmtpServer;
-import com.dumbster.smtp.SmtpMessage;
 import com.ericsson.ei.mongo.MongoCondition;
 import com.ericsson.ei.mongo.MongoDBHandler;
 import com.ericsson.ei.notifications.EmailSender;
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
 import com.fasterxml.jackson.databind.JsonNode;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 import util.IntegrationTestBase;
 
 @Ignore

src/functionaltests/java/com/ericsson/ei/notifications/trigger/TestSubscriptionNotificationRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/subscriptionNotification.feature", glue = {

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/ttl.feature", glue = {

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java

@@ -38,11 +38,13 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/query/QueryAggregatedObjectsTestRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/queryAggregatedObjects.feature", glue = {

src/functionaltests/java/com/ericsson/ei/query/QueryAggregatedObjectsTestSteps.java

@@ -29,9 +29,11 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import cucumber.api.java.en.And;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
+import io.cucumber.java.en.And;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/rabbitmq/configuration/RabbitMQConfigurationTestRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/rabbitMQConfiguration.feature", glue = {

src/functionaltests/java/com/ericsson/ei/rabbitmq/configuration/RabbitMQConfigurationTestSteps.java

@@ -27,9 +27,11 @@
 import com.ericsson.ei.utils.AMQPBrokerManager;
 import com.ericsson.ei.utils.FunctionalTestBase;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/rabbitmq/connection/RabbitMQTestConnectionRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/rabbitMQTestConnection.feature", glue = {

src/functionaltests/java/com/ericsson/ei/rabbitmq/connection/RabbitMQTestConnectionSteps.java

@@ -19,9 +19,7 @@
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -33,15 +31,15 @@
 import com.ericsson.ei.handlers.RMQProperties;
 import com.ericsson.ei.mongo.MongoCondition;
 import com.ericsson.ei.mongo.MongoDBHandler;
-import com.ericsson.ei.mongo.MongoQuery;
-import com.ericsson.ei.mongo.MongoStringQuery;
 import com.ericsson.ei.utils.AMQPBrokerManager;
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.mongodb.BasicDBObject;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/restEndpoints.feature", glue = {

src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestSteps.java

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Ignore;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.ResponseEntity;
@@ -15,9 +14,11 @@
 import com.ericsson.eiffelcommons.helpers.MediaType;
 import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/rules/RuleTestRunner.java

@@ -2,8 +2,10 @@
 
 import org.junit.runner.RunWith;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
+
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/ruleTest.feature", glue = {

src/functionaltests/java/com/ericsson/ei/rules/RuleTestSteps.java

@@ -5,7 +5,6 @@
 
 import java.io.File;
 
-import com.ericsson.ei.controller.RuleTestControllerImpl;
 import org.apache.commons.io.FileUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -16,13 +15,16 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.TestPropertySource;
 
+import com.ericsson.ei.controller.RuleTestControllerImpl;
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/rules/RulesHandlerSteps.java

@@ -15,10 +15,12 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.SocketUtils;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+
+
 
 @Ignore
 @TestPropertySource(properties = {

src/functionaltests/java/com/ericsson/ei/rules/RulesHandlerTestRunner.java

@@ -1,9 +1,11 @@
 package com.ericsson.ei.rules;
 
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
+
 import org.junit.runner.RunWith;
 
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/rulesHandler.feature", glue = {
         "com.ericsson.ei.rules" }, plugin = { "pretty", "html:target/cucumber-reports/TestRulesHandlerRunner" })