diff --git a/pom.xml b/pom.xml
index 40f18dbe6464af87cc7dfa2b429dac479e8ab73f..8b65cb078e97ffc138f4aab46efea5c9a8bcbe50 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 6fa11aec643555e1b9e151027002d4827b2b7b50..ed6134130b764126b3c890c8ea82426d46566bf3 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/RestTransactionManager.java b/src/main/java/campanule/datasource/rest/RestTransactionManager.java
index c239c5feb8192971a77634f51acbfaba20ea9093..06ddf529b1fb6243d9d428c99b4ba1dc4080a253 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 2b4eb82b6043bde992cd4b4e1f0ee4f40455a613..c22a1534ced4e3ebe4f8ceddfd4113d7b4b522c4 100644
--- a/src/main/java/campanule/datasource/rest/json/RestTransactionManager.java
+++ b/src/main/java/campanule/datasource/rest/json/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
diff --git a/src/main/java/campanule/datasource/rest/xml/RestTransactionManager.java b/src/main/java/campanule/datasource/rest/xml/RestTransactionManager.java
index 11d40caec060cb0d64ec2025825aec13b80c94d1..d8e8bc25d85c523a95e7e490d09cc8f2dbcee754 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()));
}
+
}
diff --git a/src/test/java/campanule/datasource/rest/CONSTANTES.java b/src/test/java/campanule/datasource/rest/CONSTANTES.java
index 72b4e2c4a2140a5434ab9bd9ac9b9f8543f2748e..2b9ca73f538a5406bc80b75eb949982abb1c71c1 100644
--- a/src/test/java/campanule/datasource/rest/CONSTANTES.java
+++ b/src/test/java/campanule/datasource/rest/CONSTANTES.java
@@ -7,7 +7,7 @@ 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";
diff --git a/src/test/java/campanule/datasource/rest/xml/CommandeMapperImplTest.java b/src/test/java/campanule/datasource/rest/xml/CommandeMapperImplTest.java
index 9eefacc61de8c65c71ec0c7fe12f1c57193ac472..ba484014325425366aedd4b1fe5aa4be4cac061b 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
});
}
-
}
diff --git a/src/test/java/campanule/datasource/rest/xml/TestTransactionManagerFactory.java b/src/test/java/campanule/datasource/rest/xml/TestTransactionManagerFactory.java
index 3132add43b62c8fede43852ced68990c08312a8a..c481a8591b689a46db50e1e81da13aad0f10823e 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);
}