fix: delete mongo functionalities

README.md

@@ -4,12 +4,12 @@ Batch using to implement QUEEN DB from xml files.
 
 ## Requirements
 For building and running the application you need:
-- [JDK 1.11](https://jdk.java.net/archive/)
+- JDK 21
 - Maven 3 
 
 # Add lunatic librairy to project
 ``` shell
-mvn install:install-file -Dfile=lib/lunatic-model-2.2.3.jar -DgroupId=fr.insee.lunatic -DartifactId=lunatic-model -Dversion=2.2.3 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/lunatic-model-2.5.1.jar -DgroupId=fr.insee.lunatic -DartifactId=lunatic-model -Dversion=2.5.1 -Dpackaging=jar
 ```
 
 ## Install and excute unit tests and ent-to-end tests
@@ -19,7 +19,7 @@ mvn clean install
 ```
 
 ## Running batch
-Use the folowing cmd :
+Use the following cmd :
 ``` shell
 echo $@
 java8 -Xms64m -Xmx512m -classpath '/path/to/lib/*' -Dlog4j.configurationFile=file:/path/to/log4j2/config/log4j2.xml -Dproperties.path=/path/to/properties -DcheminLog=/path/to/log fr.insee.queen.batch.Lanceur $@
@@ -38,7 +38,6 @@ fr.insee.queen.persistence.database.schema = XXXXXXX
 fr.insee.queen.persistence.database.user = XXXXXXX
 fr.insee.queen.persistence.database.password = XXXXXXX
 fr.insee.queen.persistence.database.driver = org.postgresql.Driver
-fr.insee.queen.application.persistenceType = (JPA or MONGODB)
 fr.insee.queen.folder.in=path/to/in
 fr.insee.queen.folder.out=path/to/out
 fr.insee.queen.paradata.id=idSu
@@ -58,7 +57,6 @@ Before committing code please ensure,
 - spring-data-jpa
 - commons-lang3
 - postgresql
-- mongoDb
 - liquibase
 - spring-test
 - test-containers

src/main/java/fr/insee/queen/batch/config/ApplicationContext.java

@@ -10,20 +10,13 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 
-import com.mongodb.ConnectionString;
-import com.mongodb.MongoClientSettings;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
-
 @Configuration
 @ComponentScan("fr.insee.queen.batch.*")
 @PropertySource(value = {"classpath:/queen-bo.properties", "file:${properties.path}/queen-bo.properties"}, ignoreResourceNotFound = true)
@@ -72,7 +65,6 @@ public class ApplicationContext {
 	 * @return new Datasource
 	 */
 	@Bean("dataSource")
-	@Conditional(value= ConditonJpa.class)
 	public DataSource dataSource() {
 		DriverManagerDataSource dataSource = new DriverManagerDataSource();
 		dataSource.setDriverClassName(dbDriver);
@@ -89,7 +81,6 @@ public DataSource dataSource() {
 	 * @throws SQLException 
 	 */
 	@Bean("connection")
-	@Conditional(value= ConditonJpa.class)
 	public Connection connection(@Autowired @Qualifier("dataSource") DataSource dataSource) throws SQLException {
 		return DataSourceUtils.getConnection(dataSource);
 	}
@@ -100,7 +91,6 @@ public Connection connection(@Autowired @Qualifier("dataSource") DataSource data
 	 * @return JdbcTemplate
 	 */
 	@Bean("jdbcTemplate")
-	@Conditional(value= ConditonJpa.class)
 	public JdbcTemplate jdbcTemplate(@Autowired @Qualifier("dataSource") DataSource dataSource) {
 		JdbcTemplate jdbcTemplate = null;
 		try {
@@ -111,32 +101,7 @@ public JdbcTemplate jdbcTemplate(@Autowired @Qualifier("dataSource") DataSource
 		jdbcTemplate.setResultsMapCaseInsensitive(true);
 		return jdbcTemplate;
 	}
-
-	/**
-	 * Method used to create the connection with the mongo database
-	 * @return
-	 */
-	@Bean
-	@Conditional(value= ConditonMongo.class)
-    public MongoClient mongo() {
-        ConnectionString connectionString = new ConnectionString(String.format("mongodb://%s:%s/%s", dbHost, dbPort, dbSchema));
-        		MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
-          .applyConnectionString(connectionString)
-          .build();
-        return MongoClients.create(mongoClientSettings);
-    }
-
-	/**
-	 * Method used to create the mongoTemplate
-	 * @return
-	 * @throws Exception
-	 */
-	@Conditional(value= ConditonMongo.class)
-    @Bean
-    public MongoTemplate mongoTemplate() throws Exception {
-        return new MongoTemplate(mongo(), dbSchema);
-    }
-
+
 	/**
 	 * Bean to get the Folder_in value
 	 * @return

src/main/java/fr/insee/queen/batch/config/ConditonJpa.java

@@ -2,7 +2,6 @@
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 /**
@@ -16,11 +15,10 @@ public class ConditonJpa implements Condition{
 	/**
 	 * This method override the Condition.class and checking if
 	 * the application needs to be launch in JPA persistence mode
+	 * There is no mongo anymore but we keep this class now as it is used by other jars
 	 */
 	@Override
 	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-		Environment env = context.getEnvironment();
-		return null != env 
-				&& "JPA".equals(env.getProperty("fr.insee.queen.application.persistenceType"));
+		return true;
 	}
 }

src/main/java/fr/insee/queen/batch/config/ConditonMongo.java

@@ -2,7 +2,6 @@
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 /**
@@ -16,11 +15,11 @@ public class ConditonMongo implements Condition{
 	/**
 	 * This method override the Condition.class and checking if
 	 * the application needs to be launch in MONGO persistence mode
+	 *
+	 * There is no mongo anymore but we keep this class now as it is used by other jars
 	 */
 	@Override
 	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-		Environment env = context.getEnvironment();
-		return null != env 
-				&& "MONGODB".equals(env.getProperty("fr.insee.queen.application.persistenceType"));
+		return false;
 	}
 }

src/main/java/fr/insee/queen/batch/dao/impl/jpa/CampaignDaoJpaImpl.java

@@ -6,12 +6,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
-
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.CampaignDao;
 import fr.insee.queen.batch.object.Campaign;
 
@@ -21,7 +18,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class CampaignDaoJpaImpl implements CampaignDao {
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/CommentDaoJpaImpl.java

@@ -8,11 +8,9 @@
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.CommentDao;
 import fr.insee.queen.batch.object.SurveyUnit;
 
@@ -22,7 +20,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class CommentDaoJpaImpl implements CommentDao {
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/DataDaoJpaImpl.java

@@ -10,11 +10,9 @@
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.DataDao;
 import fr.insee.queen.batch.object.SurveyUnit;
 
@@ -24,7 +22,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class DataDaoJpaImpl implements DataDao {
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/NomenclatureDaoJpaImpl.java

@@ -7,12 +7,10 @@
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.NomenclatureDao;
 import fr.insee.queen.batch.object.Nomenclature;
 
@@ -22,7 +20,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class NomenclatureDaoJpaImpl implements NomenclatureDao {
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/ParadataEventDaoJpaImpl.java

@@ -4,7 +4,6 @@
 import java.sql.SQLException;
 import java.util.*;
 
-import fr.insee.queen.batch.dao.mongo.impl.ParadataEventDaoMongoImpl;
 import fr.insee.queen.batch.object.ParadataEvent;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -13,12 +12,10 @@
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.ParadataEventDao;
 import fr.insee.queen.batch.service.DatabaseService;
 
@@ -28,7 +25,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class ParadataEventDaoJpaImpl implements ParadataEventDao{
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/PersonalizationDaoJpaImpl.java

@@ -12,12 +12,10 @@
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.PersonalizationDao;
 import fr.insee.queen.batch.object.Personalization;
 import fr.insee.queen.batch.object.SurveyUnit;
@@ -28,7 +26,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class PersonalizationDaoJpaImpl implements PersonalizationDao{
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/QuestionnaireModelDaoJpaImpl.java

@@ -8,12 +8,10 @@
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.QuestionnaireModelDao;
 import fr.insee.queen.batch.object.QuestionnaireModel;
 
@@ -23,7 +21,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class QuestionnaireModelDaoJpaImpl implements QuestionnaireModelDao{
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/RequiredNomenclatureDaoJpaImpl.java

@@ -5,11 +5,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.RequiredNomenclatureDao;
 import fr.insee.queen.batch.object.Nomenclature;
 
@@ -19,7 +17,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class RequiredNomenclatureDaoJpaImpl implements RequiredNomenclatureDao{
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/StateDataDaoJpaImpl.java

@@ -6,22 +6,18 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.StateDataDao;
 import fr.insee.queen.batch.object.StateData;
-import fr.insee.queen.batch.utils.PathUtils;
 
 /**
  * Service for the StateData entity that implements the interface associated
  * @author scorcaud
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class StateDataDaoJpaImpl implements StateDataDao{
 
 	@Autowired

src/main/java/fr/insee/queen/batch/dao/impl/jpa/SurveyUnitDaoJpaImpl.java

@@ -10,12 +10,10 @@
 import fr.insee.queen.batch.object.StateData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import fr.insee.queen.batch.config.ConditonJpa;
 import fr.insee.queen.batch.dao.SurveyUnitDao;
 import fr.insee.queen.batch.object.SurveyUnit;
 
@@ -25,7 +23,6 @@
  *
  */
 @Service
-@Conditional(value= ConditonJpa.class)
 public class SurveyUnitDaoJpaImpl implements SurveyUnitDao {
 
 	@Autowired