Skip to content

Commit 2a329eb

Browse files
committed
Remove deprecated method
1 parent 799c22b commit 2a329eb

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ public DomaConfig config(DataSource dataSource, Dialect dialect,
171171
if (domaConfigBuilder.entityListenerProvider() == null) {
172172
domaConfigBuilder.entityListenerProvider(entityListenerProvider);
173173
}
174-
if (domaConfigBuilder.domaProperties() == null) {
175-
return domaConfigBuilder.build(domaProperties);
176-
}
177174
return domaConfigBuilder.build();
178175
}
179176

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaConfigBuilder.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.seasar.doma.boot.autoconfigure;
22

3+
import java.util.Objects;
4+
35
import javax.sql.DataSource;
46

57
import org.seasar.doma.jdbc.*;
@@ -39,16 +41,8 @@ public class DomaConfigBuilder {
3941
private Commenter commenter = ConfigSupport.defaultCommenter;
4042
private EntityListenerProvider entityListenerProvider;
4143

42-
@Deprecated
43-
public DomaConfigBuilder() {
44-
}
45-
4644
public DomaConfigBuilder(DomaProperties domaProperties) {
47-
this.domaProperties = domaProperties;
48-
}
49-
50-
DomaProperties domaProperties() {
51-
return domaProperties;
45+
this.domaProperties = Objects.requireNonNull(domaProperties);
5246
}
5347

5448
public DataSource dataSource() {
@@ -180,12 +174,6 @@ public DomaConfigBuilder entityListenerProvider(
180174
return this;
181175
}
182176

183-
@Deprecated
184-
public DomaConfig build(DomaProperties domaProperties) {
185-
this.domaProperties = domaProperties;
186-
return build();
187-
}
188-
189177
public DomaConfig build() {
190178
return new DomaConfig(this, domaProperties);
191179
}

0 commit comments

Comments
 (0)