Skip to content

Commit 226cd3d

Browse files
committed
Change the defaut value of the "doma.criteria.enabled" option.
The default value is "true".
1 parent a335135 commit 226cd3d

File tree

4 files changed

+1
-13
lines changed

4 files changed

+1
-13
lines changed

doma-processor/src/main/java/org/seasar/doma/internal/apt/Options.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public String getVersion() {
7676

7777
public boolean isCriteriaEnabled() {
7878
String enabled = getOption(CRITERIA_ENABLED);
79-
return Boolean.valueOf(enabled);
79+
return enabled != null ? Boolean.valueOf(enabled) : true;
8080
}
8181

8282
public Date getDate() {

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/embeddabledesc/EmbeddableDescProcessorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class EmbeddableDescProcessorTest extends CompilerSupport {
2424
@BeforeEach
2525
void beforeEach() {
2626
addOption("-Adoma.test=true");
27-
addOption("-Adoma.criteria.enabled=true");
2827
}
2928

3029
@TestTemplate

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entitydesc/EntityDescProcessorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class EntityDescProcessorTest extends CompilerSupport {
2424
@BeforeEach
2525
void beforeEach() {
2626
addOption("-Adoma.test=true");
27-
addOption("-Adoma.criteria.enabled=true");
2827
}
2928

3029
@TestTemplate

test-criteria/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ plugins {
33
kotlin("kapt") apply true
44
}
55

6-
kapt {
7-
arguments {
8-
arg("doma.criteria.enabled", true)
9-
}
10-
}
11-
12-
val compileJava by tasks.existing(JavaCompile::class) {
13-
options.compilerArgs = listOf("-Adoma.criteria.enabled=true")
14-
}
15-
166
dependencies {
177
kapt(project(":doma-processor"))
188
implementation(project(":doma-core"))

0 commit comments

Comments
 (0)