Skip to content

Commit 8cefdf4

Browse files
authored
Support the DataType annotation officially (#670)
* Move DataType annotation to org.seasar.doma package * Use Java 16 to test DataType annotation * Change documents about DataType annotation
1 parent 958d46c commit 8cefdf4

File tree

7 files changed

+7
-9
lines changed

7 files changed

+7
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ jobs:
384384
- name: Set up JDK
385385
uses: actions/setup-java@v1
386386
with:
387-
java-version: 15
387+
java-version: 16
388388

389389
- name: Checkout
390390
uses: actions/checkout@v2

docs/domain.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ The value ``new`` means that the object of annotated class is created with a con
7474
}
7575
}
7676
77-
But note that ``@DataType`` is an experimental feature.
78-
7977
8078
Instantiation with a static factory method
8179
------------------------------------------

doma-core/src/main/java/org/seasar/doma/experimental/DataType.java renamed to doma-core/src/main/java/org/seasar/doma/DataType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.seasar.doma.experimental;
1+
package org.seasar.doma;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Retention;

doma-core/src/main/java/org/seasar/doma/jdbc/domain/DomainTypeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import static org.seasar.doma.internal.Constants.EXTERNAL_DOMAIN_TYPE_ARRAY_SUFFIX;
44

55
import java.lang.reflect.Method;
6+
import org.seasar.doma.DataType;
67
import org.seasar.doma.DomaIllegalArgumentException;
78
import org.seasar.doma.DomaNullPointerException;
89
import org.seasar.doma.Domain;
9-
import org.seasar.doma.experimental.DataType;
1010
import org.seasar.doma.internal.ClassNames;
1111
import org.seasar.doma.internal.WrapException;
1212
import org.seasar.doma.internal.util.ClassUtil;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.seasar.doma.ClobFactory;
2222
import org.seasar.doma.Column;
2323
import org.seasar.doma.Dao;
24+
import org.seasar.doma.DataType;
2425
import org.seasar.doma.Delete;
2526
import org.seasar.doma.Domain;
2627
import org.seasar.doma.DomainConverters;
@@ -39,7 +40,6 @@
3940
import org.seasar.doma.Table;
4041
import org.seasar.doma.TableGenerator;
4142
import org.seasar.doma.Update;
42-
import org.seasar.doma.experimental.DataType;
4343
import org.seasar.doma.internal.apt.Context;
4444
import org.seasar.doma.internal.apt.util.AnnotationValueUtil;
4545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
import javax.lang.model.type.TypeMirror;
4848
import javax.lang.model.util.ElementFilter;
4949
import javax.lang.model.util.SimpleTypeVisitor8;
50+
import org.seasar.doma.DataType;
5051
import org.seasar.doma.Domain;
5152
import org.seasar.doma.Embeddable;
5253
import org.seasar.doma.Entity;
53-
import org.seasar.doma.experimental.DataType;
5454
import org.seasar.doma.internal.ClassName;
5555
import org.seasar.doma.internal.ClassNames;
5656
import org.seasar.doma.internal.apt.AptException;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import javax.annotation.processing.SupportedAnnotationTypes;
44
import javax.annotation.processing.SupportedOptions;
5-
import org.seasar.doma.experimental.DataType;
5+
import org.seasar.doma.DataType;
66
import org.seasar.doma.internal.apt.Options;
77
import org.seasar.doma.internal.apt.meta.domain.DataTypeMeta;
88
import org.seasar.doma.internal.apt.meta.domain.DataTypeMetaFactory;
99

10-
@SupportedAnnotationTypes({"org.seasar.doma.experimental.DataType"})
10+
@SupportedAnnotationTypes({"org.seasar.doma.DataType"})
1111
@SupportedOptions({
1212
Options.VERSION_VALIDATION,
1313
Options.RESOURCES_DIR,

0 commit comments

Comments
 (0)