Skip to content

Commit c4bba33

Browse files
vincenzo-ingenitovincenzo-ingenito
committed
Merge branch 'develop' into feature/eds
2 parents 1bea7a4 + 5911af8 commit c4bba33

File tree

10 files changed

+104
-86
lines changed

10 files changed

+104
-86
lines changed

‎pom.xml‎

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.7.18</version>
15+
<version>3.4.3</version>
1616
<relativePath /> <!-- lookup parent from repository -->
1717
</parent>
1818

19-
2019
<properties>
2120
<!-- Application -->
2221
<java.version>21</java.version>
23-
<spring-cloud.version>2021.0.1</spring-cloud.version>
22+
<spring-cloud.version>2024.0.0</spring-cloud.version>
2423
<start-class>it.finanze.sanita.fse2.ms.edsclient.EDSClientApplication</start-class>
2524
<!-- Build -->
2625
<config.infra>${project.basedir}/infrastructure</config.infra>
@@ -30,7 +29,7 @@
3029
<sonar.organization>ministero-salute</sonar.organization>
3130
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
3231
<sonar.exclusions>src/main/java/it/finanze/sanita/fse2/ms/edsclient/logging/**/*.*</sonar.exclusions>
33-
<logback.version>1.2.13</logback.version>
32+
<logback.version>1.5.16</logback.version>
3433
</properties>
3534

3635
<dependencies>
@@ -45,11 +44,7 @@
4544
</exclusion>
4645
</exclusions>
4746
</dependency>
48-
<dependency>
49-
<groupId>org.apache.httpcomponents</groupId>
50-
<artifactId>httpclient</artifactId>
51-
</dependency>
52-
47+
5348
<!-- RESILIENCE -->
5449
<dependency>
5550
<groupId>org.springframework.boot</groupId>
@@ -67,17 +62,13 @@
6762
<scope>runtime</scope>
6863
</dependency>
6964

70-
<!-- OPENAPI-UI -->
65+
<!-- OpenAPI -->
66+
<!--
67+
https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-starter-webmvc-ui -->
7168
<dependency>
7269
<groupId>org.springdoc</groupId>
73-
<artifactId>springdoc-openapi-ui</artifactId>
74-
<version>1.6.11</version>
75-
<exclusions>
76-
<exclusion>
77-
<groupId>org.yaml</groupId>
78-
<artifactId>snakeyaml</artifactId>
79-
</exclusion>
80-
</exclusions>
70+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
71+
<version>2.8.6</version>
8172
</dependency>
8273

8374
<!-- LOGBACK JSON -->
@@ -98,7 +89,6 @@
9889
<artifactId>lombok</artifactId>
9990
<optional>true</optional>
10091
</dependency>
101-
10292

10393
<!-- TEST -->
10494
<dependency>
@@ -136,17 +126,38 @@
136126
<artifactId>commons-pool2</artifactId>
137127
</dependency>
138128

139-
<!-- TRACING -->
140-
<dependency>
141-
<groupId>org.springframework.cloud</groupId>
142-
<artifactId>spring-cloud-starter-sleuth</artifactId>
143-
</dependency>
144-
145129
<!-- GSON -->
146130
<dependency>
147131
<groupId>com.google.code.gson</groupId>
148132
<artifactId>gson</artifactId>
149133
</dependency>
134+
135+
<!-- OPEN TELEMETRY -->
136+
<dependency>
137+
<groupId>io.micrometer</groupId>
138+
<artifactId>micrometer-observation</artifactId>
139+
</dependency>
140+
141+
<dependency>
142+
<groupId>io.micrometer</groupId>
143+
<artifactId>micrometer-registry-otlp</artifactId>
144+
</dependency>
145+
146+
<dependency>
147+
<groupId>io.micrometer</groupId>
148+
<artifactId>micrometer-tracing</artifactId>
149+
</dependency>
150+
151+
<dependency>
152+
<groupId>io.micrometer</groupId>
153+
<artifactId>micrometer-tracing-bridge-otel</artifactId>
154+
</dependency>
155+
156+
<dependency>
157+
<groupId>io.opentelemetry</groupId>
158+
<artifactId>opentelemetry-exporter-otlp</artifactId>
159+
</dependency>
160+
<!-- OPEN TELEMETRY -->
150161

151162
</dependencies>
152163

@@ -177,7 +188,7 @@
177188
<plugin>
178189
<groupId>org.jacoco</groupId>
179190
<artifactId>jacoco-maven-plugin</artifactId>
180-
<version>0.8.11</version>
191+
<version>0.8.12</version>
181192
<configuration>
182193
</configuration>
183194
<executions>

