Skip to content

Commit 2fd6330

Browse files
committed
Merge branch 'main' into devJsonExtraction
2 parents 9962103 + f2bf224 commit 2fd6330

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Changelog
2+
3+
## 1.8.6 [2025-09-18]
4+
### Added
5+
- print role authorities on endpoint for batch generic for debug purpose
6+
27
## 1.8.4 [2025-09-11]
38
### Updated
49
- Sonar 5.2.0.4988

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>fr.insee.genesis</groupId>
66
<artifactId>genesis-api</artifactId>
7-
<version>1.8.4</version>
7+
<version>1.8.7</version>
88
<packaging>jar</packaging>
99
<name>genesis-api</name>
1010

1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>3.5.5</version>
14+
<version>3.5.6</version>
1515
</parent>
1616

1717
<properties>
1818
<java.version>21</java.version>
1919
<springdoc.version>2.8.13</springdoc.version>
2020
<mapstruct.version>1.6.3</mapstruct.version>
21-
<cucumber.version>7.28.2</cucumber.version>
21+
<cucumber.version>7.29.0</cucumber.version>
2222
<junit-jupiter.version>5.13.4</junit-jupiter.version>
2323

2424
<!-- Proprietes sonar -->
@@ -31,10 +31,10 @@
3131
</sonar.exclusions>
3232
<skipSurefireReport>true</skipSurefireReport>
3333
<!-- Pi Test-->
34-
<pitest.version>1.20.2</pitest.version>
34+
<pitest.version>1.20.3</pitest.version>
3535
<pitest.junit.version>1.2.3</pitest.junit.version>
3636
<jackson.version>2.19.0</jackson.version>
37-
<bpm.version>1.0.15</bpm.version>
37+
<bpm.version>1.0.17</bpm.version>
3838
</properties>
3939
<dependencies>
4040
<dependency>
@@ -102,14 +102,14 @@
102102
<dependency>
103103
<groupId>net.sf.saxon</groupId>
104104
<artifactId>Saxon-HE</artifactId>
105-
<version>12.8</version>
105+
<version>12.9</version>
106106
</dependency>
107107

108108
<!-- JSON -->
109109
<dependency>
110110
<groupId>com.networknt</groupId>
111111
<artifactId>json-schema-validator</artifactId>
112-
<version>1.5.8</version>
112+
<version>1.5.9</version>
113113
</dependency>
114114

115115
<!-- generate implementation auto -->
@@ -166,7 +166,7 @@
166166
<plugin>
167167
<groupId>org.apache.maven.plugins</groupId>
168168
<artifactId>maven-compiler-plugin</artifactId>
169-
<version>3.14.0</version>
169+
<version>3.14.1</version>
170170
</plugin>
171171
<plugin>
172172
<groupId>org.sonarsource.scanner.maven</groupId>

src/main/java/fr/insee/genesis/configuration/auth/security/OIDCSecurityConfig.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,18 @@ public Collection<GrantedAuthority> convert(Jwt source) {
144144
.toList();
145145

146146
// 🔹 4. Transforms in GrantedAuthority
147-
return Collections.unmodifiableCollection(
147+
List<GrantedAuthority> authorities =
148148
claimedRoles.stream()
149149
.map(s -> (GrantedAuthority) () -> ROLE_PREFIX + s)
150-
.toList()
151-
);
150+
.toList();
152151

152+
//TODO put on debug once genesis bug is corrected
153+
log.info("Authorities extracted from JWT: {}",
154+
authorities.stream()
155+
.map(GrantedAuthority::getAuthority)
156+
.toList());
157+
158+
return authorities;
153159
} catch (ClassCastException e) {
154160
// role path not correctly found, assume that no role for this user
155161
return List.of();

src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public ResponseEntity<PagedModel<LunaticJsonRawDataModel>> getRawResponsesFromJs
205205
log.info("Try to read raw JSONs for campaign {}, with startDate={} and endDate={} - page={} - size={}", campaignId, startDate, endDate,page,size);
206206
Pageable pageable = PageRequest.of(page, size);
207207
Page<LunaticJsonRawDataModel> rawResponses = lunaticJsonRawDataApiPort.findRawDataByCampaignIdAndDate(campaignId, startDate, endDate, pageable);
208-
log.info("rawResponses=" + rawResponses.getContent().size());
208+
log.info("rawResponses={}", rawResponses.getContent().size());
209209
return ResponseEntity.status(HttpStatus.OK).body(new PagedModel<>(rawResponses));
210210
}
211211

0 commit comments

Comments
 (0)