diff --git a/pom.xml b/pom.xml index 2ba94b58..c951ed78 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 6.0.8 2.9.1 2.6 - 1.7.0 + 2.3.0 7.5.0 7.3.0 4.5.14 @@ -44,6 +44,8 @@ 2.11.0 3.10.8 3.3.0 + 2.0.1 + 6.0.1 @@ -241,13 +243,7 @@ org.springdoc - springdoc-openapi-ui - ${org.springdoc.version} - - - - org.springdoc - springdoc-openapi-security + springdoc-openapi-starter-webmvc-ui ${org.springdoc.version} @@ -307,6 +303,23 @@ ${org.ehcache.version} + + javax.jms + javax.jms-api + ${javax.jms-api.version} + + + + org.apache.activemq + activemq-broker + ${org.activemq.version} + + + + org.apache.activemq + activemq-kahadb-store + ${org.activemq.version} + diff --git a/sugoi-api-distribution/sugoi-api-distribution-full-env/pom.xml b/sugoi-api-distribution/sugoi-api-distribution-full-env/pom.xml index 5db907de..7f727d3e 100644 --- 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 @@ org.apache.activemq activemq-broker - 6.0.1 org.apache.activemq activemq-kahadb-store - 6.0.1 + + + + javax.jms + javax.jms-api diff --git a/sugoi-api-distribution/sugoi-api-distribution-full-env/src/main/resources/application.properties b/sugoi-api-distribution/sugoi-api-distribution-full-env/src/main/resources/application.properties index e935d0a1..552a3d9d 100644 --- a/sugoi-api-distribution/sugoi-api-distribution-full-env/src/main/resources/application.properties +++ b/sugoi-api-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 index 060e5bd4..d7459f35 100644 --- a/sugoi-api-distribution/sugoi-api-distribution-jar/pom.xml +++ b/sugoi-api-distribution/sugoi-api-distribution-jar/pom.xml @@ -42,11 +42,6 @@ true - - org.springdoc - springdoc-openapi-ui - - org.springframework.boot spring-boot-starter-test diff --git a/sugoi-api-distribution/sugoi-api-distribution-war/pom.xml b/sugoi-api-distribution/sugoi-api-distribution-war/pom.xml index 25b77ec3..9b1f4104 100644 --- a/sugoi-api-distribution/sugoi-api-distribution-war/pom.xml +++ b/sugoi-api-distribution/sugoi-api-distribution-war/pom.xml @@ -49,11 +49,6 @@ true - - org.springdoc - springdoc-openapi-ui - - org.springframework.boot spring-boot-starter-test diff --git a/sugoi-api-jms-store-provider/pom.xml b/sugoi-api-jms-store-provider/pom.xml index cab3bd2e..a41f3f4d 100644 --- a/sugoi-api-jms-store-provider/pom.xml +++ b/sugoi-api-jms-store-provider/pom.xml @@ -32,6 +32,24 @@ test + + org.apache.activemq + activemq-broker + test + + + + org.apache.activemq + activemq-kahadb-store + test + + + + javax.jms + javax.jms-api + test + + diff --git a/sugoi-api-jms-store-provider/src/main/resources/application.properties b/sugoi-api-jms-store-provider/src/main/resources/application.properties index 9f488adc..7b96d89d 100644 --- 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 index e4e1b1f4..f097a929 100644 --- 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= \ No newline at end of file diff --git a/sugoi-api-jms-utils/pom.xml b/sugoi-api-jms-utils/pom.xml index c5c1679a..220e23e7 100644 --- a/sugoi-api-jms-utils/pom.xml +++ b/sugoi-api-jms-utils/pom.xml @@ -11,8 +11,8 @@ sugoi-api-jms-utils - org.springframework - spring-jms + org.springframework.boot + spring-boot-starter-activemq @@ -27,16 +27,21 @@ + + javax.jms + javax.jms-api + test + + org.apache.activemq activemq-broker - 6.0.1 + test org.apache.activemq activemq-kahadb-store - 6.0.1 test diff --git a/sugoi-api-jms-utils/src/main/resources/application.properties b/sugoi-api-jms-utils/src/main/resources/application.properties index af20fb9a..bafe7552 100644 --- 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 deleted file mode 100644 index b7c1d36c..00000000 --- a/sugoi-api-jms-utils/src/test/java/fr/insee/sugoi/jms/JmsNoBrokerTests.java +++ /dev/null @@ -1,44 +0,0 @@ -/* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package fr.insee.sugoi.jms; - -import fr.insee.sugoi.jms.exception.BrokerException; -import fr.insee.sugoi.jms.writer.JmsWriter; -import java.util.HashMap; -import java.util.Map; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -@ExtendWith(SpringExtension.class) -@SpringBootTest -@ActiveProfiles("withoutBroker") -public class JmsNoBrokerTests { - - @Autowired private JmsWriter jmsWriter; - - @Test - public void testWithNoBroker() throws Exception { - Assertions.assertThrows( - BrokerException.class, - () -> { - Map params = new HashMap<>(); - jmsWriter.writeRequestInQueueSynchronous("queueTests", "toto", params); - }); - } -} diff --git a/sugoi-api-jms-utils/src/test/resources/application-brokerEmbedded.properties b/sugoi-api-jms-utils/src/test/resources/application-brokerEmbedded.properties index a734571c..b2d72115 100644 --- 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 \ No newline at end of file +fr.insee.sugoi.jms.broker.password=admin \ No newline at end of file diff --git a/sugoi-api-jms-utils/src/test/resources/application-withoutBroker.properties b/sugoi-api-jms-utils/src/test/resources/application-withoutBroker.properties index 3b63b8f8..f2453f80 100644 --- 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 index 8fb7bc11..788d5fe6 100644 --- a/sugoi-api-rest-commons-services/pom.xml +++ b/sugoi-api-rest-commons-services/pom.xml @@ -45,12 +45,7 @@ org.springdoc - springdoc-openapi-ui - - - - org.springdoc - springdoc-openapi-security + springdoc-openapi-starter-webmvc-ui diff --git a/sugoi-api-test/src/main/resources/application.properties b/sugoi-api-test/src/main/resources/application.properties index 5221a5f0..8a7a37a5 100644 --- 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