‎src/main/java/it/finanze/sanita/fse2/ms/edsclient/controller/IEDSPublicationCTL.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
*/
1212
package it.finanze.sanita.fse2.ms.edsclient.controller;
1313

14-
import javax.servlet.http.HttpServletRequest;
15-
import javax.validation.constraints.Size;
16-
1714
import org.springframework.http.MediaType;
1815
import org.springframework.web.bind.annotation.DeleteMapping;
1916
import org.springframework.web.bind.annotation.PathVariable;
@@ -33,6 +30,8 @@
3330
import it.finanze.sanita.fse2.ms.edsclient.dto.request.IndexerValueDTO;
3431
import it.finanze.sanita.fse2.ms.edsclient.dto.request.PublicationRequestBodyDTO;
3532
import it.finanze.sanita.fse2.ms.edsclient.dto.response.ErrorResponseDTO;
33+
import jakarta.servlet.http.HttpServletRequest;
34+
import jakarta.validation.constraints.Size;
3635

3736

3837
/**

‎src/main/java/it/finanze/sanita/fse2/ms/edsclient/controller/impl/AbstractCTL.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,26 @@
1111
*/
1212
package it.finanze.sanita.fse2.ms.edsclient.controller.impl;
1313

14-
import java.io.Serializable;
15-
1614
import org.springframework.beans.factory.annotation.Autowired;
1715

18-
import brave.Tracer;
16+
import io.micrometer.tracing.Tracer;
1917
import it.finanze.sanita.fse2.ms.edsclient.dto.response.LogTraceInfoDTO;
2018

