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:11 UTC
[10/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/a9d22d3a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a9d22d3a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a9d22d3a
Branch: refs/heads/master
Commit: a9d22d3afd6d0dfc5b203536afcc72cb0d75f306
Parents: aa962a8
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:17:10 2016 +0300
----------------------------------------------------------------------
...ataContextDisjointByIdPrefetch_ExtrasIT.java | 38 +++++++++-----------
.../apache/cayenne/testdo/things/auto/_Bag.java | 17 +++------
.../cayenne/testdo/things/auto/_Ball.java | 17 +++------
.../apache/cayenne/testdo/things/auto/_Box.java | 21 +++--------
.../cayenne/testdo/things/auto/_BoxInfo.java | 9 ++---
.../cayenne/testdo/things/auto/_Thing.java | 17 +++------
.../cayenne/testdo/toone/auto/_TooneDep.java | 9 +++--
.../cayenne/testdo/toone/auto/_TooneMaster.java | 9 +++--
.../auto/_Customer.java | 9 ++---
.../auto/_Product.java | 17 +++------
.../cayenne/testdo/uuid/auto/_UuidPkEntity.java | 5 +--
.../testdo/uuid/auto/_UuidTestEntity.java | 5 +--
12 files changed, 55 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
index e5bf301..44b2060 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
@@ -22,7 +22,6 @@ import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.ValueHolder;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.query.PrefetchTreeNode;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
@@ -42,11 +41,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.apache.cayenne.exp.ExpressionFactory.matchExp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.THINGS_PROJECT)
public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
@@ -129,7 +124,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
SelectQuery query = new SelectQuery(Bag.class);
- query.addPrefetch(Bag.BALLS_PROPERTY).setSemantics(PrefetchTreeNode.DISJOINT_BY_ID_PREFETCH_SEMANTICS);
+ query.addPrefetch(Bag.BALLS.disjointById());
final List<Bag> result = context.performQuery(query);
queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
@@ -137,7 +132,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
public void execute() {
assertFalse(result.isEmpty());
Bag b1 = result.get(0);
- List<Ball> balls = (List<Ball>) b1.readPropertyDirectly(Bag.BALLS_PROPERTY);
+ List<Ball> balls = (List<Ball>) b1.readPropertyDirectly(Bag.BALLS.getName());
assertNotNull(balls);
assertFalse(((ValueHolder) balls).isFault());
assertEquals(6, balls.size());
@@ -157,7 +152,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
SelectQuery query = new SelectQuery(Box.class);
- query.addPrefetch(Box.THINGS_PROPERTY).setSemantics(PrefetchTreeNode.DISJOINT_BY_ID_PREFETCH_SEMANTICS);
+ query.addPrefetch(Box.THINGS.disjointById());
final List<Box> result = context.performQuery(query);
queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
@@ -166,7 +161,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
assertFalse(result.isEmpty());
List<Integer> volumes = new ArrayList<Integer>();
for (Box box : result) {
- List<Thing> things = (List<Thing>) box.readPropertyDirectly(Box.THINGS_PROPERTY);
+ List<Thing> things = (List<Thing>) box.readPropertyDirectly(Box.THINGS.getName());
assertNotNull(things);
assertFalse(((ValueHolder) things).isFault());
for (Thing t : things) {
@@ -185,7 +180,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
SelectQuery query = new SelectQuery(Bag.class);
- query.addPrefetch(Bag.THINGS_PROPERTY).setSemantics(PrefetchTreeNode.DISJOINT_BY_ID_PREFETCH_SEMANTICS);
+ query.addPrefetch(Bag.THINGS.disjointById());
final List<Bag> result = context.performQuery(query);
queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
@@ -193,7 +188,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
public void execute() {
assertFalse(result.isEmpty());
Bag b1 = result.get(0);
- List<Thing> things = (List<Thing>) b1.readPropertyDirectly(Bag.THINGS_PROPERTY);
+ List<Thing> things = (List<Thing>) b1.readPropertyDirectly(Bag.THINGS.getName());
assertNotNull(things);
assertFalse(((ValueHolder) things).isFault());
assertEquals(6, things.size());
@@ -213,10 +208,10 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
SelectQuery query = new SelectQuery(Ball.class);
- query.orQualifier(matchExp(Ball.THING_VOLUME_PROPERTY, 40).andExp(matchExp(Ball.THING_WEIGHT_PROPERTY, 30)));
- query.orQualifier(matchExp(Ball.THING_VOLUME_PROPERTY, 20).andExp(matchExp(Ball.THING_WEIGHT_PROPERTY, 10)));
+ query.orQualifier(Ball.THING_VOLUME.eq(40).andExp(Ball.THING_WEIGHT.eq(30)));
+ query.orQualifier(Ball.THING_VOLUME.eq(20).andExp(Ball.THING_WEIGHT.eq(10)));
- query.addPrefetch(Ball.THING_PROPERTY).setSemantics(PrefetchTreeNode.DISJOINT_BY_ID_PREFETCH_SEMANTICS);
+ query.addPrefetch(Ball.THING.disjointById());
final List<Ball> balls = context.performQuery(query);
@@ -237,9 +232,8 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
createBagWithTwoBoxesAndPlentyOfBallsDataSet();
SelectQuery query = new SelectQuery(Box.class);
- query.addPrefetch(Box.BALLS_PROPERTY).setSemantics(PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
- query.addPrefetch(Box.BALLS_PROPERTY + "." + Ball.THING_PROPERTY).setSemantics(
- PrefetchTreeNode.DISJOINT_BY_ID_PREFETCH_SEMANTICS);
+ query.addPrefetch(Box.BALLS.disjointById());
+ query.addPrefetch(Box.BALLS.dot(Ball.THING).disjointById());
final List<Box> result = context.performQuery(query);
queryInterceptor.runWithQueriesBlocked(new UnitTestClosure() {
@@ -248,11 +242,11 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
assertFalse(result.isEmpty());
List<Integer> volumes = new ArrayList<Integer>();
for (Box box : result) {
- List<Ball> balls = (List<Ball>) box.readPropertyDirectly(Box.BALLS_PROPERTY);
+ List<Ball> balls = (List<Ball>) box.readPropertyDirectly(Box.BALLS.getName());
assertNotNull(balls);
assertFalse(((ValueHolder) balls).isFault());
for (Ball ball : balls) {
- Thing thing = (Thing) ball.readPropertyDirectly(Ball.THING_PROPERTY);
+ Thing thing = (Thing) ball.readPropertyDirectly(Ball.THING.getName());
assertNotNull(thing);
assertEquals(PersistenceState.COMMITTED, thing.getPersistenceState());
volumes.add(thing.getVolume());
@@ -280,7 +274,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
assertFalse(result.isEmpty());
Bag bag = result.get(0);
- List<Box> boxes = (List<Box>) bag.readPropertyDirectly(Bag.BOXES_PROPERTY);
+ List<Box> boxes = (List<Box>) bag.readPropertyDirectly(Bag.BOXES.getName());
assertNotNull(boxes);
assertFalse(((ValueHolder) boxes).isFault());
assertEquals(2, boxes.size());
@@ -297,7 +291,7 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase {
assertTrue(names.contains("big"));
assertTrue(names.contains("small"));
- List<Ball> balls = (List<Ball>) big.readPropertyDirectly(Box.BALLS_PROPERTY);
+ List<Ball> balls = (List<Ball>) big.readPropertyDirectly(Box.BALLS.getName());
assertNotNull(balls);
assertFalse(((ValueHolder) balls).isFault());
assertEquals(2, balls.size());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
index 88b7319..a816483 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Bag.java
@@ -18,21 +18,12 @@ public abstract class _Bag extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String NAME_PROPERTY = "name";
- @Deprecated
- public static final String BALLS_PROPERTY = "balls";
- @Deprecated
- public static final String BOXES_PROPERTY = "boxes";
- @Deprecated
- public static final String THINGS_PROPERTY = "things";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<String> NAME = new Property<String>("name");
- public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
- public static final Property<List<Box>> BOXES = new Property<List<Box>>("boxes");
- public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
+ public static final Property<String> NAME = new Property<>("name");
+ public static final Property<List<Ball>> BALLS = new Property<>("balls");
+ public static final Property<List<Box>> BOXES = new Property<>("boxes");
+ public static final Property<List<Thing>> THINGS = new Property<>("things");
public void setName(String name) {
writeProperty("name", name);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
index 61321b2..c8e3a78 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Ball.java
@@ -15,21 +15,12 @@ public abstract class _Ball extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String THING_VOLUME_PROPERTY = "thingVolume";
- @Deprecated
- public static final String THING_WEIGHT_PROPERTY = "thingWeight";
- @Deprecated
- public static final String BOX_PROPERTY = "box";
- @Deprecated
- public static final String THING_PROPERTY = "thing";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Integer> THING_VOLUME = new Property<Integer>("thingVolume");
- public static final Property<Integer> THING_WEIGHT = new Property<Integer>("thingWeight");
- public static final Property<Box> BOX = new Property<Box>("box");
- public static final Property<Thing> THING = new Property<Thing>("thing");
+ public static final Property<Integer> THING_VOLUME = new Property<>("thingVolume");
+ public static final Property<Integer> THING_WEIGHT = new Property<>("thingWeight");
+ public static final Property<Box> BOX = new Property<>("box");
+ public static final Property<Thing> THING = new Property<>("thing");
public void setThingVolume(Integer thingVolume) {
writeProperty("thingVolume", thingVolume);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
index 8da6b32..2bfe42a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Box.java
@@ -19,24 +19,13 @@ public abstract class _Box extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String NAME_PROPERTY = "name";
- @Deprecated
- public static final String BAG_PROPERTY = "bag";
- @Deprecated
- public static final String BALLS_PROPERTY = "balls";
- @Deprecated
- public static final String BOX_INFO_PROPERTY = "boxInfo";
- @Deprecated
- public static final String THINGS_PROPERTY = "things";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<String> NAME = new Property<String>("name");
- public static final Property<Bag> BAG = new Property<Bag>("bag");
- public static final Property<List<Ball>> BALLS = new Property<List<Ball>>("balls");
- public static final Property<BoxInfo> BOX_INFO = new Property<BoxInfo>("boxInfo");
- public static final Property<List<Thing>> THINGS = new Property<List<Thing>>("things");
+ public static final Property<String> NAME = new Property<>("name");
+ public static final Property<Bag> BAG = new Property<>("bag");
+ public static final Property<List<Ball>> BALLS = new Property<>("balls");
+ public static final Property<BoxInfo> BOX_INFO = new Property<>("boxInfo");
+ public static final Property<List<Thing>> THINGS = new Property<>("things");
public void setName(String name) {
writeProperty("name", name);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
index 8d37e3b..9f4222a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_BoxInfo.java
@@ -14,15 +14,10 @@ public abstract class _BoxInfo extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String COLOR_PROPERTY = "color";
- @Deprecated
- public static final String BOX_PROPERTY = "box";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<String> COLOR = new Property<String>("color");
- public static final Property<Box> BOX = new Property<Box>("box");
+ public static final Property<String> COLOR = new Property<>("color");
+ public static final Property<Box> BOX = new Property<>("box");
public void setColor(String color) {
writeProperty("color", color);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
index 5b604b8..1ef46f0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/things/auto/_Thing.java
@@ -17,21 +17,12 @@ public abstract class _Thing extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String VOLUME_PROPERTY = "volume";
- @Deprecated
- public static final String WEIGHT_PROPERTY = "weight";
- @Deprecated
- public static final String BALL_PROPERTY = "ball";
- @Deprecated
- public static final String BOX_PROPERTY = "box";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Integer> VOLUME = new Property<Integer>("volume");
- public static final Property<Integer> WEIGHT = new Property<Integer>("weight");
- public static final Property<Ball> BALL = new Property<Ball>("ball");
- public static final Property<List<Box>> BOX = new Property<List<Box>>("box");
+ public static final Property<Integer> VOLUME = new Property<>("volume");
+ public static final Property<Integer> WEIGHT = new Property<>("weight");
+ public static final Property<Ball> BALL = new Property<>("ball");
+ public static final Property<List<Box>> BOX = new Property<>("box");
public void setVolume(Integer volume) {
writeProperty("volume", volume);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
index 262d73f..fc9917d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneDep.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.testdo.toone.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.toone.TooneMaster;
/**
@@ -11,16 +12,18 @@ import org.apache.cayenne.testdo.toone.TooneMaster;
*/
public abstract class _TooneDep extends CayenneDataObject {
- public static final String TO_MASTER_PROPERTY = "toMaster";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<TooneMaster> TO_MASTER = new Property<>("toMaster");
+
public void setToMaster(TooneMaster toMaster) {
- setToOneTarget(TO_MASTER_PROPERTY, toMaster, true);
+ setToOneTarget("toMaster", toMaster, true);
}
public TooneMaster getToMaster() {
- return (TooneMaster)readProperty(TO_MASTER_PROPERTY);
+ return (TooneMaster)readProperty("toMaster");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
index 788411f..b89c729 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/toone/auto/_TooneMaster.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.testdo.toone.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.toone.TooneDep;
/**
@@ -11,16 +12,18 @@ import org.apache.cayenne.testdo.toone.TooneDep;
*/
public abstract class _TooneMaster extends CayenneDataObject {
- public static final String TO_DEPENDENT_PROPERTY = "toDependent";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<TooneDep> TO_DEPENDENT = new Property<>("toDependent");
+
public void setToDependent(TooneDep toDependent) {
- setToOneTarget(TO_DEPENDENT_PROPERTY, toDependent, true);
+ setToOneTarget("toDependent", toDependent, true);
}
public TooneDep getToDependent() {
- return (TooneDep)readProperty(TO_DEPENDENT_PROPERTY);
+ return (TooneDep)readProperty("toDependent");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
index f071ed8..6d6a902 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Customer.java
@@ -16,15 +16,10 @@ public abstract class _Customer extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String LONGVARCHAR_COL_PROPERTY = "longvarcharCol";
- @Deprecated
- public static final String ORDER_PROPERTY = "order";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<String> LONGVARCHAR_COL = new Property<String>("longvarcharCol");
- public static final Property<List<Product>> ORDER = new Property<List<Product>>("order");
+ public static final Property<String> LONGVARCHAR_COL = new Property<>("longvarcharCol");
+ public static final Property<List<Product>> ORDER = new Property<>("order");
public void setLongvarcharCol(String longvarcharCol) {
writeProperty("longvarcharCol", longvarcharCol);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
index 02209b8..7b320c8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/auto/_Product.java
@@ -17,21 +17,12 @@ public abstract class _Product extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String LONGVARCHAR_COL_PROPERTY = "longvarcharCol";
- @Deprecated
- public static final String BASE_PROPERTY = "base";
- @Deprecated
- public static final String CONTAINED_PROPERTY = "contained";
- @Deprecated
- public static final String ORDER_BY_PROPERTY = "orderBy";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<String> LONGVARCHAR_COL = new Property<String>("longvarcharCol");
- public static final Property<List<Product>> BASE = new Property<List<Product>>("base");
- public static final Property<List<Product>> CONTAINED = new Property<List<Product>>("contained");
- public static final Property<List<Customer>> ORDER_BY = new Property<List<Customer>>("orderBy");
+ public static final Property<String> LONGVARCHAR_COL = new Property<>("longvarcharCol");
+ public static final Property<List<Product>> BASE = new Property<>("base");
+ public static final Property<List<Product>> CONTAINED = new Property<>("contained");
+ public static final Property<List<Customer>> ORDER_BY = new Property<>("orderBy");
public void setLongvarcharCol(String longvarcharCol) {
writeProperty("longvarcharCol", longvarcharCol);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
index 492c380..b8bc876 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidPkEntity.java
@@ -15,12 +15,9 @@ public abstract class _UuidPkEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ID_PROPERTY = "id";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<UUID> ID = new Property<UUID>("id");
+ public static final Property<UUID> ID = new Property<>("id");
public void setId(UUID id) {
writeProperty("id", id);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9d22d3a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
index 82315b4..3cf702b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/uuid/auto/_UuidTestEntity.java
@@ -15,12 +15,9 @@ public abstract class _UuidTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String UUID_PROPERTY = "uuid";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<UUID> UUID = new Property<UUID>("uuid");
+ public static final Property<UUID> UUID = new Property<>("uuid");
public void setUuid(UUID uuid) {
writeProperty("uuid", uuid);