From a9b12aed0dc896bfb0695c3571a63171944fde61 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 1 Sep 2016 12:37:25 +0200
Subject: [PATCH] connection to two datasources is finally working
---
.../hbp/mip/configuration/PersistenceConfiguration.java | 6 +++---
src/main/java/eu/hbp/mip/controllers/StatsApi.java | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index 09293cc42..09812b521 100644
--- a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -42,9 +42,9 @@ public class PersistenceConfiguration {
@Bean
@Autowired
- @Qualifier("metaJDBC")
- public JdbcTemplate metaJDBC() {
- return new JdbcTemplate(metaDataSource());
+ @Qualifier("jdbcTemplate")
+ public JdbcTemplate jdbcTemplate() {
+ return new JdbcTemplate(dataSource());
}
@Bean(name = "metaEntityManagerFactory")
diff --git a/src/main/java/eu/hbp/mip/controllers/StatsApi.java b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
index 6a1fe47e8..0e10c7ca2 100644
--- a/src/main/java/eu/hbp/mip/controllers/StatsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
@@ -36,8 +36,8 @@ public class StatsApi {
ArticleRepository articleRepository;
@Autowired
- @Qualifier("metaJDBC")
- private JdbcTemplate metaJDBC;
+ @Qualifier("jdbcTemplate")
+ private JdbcTemplate jdbcTemplate;
@ApiOperation(value = "Get general statistics", response = GeneralStats.class)
@ApiResponses(value = {@ApiResponse(code = 200, message = "Found"), @ApiResponse(code = 404, message = "Not found") })
@@ -56,8 +56,8 @@ public class StatsApi {
private Long countVariables()
{
- LOGGER.warn("TEST DB : " + metaJDBC.queryForObject("select count(*) from information_schema.tables", Long.class)); // This is a test
- Long count = metaJDBC.queryForObject("select count(*) from adni_merge", Long.class); // TODO: compute from adni_merge DB
+ LOGGER.warn("TEST DB : " + jdbcTemplate.queryForObject("select count(*) from information_schema.tables", Long.class)); // This is a test
+ Long count = jdbcTemplate.queryForObject("select count(*) from adni_merge", Long.class); // TODO: compute from adni_merge DB
return count;
}
--
GitLab