Fix broker

InseeFr · Jan 30, 2024 · 136e5c7 · 136e5c7
1 parent 17c59e1
commit 136e5c7
Show file tree

Hide file tree

Showing 15 changed files with 98 additions and 90 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 		<com.unboundid.version>6.0.8</com.unboundid.version>
 		<org.xmlunit.version>2.9.1</org.xmlunit.version>
 		<commons-lang.version>2.6</commons-lang.version>
-		<org.springdoc.version>1.7.0</org.springdoc.version>
+		<org.springdoc.version>2.3.0</org.springdoc.version>
 		<cucumber.version>7.5.0</cucumber.version>
 		<cucumber-reporting-plugin.version>7.3.0</cucumber-reporting-plugin.version>
 		<httpclient.version>4.5.14</httpclient.version>
@@ -44,6 +44,8 @@
 		<commons-io.version>2.11.0</commons-io.version>
 		<org.ehcache.version>3.10.8</org.ehcache.version>
 		<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
+		<javax.jms-api.version>2.0.1</javax.jms-api.version>
+		<org.activemq.version>6.0.1</org.activemq.version>
 	</properties>
 
 	<dependencies></dependencies>
@@ -241,13 +243,7 @@
 
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-ui</artifactId>
-				<version>${org.springdoc.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-security</artifactId>
+				<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 				<version>${org.springdoc.version}</version>
 			</dependency>
 
@@ -307,6 +303,23 @@
 				<version>${org.ehcache.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>javax.jms</groupId>
+				<artifactId>javax.jms-api</artifactId>
+				<version>${javax.jms-api.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-broker</artifactId>
+				<version>${org.activemq.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-kahadb-store</artifactId>
+				<version>${org.activemq.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

diff --git a/sugoi-api-distribution/sugoi-api-distribution-full-env/pom.xml b/sugoi-api-distribution/sugoi-api-distribution-full-env/pom.xml
@@ -28,13 +28,16 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>6.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-kahadb-store</artifactId>
-            <version>6.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jms</groupId>
+            <artifactId>javax.jms-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...pi-distribution/sugoi-api-distribution-full-env/src/main/resources/application.properties b/...pi-distribution/sugoi-api-distribution-full-env/src/main/resources/application.properties
@@ -43,3 +43,5 @@ logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t
 #logging.file.name=./logs/sugoi-full-env.log
 #logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} : %m%n%ex #.. file pattern for logs here
 
+fr.insee.sugoi.jms.queue.requests.asynchronous.name=queue
+fr.insee.sugoi.jms.queue.response.asynchronous.name=queue
diff --git a/sugoi-api-distribution/sugoi-api-distribution-jar/pom.xml b/sugoi-api-distribution/sugoi-api-distribution-jar/pom.xml
@@ -42,11 +42,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>

diff --git a/sugoi-api-distribution/sugoi-api-distribution-war/pom.xml b/sugoi-api-distribution/sugoi-api-distribution-war/pom.xml
@@ -49,11 +49,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>

diff --git a/sugoi-api-jms-store-provider/pom.xml b/sugoi-api-jms-store-provider/pom.xml
@@ -32,6 +32,24 @@
          <scope>test</scope>
       </dependency>
 
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-broker</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-kahadb-store</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.jms</groupId>
+         <artifactId>javax.jms-api</artifactId>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
 </project>
diff --git a/sugoi-api-jms-store-provider/src/main/resources/application.properties b/sugoi-api-jms-store-provider/src/main/resources/application.properties
@@ -1,8 +1,5 @@
 spring.main.allow-bean-definition-overriding=true
 
-fr.insee.sugoi.jms.queue.requests.name=
-fr.insee.sugoi.jms.queue.response.name=
-
 fr.insee.sugoi.jms.receiver.request.enabled=false
 fr.insee.sugoi.jms.receiver.response.enabled=false
 

diff --git a/sugoi-api-jms-store-provider/src/test/resources/application.properties b/sugoi-api-jms-store-provider/src/test/resources/application.properties
@@ -1,8 +1,25 @@
+spring.activemq.broker-url=vm://embedded?broker.persistent=false,useShutdownHook=false
+spring.activemq.close-timeout=15000
+spring.activemq.in-memory=true
+spring.activemq.non-blocking-redelivery=false
+spring.activemq.password=admin
+spring.activemq.user=admin
+spring.activemq.send-timeout=0
+spring.activemq.packages.trust-all=false
+spring.activemq.packages.trusted=com.memorynotfound
+spring.activemq.pool.block-if-full=true
+spring.activemq.pool.block-if-full-timeout=-1
+spring.activemq.pool.enabled=false
+spring.activemq.pool.idle-timeout=30000
+spring.activemq.pool.max-connections=1
+spring.activemq.pool.time-between-expiration-check=-1
+spring.activemq.pool.use-anonymous-producers=true
+
 fr.insee.sugoi.jms.receiver.request.enabled=true
 fr.insee.sugoi.jms.queue.requests.name=queue.request
 fr.insee.sugoi.jms.queue.response.name=queue.response
-fr.insee.sugoi.jms.broker.url=vm://embedded?broker.persistent=false,useShutdownHook=false
-fr.insee.sugoi.jms.broker.username=admin
-fr.insee.sugoi.jms.broker.password=admin
+fr.insee.sugoi.jms.broker.url=${spring.activemq.broker-url}
+fr.insee.sugoi.jms.broker.username=${spring.activemq.user}
+fr.insee.sugoi.jms.broker.password=${spring.activemq.password}spring.activemq.broker-url=vm://embedded?broker.persistent=false,useShutdownHook=false
 fr.insee.sugoi.jms.broker.timeout=5000
 sugoi.api.event.webhook.mail.secondaryMailAttribute=
diff --git a/sugoi-api-jms-utils/pom.xml b/sugoi-api-jms-utils/pom.xml
@@ -11,8 +11,8 @@
    <name>sugoi-api-jms-utils</name>
    <dependencies>
       <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-jms</artifactId>
+         <groupId>org.springframework.boot</groupId>
+         <artifactId>spring-boot-starter-activemq</artifactId>
       </dependency>
 
       <dependency>
@@ -27,16 +27,21 @@
          </exclusions>
       </dependency>
 
+      <dependency>
+         <groupId>javax.jms</groupId>
+         <artifactId>javax.jms-api</artifactId>
+         <scope>test</scope>
+      </dependency>
+
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-broker</artifactId>
-         <version>6.0.1</version>
+         <scope>test</scope>
       </dependency>
 
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-kahadb-store</artifactId>
-         <version>6.0.1</version>
          <scope>test</scope>
       </dependency>
 

diff --git a/sugoi-api-jms-utils/src/main/resources/application.properties b/sugoi-api-jms-utils/src/main/resources/application.properties
@@ -1,10 +1,5 @@
 spring.main.allow-bean-definition-overriding=true
 
-fr.insee.sugoi.jms.broker.url=
-fr.insee.sugoi.jms.broker.username=
-fr.insee.sugoi.jms.broker.password=
-fr.insee.sugoi.jms.broker.timeout=
-
 
 
 
diff --git a/sugoi-api-jms-utils/src/test/java/fr/insee/sugoi/jms/JmsNoBrokerTests.java b/sugoi-api-jms-utils/src/test/java/fr/insee/sugoi/jms/JmsNoBrokerTests.java
diff --git a/sugoi-api-jms-utils/src/test/resources/application-brokerEmbedded.properties b/sugoi-api-jms-utils/src/test/resources/application-brokerEmbedded.properties
@@ -1,4 +1,22 @@
+
+# Embedded ActiveMQ Configuration Example
+spring.activemq.broker-url=vm://embedded?broker.persistent=false,useShutdownHook=false
+spring.activemq.close-timeout=15000
+spring.activemq.in-memory=true
+spring.activemq.non-blocking-redelivery=false
+spring.activemq.password=admin
+spring.activemq.user=admin
+spring.activemq.send-timeout=0
+spring.activemq.packages.trust-all=false
+spring.activemq.packages.trusted=com.memorynotfound
+spring.activemq.pool.block-if-full=true
+spring.activemq.pool.block-if-full-timeout=-1
+spring.activemq.pool.enabled=false
+spring.activemq.pool.idle-timeout=30000
+spring.activemq.pool.max-connections=1
+spring.activemq.pool.time-between-expiration-check=-1
+spring.activemq.pool.use-anonymous-producers=true
+
 fr.insee.sugoi.jms.broker.url=vm://embedded?broker.persistent=false,useShutdownHook=false
 fr.insee.sugoi.jms.broker.username=admin
-fr.insee.sugoi.jms.broker.password=admin
-fr.insee.sugoi.jms.broker.timeout=5000
+fr.insee.sugoi.jms.broker.password=admin
diff --git a/sugoi-api-jms-utils/src/test/resources/application-withoutBroker.properties b/sugoi-api-jms-utils/src/test/resources/application-withoutBroker.properties
@@ -1,6 +1,3 @@
-fr.insee.sugoi.jms.broker.writer.url=
-fr.insee.sugoi.jms.broker.writer.username=
-fr.insee.sugoi.jms.broker.writer.password=
 fr.insee.sugoi.jms.broker.timeout=5000
 
 

diff --git a/sugoi-api-rest-commons-services/pom.xml b/sugoi-api-rest-commons-services/pom.xml
@@ -45,12 +45,7 @@
 
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-security</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 		</dependency>
 
 		<dependency>

diff --git a/sugoi-api-test/src/main/resources/application.properties b/sugoi-api-test/src/main/resources/application.properties
@@ -28,3 +28,5 @@ fr.insee.sugoi.full.env.tomcat2.properties.file=/src/main/resources/tomcat-prope
 fr.insee.sugoi.full.env.tomcat2.name=tomcat2
 fr.insee.sugoi.full.env.war.relative.path=/../sugoi-api-distribution/sugoi-api-distribution-war/target/sugoi-api.war
 fr.insee.sugoi.config.ldap.profils.pattern=cn=Profil_{realm}_WebServiceLdap
+fr.insee.sugoi.jms.queue.requests.asynchronous.name=queue
+fr.insee.sugoi.jms.queue.response.asynchronous.name=queue