SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to use new JdbcTemplate.query() varargs method.

Browse Source 
Also some polish.
This commit is contained in:
spencergibb
2020-09-28 11:30:53 -04:00
parent 9c8e92febc
commit a68a7f554e
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
View File

@@ -53,7 +53,7 @@ import org.springframework.util.StringUtils;
*/
public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered {
private static Log logger = LogFactory.getLog(JdbcEnvironmentRepository.class);
private static final Log logger = LogFactory.getLog(JdbcEnvironmentRepository.class);
private final JdbcTemplate jdbc;
@@ -97,17 +97,16 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
if (!config.startsWith("application")) {
config = "application," + config;
}
List<String> applications = new ArrayList<String>(
List<String> applications = new ArrayList<>(
new LinkedHashSet<>(Arrays.asList(StringUtils.commaDelimitedListToStringArray(config))));
List<String> envs = new ArrayList<String>(new LinkedHashSet<>(Arrays.asList(profiles)));
List<String> envs = new ArrayList<>(new LinkedHashSet<>(Arrays.asList(profiles)));
Collections.reverse(applications);
Collections.reverse(envs);
for (String app : applications) {
for (String env : envs) {
try {
Map<String, String> next = (Map<String, String>) this.jdbc.query(this.sql,
new Object[] { app, env, label }, this.extractor);
if (!next.isEmpty()) {
Map<String, String> next = this.jdbc.query(this.sql, this.extractor, app, env, label);
if (next != null && !next.isEmpty()) {
environment.add(new PropertySource(app + "-" + env, next));
}
}
@@ -143,17 +142,17 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
this.failOnError = failOnError;
}
}
public static class PropertiesResultSetExtractor implements ResultSetExtractor<Map<String, String>> {
class PropertiesResultSetExtractor implements ResultSetExtractor<Map<String, String>> {
@Override
public Map<String, String> extractData(ResultSet rs) throws SQLException, DataAccessException {
Map<String, String> map = new LinkedHashMap<>();
while (rs.next()) {
map.put(rs.getString(1), rs.getString(2));
@Override
public Map<String, String> extractData(ResultSet rs) throws SQLException, DataAccessException {
Map<String, String> map = new LinkedHashMap<>();
while (rs.next()) {
map.put(rs.getString(1), rs.getString(2));
}
return map;
}
return map;
}
}