diff --git a/arc-core/src/main/java/fr/insee/arc/core/service/global/ApiService.java b/arc-core/src/main/java/fr/insee/arc/core/service/global/ApiService.java index 09d53cb3a..dd82637e4 100644 --- a/arc-core/src/main/java/fr/insee/arc/core/service/global/ApiService.java +++ b/arc-core/src/main/java/fr/insee/arc/core/service/global/ApiService.java @@ -8,7 +8,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.springframework.stereotype.Component; import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder; import fr.insee.arc.core.dataobjects.ColumnEnum; @@ -27,14 +26,12 @@ import fr.insee.arc.utils.database.ArcDatabase; import fr.insee.arc.utils.exception.ArcException; import fr.insee.arc.utils.exception.ArcExceptionMessage; -import fr.insee.arc.utils.ressourceUtils.SpringApplicationContext; import fr.insee.arc.utils.security.SqlInjectionChecked; import fr.insee.arc.utils.structure.GenericBean; import fr.insee.arc.utils.textUtils.IConstanteNumerique; import fr.insee.arc.utils.utils.FormatSQL; import fr.insee.arc.utils.utils.LoggerHelper; -@Component public abstract class ApiService implements IConstanteNumerique { protected static final Logger LOGGER_APISERVICE = LogManager.getLogger(ApiService.class); @@ -71,7 +68,6 @@ public abstract class ApiService implements IConstanteNumerique { public ApiService() { super(); - springInit(); } protected ApiService(TraitementPhase aCurrentPhase, String aEnvExecution, Integer aNbEnr, @@ -135,15 +131,6 @@ private boolean initialiser() { return this.todo; } - /** Manually autowire the factory-produced instance. */ - private void springInit() { - try { - SpringApplicationContext.autowire(this); - } catch (Exception e) { - // - } - } - /** * Vérifier si y'a des fichiers à traiter on teste dans la phase précédente si * on trouve des fichiers OK avec etape=1 diff --git a/arc-core/src/main/java/fr/insee/arc/core/util/StaticLoggerDispatcher.java b/arc-core/src/main/java/fr/insee/arc/core/util/StaticLoggerDispatcher.java index 42124756c..fd2827bdf 100644 --- a/arc-core/src/main/java/fr/insee/arc/core/util/StaticLoggerDispatcher.java +++ b/arc-core/src/main/java/fr/insee/arc/core/util/StaticLoggerDispatcher.java @@ -6,7 +6,6 @@ import fr.insee.arc.utils.utils.LoggerHelper; -/** Transition class. Try to use a LoggerDispatcher as an @Autowired attribute instead. */ @Component public class StaticLoggerDispatcher { @@ -16,7 +15,6 @@ public static void custom(Logger logger, Object message) { } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void error(Logger logger, Exception e) { LoggerHelper.error(logger,ExceptionUtils.getStackTrace(e)); } @@ -25,48 +23,39 @@ public static void error(Logger logger, Object message) { LoggerHelper.error(logger,message); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void error(Logger logger, Object message, Exception ex) { LoggerHelper.error(logger,message,ExceptionUtils.getStackTrace(ex)); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void warn(Logger logger, Object message) { LoggerHelper.warn(logger,message); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void warn(Logger logger, Object message, Exception ex) { LoggerHelper.warn(logger,message,ex); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void info(Logger logger, Object message) { LoggerHelper.info(logger,message); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void info(Logger logger, Object message, Exception ex) { LoggerHelper.info(logger,message,ex); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void debug(Logger logger, Object message) { LoggerHelper.debug(logger,message); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void debug(Logger logger, Object message, Exception ex) { LoggerHelper.debug(logger,message,ex); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void trace(Logger logger, Object message) { LoggerHelper.trace(logger,message); } - /** Transition class. Use a LoggerDispatcher as an @Autowired attribute instead. */ public static void trace(Logger logger, Object message, Exception ex) { LoggerHelper.trace(logger,message,ex); } diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/all/util/VObjectService.java b/arc-web/src/main/java/fr/insee/arc/web/gui/all/util/VObjectService.java index c68e0beb0..9bec1c706 100644 --- a/arc-web/src/main/java/fr/insee/arc/web/gui/all/util/VObjectService.java +++ b/arc-web/src/main/java/fr/insee/arc/web/gui/all/util/VObjectService.java @@ -25,7 +25,6 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.ScopedProxyMode; @@ -36,7 +35,6 @@ import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder; import fr.insee.arc.core.dataobjects.ColumnEnum; import fr.insee.arc.core.service.global.dao.FileSystemManagement; -import fr.insee.arc.core.util.LoggerDispatcher; import fr.insee.arc.utils.dao.ModeRequeteImpl; import fr.insee.arc.utils.dao.UtilitaireDao; import fr.insee.arc.utils.database.ArcDatabase; @@ -66,6 +64,11 @@ @Scope(scopeName = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS) public class VObjectService { + public VObjectService(Session session) + { + this.session=session; + } + private static final Logger LOGGER = LogManager.getLogger(VObjectService.class); // filter constants @@ -85,12 +88,8 @@ public class VObjectService { public static final String DEFAULT_FILTER_FUNCTION = "upper"; - @Autowired private Session session; - @Autowired - private LoggerDispatcher loggerDispatcher; - // default database target for query is META_DATA private Integer connectionIndex = ArcDatabase.COORDINATOR.getIndex(); @@ -1432,7 +1431,7 @@ public void upload(VObject data, String repertoireCible) throws ArcException { temporaryFolder = Files.createTempDirectory("tmp_" + System.currentTimeMillis()).toFile(); Path locationTmp = Paths.get(temporaryFolder.getAbsolutePath(), fileName); - loggerDispatcher.info("Upload >> " + locationTmp, LOGGER); + LoggerHelper.info(LOGGER, "Upload >> " + locationTmp); File newFileTmp = locationTmp.toFile(); @@ -1440,7 +1439,7 @@ public void upload(VObject data, String repertoireCible) throws ArcException { uploadedFile.transferTo(newFileTmp); Path location = Paths.get(repertoireCible, fileName); - loggerDispatcher.info("Transfering uploaded file to >> " + location, LOGGER); + LoggerHelper.info(LOGGER, "Transfering uploaded file to >> " + location); Files.copy(locationTmp, location, StandardCopyOption.REPLACE_EXISTING); } catch (IOException ex) { diff --git a/arc-web/src/test/java/fr/insee/arc/web/controllers/IndexActionTest.java b/arc-web/src/test/java/fr/insee/arc/web/controllers/IndexActionTest.java index f3f518478..6914df24f 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/controllers/IndexActionTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/controllers/IndexActionTest.java @@ -8,6 +8,8 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; @@ -30,8 +32,8 @@ public void setup() { @Test public void indexOk() throws Exception { -// mockMvc.perform(MockMvcRequestBuilders.get("/healthcheck")) -// .andExpect(MockMvcResultMatchers.status().isInternalServerError()); + mockMvc.perform(MockMvcRequestBuilders.get("/healthcheck")) + .andExpect(MockMvcResultMatchers.status().is(200)); } } diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/all/util/VObjectServiceTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/all/util/VObjectServiceTest.java index 1fe67ac69..d9f89f505 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/all/util/VObjectServiceTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/all/util/VObjectServiceTest.java @@ -31,14 +31,16 @@ public class VObjectServiceTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); - vObjectService = new VObjectService(); - vObjectService.setConnection(c); Session session = new Session(); HttpSessionTemplate z = new HttpSessionTemplate(); session.setHttpSession(z); - vObjectService.setSession(session); + + vObjectService = new VObjectService(session); + vObjectService.setConnection(c); + } @Rule @@ -49,6 +51,8 @@ public void download() throws ArcException, IOException, SQLException { File root = testFolder.newFolder("root"); String repertoire = root.getAbsolutePath(); + + buildPropertiesWithoutScalability(repertoire); String testSandbox1 = "arc_bas1"; VObject viewFichierBAS = new ViewFichierBAS(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/entrepot/dao/EntrepotDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/entrepot/dao/EntrepotDaoTest.java index 8af148ee7..ee70154b9 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/entrepot/dao/EntrepotDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/entrepot/dao/EntrepotDaoTest.java @@ -26,10 +26,12 @@ public class EntrepotDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new EntrepotDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/export/dao/ExportDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/export/dao/ExportDaoTest.java index de0d15d77..41ba6314b 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/export/dao/ExportDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/export/dao/ExportDaoTest.java @@ -37,11 +37,13 @@ public class ExportDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); BddPatcherTest.insertTestDataExport(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new ExportDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/famillenorme/dao/GererFamilleNormeDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/famillenorme/dao/GererFamilleNormeDaoTest.java index 0163cc940..13ab9dae2 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/famillenorme/dao/GererFamilleNormeDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/famillenorme/dao/GererFamilleNormeDaoTest.java @@ -36,11 +36,13 @@ public class GererFamilleNormeDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); BddPatcherTest.insertTestDataFamilleNorme(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new GererFamilleNormeDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/index/dao/IndexDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/index/dao/IndexDaoTest.java index 558281863..1195a1322 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/index/dao/IndexDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/index/dao/IndexDaoTest.java @@ -27,9 +27,10 @@ public class IndexDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { BddPatcherTest.createDatabase(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new IndexDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/maintenanceparametre/dao/MaintenanceParametreDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/maintenanceparametre/dao/MaintenanceParametreDaoTest.java index 1bceeeaa0..5648ce31f 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/maintenanceparametre/dao/MaintenanceParametreDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/maintenanceparametre/dao/MaintenanceParametreDaoTest.java @@ -26,10 +26,12 @@ public class MaintenanceParametreDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new MaintenanceParametreDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/nomenclature/dao/GererNomenclatureDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/nomenclature/dao/GererNomenclatureDaoTest.java index 40aa6d8ad..3f12137c4 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/nomenclature/dao/GererNomenclatureDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/nomenclature/dao/GererNomenclatureDaoTest.java @@ -34,11 +34,13 @@ public class GererNomenclatureDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); BddPatcherTest.insertTestDataLight(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new GererNomenclatureDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/norme/dao/GererNormeDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/norme/dao/GererNormeDaoTest.java index 3feb8b93e..10b64a9cc 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/norme/dao/GererNormeDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/norme/dao/GererNormeDaoTest.java @@ -55,9 +55,10 @@ public static void setup() throws ArcException, SQLException { BddPatcherTest.createDatabase(); BddPatcherTest.insertTestDataSiera(); - vObjectService = new VObjectService(); + + vObjectService = new VObjectService(new Session()); vObjectService.setConnection(c); - vObjectService.setSession(new Session()); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new GererNormeDao(); diff --git a/arc-web/src/test/java/fr/insee/arc/web/gui/pilotage/dao/PilotageDaoTest.java b/arc-web/src/test/java/fr/insee/arc/web/gui/pilotage/dao/PilotageDaoTest.java index f4f36f6f1..57bc69249 100644 --- a/arc-web/src/test/java/fr/insee/arc/web/gui/pilotage/dao/PilotageDaoTest.java +++ b/arc-web/src/test/java/fr/insee/arc/web/gui/pilotage/dao/PilotageDaoTest.java @@ -47,15 +47,15 @@ public class PilotageDaoTest extends InitializeQueryTest { @BeforeClass public static void setup() throws ArcException { + BddPatcherTest.createDatabase(); - vObjectService = new VObjectService(); - vObjectService.setConnection(c); Session session = new Session(); HttpSessionTemplate z = new HttpSessionTemplate(); session.setHttpSession(z); - vObjectService.setSession(session); - + vObjectService = new VObjectService(session); + vObjectService.setConnection(c); + dao = new DataObjectService(); dao.setSandboxSchema(BddPatcherTest.testSandbox1); pdao = new PilotageDao();