diff --git a/pom.xml b/pom.xml index 7f7ed02..0393267 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,11 @@ ojdbc8 21.6.0.0.1 - + + com.h2database + h2 + runtime + co.elastic.clients elasticsearch-java diff --git a/src/main/java/fr/abes/thesesapirecherche/theses/controller/TheseController.java b/src/main/java/fr/abes/thesesapirecherche/theses/controller/TheseController.java index 65a008b..be08ec9 100644 --- a/src/main/java/fr/abes/thesesapirecherche/theses/controller/TheseController.java +++ b/src/main/java/fr/abes/thesesapirecherche/theses/controller/TheseController.java @@ -12,19 +12,20 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; import java.net.URI; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @Slf4j @RestController @RequestMapping("/api/v1/theses") public class TheseController { - final SearchQueryBuilder searchQueryBuilder; @Value("${google.recaptcha.key.site}") private String recaptchaSite; @@ -32,15 +33,18 @@ public class TheseController { private String recaptchaSecret; @Value("${google.recaptcha.key.threshold}") private float threshold; - @Value("${spring.profiles.active}") - private String activeProfile; + @Value("${theses.mail}") private String mailTheses; @Value("${mail.ws}") private String wsMailURL; + @Autowired private JdbcTemplate jdbcTemplate; + @Autowired + private Environment env; + public TheseController(SearchQueryBuilder searchQueryBuilder) { this.searchQueryBuilder = searchQueryBuilder; } @@ -92,7 +96,7 @@ public String signalerErreur(@RequestBody SignalerErreurDto json) throws Recaptc */ List to; - if (activeProfile == "prod" || activeProfile == "test") { + if (Arrays.asList(env.getActiveProfiles()).contains("prod") || Arrays.asList(env.getActiveProfiles()).contains("test")) { to = getMailAddress(json.getEtabPpn(), json.getAppSource()); } else { to = new ArrayList<>() {{ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3125b3d..40791a4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,7 +14,7 @@ es.personnes.recherche.indexname=aa spring.mvc.throw-exception-if-no-handler-found=true spring.web.resources.add-mappings=false maxfacetsvalues=4000 -spring.datasource.url=jdbc:mysql://localhost/test +spring.datasource.url= spring.datasource.username=dbuser spring.datasource.password=dbpass google.recaptcha.key.site=XXX diff --git a/src/test/java/fr/abes/thesesapirecherche/ThesesApiRechercheApplicationTests.java b/src/test/java/fr/abes/thesesapirecherche/ThesesApiRechercheApplicationTests.java index b0dc57c..ae48eea 100644 --- a/src/test/java/fr/abes/thesesapirecherche/ThesesApiRechercheApplicationTests.java +++ b/src/test/java/fr/abes/thesesapirecherche/ThesesApiRechercheApplicationTests.java @@ -9,7 +9,6 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.servlet.handler.HandlerMappingIntrospector; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;