Skip to content

Commit

Permalink
use constant for database initializer bean name
Browse files Browse the repository at this point in the history
  • Loading branch information
Edvard Fonsell committed Oct 14, 2014
1 parent d0951d0 commit f0c3c39
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.nitorcreations.nflow.engine.internal.dao;

import static com.nitorcreations.nflow.engine.internal.dao.DaoUtil.toDateTime;
import static com.nitorcreations.nflow.engine.internal.storage.db.DatabaseConfiguration.NFLOW_DATABASE_INITIALIZER;
import static com.nitorcreations.nflow.engine.internal.storage.db.DatabaseConfiguration.NFLOW_JDBC;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.commons.lang3.StringUtils.trimToNull;
Expand Down Expand Up @@ -35,7 +36,7 @@
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

@Component
@DependsOn("nflowDatabaseInitializer")
@DependsOn(NFLOW_DATABASE_INITIALIZER)
public class ExecutorDao {
private JdbcTemplate jdbc;
final SQLVariants sqlVariants;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public abstract class DatabaseConfiguration {
public static final String NFLOW_JDBC = "nflowJdbc";
public static final String NFLOW_NAMED_JDBC = "nflowNamedJdbc";
public static final String NFLOW_DATASOURCE = "nflowDatasource";
public static final String NFLOW_DATABASE_INITIALIZER = "nflowDatabaseInitializer";
private static final Logger logger = getLogger(DatabaseConfiguration.class);
private final String dbType;

Expand Down Expand Up @@ -67,7 +68,7 @@ protected <T> T property(Environment env, String key, Class<T> type) {
return val;
}

@Bean(name = "nflowDatabaseInitializer")
@Bean(name = NFLOW_DATABASE_INITIALIZER)
public DatabaseInitializer nflowDatabaseInitializer(@Named(NFLOW_DATASOURCE) DataSource dataSource, Environment env) {
return new DatabaseInitializer(dbType, dataSource, env);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public MysqlDatabaseConfiguration() {
super("mysql");
}

@Bean(name="nflowDatabaseInitializer")
@Bean(name = NFLOW_DATABASE_INITIALIZER)
@Override
public DatabaseInitializer nflowDatabaseInitializer(@Named(NFLOW_DATASOURCE) DataSource dataSource, Environment env) {
String dbType = "mysql";
Expand Down

0 comments on commit f0c3c39

Please sign in to comment.