From 1c2c1ac27cf6be40cfba2f54ef132c0be919913f Mon Sep 17 00:00:00 2001 From: huguenindo Date: Wed, 5 Jan 2022 15:11:30 +0100 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20cr=C3=A9ation=20du=20bon=20Transacti?= =?UTF-8?q?onManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/rest/xml/TestTransactionManagerFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/campanule/datasource/rest/xml/TestTransactionManagerFactory.java b/src/test/java/campanule/datasource/rest/xml/TestTransactionManagerFactory.java index 3132add..c481a85 100644 --- a/src/test/java/campanule/datasource/rest/xml/TestTransactionManagerFactory.java +++ b/src/test/java/campanule/datasource/rest/xml/TestTransactionManagerFactory.java @@ -6,7 +6,7 @@ import core.datasource.TransactionManager; public class TestTransactionManagerFactory { public static TransactionManager createTransactionManager() { - return campanule.datasource.rest.json.RestTransactionManager + return campanule.datasource.rest.xml.RestTransactionManager .getInstance(CONSTANTES.SERVICE_REST_URL); } -- GitLab From 084afe9ba812e6d2a5ba06c41e4a2c2a5f0f2693 Mon Sep 17 00:00:00 2001 From: huguenindo Date: Wed, 5 Jan 2022 15:12:00 +0100 Subject: [PATCH 2/4] fix:le lien vers le service rest local --- src/test/java/campanule/datasource/rest/CONSTANTES.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/campanule/datasource/rest/CONSTANTES.java b/src/test/java/campanule/datasource/rest/CONSTANTES.java index 72b4e2c..ba3e2e9 100644 --- a/src/test/java/campanule/datasource/rest/CONSTANTES.java +++ b/src/test/java/campanule/datasource/rest/CONSTANTES.java @@ -7,8 +7,8 @@ package campanule.datasource.rest; public class CONSTANTES { //Configuration pour les tests en local - //public static final String SERVICE_REST_URL = "http://localhost:8080/campanule.rest/resources"; + public static final String SERVICE_REST_URL = "http://localhost:8080/campanule.rest/resources"; //Configuration pour les test dans la CI/CD de gitlab - public static final String SERVICE_REST_URL = "http://campanule.rest:8080/resources"; + //public static final String SERVICE_REST_URL = "http://campanule.rest:8080/resources"; } -- GitLab From 89934fcdb4c47953684ea33d4b0c153b381fb2a4 Mon Sep 17 00:00:00 2001 From: huguenindo Date: Wed, 5 Jan 2022 15:13:08 +0100 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20m=C3=A9morisation=20du=20bon=20trans?= =?UTF-8?q?actionManager=20(Singleton)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/rest/RestTransactionManager.java | 9 --------- .../datasource/rest/json/RestTransactionManager.java | 7 ++++++- .../datasource/rest/xml/RestTransactionManager.java | 8 +++++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/campanule/datasource/rest/RestTransactionManager.java b/src/main/java/campanule/datasource/rest/RestTransactionManager.java index c239c5f..06ddf52 100644 --- a/src/main/java/campanule/datasource/rest/RestTransactionManager.java +++ b/src/main/java/campanule/datasource/rest/RestTransactionManager.java @@ -11,8 +11,6 @@ import core.datasource.TransactionManager.Operation; public abstract class RestTransactionManager implements TransactionManager> { - private static RestTransactionManager transactionManager; - private final String context; protected RestTransactionManager(final String context) { @@ -23,12 +21,5 @@ public abstract class RestTransactionManager return context; } - protected static RestTransactionManager setInstance( - final RestTransactionManager tm) { - if (transactionManager == null) { - transactionManager = tm; - } - return transactionManager; - } } diff --git a/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java b/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java index 2b4eb82..91b20cc 100644 --- a/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java +++ b/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java @@ -10,13 +10,18 @@ import core.datasource.TransactionManager.Operation; */ public final class RestTransactionManager extends campanule.datasource.rest.RestTransactionManager { + + private static RestTransactionManager transactionManager; public RestTransactionManager(final String context) { super(context); } public static TransactionManager getInstance(final String context) { - return setInstance(new RestTransactionManager(context)); + if (transactionManager == null) { + transactionManager = new RestTransactionManager(context); + } + return transactionManager; } @Override diff --git a/src/main/java/campanule/datasource/rest/xml/RestTransactionManager.java b/src/main/java/campanule/datasource/rest/xml/RestTransactionManager.java index 11d40ca..d8e8bc2 100644 --- a/src/main/java/campanule/datasource/rest/xml/RestTransactionManager.java +++ b/src/main/java/campanule/datasource/rest/xml/RestTransactionManager.java @@ -11,12 +11,17 @@ import core.datasource.TransactionManager.Operation; public final class RestTransactionManager extends campanule.datasource.rest.RestTransactionManager { + private static RestTransactionManager transactionManager; + public RestTransactionManager(final String context) { super(context); } public static TransactionManager getInstance(final String context) { - return setInstance(new RestTransactionManager(context)); + if (transactionManager == null) { + transactionManager = new RestTransactionManager(context); + } + return transactionManager; } @Override @@ -25,4 +30,5 @@ public final class RestTransactionManager return operation.execute( new RestMapperManager(this.getContext())); } + } -- GitLab From 1af01810761478847ee7ef2038cc1151d70f4d68 Mon Sep 17 00:00:00 2001 From: huguenindo Date: Wed, 5 Jan 2022 15:44:16 +0100 Subject: [PATCH 4/4] fix: ajout de l'attribut accept dans le recherche des commandes d'un client --- pom.xml | 2 +- .../java/campanule/datasource/rest/CommandeMapperImpl.java | 1 + .../datasource/rest/json/RestTransactionManager.java | 2 +- src/test/java/campanule/datasource/rest/CONSTANTES.java | 4 ++-- .../campanule/datasource/rest/xml/CommandeMapperImplTest.java | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 40f18db..8b65cb0 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ${project.groupId} campanule.lib - 1.0.5 + 1.0.6 test test-jar diff --git a/src/main/java/campanule/datasource/rest/CommandeMapperImpl.java b/src/main/java/campanule/datasource/rest/CommandeMapperImpl.java index 6fa11ae..ed61341 100644 --- a/src/main/java/campanule/datasource/rest/CommandeMapperImpl.java +++ b/src/main/java/campanule/datasource/rest/CommandeMapperImpl.java @@ -84,6 +84,7 @@ public abstract class CommandeMapperImpl identifiant.getUUID()); try { return (List) Request.Get(targetURL) + .addHeader(getAcceptHeader()) .execute() .handleResponse(new ResponseHandler>() { @Override diff --git a/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java b/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java index 91b20cc..c22a153 100644 --- a/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java +++ b/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java @@ -10,7 +10,7 @@ import core.datasource.TransactionManager.Operation; */ public final class RestTransactionManager extends campanule.datasource.rest.RestTransactionManager { - + private static RestTransactionManager transactionManager; public RestTransactionManager(final String context) { diff --git a/src/test/java/campanule/datasource/rest/CONSTANTES.java b/src/test/java/campanule/datasource/rest/CONSTANTES.java index ba3e2e9..2b9ca73 100644 --- a/src/test/java/campanule/datasource/rest/CONSTANTES.java +++ b/src/test/java/campanule/datasource/rest/CONSTANTES.java @@ -7,8 +7,8 @@ package campanule.datasource.rest; public class CONSTANTES { //Configuration pour les tests en local - public static final String SERVICE_REST_URL = "http://localhost:8080/campanule.rest/resources"; +// public static final String SERVICE_REST_URL = "http://localhost:8080/campanule.rest/resources"; //Configuration pour les test dans la CI/CD de gitlab - //public static final String SERVICE_REST_URL = "http://campanule.rest:8080/resources"; + public static final String SERVICE_REST_URL = "http://campanule.rest:8080/resources"; } diff --git a/src/test/java/campanule/datasource/rest/xml/CommandeMapperImplTest.java b/src/test/java/campanule/datasource/rest/xml/CommandeMapperImplTest.java index 9eefacc..ba48401 100644 --- a/src/test/java/campanule/datasource/rest/xml/CommandeMapperImplTest.java +++ b/src/test/java/campanule/datasource/rest/xml/CommandeMapperImplTest.java @@ -39,5 +39,4 @@ public class CommandeMapperImplTest }); } - } -- GitLab