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:05 UTC
[04/11] cayenne git commit: CAY-2176 Java 7 diamond class generation
templates
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
index 0beee0a..1492830 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable1Subclass2.java
@@ -11,12 +11,11 @@ import org.apache.cayenne.testdo.mt.MtTable1;
*/
public abstract class _MtTable1Subclass2 extends MtTable1 {
- @Deprecated
- public static final String SUBCLASS2ATTRIBUTE1_PROPERTY = "subclass2Attribute1";
+ private static final long serialVersionUID = 1L;
public static final String TABLE1_ID_PK_COLUMN = "TABLE1_ID";
- public static final Property<String> SUBCLASS2ATTRIBUTE1 = new Property<String>("subclass2Attribute1");
+ public static final Property<String> SUBCLASS2ATTRIBUTE1 = new Property<>("subclass2Attribute1");
public void setSubclass2Attribute1(String subclass2Attribute1) {
writeProperty("subclass2Attribute1", subclass2Attribute1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
index 2305667..19ab637 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable2.java
@@ -1,6 +1,7 @@
package org.apache.cayenne.testdo.mt.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.mt.MtTable1;
import org.apache.cayenne.testdo.mt.MtTable3;
@@ -12,34 +13,36 @@ import org.apache.cayenne.testdo.mt.MtTable3;
*/
public abstract class _MtTable2 extends CayenneDataObject {
- public static final String GLOBAL_ATTRIBUTE_PROPERTY = "globalAttribute";
- public static final String TABLE1_PROPERTY = "table1";
- public static final String TABLE3_PROPERTY = "table3";
+ private static final long serialVersionUID = 1L;
public static final String TABLE2_ID_PK_COLUMN = "TABLE2_ID";
+ public static final Property<String> GLOBAL_ATTRIBUTE = new Property<>("globalAttribute");
+ public static final Property<MtTable1> TABLE1 = new Property<>("table1");
+ public static final Property<MtTable3> TABLE3 = new Property<>("table3");
+
public void setGlobalAttribute(String globalAttribute) {
- writeProperty(GLOBAL_ATTRIBUTE_PROPERTY, globalAttribute);
+ writeProperty("globalAttribute", globalAttribute);
}
public String getGlobalAttribute() {
- return (String)readProperty(GLOBAL_ATTRIBUTE_PROPERTY);
+ return (String)readProperty("globalAttribute");
}
public void setTable1(MtTable1 table1) {
- setToOneTarget(TABLE1_PROPERTY, table1, true);
+ setToOneTarget("table1", table1, true);
}
public MtTable1 getTable1() {
- return (MtTable1)readProperty(TABLE1_PROPERTY);
+ return (MtTable1)readProperty("table1");
}
public void setTable3(MtTable3 table3) {
- setToOneTarget(TABLE3_PROPERTY, table3, true);
+ setToOneTarget("table3", table3, true);
}
public MtTable3 getTable3() {
- return (MtTable3)readProperty(TABLE3_PROPERTY);
+ return (MtTable3)readProperty("table3");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
index 6409b17..5761c5d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable3.java
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.mt.auto;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.mt.MtTable2;
/**
@@ -13,43 +14,45 @@ import org.apache.cayenne.testdo.mt.MtTable2;
*/
public abstract class _MtTable3 extends CayenneDataObject {
- public static final String BINARY_COLUMN_PROPERTY = "binaryColumn";
- public static final String CHAR_COLUMN_PROPERTY = "charColumn";
- public static final String INT_COLUMN_PROPERTY = "intColumn";
- public static final String TABLE2ARRAY_PROPERTY = "table2Array";
+ private static final long serialVersionUID = 1L;
public static final String TABLE3_ID_PK_COLUMN = "TABLE3_ID";
+ public static final Property<byte[]> BINARY_COLUMN = new Property<>("binaryColumn");
+ public static final Property<String> CHAR_COLUMN = new Property<>("charColumn");
+ public static final Property<Integer> INT_COLUMN = new Property<>("intColumn");
+ public static final Property<List<MtTable2>> TABLE2ARRAY = new Property<>("table2Array");
+
public void setBinaryColumn(byte[] binaryColumn) {
- writeProperty(BINARY_COLUMN_PROPERTY, binaryColumn);
+ writeProperty("binaryColumn", binaryColumn);
}
public byte[] getBinaryColumn() {
- return (byte[])readProperty(BINARY_COLUMN_PROPERTY);
+ return (byte[])readProperty("binaryColumn");
}
public void setCharColumn(String charColumn) {
- writeProperty(CHAR_COLUMN_PROPERTY, charColumn);
+ writeProperty("charColumn", charColumn);
}
public String getCharColumn() {
- return (String)readProperty(CHAR_COLUMN_PROPERTY);
+ return (String)readProperty("charColumn");
}
public void setIntColumn(Integer intColumn) {
- writeProperty(INT_COLUMN_PROPERTY, intColumn);
+ writeProperty("intColumn", intColumn);
}
public Integer getIntColumn() {
- return (Integer)readProperty(INT_COLUMN_PROPERTY);
+ return (Integer)readProperty("intColumn");
}
public void addToTable2Array(MtTable2 obj) {
- addToManyTarget(TABLE2ARRAY_PROPERTY, obj, true);
+ addToManyTarget("table2Array", obj, true);
}
public void removeFromTable2Array(MtTable2 obj) {
- removeToManyTarget(TABLE2ARRAY_PROPERTY, obj, true);
+ removeToManyTarget("table2Array", obj, true);
}
@SuppressWarnings("unchecked")
public List<MtTable2> getTable2Array() {
- return (List<MtTable2>)readProperty(TABLE2ARRAY_PROPERTY);
+ return (List<MtTable2>)readProperty("table2Array");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java
index 8892540..fb1b8d7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable4.java
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.mt.auto;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.mt.MtTable5;
/**
@@ -13,19 +14,21 @@ import org.apache.cayenne.testdo.mt.MtTable5;
*/
public abstract class _MtTable4 extends CayenneDataObject {
- public static final String TABLE5S_PROPERTY = "table5s";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<List<MtTable5>> TABLE5S = new Property<>("table5s");
+
public void addToTable5s(MtTable5 obj) {
- addToManyTarget(TABLE5S_PROPERTY, obj, true);
+ addToManyTarget("table5s", obj, true);
}
public void removeFromTable5s(MtTable5 obj) {
- removeToManyTarget(TABLE5S_PROPERTY, obj, true);
+ removeToManyTarget("table5s", obj, true);
}
@SuppressWarnings("unchecked")
public List<MtTable5> getTable5s() {
- return (List<MtTable5>)readProperty(TABLE5S_PROPERTY);
+ return (List<MtTable5>)readProperty("table5s");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java
index 613c818..aa3e7bf 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/mt/auto/_MtTable5.java
@@ -3,6 +3,7 @@ package org.apache.cayenne.testdo.mt.auto;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.testdo.mt.MtTable4;
/**
@@ -13,19 +14,21 @@ import org.apache.cayenne.testdo.mt.MtTable4;
*/
public abstract class _MtTable5 extends CayenneDataObject {
- public static final String TABLE4S_PROPERTY = "table4s";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<List<MtTable4>> TABLE4S = new Property<>("table4s");
+
public void addToTable4s(MtTable4 obj) {
- addToManyTarget(TABLE4S_PROPERTY, obj, true);
+ addToManyTarget("table4s", obj, true);
}
public void removeFromTable4s(MtTable4 obj) {
- removeToManyTarget(TABLE4S_PROPERTY, obj, true);
+ removeToManyTarget("table4s", obj, true);
}
@SuppressWarnings("unchecked")
public List<MtTable4> getTable4s() {
- return (List<MtTable4>)readProperty(TABLE4S_PROPERTY);
+ return (List<MtTable4>)readProperty("table4s");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
index 2cfbe63..34083f4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/no_pk/auto/_NoPkTestEntity.java
@@ -13,11 +13,8 @@ public abstract class _NoPkTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String ATTRIBUTE1_PROPERTY = "attribute1";
-
- public static final Property<Integer> ATTRIBUTE1 = new Property<Integer>("attribute1");
+ public static final Property<Integer> ATTRIBUTE1 = new Property<>("attribute1");
public void setAttribute1(Integer attribute1) {
writeProperty("attribute1", attribute1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
index dc6d5bb..718a600 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigDecimalEntity.java
@@ -15,12 +15,9 @@ public abstract class _BigDecimalEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String BIG_DECIMAL_FIELD_PROPERTY = "bigDecimalField";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<BigDecimal> BIG_DECIMAL_FIELD = new Property<BigDecimal>("bigDecimalField");
+ public static final Property<BigDecimal> BIG_DECIMAL_FIELD = new Property<>("bigDecimalField");
public void setBigDecimalField(BigDecimal bigDecimalField) {
writeProperty("bigDecimalField", bigDecimalField);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
index 2d9d988..1fac071 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BigIntegerEntity.java
@@ -15,12 +15,9 @@ public abstract class _BigIntegerEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String BIG_INTEGER_FIELD_PROPERTY = "bigIntegerField";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<BigInteger> BIG_INTEGER_FIELD = new Property<BigInteger>("bigIntegerField");
+ public static final Property<BigInteger> BIG_INTEGER_FIELD = new Property<>("bigIntegerField");
public void setBigIntegerField(BigInteger bigIntegerField) {
writeProperty("bigIntegerField", bigIntegerField);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
index 50bc6c0..b0a4a82 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitNumberTestEntity.java
@@ -13,12 +13,9 @@ public abstract class _BitNumberTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String BIT_COLUMN_PROPERTY = "bitColumn";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Integer> BIT_COLUMN = new Property<Integer>("bitColumn");
+ public static final Property<Integer> BIT_COLUMN = new Property<>("bitColumn");
public void setBitColumn(Integer bitColumn) {
writeProperty("bitColumn", bitColumn);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
index 91d49dd..1820a4c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BitTestEntity.java
@@ -13,12 +13,9 @@ public abstract class _BitTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String BIT_COLUMN_PROPERTY = "bitColumn";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Boolean> BIT_COLUMN = new Property<Boolean>("bitColumn");
+ public static final Property<Boolean> BIT_COLUMN = new Property<>("bitColumn");
public void setBitColumn(Boolean bitColumn) {
writeProperty("bitColumn", bitColumn);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
index 6651379..4da9062 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_BooleanTestEntity.java
@@ -13,12 +13,9 @@ public abstract class _BooleanTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
+ public static final Property<Boolean> BOOLEAN_COLUMN = new Property<>("booleanColumn");
public void setBooleanColumn(Boolean booleanColumn) {
writeProperty("booleanColumn", booleanColumn);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
index ef70095..1877aae 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTest1.java
@@ -13,15 +13,10 @@ public abstract class _DecimalPKTest1 extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String DECIMAL_PK_PROPERTY = "decimalPK";
- @Deprecated
- public static final String NAME_PROPERTY = "name";
-
public static final String DECIMAL_PK_PK_COLUMN = "DECIMAL_PK";
- public static final Property<Double> DECIMAL_PK = new Property<Double>("decimalPK");
- public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<Double> DECIMAL_PK = new Property<>("decimalPK");
+ public static final Property<String> NAME = new Property<>("name");
public void setDecimalPK(Double decimalPK) {
writeProperty("decimalPK", decimalPK);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
index 8f51019..6a79d2c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_DecimalPKTestEntity.java
@@ -15,15 +15,10 @@ public abstract class _DecimalPKTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String DECIMAL_PK_PROPERTY = "decimalPK";
- @Deprecated
- public static final String NAME_PROPERTY = "name";
-
public static final String DECIMAL_PK_PK_COLUMN = "DECIMAL_PK";
- public static final Property<BigDecimal> DECIMAL_PK = new Property<BigDecimal>("decimalPK");
- public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<BigDecimal> DECIMAL_PK = new Property<>("decimalPK");
+ public static final Property<String> NAME = new Property<>("name");
public void setDecimalPK(BigDecimal decimalPK) {
writeProperty("decimalPK", decimalPK);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
index 3f976b6..8d7789a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_LongEntity.java
@@ -13,12 +13,9 @@ public abstract class _LongEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String LONG_FIELD_PROPERTY = "longField";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Long> LONG_FIELD = new Property<Long>("longField");
+ public static final Property<Long> LONG_FIELD = new Property<>("longField");
public void setLongField(Long longField) {
writeProperty("longField", longField);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
index 8be4455..cc916ba 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_SmallintTestEntity.java
@@ -13,12 +13,9 @@ public abstract class _SmallintTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String SMALLINT_COL_PROPERTY = "smallintCol";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Short> SMALLINT_COL = new Property<Short>("smallintCol");
+ public static final Property<Short> SMALLINT_COL = new Property<>("smallintCol");
public void setSmallintCol(Short smallintCol) {
writeProperty("smallintCol", smallintCol);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
index d31fccd..3021254 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/numeric_types/auto/_TinyintTestEntity.java
@@ -13,12 +13,9 @@ public abstract class _TinyintTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String TINYINT_COL_PROPERTY = "tinyintCol";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Byte> TINYINT_COL = new Property<Byte>("tinyintCol");
+ public static final Property<Byte> TINYINT_COL = new Property<>("tinyintCol");
public void setTinyintCol(Byte tinyintCol) {
writeProperty("tinyintCol", tinyintCol);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable1.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable1.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable1.java
index 136eb14..8f2b5f2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable1.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable1.java
@@ -1,7 +1,6 @@
package org.apache.cayenne.testdo.oneway.auto;
import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
/**
* Class _OnewayTable1 was generated by Cayenne.
@@ -11,6 +10,7 @@ import org.apache.cayenne.exp.Property;
*/
public abstract class _OnewayTable1 extends CayenneDataObject {
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
index 960d372..6425946 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable2.java
@@ -12,15 +12,12 @@ import org.apache.cayenne.testdo.oneway.OnewayTable1;
*/
public abstract class _OnewayTable2 extends CayenneDataObject {
- @Deprecated
- public static final String ID_PROPERTY = "id";
- @Deprecated
- public static final String TO_ONE_ONE_WAY_DB_PROPERTY = "toOneOneWayDb";
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Integer> ID = new Property<Integer>("id");
- public static final Property<OnewayTable1> TO_ONE_ONE_WAY_DB = new Property<OnewayTable1>("toOneOneWayDb");
+ public static final Property<Integer> ID = new Property<>("id");
+ public static final Property<OnewayTable1> TO_ONE_ONE_WAY_DB = new Property<>("toOneOneWayDb");
public void setId(Integer id) {
writeProperty("id", id);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable3.java
index 840224e..bd25371 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable3.java
@@ -16,12 +16,9 @@ public abstract class _OnewayTable3 extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String TO_MANY_ONE_WAY_DB_PROPERTY = "toManyOneWayDb";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<List<OnewayTable4>> TO_MANY_ONE_WAY_DB = new Property<List<OnewayTable4>>("toManyOneWayDb");
+ public static final Property<List<OnewayTable4>> TO_MANY_ONE_WAY_DB = new Property<>("toManyOneWayDb");
public void addToToManyOneWayDb(OnewayTable4 obj) {
addToManyTarget("toManyOneWayDb", obj, true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable4.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable4.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable4.java
index ba06814..1f0ca75 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable4.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/oneway/auto/_OnewayTable4.java
@@ -1,7 +1,6 @@
package org.apache.cayenne.testdo.oneway.auto;
import org.apache.cayenne.CayenneDataObject;
-import org.apache.cayenne.exp.Property;
/**
* Class _OnewayTable4 was generated by Cayenne.
@@ -11,6 +10,7 @@ import org.apache.cayenne.exp.Property;
*/
public abstract class _OnewayTable4 extends CayenneDataObject {
+ private static final long serialVersionUID = 1L;
public static final String ID_PK_COLUMN = "ID";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Continent.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Continent.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Continent.java
deleted file mode 100644
index faa7c30..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Continent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.testdo.persistent;
-
-import org.apache.cayenne.testdo.persistent.auto._Continent;
-
-public class Continent extends _Continent {
-
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Country.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Country.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Country.java
deleted file mode 100644
index e20e213..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/Country.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.testdo.persistent;
-
-import org.apache.cayenne.testdo.persistent.auto._Country;
-
-public class Country extends _Country {
-
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Continent.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Continent.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Continent.java
deleted file mode 100644
index 798c45b..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Continent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.apache.cayenne.testdo.persistent.auto;
-
-import java.util.List;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.testdo.persistent.Country;
-
-/**
- * A generated persistent class mapped as "Continent" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _Continent extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
- public static final String COUNTRIES_PROPERTY = "countries";
-
- protected String name;
- protected List<Country> countries;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
- public List<Country> getCountries() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "countries", true);
- }
-
- return countries;
- }
- public void addToCountries(Country object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "countries", true);
- }
-
- this.countries.add(object);
- }
- public void removeFromCountries(Country object) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "countries", true);
- }
-
- this.countries.remove(object);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Country.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Country.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Country.java
deleted file mode 100644
index 45c0ee4..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/persistent/auto/_Country.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.cayenne.testdo.persistent.auto;
-
-import org.apache.cayenne.PersistentObject;
-import org.apache.cayenne.ValueHolder;
-import org.apache.cayenne.testdo.persistent.Continent;
-
-/**
- * A generated persistent class mapped as "Country" Cayenne entity. It is a good idea to
- * avoid changing this class manually, since it will be overwritten next time code is
- * regenerated. If you need to make any customizations, put them in a subclass.
- */
-public abstract class _Country extends PersistentObject {
-
- public static final String NAME_PROPERTY = "name";
- public static final String CONTINENT_PROPERTY = "continent";
-
- protected String name;
- protected ValueHolder continent;
-
- public String getName() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- return name;
- }
- public void setName(String name) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "name", false);
- }
-
- Object oldValue = this.name;
- this.name = name;
-
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "name", oldValue, name);
- }
- }
-
- public Continent getContinent() {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "continent", true);
- }
-
- return (Continent) continent.getValue();
- }
- public void setContinent(Continent continent) {
- if(objectContext != null) {
- objectContext.prepareForAccess(this, "continent", true);
- }
-
- this.continent.setValue(continent);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
index 6bdb279..4056499 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/primitive/auto/_PrimitivesTestEntity.java
@@ -13,15 +13,10 @@ public abstract class _PrimitivesTestEntity extends CayenneDataObject {
private static final long serialVersionUID = 1L;
- @Deprecated
- public static final String BOOLEAN_COLUMN_PROPERTY = "booleanColumn";
- @Deprecated
- public static final String INT_COLUMN_PROPERTY = "intColumn";
-
public static final String ID_PK_COLUMN = "ID";
- public static final Property<Boolean> BOOLEAN_COLUMN = new Property<Boolean>("booleanColumn");
- public static final Property<Integer> INT_COLUMN = new Property<Integer>("intColumn");
+ public static final Property<Boolean> BOOLEAN_COLUMN = new Property<>("booleanColumn");
+ public static final Property<Integer> INT_COLUMN = new Property<>("intColumn");
public void setBooleanColumn(boolean booleanColumn) {
writeProperty("booleanColumn", booleanColumn);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/CayenneProjects.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/CayenneProjects.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/CayenneProjects.java
index 99a98da..ee51554 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/CayenneProjects.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/CayenneProjects.java
@@ -54,7 +54,6 @@ public class CayenneProjects {
public static final String NUMERIC_TYPES_PROJECT = "cayenne-numeric-types.xml";
public static final String ONEWAY_PROJECT = "cayenne-oneway-rels.xml";
public static final String PEOPLE_PROJECT = "cayenne-people.xml";
- public static final String PERSISTENT_PROJECT = "cayenne-persistent.xml";
public static final String PRIMITIVE_PROJECT = "cayenne-primitive.xml";
public static final String QUALIFIED_PROJECT = "cayenne-qualified.xml";
public static final String QUOTED_IDENTIFIERS_PROJECT = "cayenne-quoted-identifiers.xml";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
index 8c8a208..8cab9b1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
@@ -78,7 +78,7 @@ public class SchemaBuilder {
"relationships-collection-to-many.map.xml", "relationships-child-master.map.xml",
"relationships-clob.map.xml", "relationships-flattened.map.xml", "relationships-set-to-many.map.xml",
"relationships-to-many-fk.map.xml", "relationships-to-one-fk.map.xml", "return-types.map.xml",
- "uuid.map.xml", "multi-tier.map.xml", "persistent.map.xml", "reflexive.map.xml", "delete-rules.map.xml",
+ "uuid.map.xml", "multi-tier.map.xml", "reflexive.map.xml", "delete-rules.map.xml",
"lifecycle-callbacks-order.map.xml", "lifecycles.map.xml", "map-to-many.map.xml", "toone.map.xml", "meaningful-pk.map.xml",
"table-primitives.map.xml", "generic.map.xml", "map-db1.map.xml", "map-db2.map.xml", "embeddable.map.xml",
"qualified.map.xml", "quoted-identifiers.map.xml", "inheritance-single-table1.map.xml",
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/resources/cayenne-persistent.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-persistent.xml b/cayenne-server/src/test/resources/cayenne-persistent.xml
deleted file mode 100644
index e368c57..0000000
--- a/cayenne-server/src/test/resources/cayenne-persistent.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
- <map name="persistent"/>
-</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/92616348/cayenne-server/src/test/resources/persistent.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/persistent.map.xml b/cayenne-server/src/test/resources/persistent.map.xml
deleted file mode 100644
index ee0481a..0000000
--- a/cayenne-server/src/test/resources/persistent.map.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
- <property name="defaultPackage" value="org.apache.cayenne.testdo.persistent"/>
- <property name="clientSupported" value="true"/>
- <property name="defaultClientPackage" value="org.apache.cayenne.testdo.persistent"/>
- <db-entity name="CONTINENT">
- <db-attribute name="CONTINENTD" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/>
- </db-entity>
- <db-entity name="COUNTRY">
- <db-attribute name="CONTINENTID" type="BIGINT" isMandatory="true"/>
- <db-attribute name="COUNTRYID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/>
- </db-entity>
- <obj-entity name="Continent" className="org.apache.cayenne.testdo.persistent.Continent" clientClassName="org.apache.cayenne.testdo.persistent.Continent" dbEntityName="CONTINENT" superClassName="org.apache.cayenne.PersistentObject">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <obj-entity name="Country" className="org.apache.cayenne.testdo.persistent.Country" clientClassName="org.apache.cayenne.testdo.persistent.Country" dbEntityName="COUNTRY" superClassName="org.apache.cayenne.PersistentObject">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <db-relationship name="countries" source="CONTINENT" target="COUNTRY" toMany="true">
- <db-attribute-pair source="CONTINENTD" target="CONTINENTID"/>
- </db-relationship>
- <db-relationship name="continent" source="COUNTRY" target="CONTINENT" toMany="false">
- <db-attribute-pair source="CONTINENTID" target="CONTINENTD"/>
- </db-relationship>
- <obj-relationship name="countries" source="Continent" target="Country" deleteRule="Cascade" db-relationship-path="countries"/>
- <obj-relationship name="continent" source="Country" target="Continent" deleteRule="Nullify" db-relationship-path="continent"/>
-</data-map>