Skip to content

Commit c9e8a83

Browse files
mkurzmergify[bot]
authored andcommitted
Lets use boolean instead of Boolean wrapper
(cherry picked from commit c54a39b)
1 parent 3352d9d commit c9e8a83

4 files changed

Lines changed: 17 additions & 14 deletions

File tree

play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@
2424
/** Ebean server configuration. */
2525
@Singleton
2626
public class DefaultEbeanConfig implements EbeanConfig {
27+
2728
private final String defaultServer;
2829

2930
private final Map<String, DatabaseConfig> serverConfigs;
3031

31-
private final Boolean generateEvolutionsScripts;
32+
private final boolean generateEvolutionsScripts;
3233

3334
public DefaultEbeanConfig(
3435
String defaultServer,
3536
Map<String, DatabaseConfig> serverConfigs,
36-
Boolean generateEvolutionsScripts) {
37+
boolean generateEvolutionsScripts) {
3738
this.defaultServer = defaultServer;
3839
this.serverConfigs = serverConfigs;
3940
this.generateEvolutionsScripts = generateEvolutionsScripts;
@@ -54,20 +55,21 @@ public Map<String, DatabaseConfig> serverConfigs() {
5455
}
5556

5657
@Override
57-
public Boolean generateEvolutionsScripts() {
58+
public boolean generateEvolutionsScripts() {
5859
return generateEvolutionsScripts;
5960
}
6061

6162
@Singleton
6263
public static class EbeanConfigParser implements Provider<EbeanConfig> {
63-
private static final Logger.ALogger LOGGER = Logger.of(DefaultEbeanConfig.class);
6464

6565
private final Config config;
6666

6767
private final Environment environment;
6868

6969
private final DBApi dbApi;
7070

71+
private static final Logger.ALogger LOGGER = Logger.of(DefaultEbeanConfig.class);
72+
7173
@Inject
7274
public EbeanConfigParser(Config config, Environment environment, DBApi dbApi) {
7375
this.config = config;
@@ -86,6 +88,7 @@ public EbeanConfig get() {
8688
* @return a config for Ebean servers.
8789
*/
8890
public EbeanConfig parse() {
91+
8992
EbeanParsedConfig ebeanConfig = EbeanParsedConfig.parseFromConfig(config);
9093

9194
Map<String, DatabaseConfig> serverConfigs = new HashMap<>();

play-ebean/src/main/java/play/db/ebean/EbeanConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import java.util.Map;
99

1010
public interface EbeanConfig {
11+
1112
String defaultServer();
1213

1314
Map<String, DatabaseConfig> serverConfigs();
1415

15-
Boolean generateEvolutionsScripts();
16+
boolean generateEvolutionsScripts();
1617
}

play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void create() {
6464
if (environment.isProd()) {
6565
return;
6666
}
67-
if (Boolean.FALSE.equals(config.generateEvolutionsScripts())) {
67+
if (!config.generateEvolutionsScripts()) {
6868
return;
6969
}
7070
config

play-ebean/src/main/java/play/db/ebean/EbeanParsedConfig.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
* database connection pools to create.
1717
*/
1818
public class EbeanParsedConfig {
19+
1920
private final String defaultDatasource;
2021

2122
private final Map<String, List<String>> datasourceModels;
2223

23-
private final Boolean generateEvolutionsScripts;
24+
private final boolean generateEvolutionsScripts;
2425

2526
public EbeanParsedConfig(
2627
String defaultDatasource,
2728
Map<String, List<String>> datasourceModels,
28-
Boolean generateEvolutionsScripts) {
29+
boolean generateEvolutionsScripts) {
2930
this.defaultDatasource = defaultDatasource;
3031
this.datasourceModels = datasourceModels;
3132
this.generateEvolutionsScripts = generateEvolutionsScripts;
@@ -43,7 +44,7 @@ public Map<String, List<String>> getDatasourceModels() {
4344
return datasourceModels;
4445
}
4546

46-
public Boolean generateEvolutionsScripts() {
47+
public boolean generateEvolutionsScripts() {
4748
return generateEvolutionsScripts;
4849
}
4950

@@ -56,10 +57,9 @@ public Boolean generateEvolutionsScripts() {
5657
*/
5758
public static EbeanParsedConfig parseFromConfig(Config config) {
5859
Config playEbeanConfig = config.getConfig("play.ebean");
60+
String defaultDatasource = playEbeanConfig.getString("defaultDatasource");
5961
String ebeanConfigKey = playEbeanConfig.getString("config");
60-
String ebeanDefaultDatasource = playEbeanConfig.getString("defaultDatasource");
61-
Boolean ebeanGenerateEvolutionsScripts =
62-
playEbeanConfig.getBoolean("generateEvolutionsScripts");
62+
boolean generateEvolutionsScripts = playEbeanConfig.getBoolean("generateEvolutionsScripts");
6363

6464
Map<String, List<String>> datasourceModels = new HashMap<>();
6565

@@ -80,7 +80,6 @@ public static EbeanParsedConfig parseFromConfig(Config config) {
8080
datasourceModels.put(key, models);
8181
});
8282
}
83-
return new EbeanParsedConfig(
84-
ebeanDefaultDatasource, datasourceModels, ebeanGenerateEvolutionsScripts);
83+
return new EbeanParsedConfig(defaultDatasource, datasourceModels, generateEvolutionsScripts);
8584
}
8685
}

0 commit comments

Comments
 (0)