2119
/**
2220
* Abstract controller.
2321
*/
24-
public abstract class AbstractCTL implements Serializable {
22+
public abstract class AbstractCTL{
2523

26-
/**
27-
* Serial version uid.
28-
*/
29-
private static final long serialVersionUID = -3077780100650268134L;
30-
3124
@Autowired
3225
private Tracer tracer;
3326

34-
27+
3528
protected LogTraceInfoDTO getLogTraceInfo() {
3629
LogTraceInfoDTO out = new LogTraceInfoDTO(null, null);
3730
if (tracer.currentSpan() != null) {
3831
out = new LogTraceInfoDTO(
39-
tracer.currentSpan().context().spanIdString(),
40-
tracer.currentSpan().context().traceIdString());
32+
tracer.currentSpan().context().spanId(),
33+
tracer.currentSpan().context().traceId());
4134
}
4235
return out;
4336
}

‎src/main/java/it/finanze/sanita/fse2/ms/edsclient/controller/impl/EDSPublicationCTL.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
*/
1212
package it.finanze.sanita.fse2.ms.edsclient.controller.impl;
1313

14-
import javax.servlet.http.HttpServletRequest;
15-
1614
import org.springframework.beans.factory.annotation.Autowired;
1715
import org.springframework.web.bind.annotation.RestController;
1816

@@ -23,6 +21,7 @@
2321
import it.finanze.sanita.fse2.ms.edsclient.dto.request.PublicationRequestBodyDTO;
2422
import it.finanze.sanita.fse2.ms.edsclient.dto.response.LogTraceInfoDTO;
2523
import it.finanze.sanita.fse2.ms.edsclient.service.IEdsInvocationSRV;
24+
import jakarta.servlet.http.HttpServletRequest;
2625
import lombok.extern.slf4j.Slf4j;
2726

2827
/**

‎src/main/java/it/finanze/sanita/fse2/ms/edsclient/dto/request/PublicationMetadataReqDTO.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@
1111
*/
1212
package it.finanze.sanita.fse2.ms.edsclient.dto.request;
1313

14+
import java.util.List;
15+
1416
import io.swagger.v3.oas.annotations.media.Schema;
1517
import it.finanze.sanita.fse2.ms.edsclient.dto.AbstractDTO;
1618
import it.finanze.sanita.fse2.ms.edsclient.enums.AttivitaClinicaEnum;
1719
import it.finanze.sanita.fse2.ms.edsclient.enums.HealthcareFacilityEnum;
1820
import it.finanze.sanita.fse2.ms.edsclient.enums.PracticeSettingCodeEnum;
1921
import it.finanze.sanita.fse2.ms.edsclient.enums.TipoDocAltoLivEnum;
20-
import lombok.*;
21-
22-
import javax.validation.constraints.Size;
23-
import java.util.List;
22+
import jakarta.validation.constraints.Size;
23+
import lombok.AllArgsConstructor;
24+
import lombok.Getter;
25+
import lombok.NoArgsConstructor;
26+
import lombok.Setter;
27+
import lombok.ToString;
2428

2529
@Getter
2630
@Setter

‎src/main/java/it/finanze/sanita/fse2/ms/edsclient/service/impl/ConfigSRV.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
package it.finanze.sanita.fse2.ms.edsclient.service.impl;
22

33

4-
import it.finanze.sanita.fse2.ms.edsclient.client.IConfigClient;
5-
import it.finanze.sanita.fse2.ms.edsclient.dto.ConfigItemDTO;
6-
import it.finanze.sanita.fse2.ms.edsclient.enums.ConfigItemTypeEnum;
7-
import it.finanze.sanita.fse2.ms.edsclient.service.IConfigSRV;
8-
import it.finanze.sanita.fse2.ms.edsclient.utility.ProfileUtility;
9-
import lombok.extern.slf4j.Slf4j;
10-
import org.apache.commons.lang3.tuple.Pair;
11-
import org.springframework.beans.factory.annotation.Autowired;
12-
import org.springframework.stereotype.Service;
4+
import static it.finanze.sanita.fse2.ms.edsclient.client.routes.base.ClientRoutes.Config.PROPS_NAME_REMOVE_METADATA_ENABLE;
5+
import static it.finanze.sanita.fse2.ms.edsclient.enums.ConfigItemTypeEnum.EDS_CLIENT;
136

14-
import javax.annotation.PostConstruct;
157
import java.util.Date;
168
import java.util.HashMap;
179
import java.util.List;
1810
import java.util.Map;
1911

20-
import static it.finanze.sanita.fse2.ms.edsclient.client.routes.base.ClientRoutes.Config.PROPS_NAME_REMOVE_METADATA_ENABLE;
21-
import static it.finanze.sanita.fse2.ms.edsclient.enums.ConfigItemTypeEnum.EDS_CLIENT;
12+
import org.apache.commons.lang3.tuple.Pair;
13+
import org.springframework.beans.factory.annotation.Autowired;
14+
import org.springframework.stereotype.Service;
15+
16+
import it.finanze.sanita.fse2.ms.edsclient.client.IConfigClient;
17+
import it.finanze.sanita.fse2.ms.edsclient.dto.ConfigItemDTO;
18+
import it.finanze.sanita.fse2.ms.edsclient.enums.ConfigItemTypeEnum;
19+
import it.finanze.sanita.fse2.ms.edsclient.service.IConfigSRV;
20+
import it.finanze.sanita.fse2.ms.edsclient.utility.ProfileUtility;
21+
import jakarta.annotation.PostConstruct;
22+
import lombok.extern.slf4j.Slf4j;
2223

2324
@Service
2425
@Slf4j

‎src/test/java/it/finanze/sanita/fse2/ms/edsclient/ConfigClientTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.springframework.boot.test.mock.mockito.MockBean;
1414
import org.springframework.http.ResponseEntity;
1515
import org.springframework.test.context.ActiveProfiles;
16+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1617
import org.springframework.web.client.RestTemplate;
1718

1819
import java.util.ArrayList;
@@ -36,7 +37,7 @@ class ConfigClientTest {
3637
@Autowired
3738
private IConfigClient config;
3839

39-
@MockBean
40+
@MockitoBean
4041
private RestTemplate client;
4142

4243
@Autowired

‎src/test/java/it/finanze/sanita/fse2/ms/edsclient/EdsClientTest.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,24 @@
1818
import static org.mockito.ArgumentMatchers.any;
1919
import static org.mockito.ArgumentMatchers.anyString;
2020
import static org.mockito.ArgumentMatchers.eq;
21-
import static org.mockito.Mockito.*;
21+
import static org.mockito.Mockito.doReturn;
22+
import static org.mockito.Mockito.doThrow;
23+
import static org.mockito.Mockito.when;
2224

2325
import java.util.UUID;
2426

25-
import it.finanze.sanita.fse2.ms.edsclient.service.impl.ConfigSRV;
2627
import org.junit.jupiter.api.BeforeEach;
2728
import org.junit.jupiter.api.Test;
2829
import org.springframework.beans.factory.annotation.Autowired;
2930
import org.springframework.boot.test.context.SpringBootTest;
30-
import org.springframework.boot.test.mock.mockito.MockBean;
31-
import org.springframework.boot.test.mock.mockito.SpyBean;
3231
import org.springframework.context.annotation.ComponentScan;
3332
import org.springframework.data.mongodb.core.MongoTemplate;
3433
import org.springframework.http.HttpEntity;
3534
import org.springframework.http.HttpStatus;
3635
import org.springframework.http.ResponseEntity;
3736
import org.springframework.test.context.ActiveProfiles;
37+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
38+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
3839
import org.springframework.web.client.ResourceAccessException;
3940
import org.springframework.web.client.RestTemplate;
4041

@@ -46,6 +47,7 @@
4647
import it.finanze.sanita.fse2.ms.edsclient.enums.ProcessorOperationEnum;
4748
import it.finanze.sanita.fse2.ms.edsclient.exceptions.BusinessException;
4849
import it.finanze.sanita.fse2.ms.edsclient.repository.entity.IniEdsInvocationETY;
50+
import it.finanze.sanita.fse2.ms.edsclient.service.impl.ConfigSRV;
4951
import it.finanze.sanita.fse2.ms.edsclient.utility.JsonUtility;
5052

5153
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -56,10 +58,10 @@ class EdsClientTest extends AbstractTest {
5658
@Autowired
5759
MongoTemplate mongoTemplate;
5860

59-
@SpyBean
61+
@MockitoSpyBean
6062
private RestTemplate restTemplate;
6163

62-
@MockBean
64+
@MockitoBean
6365
private ConfigSRV config;
6466

6567
private static final String TEST_WORKFLOW_INSTANCE_ID = UUID.randomUUID().toString();

‎src/test/java/it/finanze/sanita/fse2/ms/edsclient/EdsInvocationSRVTest.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
package it.finanze.sanita.fse2.ms.edsclient;
22

3-
import it.finanze.sanita.fse2.ms.edsclient.client.impl.EdsClient;
4-
import it.finanze.sanita.fse2.ms.edsclient.config.Constants;
5-
import it.finanze.sanita.fse2.ms.edsclient.dto.EdsResponseDTO;
6-
import it.finanze.sanita.fse2.ms.edsclient.dto.request.PublicationRequestBodyDTO;
7-
import it.finanze.sanita.fse2.ms.edsclient.repository.entity.IniEdsInvocationETY;
8-
import it.finanze.sanita.fse2.ms.edsclient.repository.impl.EdsInvocationRepo;
9-
import it.finanze.sanita.fse2.ms.edsclient.service.impl.ConfigSRV;
10-
import it.finanze.sanita.fse2.ms.edsclient.service.impl.EdsInvocationSRV;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.mockito.Mockito.times;
5+
import static org.mockito.Mockito.verify;
6+
import static org.mockito.Mockito.when;
7+
118
import org.bson.Document;
129
import org.junit.jupiter.api.Test;
1310
import org.mockito.Mockito;
1411
import org.springframework.beans.factory.annotation.Autowired;
1512
import org.springframework.boot.test.context.SpringBootTest;
16-
import org.springframework.boot.test.mock.mockito.MockBean;
1713
import org.springframework.context.annotation.ComponentScan;
1814
import org.springframework.test.context.ActiveProfiles;
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1916

20-
import static org.junit.jupiter.api.Assertions.assertEquals;
21-
import static org.mockito.Mockito.*;
17+
import it.finanze.sanita.fse2.ms.edsclient.client.impl.EdsClient;
18+
import it.finanze.sanita.fse2.ms.edsclient.config.Constants;
19+
import it.finanze.sanita.fse2.ms.edsclient.dto.EdsResponseDTO;
20+
import it.finanze.sanita.fse2.ms.edsclient.dto.request.PublicationRequestBodyDTO;
21+
import it.finanze.sanita.fse2.ms.edsclient.repository.entity.IniEdsInvocationETY;
22+
import it.finanze.sanita.fse2.ms.edsclient.repository.impl.EdsInvocationRepo;
23+
import it.finanze.sanita.fse2.ms.edsclient.service.impl.ConfigSRV;
24+
import it.finanze.sanita.fse2.ms.edsclient.service.impl.EdsInvocationSRV;
2225

2326
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
2427
@ComponentScan(basePackages = {Constants.ComponentScan.BASE})
@@ -28,13 +31,13 @@ public class EdsInvocationSRVTest {
2831
@Autowired
2932
private EdsInvocationSRV edsInvocationSRV;
3033

31-
@MockBean
34+
@MockitoBean
3235
private EdsClient edsClient;
3336

34-
@MockBean
37+
@MockitoBean
3538
private EdsInvocationRepo edsInvocationRepo;
3639

37-
@MockBean
40+
@MockitoBean
3841
private ConfigSRV configSRV;
3942

4043
@Test

0 commit comments

Comments
 (0)