Skip to content

Commit 8b6077d

Browse files
Vinay-kalpaguriVinay Kumar Gupta Kalpaguri
andauthored
code changes to support openJdk17 (#553)
* code changes to support openJdk17 --------- Co-authored-by: Vinay Kumar Gupta Kalpaguri <vinay.kumar.gupta.kalpaguri.ext@ericsson.com>
1 parent 4c0fe80 commit 8b6077d

File tree

44 files changed

+204
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+204
-132
lines changed

pom.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<relativePath /> <!-- .. lookup parent from repository -->
1717
</parent>
1818
<properties>
19-
<java.version>1.8</java.version>
19+
<java.version>17</java.version>
2020
<springmvcRamlVersion>2.0.5</springmvcRamlVersion>
2121
<outputRelativePath>src/main/java</outputRelativePath>
2222
<ramlPath>src/main/resources/public/raml/eiffel-intelligence.raml</ramlPath>
@@ -310,9 +310,16 @@
310310
<dependency>
311311
<groupId>org.projectlombok</groupId>
312312
<artifactId>lombok</artifactId>
313-
<version>1.18.20</version>
313+
<version>1.18.24</version>
314314
<scope>provided</scope>
315315
</dependency>
316+
317+
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
318+
<dependency>
319+
<groupId>com.google.code.gson</groupId>
320+
<artifactId>gson</artifactId>
321+
<version>2.9.0</version>
322+
</dependency>
316323

317324
<dependency>
318325
<groupId>org.jongo</groupId>
@@ -393,21 +400,21 @@
393400
<dependency>
394401
<groupId>io.cucumber</groupId>
395402
<artifactId>cucumber-junit</artifactId>
396-
<version>2.4.0</version>
403+
<version>4.8.1</version>
397404
<scope>test</scope>
398405
</dependency>
399406

400407
<dependency>
401408
<groupId>io.cucumber</groupId>
402409
<artifactId>cucumber-java</artifactId>
403-
<version>2.4.0</version>
410+
<version>4.8.1</version>
404411
<scope>test</scope>
405412
</dependency>
406413

407414
<dependency>
408415
<groupId>io.cucumber</groupId>
409416
<artifactId>cucumber-spring</artifactId>
410-
<version>2.4.0</version>
417+
<version>4.8.1</version>
411418
<scope>test</scope>
412419
</dependency>
413420

@@ -643,7 +650,7 @@
643650
<plugin>
644651
<groupId>org.jacoco</groupId>
645652
<artifactId>jacoco-maven-plugin</artifactId>
646-
<version>0.8.5</version>
653+
<version>0.8.8</version>
647654
<configuration>
648655
<excludes>
649656
<exclude>com/ericsson/ei/controller/model/*</exclude>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
import com.ericsson.ei.utils.HttpRequest.HttpMethod;
2727
import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
2828

29-
import cucumber.api.java.Before;
30-
import cucumber.api.java.en.Then;
31-
import cucumber.api.java.en.When;
29+
import io.cucumber.java.Before;
30+
import io.cucumber.java.en.Then;
31+
import io.cucumber.java.en.When;
32+
3233

3334
@Ignore
3435
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import org.junit.BeforeClass;
44
import org.junit.runner.RunWith;
55

6-
import cucumber.api.CucumberOptions;
7-
import cucumber.api.junit.Cucumber;
6+
import io.cucumber.junit.Cucumber;
7+
import io.cucumber.junit.CucumberOptions;
8+
9+
810

911
@RunWith(Cucumber.class)
1012
@CucumberOptions(features = "src/functionaltests/resources/features/encryption.feature", glue = {

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static org.slf4j.LoggerFactory.getLogger;
99

1010
import java.io.IOException;
11-
import java.net.BindException;
1211
import java.net.URISyntaxException;
1312
import java.util.ArrayList;
1413
import java.util.Arrays;
@@ -17,12 +16,10 @@
1716
import java.util.stream.Collectors;
1817
import java.util.stream.Stream;
1918

20-
import org.bson.Document;
2119
import org.json.JSONArray;
2220
import org.json.JSONException;
2321
import org.json.JSONObject;
2422
import org.junit.Ignore;
25-
import org.mockito.InjectMocks;
2623
import org.mockserver.client.MockServerClient;
2724
import org.mockserver.integration.ClientAndServer;
2825
import org.mockserver.model.Format;
@@ -36,20 +33,18 @@
3633
import org.springframework.test.context.TestPropertySource;
3734
import org.springframework.util.SocketUtils;
3835

39-
import com.dumbster.smtp.SimpleSmtpServer;
40-
import com.dumbster.smtp.SmtpMessage;
4136
import com.ericsson.ei.mongo.MongoCondition;
4237
import com.ericsson.ei.mongo.MongoDBHandler;
4338
import com.ericsson.ei.notifications.EmailSender;
4439
import com.ericsson.ei.utils.FunctionalTestBase;
4540
import com.ericsson.ei.utils.HttpRequest;
4641
import com.fasterxml.jackson.databind.JsonNode;
4742

48-
import cucumber.api.java.After;
49-
import cucumber.api.java.Before;
50-
import cucumber.api.java.en.Given;
51-
import cucumber.api.java.en.Then;
52-
import cucumber.api.java.en.When;
43+
import io.cucumber.java.After;
44+
import io.cucumber.java.Before;
45+
import io.cucumber.java.en.Given;
46+
import io.cucumber.java.en.Then;
47+
import io.cucumber.java.en.When;
5348
import util.IntegrationTestBase;
5449

5550
@Ignore

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/subscriptionNotification.feature", glue = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/ttl.feature", glue = {

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@
3838
import com.fasterxml.jackson.databind.JsonNode;
3939
import com.fasterxml.jackson.databind.ObjectMapper;
4040

41-
import cucumber.api.java.After;
42-
import cucumber.api.java.Before;
43-
import cucumber.api.java.en.Given;
44-
import cucumber.api.java.en.Then;
45-
import cucumber.api.java.en.When;
41+
import io.cucumber.java.After;
42+
import io.cucumber.java.Before;
43+
import io.cucumber.java.en.Given;
44+
import io.cucumber.java.en.Then;
45+
import io.cucumber.java.en.When;
46+
47+
4648

4749
@Ignore
4850
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/queryAggregatedObjects.feature", glue = {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@
2929
import com.fasterxml.jackson.databind.JsonNode;
3030
import com.fasterxml.jackson.databind.ObjectMapper;
3131

32-
import cucumber.api.java.en.And;
33-
import cucumber.api.java.en.Given;
34-
import cucumber.api.java.en.Then;
32+
import io.cucumber.java.en.And;
33+
import io.cucumber.java.en.Given;
34+
import io.cucumber.java.en.Then;
35+
36+
3537

3638
@Ignore
3739
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/rabbitMQConfiguration.feature", glue = {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
import com.ericsson.ei.utils.AMQPBrokerManager;
2828
import com.ericsson.ei.utils.FunctionalTestBase;
2929

30-
import cucumber.api.java.en.Given;
31-
import cucumber.api.java.en.Then;
32-
import cucumber.api.java.en.When;
30+
import io.cucumber.java.en.Given;
31+
import io.cucumber.java.en.Then;
32+
import io.cucumber.java.en.When;
33+
34+
3335

3436
@Ignore
3537
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/rabbitMQTestConnection.feature", glue = {

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
2020
import org.springframework.amqp.rabbit.core.RabbitAdmin;
2121
import org.springframework.amqp.rabbit.core.RabbitTemplate;
22-
import org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback;
2322
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
24-
import org.springframework.amqp.rabbit.connection.CorrelationData;
2523
import org.springframework.beans.factory.annotation.Autowired;
2624
import org.springframework.beans.factory.annotation.Qualifier;
2725
import org.springframework.beans.factory.annotation.Value;
@@ -33,15 +31,15 @@
3331
import com.ericsson.ei.handlers.RMQProperties;
3432
import com.ericsson.ei.mongo.MongoCondition;
3533
import com.ericsson.ei.mongo.MongoDBHandler;
36-
import com.ericsson.ei.mongo.MongoQuery;
37-
import com.ericsson.ei.mongo.MongoStringQuery;
3834
import com.ericsson.ei.utils.AMQPBrokerManager;
3935
import com.ericsson.ei.utils.FunctionalTestBase;
4036
import com.mongodb.BasicDBObject;
4137

42-
import cucumber.api.java.en.Given;
43-
import cucumber.api.java.en.Then;
44-
import cucumber.api.java.en.When;
38+
import io.cucumber.java.en.Given;
39+
import io.cucumber.java.en.Then;
40+
import io.cucumber.java.en.When;
41+
42+
4543

4644
@Ignore
4745
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/restEndpoints.feature", glue = {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.Assert.assertEquals;
44

55
import org.junit.Ignore;
6-
import org.springframework.beans.factory.annotation.Value;
76
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
87
import org.springframework.boot.web.server.LocalServerPort;
98
import org.springframework.http.ResponseEntity;
@@ -15,9 +14,11 @@
1514
import com.ericsson.eiffelcommons.helpers.MediaType;
1615
import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
1716

18-
import cucumber.api.java.en.Given;
19-
import cucumber.api.java.en.Then;
20-
import cucumber.api.java.en.When;
17+
import io.cucumber.java.en.Given;
18+
import io.cucumber.java.en.Then;
19+
import io.cucumber.java.en.When;
20+
21+
2122

2223
@Ignore
2324
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.junit.runner.RunWith;
44

5-
import cucumber.api.CucumberOptions;
6-
import cucumber.api.junit.Cucumber;
5+
import io.cucumber.junit.Cucumber;
6+
import io.cucumber.junit.CucumberOptions;
7+
8+
79

810
@RunWith(Cucumber.class)
911
@CucumberOptions(features = "src/functionaltests/resources/features/ruleTest.feature", glue = {

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import java.io.File;
77

8-
import com.ericsson.ei.controller.RuleTestControllerImpl;
98
import org.apache.commons.io.FileUtils;
109
import org.json.JSONArray;
1110
import org.json.JSONObject;
@@ -16,13 +15,16 @@
1615
import org.springframework.http.ResponseEntity;
1716
import org.springframework.test.context.TestPropertySource;
1817

18+
import com.ericsson.ei.controller.RuleTestControllerImpl;
1919
import com.ericsson.ei.utils.FunctionalTestBase;
2020
import com.ericsson.ei.utils.HttpRequest;
2121
import com.ericsson.ei.utils.HttpRequest.HttpMethod;
2222

23-
import cucumber.api.java.en.Given;
24-
import cucumber.api.java.en.Then;
25-
import cucumber.api.java.en.When;
23+
import io.cucumber.java.en.Given;
24+
import io.cucumber.java.en.Then;
25+
import io.cucumber.java.en.When;
26+
27+
2628

2729
@Ignore
2830
@TestPropertySource(properties = {

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
import org.springframework.test.context.TestPropertySource;
1616
import org.springframework.util.SocketUtils;
1717

18-
import cucumber.api.java.After;
19-
import cucumber.api.java.Before;
20-
import cucumber.api.java.en.Given;
21-
import cucumber.api.java.en.Then;
18+
import io.cucumber.java.After;
19+
import io.cucumber.java.Before;
20+
import io.cucumber.java.en.Given;
21+
import io.cucumber.java.en.Then;
22+
23+
2224

2325
@Ignore
2426
@TestPropertySource(properties = {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.ericsson.ei.rules;
22

3-
import cucumber.api.CucumberOptions;
4-
import cucumber.api.junit.Cucumber;
3+
54
import org.junit.runner.RunWith;
65

6+
import io.cucumber.junit.Cucumber;
7+
import io.cucumber.junit.CucumberOptions;
8+
79
@RunWith(Cucumber.class)
810
@CucumberOptions(features = "src/functionaltests/resources/features/rulesHandler.feature", glue = {
911
"com.ericsson.ei.rules" }, plugin = { "pretty", "html:target/cucumber-reports/TestRulesHandlerRunner" })

0 commit comments

Comments
 (0)