Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-04-01 08:10:08 -0400
committerMartin Taal2013-04-01 08:10:08 -0400
commit689def9c07862da888c885d7bca4d3b0dd742f75 (patch)
tree3f68860c9426141db809013cd5d5b1dc69aabff2
parent778f7d6395b132b70448babbbb1898e89ba3a33b (diff)
downloadorg.eclipse.emf.teneo-689def9c07862da888c885d7bca4d3b0dd742f75.tar.gz
org.eclipse.emf.teneo-689def9c07862da888c885d7bca4d3b0dd742f75.tar.xz
org.eclipse.emf.teneo-689def9c07862da888c885d7bca4d3b0dd742f75.zip
Fixes issue [404025]
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore2
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java26
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java28
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java99
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java63
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java46
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java25
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java6
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml2
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java2
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java2
15 files changed, 198 insertions, 111 deletions
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel
index 6a85aa45d..5e9015761 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbannotation.genmodel
@@ -191,6 +191,7 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/mapKeyManyToMany"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/formula"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/hbFetch"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedETypeElement/batchSize"/>
</genClasses>
<genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEAttribute">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEAttribute/hbType"/>
@@ -229,7 +230,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/immutable"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/notFound"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/hbType"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/batchSize"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/any"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEReference/anyMetaDef"/>
</genClasses>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore
index 4842494f2..e260d3cc5 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/model/hbmodel.ecore
@@ -32,6 +32,7 @@
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="formula" eType="ecore:EClass hbannotation.ecore#//Formula"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="hbFetch" eType="ecore:EClass hbannotation.ecore#//Fetch"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="batchSize" eType="ecore:EClass hbannotation.ecore#//BatchSize"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEAttribute" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEAttribute #//HbAnnotatedETypeElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="hbType" eType="ecore:EClass hbannotation.ecore#//Type"
@@ -93,7 +94,6 @@
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="hbType" eType="ecore:EClass hbannotation.ecore#//Type"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="batchSize" eType="ecore:EClass hbannotation.ecore#//BatchSize"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="any" eType="ecore:EClass hbannotation.ecore#//Any"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="anyMetaDef" eType="ecore:EClass hbannotation.ecore#//AnyMetaDef"/>
</eClassifiers>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
index d555d9ca6..cfa9733f4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable <em>Immutable</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound <em>Not Found</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType <em>Hb Type</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef <em>Any Meta Def</em>}</li>
* </ul>
@@ -198,31 +197,6 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
void setHbType(Type value);
/**
- * Returns the value of the '<em><b>Batch Size</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Batch Size</em>' reference isn't clear, there really should be more
- * of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Batch Size</em>' reference.
- * @see #setBatchSize(BatchSize)
- * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_BatchSize()
- * @model
- * @generated
- */
- BatchSize getBatchSize();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size</em>}' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Batch Size</em>' reference.
- * @see #getBatchSize()
- * @generated
- */
- void setBatchSize(BatchSize value);
-
- /**
* Returns the value of the '<em><b>Any</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
index 4ccaaba75..9e572902c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
@@ -9,6 +9,7 @@ package org.eclipse.emf.teneo.hibernate.hbmodel;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
import org.eclipse.emf.teneo.annotations.pannotation.Column;
+import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
@@ -38,6 +39,7 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula <em>Formula</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbFetch <em>Hb Fetch</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getBatchSize <em>Batch Size</em>}</li>
* </ul>
* </p>
*
@@ -315,4 +317,30 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature,
*/
void setHbFetch(Fetch value);
+ /**
+ * Returns the value of the '<em><b>Batch Size</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Batch Size</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Batch Size</em>' reference.
+ * @see #setBatchSize(BatchSize)
+ * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_BatchSize()
+ * @model
+ * @generated
+ */
+ BatchSize getBatchSize();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getBatchSize <em>Batch Size</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Batch Size</em>' reference.
+ * @see #getBatchSize()
+ * @generated
+ */
+ void setBatchSize(BatchSize value);
+
} // HbAnnotatedETypeElement
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
index f2f45729c..14dff4ac0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
@@ -334,13 +334,22 @@ public interface HbmodelPackage extends EPackage {
int HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 10;
/**
+ * The feature id for the '<em><b>Batch Size</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 11;
+
+ /**
* The number of structural features of the ' <em>Hb Annotated EType Element</em>' class. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int HB_ANNOTATED_ETYPE_ELEMENT_FEATURE_COUNT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 11;
+ int HB_ANNOTATED_ETYPE_ELEMENT_FEATURE_COUNT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 12;
/**
* The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl <em>Hb Annotated EAttribute</em>}' class.
@@ -685,13 +694,22 @@ public interface HbmodelPackage extends EPackage {
int HB_ANNOTATED_EATTRIBUTE__HB_FETCH = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 10;
/**
+ * The feature id for the '<em><b>Batch Size</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 11;
+
+ /**
* The feature id for the '<em><b>Hb Type</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__HB_TYPE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 11;
+ int HB_ANNOTATED_EATTRIBUTE__HB_TYPE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Generated</b></em>' containment reference.
@@ -700,7 +718,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__GENERATED = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 12;
+ int HB_ANNOTATED_EATTRIBUTE__GENERATED = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Natural Id</b></em>' containment reference.
@@ -709,7 +727,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__NATURAL_ID = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 13;
+ int HB_ANNOTATED_EATTRIBUTE__NATURAL_ID = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Any</b></em>' reference.
@@ -718,7 +736,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__ANY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 14;
+ int HB_ANNOTATED_EATTRIBUTE__ANY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Any Meta Def</b></em>' reference.
@@ -727,7 +745,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 15;
+ int HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 16;
/**
* The number of structural features of the '<em>Hb Annotated EAttribute</em>' class. <!--
@@ -736,7 +754,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EATTRIBUTE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 16;
+ int HB_ANNOTATED_EATTRIBUTE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 17;
/**
* The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl <em>Hb Annotated EClass</em>}' class.
@@ -1707,13 +1725,22 @@ public interface HbmodelPackage extends EPackage {
int HB_ANNOTATED_EREFERENCE__HB_FETCH = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 10;
/**
+ * The feature id for the '<em><b>Batch Size</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int HB_ANNOTATED_EREFERENCE__BATCH_SIZE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 11;
+
+ /**
* The feature id for the '<em><b>Hb Cache</b></em>' containment reference.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__HB_CACHE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 11;
+ int HB_ANNOTATED_EREFERENCE__HB_CACHE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Hb On Delete</b></em>' reference.
@@ -1722,7 +1749,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__HB_ON_DELETE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 12;
+ int HB_ANNOTATED_EREFERENCE__HB_ON_DELETE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Natural Id</b></em>' containment reference.
@@ -1731,7 +1758,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__NATURAL_ID = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 13;
+ int HB_ANNOTATED_EREFERENCE__NATURAL_ID = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Immutable</b></em>' containment reference.
@@ -1740,7 +1767,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__IMMUTABLE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 14;
+ int HB_ANNOTATED_EREFERENCE__IMMUTABLE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Not Found</b></em>' containment reference.
@@ -1749,7 +1776,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__NOT_FOUND = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 15;
+ int HB_ANNOTATED_EREFERENCE__NOT_FOUND = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Hb Type</b></em>' containment reference.
@@ -1758,16 +1785,7 @@ public interface HbmodelPackage extends EPackage {
* @generated
* @ordered
*/
- int HB_ANNOTATED_EREFERENCE__HB_TYPE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 16;
-
- /**
- * The feature id for the '<em><b>Batch Size</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
- * @generated
- * @ordered
- */
- int HB_ANNOTATED_EREFERENCE__BATCH_SIZE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 17;
+ int HB_ANNOTATED_EREFERENCE__HB_TYPE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Any</b></em>' reference.
@@ -2106,6 +2124,17 @@ public interface HbmodelPackage extends EPackage {
EReference getHbAnnotatedETypeElement_HbFetch();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getBatchSize <em>Batch Size</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Batch Size</em>'.
+ * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getBatchSize()
+ * @see #getHbAnnotatedETypeElement()
+ * @generated
+ */
+ EReference getHbAnnotatedETypeElement_BatchSize();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute <em>Hb Annotated EAttribute</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Hb Annotated EAttribute</em>'.
@@ -2441,16 +2470,6 @@ public interface HbmodelPackage extends EPackage {
EReference getHbAnnotatedEReference_HbType();
/**
- * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Batch Size</em>'.
- * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize()
- * @see #getHbAnnotatedEReference()
- * @generated
- */
- EReference getHbAnnotatedEReference_BatchSize();
-
- /**
* Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the reference '<em>Any</em>'.
@@ -2651,6 +2670,14 @@ public interface HbmodelPackage extends EPackage {
EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH = eINSTANCE.getHbAnnotatedETypeElement_HbFetch();
/**
+ * The meta object literal for the '<em><b>Batch Size</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE = eINSTANCE.getHbAnnotatedETypeElement_BatchSize();
+
+ /**
* The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl <em>Hb Annotated EAttribute</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl
@@ -2915,14 +2942,6 @@ public interface HbmodelPackage extends EPackage {
EReference HB_ANNOTATED_EREFERENCE__HB_TYPE = eINSTANCE.getHbAnnotatedEReference_HbType();
/**
- * The meta object literal for the '<em><b>Batch Size</b></em>' reference feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference HB_ANNOTATED_EREFERENCE__BATCH_SIZE = eINSTANCE.getHbAnnotatedEReference_BatchSize();
-
- /**
* The meta object literal for the '<em><b>Any</b></em>' reference feature.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
index 802dcf704..330fd41d8 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEAttributeImpl;
import org.eclipse.emf.teneo.annotations.pannotation.Column;
import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
+import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
@@ -56,6 +57,7 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFormula <em>Formula</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbFetch <em>Hb Fetch</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getBatchSize <em>Batch Size</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbType <em>Hb Type</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getGenerated <em>Generated</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getNaturalId <em>Natural Id</em>}</li>
@@ -175,6 +177,16 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
protected Fetch hbFetch;
/**
+ * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBatchSize()
+ * @generated
+ * @ordered
+ */
+ protected BatchSize batchSize;
+
+ /**
* The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
@@ -612,6 +624,44 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public BatchSize getBatchSize() {
+ if (batchSize != null && batchSize.eIsProxy()) {
+ InternalEObject oldBatchSize = (InternalEObject)batchSize;
+ batchSize = (BatchSize)eResolveProxy(oldBatchSize);
+ if (batchSize != oldBatchSize) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE, oldBatchSize, batchSize));
+ }
+ }
+ return batchSize;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public BatchSize basicGetBatchSize() {
+ return batchSize;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setBatchSize(BatchSize newBatchSize) {
+ BatchSize oldBatchSize = batchSize;
+ batchSize = newBatchSize;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE, oldBatchSize, batchSize));
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -865,6 +915,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
if (resolve) return getHbFetch();
return basicGetHbFetch();
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE:
+ if (resolve) return getBatchSize();
+ return basicGetBatchSize();
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
return getHbType();
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
@@ -924,6 +977,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
setHbFetch((Fetch)newValue);
return;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE:
+ setBatchSize((BatchSize)newValue);
+ return;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
setHbType((Type)newValue);
return;
@@ -983,6 +1039,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
setHbFetch((Fetch)null);
return;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE:
+ setBatchSize((BatchSize)null);
+ return;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
setHbType((Type)null);
return;
@@ -1031,6 +1090,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
return formula != null;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH:
return hbFetch != null;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE:
+ return batchSize != null;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
return hbType != null;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
@@ -1069,6 +1130,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH;
+ case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE;
default: return -1;
}
}
@@ -1099,6 +1161,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_FETCH;
+ case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__BATCH_SIZE;
default: return -1;
}
}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
index 818b62d0e..335f37936 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
@@ -60,13 +60,13 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFormula <em>Formula</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbFetch <em>Hb Fetch</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getBatchSize <em>Batch Size</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCache <em>Hb Cache</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbOnDelete <em>Hb On Delete</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNaturalId <em>Natural Id</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getImmutable <em>Immutable</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNotFound <em>Not Found</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbType <em>Hb Type</em>}</li>
- * <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getBatchSize <em>Batch Size</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getAny <em>Any</em>}</li>
* <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getAnyMetaDef <em>Any Meta Def</em>}</li>
* </ul>
@@ -183,6 +183,16 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
protected Fetch hbFetch;
/**
+ * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getBatchSize()
+ * @generated
+ * @ordered
+ */
+ protected BatchSize batchSize;
+
+ /**
* The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
@@ -241,16 +251,6 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
protected Type hbType;
/**
- * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getBatchSize()
- * @generated
- * @ordered
- */
- protected BatchSize batchSize;
-
- /**
* The cached value of the '{@link #getAny() <em>Any</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1064,6 +1064,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
if (resolve) return getHbFetch();
return basicGetHbFetch();
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+ if (resolve) return getBatchSize();
+ return basicGetBatchSize();
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
return getHbCache();
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
@@ -1077,9 +1080,6 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
return getNotFound();
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
return getHbType();
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
- if (resolve) return getBatchSize();
- return basicGetBatchSize();
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
if (resolve) return getAny();
return basicGetAny();
@@ -1133,6 +1133,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
setHbFetch((Fetch)newValue);
return;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+ setBatchSize((BatchSize)newValue);
+ return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
setHbCache((Cache)newValue);
return;
@@ -1151,9 +1154,6 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
setHbType((Type)newValue);
return;
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
- setBatchSize((BatchSize)newValue);
- return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
setAny((Any)newValue);
return;
@@ -1204,6 +1204,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
setHbFetch((Fetch)null);
return;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+ setBatchSize((BatchSize)null);
+ return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
setHbCache((Cache)null);
return;
@@ -1222,9 +1225,6 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
setHbType((Type)null);
return;
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
- setBatchSize((BatchSize)null);
- return;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
setAny((Any)null);
return;
@@ -1264,6 +1264,8 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
return formula != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
return hbFetch != null;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+ return batchSize != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
return hbCache != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
@@ -1276,8 +1278,6 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
return notFound != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
return hbType != null;
- case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
- return batchSize != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
return any != null;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
@@ -1310,6 +1310,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH;
+ case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE;
default: return -1;
}
}
@@ -1340,6 +1341,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA;
case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH;
+ case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE;
default: return -1;
}
}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
index ae12b3643..a8fff04e4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
@@ -236,6 +236,15 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getHbAnnotatedETypeElement_BatchSize() {
+ return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(11);
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -511,16 +520,8 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
- public EReference getHbAnnotatedEReference_BatchSize() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
public EReference getHbAnnotatedEReference_Any() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(7);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(6);
}
/**
@@ -528,7 +529,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
* @generated
*/
public EReference getHbAnnotatedEReference_AnyMetaDef() {
- return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(8);
+ return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(7);
}
/**
@@ -624,6 +625,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY);
createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__FORMULA);
createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_FETCH);
+ createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__BATCH_SIZE);
hbAnnotatedEAttributeEClass = createEClass(HB_ANNOTATED_EATTRIBUTE);
createEReference(hbAnnotatedEAttributeEClass, HB_ANNOTATED_EATTRIBUTE__HB_TYPE);
@@ -663,7 +665,6 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__IMMUTABLE);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__NOT_FOUND);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__HB_TYPE);
- createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__BATCH_SIZE);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__ANY);
createEReference(hbAnnotatedEReferenceEClass, HB_ANNOTATED_EREFERENCE__ANY_META_DEF);
@@ -732,6 +733,7 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
initEReference(getHbAnnotatedETypeElement_MapKeyManyToMany(), theHbannotationPackage.getMapKeyManyToMany(), null, "mapKeyManyToMany", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedETypeElement_Formula(), theHbannotationPackage.getFormula(), null, "formula", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedETypeElement_HbFetch(), theHbannotationPackage.getFetch(), null, "hbFetch", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getHbAnnotatedETypeElement_BatchSize(), theHbannotationPackage.getBatchSize(), null, "batchSize", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(hbAnnotatedEAttributeEClass, HbAnnotatedEAttribute.class, "HbAnnotatedEAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getHbAnnotatedEAttribute_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -771,7 +773,6 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
initEReference(getHbAnnotatedEReference_Immutable(), theHbannotationPackage.getImmutable(), null, "immutable", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_NotFound(), theHbannotationPackage.getNotFound(), null, "notFound", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getHbAnnotatedEReference_BatchSize(), theHbannotationPackage.getBatchSize(), null, "batchSize", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_Any(), theHbannotationPackage.getAny(), null, "any", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getHbAnnotatedEReference_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(), null, "anyMetaDef", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
index 11b1adfbb..0f95cb951 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
@@ -665,12 +665,12 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
.getClause());
}
- final boolean hasBatchSize = paFeature instanceof HbAnnotatedEReference
- && ((HbAnnotatedEReference) paFeature).getBatchSize() != null;
+ final boolean hasBatchSize = paFeature instanceof HbAnnotatedETypeElement
+ && ((HbAnnotatedETypeElement) paFeature).getBatchSize() != null;
if (hasBatchSize) {
collectionElement.addAttribute("batch-size", ""
- + ((HbAnnotatedEReference) paFeature).getBatchSize().getSize());
+ + ((HbAnnotatedETypeElement) paFeature).getBatchSize().getSize());
}
return collectionElement;
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml
index 63013ddca..71f133760 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_e_o_hibernate.hbm.xml
@@ -51,7 +51,7 @@
<list-index column="`SIMPLELIST_FLOA_IDX`"/>
<element type="java.lang.Float"/>
</list>
- <list name="inte" fetch="subselect" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
+ <list name="inte" fetch="subselect" batch-size="10" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
<key foreign-key="SIMPLELIST_INTE_KEY" update="true">
<column name="`SIMPLELIST_INTE_E_ID`" unique="false"/>
</key>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml
index 6ac1f97da..568acfb0d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -54,7 +54,7 @@
<list-index column="`SIMPLELIST_FLOA_IDX`"/>
<element type="java.lang.Float"/>
</list>
- <list name="inte" fetch="subselect" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
+ <list name="inte" fetch="subselect" batch-size="10" table="`SIMPLELIST_INTE`" lazy="true" cascade="all">
<key foreign-key="SIMPLELIST_INTE_KEY" update="true">
<column name="`SIMPLELIST_INTE_E_ID`" unique="false"/>
</key>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore
index 104a0092a..7ad9042d8 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.ecore
@@ -129,7 +129,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="inte" unique="false" lowerBound="1"
upperBound="-1" eType="#//Int">
<eAnnotations source="teneo.jpa">
- <details key="appinfo" value="@Fetch(value=FetchMode.SUBSELECT)"/>
+ <details key="appinfo" value="@Fetch(value=FetchMode.SUBSELECT) @BatchSize(size=10)"/>
</eAnnotations>
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="element"/>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd
index b7d4913c1..ba1f6e1f1 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/model/simpletypes.xsd
@@ -47,7 +47,7 @@
<element maxOccurs="unbounded" name="floa" type="this:Float"/>
<element maxOccurs="unbounded" name="inte" type="this:Int">
<annotation>
- <appinfo source="teneo.jpa">@Fetch(value=FetchMode.SUBSELECT)</appinfo>
+ <appinfo source="teneo.jpa">@Fetch(value=FetchMode.SUBSELECT) @BatchSize(size=10)</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" name="long" type="this:Long">
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java
index 0a747a51c..118cd27c1 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/SimpleList.java
@@ -177,7 +177,7 @@ public interface SimpleList extends EObject {
* @return the value of the '<em>Inte</em>' attribute list.
* @see org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpletypesPackage#getSimpleList_Inte()
* @model unique="false" dataType="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.Int" required="true"
- * annotation="teneo.jpa appinfo='@Fetch(value=FetchMode.SUBSELECT)'"
+ * annotation="teneo.jpa appinfo='@Fetch(value=FetchMode.SUBSELECT) @BatchSize(size=10)'"
* extendedMetaData="kind='element' name='inte'"
* @generated
*/
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java
index aa9905b3b..981c29a0c 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/schemaconstructs/simpletypes/impl/SimpletypesPackageImpl.java
@@ -1384,7 +1384,7 @@ public class SimpletypesPackageImpl extends EPackageImpl implements SimpletypesP
(getSimpleList_Inte(),
source,
new String[] {
- "appinfo", "@Fetch(value=FetchMode.SUBSELECT)"
+ "appinfo", "@Fetch(value=FetchMode.SUBSELECT) @BatchSize(size=10)"
});
addAnnotation
(getSimpleList_Long(),

Back to the top