Skip to content

Commit d279e92

Browse files
committed
removed default values for deprecated config values
1 parent eaca41a commit d279e92

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

common/src/main/java/com/kumuluz/ee/common/config/DataSourcePoolConfig.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public static class Builder {
3333
private Long connectionTimeout = 30000L;
3434
private Long idleTimeout = 600000L;
3535

36-
@Deprecated
3736
private Long maxLifetime = 1800000L;
3837

3938
@Deprecated
@@ -47,19 +46,19 @@ public static class Builder {
4746
private String name;
4847

4948
@Deprecated
50-
private Long initializationFailTimeout = 1L;
49+
private Long initializationFailTimeout;
5150

5251
@Deprecated
53-
private Boolean isolateInternalQueries = false;
52+
private Boolean isolateInternalQueries;
5453

5554
@Deprecated
56-
private Boolean allowPoolSuspension = false;
55+
private Boolean allowPoolSuspension;
5756

5857
@Deprecated
59-
private Boolean readOnly = false;
58+
private Boolean readOnly;
6059

6160
@Deprecated
62-
private Boolean registerMbeans = false;
61+
private Boolean registerMbeans;
6362
private String connectionInitSql;
6463
private String transactionIsolation;
6564
private Long validationTimeout = 5000L;
@@ -86,7 +85,6 @@ public Builder idleTimeout(Long idleTimeout) {
8685
return this;
8786
}
8887

89-
@Deprecated
9088
public Builder maxLifetime(Long maxLifetime) {
9189
this.maxLifetime = maxLifetime;
9290
return this;

core/src/main/java/com/kumuluz/ee/factories/EeConfigFactory.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -399,11 +399,6 @@ public static Boolean isEeConfigValid(EeConfig eeConfig) {
399399
ds.getPool().getIdleTimeout() == null ||
400400
ds.getPool().getMaxLifetime() == null ||
401401
ds.getPool().getMaxSize() == null ||
402-
ds.getPool().getInitializationFailTimeout() == null ||
403-
ds.getPool().getIsolateInternalQueries() == null ||
404-
ds.getPool().getAllowPoolSuspension() == null ||
405-
ds.getPool().getReadOnly() == null ||
406-
ds.getPool().getRegisterMbeans() == null ||
407402
ds.getPool().getValidationTimeout() == null ||
408403
ds.getPool().getLeakDetectionThreshold() == null)));
409404
}

0 commit comments

Comments
 (0)