feat: rewrite testcontainer (#688)

* feat: rewrite testcontainer * refactor(Use RdfConnnectionDetails and remove useless Sring context for testcontainers) * refactor(unused imports) * fix: review testcontainer --------- Co-authored-by: Fabrice Bibonne <[email protected]>
InseeFr · Jul 10, 2024 · 27d28cb · 27d28cb
1 parent 70e4165
commit 27d28cb
Show file tree

Hide file tree

Showing 32 changed files with 215 additions and 142 deletions.
diff --git a/pom.xml b/pom.xml
@@ -254,7 +254,11 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.17.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/operations/OperationsDocumentationsImpl.java b/src/main/java/fr/insee/rmes/bauhaus_services/operations/OperationsDocumentationsImpl.java
@@ -11,7 +11,7 @@
 import fr.insee.rmes.exceptions.ErrorCodes;
 import fr.insee.rmes.exceptions.RmesException;
 import fr.insee.rmes.exceptions.RmesNotAcceptableException;
-import fr.insee.rmes.external_services.export.XDocReport;
+import fr.insee.rmes.external.services.export.XDocReport;
 import fr.insee.rmes.model.operations.documentations.Documentation;
 import fr.insee.rmes.model.operations.documentations.MSD;
 import fr.insee.rmes.persistance.sparql_queries.operations.documentations.DocumentationsQueries;

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/operations/OperationsImpl.java b/src/main/java/fr/insee/rmes/bauhaus_services/operations/OperationsImpl.java
@@ -10,7 +10,7 @@
 import fr.insee.rmes.bauhaus_services.rdf_utils.RdfService;
 import fr.insee.rmes.config.swagger.model.IdLabelTwoLangs;
 import fr.insee.rmes.exceptions.RmesException;
-import fr.insee.rmes.external_services.export.XDocReport;
+import fr.insee.rmes.external.services.export.XDocReport;
 import fr.insee.rmes.model.operations.Indicator;
 import fr.insee.rmes.model.operations.Operation;
 import fr.insee.rmes.model.operations.Series;

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/rdf_utils/RdfConnectionDetails.java b/src/main/java/fr/insee/rmes/bauhaus_services/rdf_utils/RdfConnectionDetails.java
@@ -0,0 +1,7 @@
+package fr.insee.rmes.bauhaus_services.rdf_utils;
+
+public interface RdfConnectionDetails {
+    String getUrlServer();
+
+    String repositoryId();
+}
diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/rdf_utils/RepositoryGestion.java b/src/main/java/fr/insee/rmes/bauhaus_services/rdf_utils/RepositoryGestion.java
@@ -1,6 +1,5 @@
 package fr.insee.rmes.bauhaus_services.rdf_utils;
 
-import fr.insee.rmes.config.Config;
 import fr.insee.rmes.exceptions.RmesException;
 import fr.insee.rmes.persistance.ontologies.EVOC;
 import fr.insee.rmes.persistance.ontologies.INSEE;
@@ -17,6 +16,7 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
@@ -31,26 +31,24 @@ public class RepositoryGestion {
 
 	private static final String FAILURE_LOAD_OBJECT = "Failure load object : {}";
 	private static final String FAILURE_REPLACE_GRAPH = "Failure replace graph : ";
-	private static final String FAILURE_DELETE_OBJECT = "Failure delete object";
 
 	static final Logger logger = LoggerFactory.getLogger(RepositoryGestion.class);
 
-    private final Config config;
-    private final RepositoryUtils repositoryUtils;
+	private final RdfConnectionDetails rdfGestion;
 
+	private final RepositoryUtils repositoryUtils;
 
-    public RepositoryGestion(Config config, RepositoryUtils repositoryUtils) {
+    public RepositoryGestion(@Qualifier("rdfGestionConnectionDetails") RdfConnectionDetails rdfGestion, RepositoryUtils repositoryUtils) {
+        this.rdfGestion = rdfGestion;
         this.repositoryUtils = repositoryUtils;
-        this.config = config;
-	}
+    }
 
     @PostConstruct
     public void init(){
-        repositoryUtils.initRepository(config.getRdfServerGestion(),
-                config.getRepositoryIdGestion());
+        repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+                rdfGestion.repositoryId());
     }
 
-
 	/**
 	 * Method which aims to produce response from a sparql query
 	 *
@@ -59,8 +57,8 @@ public void init(){
 	 * @throws RmesException
 	 */
 	public String getResponse(String query) throws RmesException {
-		return repositoryUtils.getResponse(query, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.getResponse(query, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 	/**
@@ -71,8 +69,8 @@ public String getResponse(String query) throws RmesException {
 	 * @throws RmesException
 	 */
 	public HttpStatus executeUpdate(String updateQuery) throws RmesException {
-		return repositoryUtils.executeUpdate(updateQuery, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.executeUpdate(updateQuery, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 	/**
@@ -83,18 +81,18 @@ public HttpStatus executeUpdate(String updateQuery) throws RmesException {
 	 * @throws RmesException
 	 */
 	public JSONObject getResponseAsObject(String query) throws RmesException {
-			return repositoryUtils.getResponseAsObject(query, repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()));
+			return repositoryUtils.getResponseAsObject(query, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()));
 	}
 
 	public JSONArray getResponseAsArray(String query) throws RmesException {
-		return repositoryUtils.getResponseAsArray(query, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.getResponseAsArray(query, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 	public JSONArray getResponseAsJSONList(String query) throws RmesException {
-		return repositoryUtils.getResponseAsJSONList(query, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.getResponseAsJSONList(query, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 	/**
@@ -106,16 +104,16 @@ public JSONArray getResponseAsJSONList(String query) throws RmesException {
 	 * @throws JSONException
 	 */
 	public boolean getResponseAsBoolean(String query) throws RmesException {
-		return repositoryUtils.getResponseForAskQuery(query, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.getResponseForAskQuery(query, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 	public RepositoryResult<Statement> getStatements(RepositoryConnection con, Resource subject)
 			throws RmesException {
 		RepositoryResult<Statement> statements = null;
 		if (con == null) {
-			con = repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()).getConnection();
+			con = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()).getConnection();
 		}
 
 		try {
@@ -146,8 +144,8 @@ public RepositoryResult<Statement> getStatementsPredicateObject(RepositoryConnec
 			throws RmesException {
 
 			if (con == null) {
-				con = repositoryUtils.initRepository(config.getRdfServerGestion(),
-						config.getRepositoryIdGestion()).getConnection();
+				con = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+						rdfGestion.repositoryId()).getConnection();
 			}
 
 		RepositoryResult<Statement> statements = null;
@@ -160,15 +158,15 @@ public RepositoryResult<Statement> getStatementsPredicateObject(RepositoryConnec
 	}
 
 	public File getGraphAsFile(String context) throws RmesException {
-			if (context != null) return repositoryUtils.getCompleteGraphInTrig(repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()), context);
-			return repositoryUtils.getAllGraphsInZip(repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()));
+			if (context != null) return repositoryUtils.getCompleteGraphInTrig(repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()), context);
+			return repositoryUtils.getAllGraphsInZip(repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()));
 	}
 
 	public String[] getAllGraphs() throws RmesException {
-		return repositoryUtils.getAllGraphs(repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.getAllGraphs(repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 	public void closeStatements(RepositoryResult<Statement> statements) throws RmesException {
@@ -181,8 +179,8 @@ public void closeStatements(RepositoryResult<Statement> statements) throws RmesE
 
 	public void loadConcept(IRI concept, Model model, List<List<IRI>> notesToDeleteAndUpdate)
 			throws RmesException {
-		try (RepositoryConnection conn = repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()).getConnection() ){
+		try (RepositoryConnection conn = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()).getConnection() ){
 			// notes to delete
 			for (IRI note : notesToDeleteAndUpdate.get(0)) {
 				conn.remove(note, null, null);
@@ -207,8 +205,8 @@ public void deleteTripletByPredicateAndValue(Resource object, IRI predicate, Res
 
 	public void deleteTripletByPredicateAndValue(Resource object, IRI predicate, Resource graph, Value value) throws RmesException {
 		try {
-			RepositoryConnection conn = repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()).getConnection();
+			RepositoryConnection conn = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()).getConnection();
 
 			conn.remove(object, predicate, value, graph);
 			conn.close();
@@ -276,8 +274,8 @@ public void replaceGraph(Resource graph, Model model, RepositoryConnection conn)
     private void processConnection(Consumer<RepositoryConnection> processor, RepositoryConnection initialConnection, String message)throws RmesException{
         try {
             if (initialConnection == null) {
-                initialConnection = repositoryUtils.initRepository(config.getRdfServerGestion(),
-                        config.getRepositoryIdGestion()).getConnection();
+                initialConnection = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+                        rdfGestion.repositoryId()).getConnection();
             }
             processor.accept(initialConnection);
             initialConnection.close();
@@ -288,15 +286,15 @@ private void processConnection(Consumer<RepositoryConnection> processor, Reposit
 
 
 	public HttpStatus persistFile(InputStream input, RDFFormat format, String graph) throws RmesException {
-		return repositoryUtils.persistFile(input, format, graph, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()), null);
+		return repositoryUtils.persistFile(input, format, graph, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()), null);
 	}
 
 	public void loadObjectWithReplaceLinks(IRI object, Model model) throws RmesException {
 
 
-		try (RepositoryConnection conn=repositoryUtils.initRepository(config.getRdfServerGestion(),
-						config.getRepositoryIdGestion()).getConnection();)
+		try (RepositoryConnection conn=repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+						rdfGestion.repositoryId()).getConnection();)
 		{
 			clearReplaceLinks(object);
 			loadSimpleObject(object, model, conn);
@@ -308,8 +306,8 @@ public void loadObjectWithReplaceLinks(IRI object, Model model) throws RmesExcep
 	public void objectsValidation(List<IRI> collectionsToValidateList, Model model) throws RmesException {
 
 		try {
-			RepositoryConnection conn=repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()).getConnection();
+			RepositoryConnection conn=repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()).getConnection();
 			for (IRI item : collectionsToValidateList) {
 				conn.remove(item, INSEE.VALIDATION_STATE, null);
 				conn.remove(item, INSEE.IS_VALIDATED, null);
@@ -324,8 +322,8 @@ public void objectsValidation(List<IRI> collectionsToValidateList, Model model)
 	public void objectValidation(IRI ressourceURI, Model model) throws RmesException {
 
 		try {
-			RepositoryConnection conn=repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()).getConnection();
+			RepositoryConnection conn=repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()).getConnection();
 			conn.remove(ressourceURI, INSEE.VALIDATION_STATE, null);
 			conn.remove(ressourceURI, INSEE.IS_VALIDATED, null);
 			conn.add(model);
@@ -348,8 +346,8 @@ private void clearReplaceLinks(Resource object) throws RmesException {
 	private  void getStatementsAndRemove(Resource object, List<IRI> typeOfLink)
 			throws RmesException {
         String exceptionCirucmstances = "";
-        try(RepositoryConnection conn = repositoryUtils.initRepository(config.getRdfServerGestion(),
-                config.getRepositoryIdGestion()).getConnection()){
+        try(RepositoryConnection conn = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+                rdfGestion.repositoryId()).getConnection()){
             for (IRI predicat : typeOfLink) {
                 RepositoryResult<Statement> statements = null;
                 exceptionCirucmstances="get " + predicat + " links from " + object;
@@ -365,17 +363,17 @@ private  void getStatementsAndRemove(Resource object, List<IRI> typeOfLink)
 	}
 
 	public void clearStructureNodeAndComponents(Resource structure) throws RmesException {
-		repositoryUtils.clearStructureAndComponents(structure, repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		repositoryUtils.clearStructureAndComponents(structure, repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
     public void keepHierarchicalOperationLinks(Resource object, Model model) throws RmesException {
         getHierarchicalOperationLinksModel(object, model, List.of(DCTERMS.HAS_PART, DCTERMS.IS_PART_OF));
     }
 
 	private void getHierarchicalOperationLinksModel(Resource object, Model model, List<IRI> typeOfLink) throws RmesException {
-        RepositoryConnection conn = repositoryUtils.initRepository(config.getRdfServerGestion(),
-                config.getRepositoryIdGestion()).getConnection();
+        RepositoryConnection conn = repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+                rdfGestion.repositoryId()).getConnection();
 		for (IRI predicat : typeOfLink) {
 			RepositoryResult<Statement> statements;
 			try {
@@ -411,17 +409,17 @@ public void loadSimpleObject(IRI geoIRI, Model model) throws RmesException {
 	}
 
 	public RepositoryConnection getConnection() throws RmesException {
-		return repositoryUtils.getConnection(repositoryUtils.initRepository(config.getRdfServerGestion(),
-				config.getRepositoryIdGestion()));
+		return repositoryUtils.getConnection(repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+				rdfGestion.repositoryId()));
 	}
 
 
 	public void overrideTriplets(IRI simsUri, Model model, Resource graph) throws RmesException {
 
 
 		try {
-			RepositoryConnection connection =repositoryUtils.initRepository(config.getRdfServerGestion(),
-					config.getRepositoryIdGestion()).getConnection();
+			RepositoryConnection connection =repositoryUtils.initRepository(rdfGestion.getUrlServer(),
+					rdfGestion.repositoryId()).getConnection();
 			model.predicates().forEach(predicate -> connection.remove(simsUri, predicate, null, graph));
 			connection.add(model);
 			connection.close();

diff --git a/src/main/java/fr/insee/rmes/config/Config.java b/src/main/java/fr/insee/rmes/config/Config.java
@@ -32,10 +32,6 @@ public class Config {
     /******************************************************/
     /** DATABASES		***********************************/
     /******************************************************/
-    @Value("${fr.insee.rmes.bauhaus.sesame.gestion.sesameServer}")
-    private String rdfServerGestion;
-    @Value("${fr.insee.rmes.bauhaus.sesame.gestion.repository}")
-    private String idRepositoryGestion;
     @Value("${fr.insee.rmes.bauhaus.sesame.gestion.baseURI}")
     private String baseUriGestion;
 
@@ -151,14 +147,6 @@ public String getBaseGraph() {
         return baseGraph;
     }
 
-    public String getRdfServerGestion() {
-        return rdfServerGestion;
-    }
-
-    public String getRepositoryIdGestion() {
-        return idRepositoryGestion;
-    }
-
     public String getBaseUriGestion() {
         return baseUriGestion;
     }

diff --git a/...authentication/stamps/RmesStampsImpl.java → ...authentication/stamps/RmesStampsImpl.java b/...authentication/stamps/RmesStampsImpl.java → ...authentication/stamps/RmesStampsImpl.java
@@ -1,4 +1,4 @@
-package fr.insee.rmes.external_services.authentication.stamps;
+package fr.insee.rmes.external.services.authentication.stamps;
 
 import fr.insee.rmes.config.auth.security.UserDecoder;
 import fr.insee.rmes.config.auth.user.Stamp;

diff --git a/.../authentication/stamps/StampsService.java → .../authentication/stamps/StampsService.java b/.../authentication/stamps/StampsService.java → .../authentication/stamps/StampsService.java
@@ -1,4 +1,4 @@
-package fr.insee.rmes.external_services.authentication.stamps;
+package fr.insee.rmes.external.services.authentication.stamps;
 
 import fr.insee.rmes.config.auth.user.Stamp;
 import fr.insee.rmes.exceptions.RmesException;

diff --git a/...services/export/ClasspathUriResolver.java → ...services/export/ClasspathUriResolver.java b/...services/export/ClasspathUriResolver.java → ...services/export/ClasspathUriResolver.java
@@ -1,4 +1,4 @@
-package fr.insee.rmes.external_services.export;
+package fr.insee.rmes.external.services.export;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../external_services/export/XDocReport.java → .../external/services/export/XDocReport.java b/.../external_services/export/XDocReport.java → .../external/services/export/XDocReport.java
@@ -1,4 +1,4 @@
-package fr.insee.rmes.external_services.export;
+package fr.insee.rmes.external.services.export;
 
 import fr.insee.rmes.bauhaus_services.operations.operations.VarBookExportBuilder;
 import fr.insee.rmes.exceptions.RmesException;

diff --git a/...s/external_services/rbac/RBACService.java → ...s/external/services/rbac/RBACService.java b/...s/external_services/rbac/RBACService.java → ...s/external/services/rbac/RBACService.java
@@ -1,4 +1,4 @@
-package fr.insee.rmes.external_services.rbac;
+package fr.insee.rmes.external.services.rbac;
 
 import fr.insee.rmes.model.rbac.RBAC;
 

diff --git a/...ternal_services/rbac/RBACServiceImpl.java → ...ternal/services/rbac/RBACServiceImpl.java b/...ternal_services/rbac/RBACServiceImpl.java → ...ternal/services/rbac/RBACServiceImpl.java
@@ -1,4 +1,4 @@
-package fr.insee.rmes.external_services.rbac;
+package fr.insee.rmes.external.services.rbac;
 
 import fr.insee.rmes.config.auth.RBACConfiguration;
 import fr.insee.rmes.model.rbac.RBAC;