Skip to content

merge dev to test #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierre-maraval merged 2 commits into from
Nov 4, 2025
Merged

merge dev to test #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d58f3fd
Fix: add null verification on json from isbn2ppn
pierre-maraval Oct 15, 2025
96e095b
Add Spring Actuator with Prometheus and configure management endpoints
Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
<properties>
<spring.profiles.active>localhost</spring.profiles.active>
</properties>
<dependencies>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>21.3.0.0</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>dev</id>
Expand Down Expand Up @@ -124,6 +131,14 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<!-- permet de gérer les contraintes d'intégrité de la BDD et les champs not null -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -146,11 +161,6 @@
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<!--BDD-->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>21.3.0.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.xml</groupId>
<artifactId>xdb</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/fr/abes/sudoc/utils/Utilitaire.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ public static List<String> parseJson(String json) throws JsonProcessingException
//la correspondance pouvant retourner plusieurs fois un ppn, on crée une multimap pour récupérer le résultat
List<String> listePpn = new ArrayList<>();
//parse de l'input json
JsonNode sudocnode = objectMapper.readTree(json);

extractPpnFromNode(listePpn, sudocnode, "result");
extractPpnFromNode(listePpn, sudocnode, "resultNoHolding");
if (json != null) {
JsonNode sudocnode = objectMapper.readTree(json);
extractPpnFromNode(listePpn, sudocnode, "result");
extractPpnFromNode(listePpn, sudocnode, "resultNoHolding");
}
return listePpn;
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ logging.config=classpath:log4j2-all.xml
springdoc.packages-to-scan=fr.abes.convergence.controller
springdoc.api-docs.path=/api-docs/
springdoc.swagger-ui.path=/swagger-ui.html

management.server.port=8083
management.endpoints.web.exposure.include=prometheus,health