You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/18 18:21:10 UTC
[09/11] cayenne git commit: CAY-2176 Java 7 diamond class generation
templates
CAY-2176 Java 7 diamond class generation templates
* regenerated unit tests with the new templates and no String properties
* cleaned up String property refs in unit tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/aa962a89
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/aa962a89
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/aa962a89
Branch: refs/heads/master
Commit: aa962a89088867a73db9dbc47874538d06cecd94
Parents: 1510b05
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 18 19:18:18 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 18 21:11:25 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/CDOMany2OneIT.java | 6 +--
.../cayenne/CayenneDataObjectValidationIT.java | 2 +-
.../cayenne/PersistenceByReachabilityIT.java | 6 +--
.../access/DataContextPrefetchExtras1IT.java | 2 +-
.../cayenne/access/DataContextPrefetchIT.java | 27 ++++++-----
.../access/DataContextRefreshQueryIT.java | 20 ++-------
.../access/DataContextRelationshipQueryIT.java | 4 +-
.../cayenne/access/DataDomainCallbacksIT.java | 2 +-
.../cayenne/access/DataDomainQueryActionIT.java | 7 ++-
.../apache/cayenne/access/JointPrefetchIT.java | 13 ++----
.../cayenne/access/NestedDataContextReadIT.java | 15 ++-----
.../access/NestedDataContextWriteIT.java | 9 +---
.../select/DefaultSelectTranslatorIT.java | 6 +--
.../cayenne/exp/ParsedExpQualifierCompatIT.java | 47 +++++++++-----------
.../org/apache/cayenne/query/EJBQLQueryIT.java | 23 ++++------
.../cayenne/testdo/testmap/auto/_ArtGroup.java | 17 ++-----
.../cayenne/testdo/testmap/auto/_Artist.java | 18 ++++----
.../testdo/testmap/auto/_ArtistCallback.java | 11 ++---
.../testdo/testmap/auto/_ArtistExhibit.java | 9 +---
.../testdo/testmap/auto/_CompoundPainting.java | 33 ++++----------
.../auto/_CompoundPaintingLongNames.java | 41 +++++------------
.../cayenne/testdo/testmap/auto/_Exhibit.java | 17 ++-----
.../cayenne/testdo/testmap/auto/_Gallery.java | 13 ++----
.../_MeaningfulGeneratedColumnTestEntity.java | 9 +---
.../testdo/testmap/auto/_NullTestEntity.java | 5 +--
.../cayenne/testdo/testmap/auto/_Painting.java | 25 +++--------
.../cayenne/testdo/testmap/auto/_Painting1.java | 13 ++----
.../testdo/testmap/auto/_PaintingInfo.java | 13 ++----
.../cayenne/testdo/testmap/auto/_ROArtist.java | 13 ++----
.../testdo/testmap/auto/_ROPainting.java | 13 ++----
.../testmap/auto/_RWCompoundPainting.java | 13 ++----
.../testdo/testmap/auto/_SubPainting.java | 5 +--
32 files changed, 140 insertions(+), 317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
index be9aac4..e063ec5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
@@ -131,7 +131,7 @@ public class CDOMany2OneIT extends ServerCase {
Artist a1 = Cayenne.objectForPK(context, Artist.class, 8);
- Expression e = ExpressionFactory.matchExp(ROPainting.TO_ARTIST_PROPERTY, a1);
+ Expression e = ROPainting.TO_ARTIST.eq(a1);
SelectQuery q = new SelectQuery(ROPainting.class, e);
List<ROPainting> paints = context.performQuery(q);
@@ -148,7 +148,7 @@ public class CDOMany2OneIT extends ServerCase {
Artist a1 = Cayenne.objectForPK(context, Artist.class, 8);
- Expression e = ExpressionFactory.matchExp(ROPainting.TO_ARTIST_PROPERTY, a1);
+ Expression e = ROPainting.TO_ARTIST.eq(a1);
SelectQuery q = new SelectQuery(ROPainting.class, e);
List<ROPainting> paints = context.performQuery(q);
@@ -169,7 +169,7 @@ public class CDOMany2OneIT extends ServerCase {
Artist a1 = Cayenne.objectForPK(context, Artist.class, 8);
Painting p1 = Cayenne.objectForPK(context, Painting.class, 6);
- Expression e = ExpressionFactory.matchExp(Painting.TO_ARTIST_PROPERTY, a1);
+ Expression e = Painting.TO_ARTIST.eq(a1);
SelectQuery q = new SelectQuery(Painting.class, e);
List<Painting> paints = context.performQuery(q);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
index 1e4c710..febf373 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
@@ -62,7 +62,7 @@ public class CayenneDataObjectValidationIT extends ServerCase {
assertEquals(1, failures.size());
BeanValidationFailure failure = (BeanValidationFailure) failures.get(0);
- assertEquals(Exhibit.TO_GALLERY_PROPERTY, failure.getProperty());
+ assertEquals(Exhibit.TO_GALLERY.getName(), failure.getProperty());
// fix the problem and see if it goes away
Gallery gallery = context.newObject(Gallery.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
index 42d0a22..f53fe16 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
@@ -44,7 +44,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
Painting persistentDO = context.newObject(Painting.class);
Artist transientDO = new Artist();
- persistentDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, transientDO, false);
+ persistentDO.setToOneTarget(Painting.TO_ARTIST.getName(), transientDO, false);
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
@@ -54,7 +54,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
Painting transientDO = context.newObject(Painting.class);
Artist persistentDO = new Artist();
- transientDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, persistentDO, false);
+ transientDO.setToOneTarget(Painting.TO_ARTIST.getName(), persistentDO, false);
assertEquals(PersistenceState.NEW, transientDO.getPersistenceState());
}
@@ -68,7 +68,7 @@ public class PersistenceByReachabilityIT extends ServerCase {
// this is the case where exception must be thrown as DataContexts are
// different
try {
- doC1.setToOneTarget(Painting.TO_ARTIST_PROPERTY, doC2, false);
+ doC1.setToOneTarget(Painting.TO_ARTIST.getName(), doC2, false);
fail("failed to detect relationship between objects in different DataContexts");
}
catch (CayenneRuntimeException ex) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
index 18b74fd..53e0998 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java
@@ -67,7 +67,7 @@ public class DataContextPrefetchExtras1IT extends ServerCase {
createDataSet();
SelectQuery query = new SelectQuery(Painting.class);
- query.addPrefetch(Painting.TO_PAINTING_INFO_PROPERTY);
+ query.addPrefetch(Painting.TO_PAINTING_INFO.disjoint());
List<Painting> objects = context.performQuery(query);
assertTrue(!objects.isEmpty());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
index 4eb2295..71fb837 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java
@@ -30,7 +30,6 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.ArtGroup;
@@ -440,7 +439,7 @@ public class DataContextPrefetchIT extends ServerCase {
createTwoArtistsAndTwoPaintingsDataSet();
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
final List<Painting> result = context.performQuery(q);
@@ -466,7 +465,7 @@ public class DataContextPrefetchIT extends ServerCase {
createTwoArtistsAndTwoPaintingsDataSet();
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
q.andQualifier(ExpressionFactory.matchDbExp("toArtist.ARTIST_NAME", "artist2"));
List<Painting> results = context.performQuery(q);
@@ -479,7 +478,7 @@ public class DataContextPrefetchIT extends ServerCase {
createTwoArtistsAndTwoPaintingsDataSet();
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
q.andQualifier(ExpressionFactory.matchExp("toArtist.artistName", "artist2"));
List<Painting> results = context.performQuery(q);
@@ -520,7 +519,7 @@ public class DataContextPrefetchIT extends ServerCase {
Expression exp = ExpressionFactory.matchExp("toArtist.artistName", "artist3");
SelectQuery q = new SelectQuery(Painting.class, exp);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
final List<Painting> results = context.performQuery(q);
@@ -597,7 +596,7 @@ public class DataContextPrefetchIT extends ServerCase {
// see that artists are resolved...
Painting px = results.get(0);
- Artist ax = (Artist) px.readProperty(Painting.TO_ARTIST_PROPERTY);
+ Artist ax = (Artist) px.readProperty(Painting.TO_ARTIST.getName());
assertEquals(PersistenceState.COMMITTED, ax.getPersistenceState());
}
});
@@ -609,8 +608,8 @@ public class DataContextPrefetchIT extends ServerCase {
Expression e = ExpressionFactory.likeExp("toArtist.artistName", "a%");
SelectQuery q = new SelectQuery(Painting.class, e);
- q.addPrefetch(Painting.TO_PAINTING_INFO_PROPERTY);
- q.addOrdering(Painting.PAINTING_TITLE_PROPERTY, SortOrder.ASCENDING);
+ q.addPrefetch(Painting.TO_PAINTING_INFO.disjoint());
+ q.addOrdering(Painting.PAINTING_TITLE.asc());
final List<Painting> results = context.performQuery(q);
@@ -621,7 +620,7 @@ public class DataContextPrefetchIT extends ServerCase {
// testing non-null to-one target
Painting p0 = results.get(0);
- Object o2 = p0.readPropertyDirectly(Painting.TO_PAINTING_INFO_PROPERTY);
+ Object o2 = p0.readPropertyDirectly(Painting.TO_PAINTING_INFO.getName());
assertTrue(o2 instanceof PaintingInfo);
PaintingInfo pi2 = (PaintingInfo) o2;
assertEquals(PersistenceState.COMMITTED, pi2.getPersistenceState());
@@ -629,7 +628,7 @@ public class DataContextPrefetchIT extends ServerCase {
// testing null to-one target
Painting p1 = results.get(1);
- assertNull(p1.readPropertyDirectly(Painting.TO_PAINTING_INFO_PROPERTY));
+ assertNull(p1.readPropertyDirectly(Painting.TO_PAINTING_INFO.getName()));
// there was a bug marking an object as dirty when clearing the
// relationships
@@ -658,7 +657,7 @@ public class DataContextPrefetchIT extends ServerCase {
tPainting.insert(6, "p_Xty", null, 1000);
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
final List<Painting> paintings = context.performQuery(q);
@@ -668,7 +667,7 @@ public class DataContextPrefetchIT extends ServerCase {
assertEquals(1, paintings.size());
Painting p2 = paintings.get(0);
- assertNull(p2.readProperty(Painting.TO_ARTIST_PROPERTY));
+ assertNull(p2.readProperty(Painting.TO_ARTIST.getName()));
}
});
}
@@ -678,7 +677,7 @@ public class DataContextPrefetchIT extends ServerCase {
createTwoArtistsAndTwoPaintingsDataSet();
final SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
q.setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
context.performQuery(q);
@@ -714,7 +713,7 @@ public class DataContextPrefetchIT extends ServerCase {
createTwoArtistsAndTwoPaintingsDataSet();
final SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
q.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
context.performQuery(q);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
index b88b269..8f60255 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java
@@ -23,7 +23,6 @@ import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.ValueHolder;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.RefreshQuery;
import org.apache.cayenne.query.SelectQuery;
@@ -40,12 +39,7 @@ import org.junit.Test;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class DataContextRefreshQueryIT extends ServerCase {
@@ -232,9 +226,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
public void testRefreshQueryResultsLocalCache() throws Exception {
createRefreshCollectionDataSet();
- Expression qual = ExpressionFactory.matchExp(
- Painting.PAINTING_TITLE_PROPERTY,
- "P2");
+ Expression qual = Painting.PAINTING_TITLE.eq("P2");
SelectQuery q = new SelectQuery(Painting.class, qual);
q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
q.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
@@ -287,9 +279,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
public void testRefreshQueryResultsSharedCache() throws Exception {
createRefreshCollectionDataSet();
- Expression qual = ExpressionFactory.matchExp(
- Painting.PAINTING_TITLE_PROPERTY,
- "P2");
+ Expression qual = Painting.PAINTING_TITLE.eq("P2");
SelectQuery q = new SelectQuery(Painting.class, qual);
q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
q.setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
@@ -342,9 +332,7 @@ public class DataContextRefreshQueryIT extends ServerCase {
public void testRefreshQueryResultGroupLocal() throws Exception {
createRefreshCollectionDataSet();
- Expression qual = ExpressionFactory.matchExp(
- Painting.PAINTING_TITLE_PROPERTY,
- "P2");
+ Expression qual = Painting.PAINTING_TITLE.eq("P2");
SelectQuery q = new SelectQuery(Painting.class, qual);
q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
q.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
index 103f8c5..272260d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java
@@ -85,7 +85,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
RelationshipQuery toOne = new RelationshipQuery(
p.getObjectId(),
- Painting.TO_ARTIST_PROPERTY,
+ Painting.TO_ARTIST.getName(),
false);
List<Artist> related = context.performQuery(toOne);
@@ -122,7 +122,7 @@ public class DataContextRelationshipQueryIT extends ServerCase {
RelationshipQuery toOne = new RelationshipQuery(
p.getObjectId(),
- Painting.TO_ARTIST_PROPERTY,
+ Painting.TO_ARTIST.getName(),
true);
List<Artist> related = context.performQuery(toOne);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
index 43d09d6..d2366e8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java
@@ -187,7 +187,7 @@ public class DataDomainCallbacksIT extends ServerCase {
context.commitChanges();
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
p1 = (Painting) context1.performQuery(q).get(0);
// artist is prefetched here, and a callback must have been invoked
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
index cd1e103..c2b7422 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java
@@ -26,7 +26,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
@@ -63,9 +62,9 @@ public class DataDomainQueryActionIT extends ServerCase {
SelectQuery query = new SelectQuery(Painting.class);
- query.addPrefetch(Painting.TO_GALLERY_PROPERTY);
- query.addPrefetch(Painting.TO_ARTIST_PROPERTY);
- query.addOrdering(Painting.PAINTING_TITLE_PROPERTY, SortOrder.ASCENDING);
+ query.addPrefetch(Painting.TO_GALLERY.disjoint());
+ query.addPrefetch(Painting.TO_ARTIST.disjoint());
+ query.addOrdering(Painting.PAINTING_TITLE.asc());
query.setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
query.setPageSize(5);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
index 0e3267c..a02cfd3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
@@ -30,7 +30,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.query.PrefetchTreeNode;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.query.SortOrder;
@@ -126,8 +125,7 @@ public class JointPrefetchIT extends ServerCase {
q.setFetchLimit(2);
q.setFetchOffset(0);
q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(
- PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
final List<?> objects = context.performQuery(q);
@@ -187,8 +185,7 @@ public class JointPrefetchIT extends ServerCase {
SelectQuery q = new SelectQuery(Painting.class);
q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
q.setFetchingDataRows(true);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(
- PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
final List<?> rows = context.performQuery(q);
@@ -287,8 +284,7 @@ public class JointPrefetchIT extends ServerCase {
// query with to-many joint prefetches
SelectQuery q = new SelectQuery(Painting.class);
q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(
- PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
final List<?> objects = context.performQuery(q);
@@ -331,8 +327,7 @@ public class JointPrefetchIT extends ServerCase {
// test
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(
- PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
ObjEntity artistE = context.getEntityResolver().getObjEntity("Artist");
ObjAttribute dateOfBirth = artistE.getAttribute("dateOfBirth");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
index 6b5f098..1441244 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
@@ -30,7 +30,6 @@ import org.apache.cayenne.Persistent;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -48,13 +47,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class NestedDataContextReadIT extends ServerCase {
@@ -246,7 +239,7 @@ public class NestedDataContextReadIT extends ServerCase {
// run an ordered query, so we can address specific objects directly by index
SelectQuery q = new SelectQuery(Painting.class);
- q.addOrdering(Painting.PAINTING_TITLE_PROPERTY, SortOrder.ASCENDING);
+ q.addOrdering(Painting.PAINTING_TITLE.asc());
final List<?> childSources = child.performQuery(q);
assertEquals(5, childSources.size());
@@ -312,8 +305,8 @@ public class NestedDataContextReadIT extends ServerCase {
new Integer(33001));
SelectQuery q = new SelectQuery(Painting.class);
- q.addOrdering(Painting.PAINTING_TITLE_PROPERTY, SortOrder.ASCENDING);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY);
+ q.addOrdering(Painting.PAINTING_TITLE.asc());
+ q.addPrefetch(Painting.TO_ARTIST.disjoint());
final List<?> results = child.performQuery(q);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
index bb188ad..c7064f3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
@@ -28,7 +28,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.ArtGroup;
@@ -48,11 +47,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class NestedDataContextWriteIT extends ServerCase {
@@ -373,7 +368,7 @@ public class NestedDataContextWriteIT extends ServerCase {
// make sure we fetch in predictable order
SelectQuery query = new SelectQuery(Painting.class);
- query.addOrdering(Painting.PAINTING_TITLE_PROPERTY, SortOrder.ASCENDING);
+ query.addOrdering(Painting.PAINTING_TITLE.asc());
List<?> objects = childContext.performQuery(query);
assertEquals(6, objects.size());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslatorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslatorIT.java
index 0608abc..e090d0c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslatorIT.java
@@ -471,7 +471,7 @@ public class DefaultSelectTranslatorIT extends ServerCase {
public void testCreateSqlString12() throws Exception {
// query with to-one joint prefetches
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
DefaultSelectTranslator transl = new DefaultSelectTranslator(q, dataNode.getAdapter(),
dataNode.getEntityResolver());
@@ -674,7 +674,7 @@ public class DefaultSelectTranslatorIT extends ServerCase {
// and with QuoteSqlIdentifiers = true
try {
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
DbEntity entity = context.getEntityResolver().getDbEntity("PAINTING");
entity.getDataMap().setQuotingSQLIdentifiers(true);
@@ -754,7 +754,7 @@ public class DefaultSelectTranslatorIT extends ServerCase {
@Test
public void testBuildResultColumns2() throws Exception {
SelectQuery q = new SelectQuery(Painting.class);
- q.addPrefetch(Painting.TO_ARTIST_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+ q.addPrefetch(Painting.TO_ARTIST.joint());
DefaultSelectTranslator tr = new DefaultSelectTranslator(q, dataNode.getAdapter(), dataNode.getEntityResolver());
List<?> columns = tr.buildResultColumns();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
index 5399545..3be97ad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java
@@ -184,62 +184,56 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
@Test
public void testLike() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression.fromString("artistName like 'artist%2'");
+ Expression parsed1 = ExpressionFactory.exp("artistName like 'artist%2'");
assertEquals(3, execute(Artist.class, parsed1).size());
}
@Test
public void testLikeIgnoreCase() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression
- .fromString("artistName likeIgnoreCase 'artist%2'");
+ Expression parsed1 = ExpressionFactory.exp("artistName likeIgnoreCase 'artist%2'");
assertEquals(3, execute(Artist.class, parsed1).size());
}
@Test
public void testNotLike() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression.fromString("artistName not like 'artist%2'");
+ Expression parsed1 = ExpressionFactory.exp("artistName not like 'artist%2'");
assertEquals(25 - 3, execute(Artist.class, parsed1).size());
}
@Test
public void testNotLikeIgnoreCase() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression
- .fromString("artistName not likeIgnoreCase 'artist%2'");
+ Expression parsed1 = ExpressionFactory.exp("artistName not likeIgnoreCase 'artist%2'");
assertEquals(25 - 3, execute(Artist.class, parsed1).size());
}
@Test
public void testIn() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression
- .fromString("artistName in ('artist1', 'artist3', 'artist19')");
+ Expression parsed1 = ExpressionFactory.exp("artistName in ('artist1', 'artist3', 'artist19')");
assertEquals(3, execute(Artist.class, parsed1).size());
}
@Test
public void testNotIn() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression
- .fromString("artistName not in ('artist1', 'artist3', 'artist19')");
+ Expression parsed1 = ExpressionFactory.exp("artistName not in ('artist1', 'artist3', 'artist19')");
assertEquals(25 - 3, execute(Artist.class, parsed1).size());
}
@Test
public void testBetween() throws Exception {
createTwentyFiveArtistsAndPaintings();
- Expression parsed1 = Expression
- .fromString("estimatedPrice between 2000.0 and 4000.0");
+ Expression parsed1 = ExpressionFactory.exp("estimatedPrice between 2000.0 and 4000.0");
assertEquals(3, execute(Painting.class, parsed1).size());
}
@Test
public void testNotBetween() throws Exception {
createTwentyFiveArtistsAndPaintings();
- Expression parsed1 = Expression
- .fromString("estimatedPrice not between 2000.0 and 4000.0");
+ Expression parsed1 = ExpressionFactory.exp("estimatedPrice not between 2000.0 and 4000.0");
assertEquals(25 - 3, execute(Painting.class, parsed1).size());
}
@@ -248,22 +242,22 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
createTwentyFiveArtists();
Map<String, Object> parameters = new HashMap<>();
parameters.put("artistName", "artist5");
- Expression parsed1 = Expression.fromString("artistName=$artistName");
- parsed1 = parsed1.expWithParameters(parameters);
+ Expression parsed1 = ExpressionFactory.exp("artistName=$artistName");
+ parsed1 = parsed1.params(parameters);
assertEquals(1, execute(Artist.class, parsed1).size());
}
@Test
public void testDbExpression() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression.fromString("db:ARTIST_NAME='artist3'");
+ Expression parsed1 = ExpressionFactory.exp("db:ARTIST_NAME='artist3'");
assertEquals(1, execute(Artist.class, parsed1).size());
}
@Test
public void testFloatExpression() throws Exception {
createTwentyFiveArtistsAndPaintings();
- Expression parsed1 = Expression.fromString("estimatedPrice < 2001.01");
+ Expression parsed1 = ExpressionFactory.exp("estimatedPrice < 2001.01");
assertEquals(2, execute(Painting.class, parsed1).size());
}
@@ -271,10 +265,10 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
public void testNullExpression() throws Exception {
createTwentyFiveArtists();
- Expression parsed1 = Expression.fromString("artistName!=null");
+ Expression parsed1 = ExpressionFactory.exp("artistName!=null");
assertEquals(25, execute(Artist.class, parsed1).size());
- Expression parsed2 = Expression.fromString("artistName = null");
+ Expression parsed2 = ExpressionFactory.exp("artistName = null");
assertEquals(0, execute(Artist.class, parsed2).size());
}
@@ -283,13 +277,13 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
createTwentyFiveArtistsAndPaintings();
- Expression parsed1 = Expression.fromString("true");
+ Expression parsed1 = ExpressionFactory.exp("true");
assertEquals(25, execute(Painting.class, parsed1).size());
- Expression parsed2 = Expression.fromString("(estimatedPrice < 2001.01) and true");
+ Expression parsed2 = ExpressionFactory.exp("(estimatedPrice < 2001.01) and true");
assertEquals(2, execute(Painting.class, parsed2).size());
- Expression parsed3 = Expression.fromString("(estimatedPrice < 2001.01) or true");
+ Expression parsed3 = ExpressionFactory.exp("(estimatedPrice < 2001.01) or true");
assertEquals(25, execute(Painting.class, parsed3).size());
}
@@ -297,14 +291,13 @@ public class ParsedExpQualifierCompatIT extends ServerCase {
public void testFalseExpression() throws Exception {
createTwentyFiveArtistsAndPaintings();
- Expression parsed1 = Expression.fromString("false");
+ Expression parsed1 = ExpressionFactory.exp("false");
assertEquals(0, execute(Painting.class, parsed1).size());
- Expression parsed2 = Expression
- .fromString("(estimatedPrice < 2001.01) and false");
+ Expression parsed2 = ExpressionFactory.exp("(estimatedPrice < 2001.01) and false");
assertEquals(0, execute(Painting.class, parsed2).size());
- Expression parsed3 = Expression.fromString("(estimatedPrice < 2001.01) or false");
+ Expression parsed3 = ExpressionFactory.exp("(estimatedPrice < 2001.01) or false");
assertEquals(2, execute(Painting.class, parsed3).size());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
index 45e156a..b1b2495 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java
@@ -18,19 +18,6 @@
****************************************************************/
package org.apache.cayenne.query;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
@@ -38,7 +25,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.ejbql.EJBQLCompiledExpression;
import org.apache.cayenne.ejbql.EJBQLException;
import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
@@ -53,6 +39,13 @@ import org.apache.cayenne.util.XMLEncoder;
import org.junit.Before;
import org.junit.Test;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class EJBQLQueryIT extends ServerCase {
@@ -480,7 +473,7 @@ public class EJBQLQueryIT extends ServerCase {
@Test
public void testRelationshipWhereClause2() throws Exception {
- Expression exp = ExpressionFactory.matchExp(Painting.TO_GALLERY_PROPERTY, null);
+ Expression exp = Painting.TO_GALLERY.isNull();
EJBQLQuery query = new EJBQLQuery("select p.toArtist from Painting p where "
+ exp.toEJBQL("p"));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtGroup.java
----------------------------------------------------------------------
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 827cefd..a9eede5 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
@@ -17,21 +17,12 @@ public abstract class _ArtGroup extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String NAME_PROPERTY = "name";
- @Deprecated
- public static final String ARTIST_ARRAY_PROPERTY = "artistArray";
- @Deprecated
- public static final String CHILD_GROUPS_ARRAY_PROPERTY = "childGroupsArray";
- @Deprecated
- public static final String TO_PARENT_GROUP_PROPERTY = "toParentGroup";
-
public static final String GROUP_ID_PK_COLUMN = "GROUP_ID";
- public static final Property<String> NAME = new Property<String>("name");
- public static final Property<List<Artist>> ARTIST_ARRAY = new Property<List<Artist>>("artistArray");
- public static final Property<List<ArtGroup>> CHILD_GROUPS_ARRAY = new Property<List<ArtGroup>>("childGroupsArray");
- public static final Property<ArtGroup> TO_PARENT_GROUP = new Property<ArtGroup>("toParentGroup");
+ public static final Property<String> NAME = new Property<>("name");
+ public static final Property<List<Artist>> ARTIST_ARRAY = new Property<>("artistArray");
+ public static final Property<List<ArtGroup>> CHILD_GROUPS_ARRAY = new Property<>("childGroupsArray");
+ public static final Property<ArtGroup> TO_PARENT_GROUP = new Property<>("toParentGroup");
public void setName(String name) {
writeProperty("name", name);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Artist.java
----------------------------------------------------------------------
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 f7a9cba..7d42fab 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
@@ -1,14 +1,14 @@
package org.apache.cayenne.testdo.testmap.auto;
+import java.util.Date;
+import java.util.List;
+
import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.testmap.ArtGroup;
import org.apache.cayenne.testdo.testmap.ArtistExhibit;
import org.apache.cayenne.testdo.testmap.Painting;
-import java.util.Date;
-import java.util.List;
-
/**
* Class _Artist was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
@@ -17,15 +17,15 @@ import java.util.List;
*/
public abstract class _Artist extends CayenneDataObject {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
- public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
- public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
- public static final Property<List<ArtistExhibit>> ARTIST_EXHIBIT_ARRAY = new Property<List<ArtistExhibit>>("artistExhibitArray");
- public static final Property<List<ArtGroup>> GROUP_ARRAY = new Property<List<ArtGroup>>("groupArray");
- public static final Property<List<Painting>> PAINTING_ARRAY = new Property<List<Painting>>("paintingArray");
+ public static final Property<String> ARTIST_NAME = new Property<>("artistName");
+ public static final Property<Date> DATE_OF_BIRTH = new Property<>("dateOfBirth");
+ public static final Property<List<ArtistExhibit>> ARTIST_EXHIBIT_ARRAY = new Property<>("artistExhibitArray");
+ public static final Property<List<ArtGroup>> GROUP_ARRAY = new Property<>("groupArray");
+ public static final Property<List<Painting>> PAINTING_ARRAY = new Property<>("paintingArray");
public void setArtistName(String artistName) {
writeProperty("artistName", artistName);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistCallback.java
----------------------------------------------------------------------
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 57255a6..5ecf2a5 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
@@ -6,7 +6,7 @@ import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.exp.Property;
/**
- * Class _ArtistCallbackTest was generated by Cayenne.
+ * Class _ArtistCallback was generated by Cayenne.
* It is probably a good idea to avoid changing this class manually,
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
@@ -15,15 +15,10 @@ public abstract class _ArtistCallback extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ARTIST_NAME_PROPERTY = "artistName";
- @Deprecated
- public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
-
public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
- public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
- public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
+ public static final Property<String> ARTIST_NAME = new Property<>("artistName");
+ public static final Property<Date> DATE_OF_BIRTH = new Property<>("dateOfBirth");
public void setArtistName(String artistName) {
writeProperty("artistName", artistName);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ArtistExhibit.java
----------------------------------------------------------------------
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 60797ec..b7d41dd 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
@@ -15,16 +15,11 @@ public abstract class _ArtistExhibit extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String TO_ARTIST_PROPERTY = "toArtist";
- @Deprecated
- public static final String TO_EXHIBIT_PROPERTY = "toExhibit";
-
public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID";
- public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
- public static final Property<Exhibit> TO_EXHIBIT = new Property<Exhibit>("toExhibit");
+ public static final Property<Artist> TO_ARTIST = new Property<>("toArtist");
+ public static final Property<Exhibit> TO_EXHIBIT = new Property<>("toExhibit");
public void setToArtist(Artist toArtist) {
setToOneTarget("toArtist", toArtist, true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPainting.java
----------------------------------------------------------------------
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 b739bc4..bfc70ca 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
@@ -18,33 +18,16 @@ public abstract class _CompoundPainting extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ARTIST_NAME_PROPERTY = "artistName";
- @Deprecated
- public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
- @Deprecated
- public static final String GALLERY_NAME_PROPERTY = "galleryName";
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
- @Deprecated
- public static final String TEXT_REVIEW_PROPERTY = "textReview";
- @Deprecated
- public static final String TO_ARTIST_PROPERTY = "toArtist";
- @Deprecated
- public static final String TO_GALLERY_PROPERTY = "toGallery";
- @Deprecated
- public static final String TO_PAINTING_INFO_PROPERTY = "toPaintingInfo";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
- public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
- public static final Property<String> GALLERY_NAME = new Property<String>("galleryName");
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
- public static final Property<String> TEXT_REVIEW = new Property<String>("textReview");
- public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
- public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
- public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<PaintingInfo>("toPaintingInfo");
+ public static final Property<String> ARTIST_NAME = new Property<>("artistName");
+ public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<>("estimatedPrice");
+ public static final Property<String> GALLERY_NAME = new Property<>("galleryName");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
+ public static final Property<String> TEXT_REVIEW = new Property<>("textReview");
+ public static final Property<Artist> TO_ARTIST = new Property<>("toArtist");
+ public static final Property<Gallery> TO_GALLERY = new Property<>("toGallery");
+ public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<>("toPaintingInfo");
public void setArtistName(String artistName) {
writeProperty("artistName", artistName);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_CompoundPaintingLongNames.java
----------------------------------------------------------------------
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 760a565..6c24869 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
@@ -19,39 +19,18 @@ public abstract class _CompoundPaintingLongNames extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ARTIST_LONG_NAME_PROPERTY = "artistLongName";
- @Deprecated
- public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
- @Deprecated
- public static final String GALLERY_LONG_NAME_PROPERTY = "galleryLongName";
- @Deprecated
- public static final String PAINTING_DESCRIPTION_PROPERTY = "paintingDescription";
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
- @Deprecated
- public static final String TEXT_LONG_REVIEW_PROPERTY = "textLongReview";
- @Deprecated
- public static final String TO_ARTIST_PROPERTY = "toArtist";
- @Deprecated
- public static final String TO_ARTIST1_PROPERTY = "toArtist1";
- @Deprecated
- public static final String TO_GALLERY_PROPERTY = "toGallery";
- @Deprecated
- public static final String TO_PAINTING_INFO_PROPERTY = "toPaintingInfo";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<String> ARTIST_LONG_NAME = new Property<String>("artistLongName");
- public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
- public static final Property<String> GALLERY_LONG_NAME = new Property<String>("galleryLongName");
- public static final Property<String> PAINTING_DESCRIPTION = new Property<String>("paintingDescription");
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
- public static final Property<String> TEXT_LONG_REVIEW = new Property<String>("textLongReview");
- public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
- public static final Property<ROArtist> TO_ARTIST1 = new Property<ROArtist>("toArtist1");
- public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
- public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<PaintingInfo>("toPaintingInfo");
+ public static final Property<String> ARTIST_LONG_NAME = new Property<>("artistLongName");
+ public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<>("estimatedPrice");
+ public static final Property<String> GALLERY_LONG_NAME = new Property<>("galleryLongName");
+ public static final Property<String> PAINTING_DESCRIPTION = new Property<>("paintingDescription");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
+ public static final Property<String> TEXT_LONG_REVIEW = new Property<>("textLongReview");
+ public static final Property<Artist> TO_ARTIST = new Property<>("toArtist");
+ public static final Property<ROArtist> TO_ARTIST1 = new Property<>("toArtist1");
+ public static final Property<Gallery> TO_GALLERY = new Property<>("toGallery");
+ public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<>("toPaintingInfo");
public void setArtistLongName(String artistLongName) {
writeProperty("artistLongName", artistLongName);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Exhibit.java
----------------------------------------------------------------------
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 4ef51c6..6c0d75c 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
@@ -18,21 +18,12 @@ public abstract class _Exhibit extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String CLOSING_DATE_PROPERTY = "closingDate";
- @Deprecated
- public static final String OPENING_DATE_PROPERTY = "openingDate";
- @Deprecated
- public static final String ARTIST_EXHIBIT_ARRAY_PROPERTY = "artistExhibitArray";
- @Deprecated
- public static final String TO_GALLERY_PROPERTY = "toGallery";
-
public static final String EXHIBIT_ID_PK_COLUMN = "EXHIBIT_ID";
- public static final Property<Date> CLOSING_DATE = new Property<Date>("closingDate");
- public static final Property<Date> OPENING_DATE = new Property<Date>("openingDate");
- public static final Property<List<ArtistExhibit>> ARTIST_EXHIBIT_ARRAY = new Property<List<ArtistExhibit>>("artistExhibitArray");
- public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
+ public static final Property<Date> CLOSING_DATE = new Property<>("closingDate");
+ public static final Property<Date> OPENING_DATE = new Property<>("openingDate");
+ public static final Property<List<ArtistExhibit>> ARTIST_EXHIBIT_ARRAY = new Property<>("artistExhibitArray");
+ public static final Property<Gallery> TO_GALLERY = new Property<>("toGallery");
public void setClosingDate(Date closingDate) {
writeProperty("closingDate", closingDate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Gallery.java
----------------------------------------------------------------------
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 f1b6576..e2bc498 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
@@ -17,18 +17,11 @@ public abstract class _Gallery extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String GALLERY_NAME_PROPERTY = "galleryName";
- @Deprecated
- public static final String EXHIBIT_ARRAY_PROPERTY = "exhibitArray";
- @Deprecated
- public static final String PAINTING_ARRAY_PROPERTY = "paintingArray";
-
public static final String GALLERY_ID_PK_COLUMN = "GALLERY_ID";
- public static final Property<String> GALLERY_NAME = new Property<String>("galleryName");
- public static final Property<List<Exhibit>> EXHIBIT_ARRAY = new Property<List<Exhibit>>("exhibitArray");
- public static final Property<List<Painting>> PAINTING_ARRAY = new Property<List<Painting>>("paintingArray");
+ public static final Property<String> GALLERY_NAME = new Property<>("galleryName");
+ public static final Property<List<Exhibit>> EXHIBIT_ARRAY = new Property<>("exhibitArray");
+ public static final Property<List<Painting>> PAINTING_ARRAY = new Property<>("paintingArray");
public void setGalleryName(String galleryName) {
writeProperty("galleryName", galleryName);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_MeaningfulGeneratedColumnTestEntity.java
----------------------------------------------------------------------
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 15ed46b..3bac978 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
@@ -13,15 +13,10 @@ public abstract class _MeaningfulGeneratedColumnTestEntity extends CayenneDataOb
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String GENERATED_COLUMN_PROPERTY = "generatedColumn";
- @Deprecated
- public static final String NAME_PROPERTY = "name";
-
public static final String GENERATED_COLUMN_PK_COLUMN = "GENERATED_COLUMN";
- public static final Property<Integer> GENERATED_COLUMN = new Property<Integer>("generatedColumn");
- public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<Integer> GENERATED_COLUMN = new Property<>("generatedColumn");
+ public static final Property<String> NAME = new Property<>("name");
public void setGeneratedColumn(Integer generatedColumn) {
writeProperty("generatedColumn", generatedColumn);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_NullTestEntity.java
----------------------------------------------------------------------
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 7e39391..5c0b608 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
@@ -13,12 +13,9 @@ public abstract class _NullTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String NAME_PROPERTY = "name";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<String> NAME = new Property<>("name");
public void setName(String name) {
writeProperty("name", name);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
----------------------------------------------------------------------
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 1911f2a..9ba62d7 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
@@ -18,27 +18,14 @@ public abstract class _Painting extends ArtDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
- @Deprecated
- public static final String PAINTING_DESCRIPTION_PROPERTY = "paintingDescription";
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
- @Deprecated
- public static final String TO_ARTIST_PROPERTY = "toArtist";
- @Deprecated
- public static final String TO_GALLERY_PROPERTY = "toGallery";
- @Deprecated
- public static final String TO_PAINTING_INFO_PROPERTY = "toPaintingInfo";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
- public static final Property<String> PAINTING_DESCRIPTION = new Property<String>("paintingDescription");
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
- public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
- public static final Property<Gallery> TO_GALLERY = new Property<Gallery>("toGallery");
- public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<PaintingInfo>("toPaintingInfo");
+ public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<>("estimatedPrice");
+ public static final Property<String> PAINTING_DESCRIPTION = new Property<>("paintingDescription");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
+ public static final Property<Artist> TO_ARTIST = new Property<>("toArtist");
+ public static final Property<Gallery> TO_GALLERY = new Property<>("toGallery");
+ public static final Property<PaintingInfo> TO_PAINTING_INFO = new Property<>("toPaintingInfo");
public void setEstimatedPrice(BigDecimal estimatedPrice) {
writeProperty("estimatedPrice", estimatedPrice);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting1.java
----------------------------------------------------------------------
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 bc53670..a7165e1 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
@@ -16,18 +16,11 @@ public abstract class _Painting1 extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
- @Deprecated
- public static final String TO_ARTIST_PROPERTY = "toArtist";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
- public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+ public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<>("estimatedPrice");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
+ public static final Property<Artist> TO_ARTIST = new Property<>("toArtist");
public void setEstimatedPrice(BigDecimal estimatedPrice) {
writeProperty("estimatedPrice", estimatedPrice);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_PaintingInfo.java
----------------------------------------------------------------------
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 dfd1251..f2f8062 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
@@ -14,18 +14,11 @@ public abstract class _PaintingInfo extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String IMAGE_BLOB_PROPERTY = "imageBlob";
- @Deprecated
- public static final String TEXT_REVIEW_PROPERTY = "textReview";
- @Deprecated
- public static final String PAINTING_PROPERTY = "painting";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<byte[]> IMAGE_BLOB = new Property<byte[]>("imageBlob");
- public static final Property<String> TEXT_REVIEW = new Property<String>("textReview");
- public static final Property<Painting> PAINTING = new Property<Painting>("painting");
+ public static final Property<byte[]> IMAGE_BLOB = new Property<>("imageBlob");
+ public static final Property<String> TEXT_REVIEW = new Property<>("textReview");
+ public static final Property<Painting> PAINTING = new Property<>("painting");
public void setImageBlob(byte[] imageBlob) {
writeProperty("imageBlob", imageBlob);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROArtist.java
----------------------------------------------------------------------
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 a2e54a8..3ecf3d2 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
@@ -17,18 +17,11 @@ public abstract class _ROArtist extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ARTIST_NAME_PROPERTY = "artistName";
- @Deprecated
- public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
- @Deprecated
- public static final String PAINTING_ARRAY_PROPERTY = "paintingArray";
-
public static final String ARTIST_ID_PK_COLUMN = "ARTIST_ID";
- public static final Property<String> ARTIST_NAME = new Property<String>("artistName");
- public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
- public static final Property<List<Painting>> PAINTING_ARRAY = new Property<List<Painting>>("paintingArray");
+ public static final Property<String> ARTIST_NAME = new Property<>("artistName");
+ public static final Property<Date> DATE_OF_BIRTH = new Property<>("dateOfBirth");
+ public static final Property<List<Painting>> PAINTING_ARRAY = new Property<>("paintingArray");
public String getArtistName() {
return (String)readProperty("artistName");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_ROPainting.java
----------------------------------------------------------------------
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 33e8be3..41f3d7c 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
@@ -16,18 +16,11 @@ public abstract class _ROPainting extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
- @Deprecated
- public static final String TO_ARTIST_PROPERTY = "toArtist";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
- public static final Property<Artist> TO_ARTIST = new Property<Artist>("toArtist");
+ public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<>("estimatedPrice");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
+ public static final Property<Artist> TO_ARTIST = new Property<>("toArtist");
public BigDecimal getEstimatedPrice() {
return (BigDecimal)readProperty("estimatedPrice");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_RWCompoundPainting.java
----------------------------------------------------------------------
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 43eb976..9246823 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
@@ -15,18 +15,11 @@ public abstract class _RWCompoundPainting extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ESTIMATED_PRICE_PROPERTY = "estimatedPrice";
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
- @Deprecated
- public static final String TEXT_REVIEW_PROPERTY = "textReview";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<BigDecimal>("estimatedPrice");
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
- public static final Property<String> TEXT_REVIEW = new Property<String>("textReview");
+ public static final Property<BigDecimal> ESTIMATED_PRICE = new Property<>("estimatedPrice");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
+ public static final Property<String> TEXT_REVIEW = new Property<>("textReview");
public void setEstimatedPrice(BigDecimal estimatedPrice) {
writeProperty("estimatedPrice", estimatedPrice);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa962a89/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/auto/_SubPainting.java
----------------------------------------------------------------------
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 d46cb3e..160926d 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
@@ -13,12 +13,9 @@ public abstract class _SubPainting extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String PAINTING_TITLE_PROPERTY = "paintingTitle";
-
public static final String PAINTING_ID_PK_COLUMN = "PAINTING_ID";
- public static final Property<String> PAINTING_TITLE = new Property<String>("paintingTitle");
+ public static final Property<String> PAINTING_TITLE = new Property<>("paintingTitle");
public void setPaintingTitle(String paintingTitle) {
writeProperty("paintingTitle", paintingTitle);