Merge pull request #14 from abes-esr/develop

Merge develop dans main
abes-esr · Mar 27, 2024 · eba975b · eba975b
2 parents 5a216a0 + 959efce
commit eba975b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 5 deletions.
diff --git a/batch/pom.xml b/batch/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>itembackoffice</artifactId>
         <groupId>fr.abes.item</groupId>
-        <version>2.4.3</version>
+        <version>2.4.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/batch/src/main/resources/application-dev.properties b/batch/src/main/resources/application-dev.properties
@@ -29,6 +29,7 @@ sudoc.serveur=
 sudoc.port=
 #login permettant de tester si le CBS répond
 sudoc.login=
+sudoc.poll=
 
 batch.min.hour=8
 batch.max.hour=20

diff --git a/batch/src/main/resources/application-prod.properties b/batch/src/main/resources/application-prod.properties
@@ -30,6 +30,7 @@ sudoc.serveur=
 sudoc.port=
 #login permettant de tester si le CBS répond
 sudoc.login=
+sudoc.poll=
 
 batch.min.hour=8
 batch.max.hour=20

diff --git a/batch/src/main/resources/application-test.properties b/batch/src/main/resources/application-test.properties
@@ -30,6 +30,7 @@ sudoc.serveur=
 sudoc.port=
 #login permettant de tester si le CBS répond
 sudoc.login=
+sudoc.poll=
 
 batch.min.hour=8
 batch.max.hour=20

diff --git a/core/pom.xml b/core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>itembackoffice</artifactId>
         <groupId>fr.abes.item</groupId>
-        <version>2.4.3</version>
+        <version>2.4.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/core/src/main/java/fr/abes/item/service/impl/TraitementService.java b/core/src/main/java/fr/abes/item/service/impl/TraitementService.java
@@ -28,6 +28,9 @@
 @Service
 public class TraitementService implements ITraitementService {
 
+    @Value("${sudoc.poll}")
+    private Integer poll;
+
     @Value("${sudoc.serveur}")
     private String serveurSudoc;
 
@@ -42,7 +45,7 @@ public class TraitementService implements ITraitementService {
     private DaoProvider dao;
 
     public TraitementService() {
-        cbs = new ProcessCBS();
+        cbs = new ProcessCBS(poll);
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>fr.abes.item</groupId>
     <artifactId>itembackoffice</artifactId>
-    <version>2.4.3</version>
+    <version>2.4.4-SNAPSHOT</version>
     <modules>
         <module>core</module>
         <module>web</module>

diff --git a/web/pom.xml b/web/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>itembackoffice</artifactId>
         <groupId>fr.abes.item</groupId>
-        <version>2.4.3</version>
+        <version>2.4.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/web/src/main/resources/application-dev.properties b/web/src/main/resources/application-dev.properties
@@ -30,6 +30,7 @@ sudoc.serveur=
 sudoc.port=
 #login permettant de tester si le CBS répond
 sudoc.login=
+sudoc.poll=
 
 # Configuration des logs
 logging.config=classpath:log4j2-dev.xml

diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties
@@ -30,6 +30,7 @@ sudoc.serveur=
 sudoc.port=
 #login permettant de tester si le CBS répond
 sudoc.login=
+sudoc.poll=
 
 # Configuration des logs
 logging.config=classpath:log4j2-prod.xml

diff --git a/web/src/main/resources/application-test.properties b/web/src/main/resources/application-test.properties
@@ -30,6 +30,7 @@ sudoc.serveur=
 sudoc.port=
 #login permettant de tester si le CBS répond
 sudoc.login=
+sudoc.poll=
 
 # Configuration des logs
 logging.config=classpath:log4j2-tests.xml