This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 89370c5e72e872965315a4024b0e6f6e8a7e91ca Author: Nikita Timofeev <[email protected]> AuthorDate: Fri Aug 19 14:22:08 2022 +0300 Return missing test comment and update test classes --- .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java | 1 + .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java | 1 + .../java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java | 1 + .../test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java | 1 + .../java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java | 1 + .../apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java | 1 + .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java | 1 + .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java | 1 + .../testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java | 1 + .../java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java | 1 + .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java | 1 + .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java | 1 + .../test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java | 1 + .../src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java | 1 + .../test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java | 1 + .../java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java | 1 + .../test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java | 1 + cayenne-server/src/test/resources/testmap.map.xml | 1 + 18 files changed, 18 insertions(+) diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java index 3ed21811d..9589412bb 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java @@ -25,6 +25,7 @@ public abstract class _ArtGroup extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<ArtGroup> SELF = PropertyFactory.createSelf(ArtGroup.class); + public static final NumericIdProperty<Integer> GROUP_ID_PK_PROPERTY = PropertyFactory.createNumericId("GROUP_ID", "ArtGroup", Integer.class); public static final String GROUP_ID_PK_COLUMN = "GROUP_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java index 520382bc0..db06d16fc 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java @@ -32,6 +32,7 @@ public abstract class _Artist extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<Artist> SELF = PropertyFactory.createSelf(Artist.class); + public static final NumericIdProperty<Long> ARTIST_ID_PK_PROPERTY = PropertyFactory.createNumericId("ARTIST_ID", "Artist", Long.class); public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java index 352b9b34d..b1c5b575c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java @@ -24,6 +24,7 @@ public abstract class _ArtistCallback extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<ArtistCallback> SELF = PropertyFactory.createSelf(ArtistCallback.class); + public static final NumericIdProperty<Integer> ARTIST_ID_PK_PROPERTY = PropertyFactory.createNumericId("ARTIST_ID", "ArtistCallback", Integer.class); public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java index da6255046..b7f30f292 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java @@ -23,6 +23,7 @@ public abstract class _ArtistExhibit extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<ArtistExhibit> SELF = PropertyFactory.createSelf(ArtistExhibit.class); + public static final NumericIdProperty<Long> ARTIST_ID_PK_PROPERTY = PropertyFactory.createNumericId("ARTIST_ID", "ArtistExhibit", Long.class); public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID"; public static final NumericIdProperty<Integer> EXHIBIT_ID_PK_PROPERTY = PropertyFactory.createNumericId("EXHIBIT_ID", "ArtistExhibit", Integer.class); diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java index b8222b1a1..2eff0dc3e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java @@ -27,6 +27,7 @@ public abstract class _CompoundPainting extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<CompoundPainting> SELF = PropertyFactory.createSelf(CompoundPainting.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "CompoundPainting", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java index dfefc51ea..683a45613 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java @@ -28,6 +28,7 @@ public abstract class _CompoundPaintingLongNames extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<CompoundPaintingLongNames> SELF = PropertyFactory.createSelf(CompoundPaintingLongNames.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "CompoundPaintingLongNames", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java index 81dc145d3..e9cd48a61 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java @@ -27,6 +27,7 @@ public abstract class _Exhibit extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<Exhibit> SELF = PropertyFactory.createSelf(Exhibit.class); + public static final NumericIdProperty<Integer> EXHIBIT_ID_PK_PROPERTY = PropertyFactory.createNumericId("EXHIBIT_ID", "Exhibit", Integer.class); public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java index 83377c295..7dcf6c7e8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java @@ -26,6 +26,7 @@ public abstract class _Gallery extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<Gallery> SELF = PropertyFactory.createSelf(Gallery.class); + public static final NumericIdProperty<Integer> GALLERY_ID_PK_PROPERTY = PropertyFactory.createNumericId("GALLERY_ID", "Gallery", Integer.class); public static final String GALLERY_ID_PK_COLUMN = "GALLERY_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java index 8be00d782..639f60262 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java @@ -22,6 +22,7 @@ public abstract class _MeaningfulGeneratedColumnTestEntity extends BaseDataObjec private static final long serialVersionUID = 1L; public static final EntityProperty<MeaningfulGeneratedColumnTestEntity> SELF = PropertyFactory.createSelf(MeaningfulGeneratedColumnTestEntity.class); + public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN"; public static final NumericProperty<Integer> GENERATED_COLUMN = PropertyFactory.createNumeric("generatedColumn", Integer.class); diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java index 4271a91f4..e07f029ec 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java @@ -22,6 +22,7 @@ public abstract class _NullTestEntity extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<NullTestEntity> SELF = PropertyFactory.createSelf(NullTestEntity.class); + public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "NullTestEntity", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java index 9f83398f6..16c455596 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java @@ -27,6 +27,7 @@ public abstract class _Painting extends ArtDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<Painting> SELF = PropertyFactory.createSelf(Painting.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "Painting", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java index 9229c21cd..b8930e718 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java @@ -25,6 +25,7 @@ public abstract class _Painting1 extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<Painting1> SELF = PropertyFactory.createSelf(Painting1.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "Painting1", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java index 56edc7d8f..e484eb34c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java @@ -24,6 +24,7 @@ public abstract class _PaintingInfo extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<PaintingInfo> SELF = PropertyFactory.createSelf(PaintingInfo.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "PaintingInfo", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java index 0303ca128..2d2323e64 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java @@ -27,6 +27,7 @@ public abstract class _ROArtist extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<ROArtist> SELF = PropertyFactory.createSelf(ROArtist.class); + public static final NumericIdProperty<Long> ARTIST_ID_PK_PROPERTY = PropertyFactory.createNumericId("ARTIST_ID", "ROArtist", Long.class); public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java index 797727e3f..f5886a8a3 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java @@ -25,6 +25,7 @@ public abstract class _ROPainting extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<ROPainting> SELF = PropertyFactory.createSelf(ROPainting.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "ROPainting", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java index 510001c20..52cd6e57d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java @@ -24,6 +24,7 @@ public abstract class _RWCompoundPainting extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<RWCompoundPainting> SELF = PropertyFactory.createSelf(RWCompoundPainting.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "RWCompoundPainting", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java index 3f97047e6..72a7d2180 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java @@ -22,6 +22,7 @@ public abstract class _SubPainting extends BaseDataObject { private static final long serialVersionUID = 1L; public static final EntityProperty<SubPainting> SELF = PropertyFactory.createSelf(SubPainting.class); + public static final NumericIdProperty<Integer> PAINTING_ID_PK_PROPERTY = PropertyFactory.createNumericId("PAINTING_ID", "SubPainting", Integer.class); public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID"; diff --git a/cayenne-server/src/test/resources/testmap.map.xml b/cayenne-server/src/test/resources/testmap.map.xml index 109aa7431..ef2584a65 100644 --- a/cayenne-server/src/test/resources/testmap.map.xml +++ b/cayenne-server/src/test/resources/testmap.map.xml @@ -84,6 +84,7 @@ <obj-entity name="Artist" className="org.apache.cayenne.testdo.testmap.Artist" dbEntityName="ARTIST"> <obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/> <obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/> + <info:property xmlns:info="http://cayenne.apache.org/schema/11/info"; name="comment" value="Example of a comment"/> </obj-entity> <obj-entity name="ArtistCallback" className="org.apache.cayenne.testdo.testmap.ArtistCallback" dbEntityName="ARTIST_CT"> <obj-attribute name="artistName" type="java.lang.String"/>
