|
@@ -7,16 +7,16 @@ |
7 |
7 |
|
|
8 |
8 |
|
import org.litesoft.bo.*; |
9 |
9 |
|
import org.litesoft.changemanagement.ServerStateChange.*; |
10 |
|
- |
import org.litesoft.core.util.*; |
11 |
10 |
|
import org.litesoft.core.*; |
|
11 |
+ |
import org.litesoft.core.util.*; |
12 |
12 |
|
import org.litesoft.db.*; |
13 |
13 |
|
import org.litesoft.encryption.symmetric.*; |
14 |
14 |
|
import org.litesoft.orsup.base.*; |
15 |
15 |
|
import org.litesoft.orsup.lazyload.*; |
16 |
16 |
|
import org.litesoft.orsup.otherattributeaccessors.*; |
17 |
17 |
|
import org.litesoft.orsup.selection.*; |
18 |
|
- |
import org.litesoft.orsup.selection.nonpublic.*; |
19 |
18 |
|
import org.litesoft.orsup.selection.nonpublic.IllegalArgument; |
|
19 |
+ |
import org.litesoft.orsup.selection.nonpublic.*; |
20 |
20 |
|
import org.litesoft.orsup.transact.*; |
21 |
21 |
|
import org.litesoft.sequences.*; |
22 |
22 |
|
import org.litesoft.util.*; |
|
@@ -42,8 +42,7 @@ |
42 |
42 |
|
private Map<String, Object> mDynamicValueMap = null; |
43 |
43 |
|
private int mChangeNumber = INITIAL_CHANGE_NUMBER; |
44 |
44 |
|
|
45 |
|
- |
private PersistentObjectImpl( MetaDataForPO pMetaDataForPO, Transaction pTransaction, boolean pNew, ConstructionControl pConstructionControlExpected, |
46 |
|
- |
ConstructionControl pConstructionControlActual ) |
|
45 |
+ |
private PersistentObjectImpl( MetaDataForPO pMetaDataForPO, Transaction pTransaction, boolean pNew, ConstructionControl pConstructionControlExpected, ConstructionControl pConstructionControlActual ) |
47 |
46 |
|
{ |
48 |
47 |
|
mMetaDataForPO = pMetaDataForPO; |
49 |
48 |
|
mNew = pNew; |
|
@@ -84,8 +83,7 @@ |
84 |
83 |
|
this( pMetaDataForPO, pTransaction, true, null, null ); |
85 |
84 |
|
} |
86 |
85 |
|
|
87 |
|
- |
protected PersistentObjectImpl( MetaDataForPO pMetaDataForPO, ConstructionControl pConstructionControlExpected, |
88 |
|
- |
ConstructionControl pConstructionControlActual ) |
|
86 |
+ |
protected PersistentObjectImpl( MetaDataForPO pMetaDataForPO, ConstructionControl pConstructionControlExpected, ConstructionControl pConstructionControlActual ) |
89 |
87 |
|
{ |
90 |
88 |
|
this( pMetaDataForPO, null, false, pConstructionControlExpected, pConstructionControlActual ); |
91 |
89 |
|
} |
|
@@ -95,7 +93,7 @@ |
95 |
93 |
|
PersistentObjectImpl<T> po = getTransactionBackdoor().addPO( this ); |
96 |
94 |
|
if ( po != this ) // Identity check / this method called outside of 'new' constructor |
97 |
95 |
|
{ |
98 |
|
- |
throw new IllegalStateException( "Apparently 'new' object already in Transaction?\nthis=" + this); |
|
96 |
+ |
throw new IllegalStateException( "Apparently 'new' object already in Transaction?\nthis=" + this ); |
99 |
97 |
|
} |
100 |
98 |
|
} |
101 |
99 |
|
|
|
@@ -123,7 +121,7 @@ |
123 |
121 |
|
@SuppressWarnings({"unchecked"}) |
124 |
122 |
|
public void setCommitTimestamps( Timestamp pTransactionTimeStamp ) |
125 |
123 |
|
{ |
126 |
|
- |
((MetaDataForPOinternalExtension)getMetaDataForPO()).setCommitTimestamps( this, pTransactionTimeStamp ); |
|
124 |
+ |
((MetaDataForPOinternalExtension) getMetaDataForPO()).setCommitTimestamps( this, pTransactionTimeStamp ); |
127 |
125 |
|
} |
128 |
126 |
|
|
129 |
127 |
|
/** |
|
@@ -604,8 +602,7 @@ |
604 |
602 |
|
{ |
605 |
603 |
|
return ((WhereClauseToSQLable) key).toSqlValueForEquals(); |
606 |
604 |
|
} |
607 |
|
- |
throw new UnsupportedOperationException( |
608 |
|
- |
"WhereClause support constrained to non-new POs with a single column unique key. Not: " + (isNew() ? " New " : "") + getObjectName() + "s." ); |
|
605 |
+ |
throw new UnsupportedOperationException( "WhereClause support constrained to non-new POs with a single column unique key. Not: " + (isNew() ? " New " : "") + getObjectName() + "s." ); |
609 |
606 |
|
} |
610 |
607 |
|
|
611 |
608 |
|
public final boolean equals( PersistentObject pThem ) |
|
@@ -834,8 +831,7 @@ |
834 |
831 |
|
} |
835 |
832 |
|
} |
836 |
833 |
|
|
837 |
|
- |
private boolean verifyMutabilityOnChangeToOne( AbstractAttributeAccessorSCDtoOne pSupplimentedSCDtoOne, PersistentObjectImpl pOldThem, Object pOldKey, |
838 |
|
- |
PersistentObjectImpl pNewThem, Object pNewKey ) |
|
834 |
+ |
private boolean verifyMutabilityOnChangeToOne( AbstractAttributeAccessorSCDtoOne pSupplimentedSCDtoOne, PersistentObjectImpl pOldThem, Object pOldKey, PersistentObjectImpl pNewThem, Object pNewKey ) |
839 |
835 |
|
{ |
840 |
836 |
|
return verifyMutabilityOnChange( pSupplimentedSCDtoOne, // |
841 |
837 |
|
new ToOneChangeEntry( pOldThem, pOldKey ), // |
|
@@ -926,9 +922,7 @@ |
926 |
922 |
|
|
927 |
923 |
|
if ( SupplimentedSCD.Form.ToMany.equals( pSupplimentedSCD.getForm() ) ) |
928 |
924 |
|
{ |
929 |
|
- |
throw new IllegalStateException( |
930 |
|
- |
"Attempt to record change on ToMany attribute (" + zAttributeName + ") on PO (" + this + ") from (" + pOldValue + ") to (" + pNewValue + |
931 |
|
- |
")!" ); |
|
925 |
+ |
throw new IllegalStateException( "Attempt to record change on ToMany attribute (" + zAttributeName + ") on PO (" + this + ") from (" + pOldValue + ") to (" + pNewValue + ")!" ); |
932 |
926 |
|
} |
933 |
927 |
|
if ( pSupplimentedSCD.isPersisted() ) |
934 |
928 |
|
{ |
|
@@ -1410,8 +1404,7 @@ |
1410 |
1404 |
|
pPersistentObject.processLazyLoadMutation( pValueHolder, pNewThem, pBackRefAttributeNameOnNewThem ); |
1411 |
1405 |
|
} |
1412 |
1406 |
|
|
1413 |
|
- |
public static boolean verifyMutabilityOnChangeToOneOn( PersistentObjectImpl pPersistentObject, AbstractAttributeAccessorSCDtoOne pSupplimentedSCDtoOne, |
1414 |
|
- |
PersistentObjectImpl pOldThem, Object pOldKey, PersistentObjectImpl pNewThem, Object pNewKey ) |
|
1407 |
+ |
public static boolean verifyMutabilityOnChangeToOneOn( PersistentObjectImpl pPersistentObject, AbstractAttributeAccessorSCDtoOne pSupplimentedSCDtoOne, PersistentObjectImpl pOldThem, Object pOldKey, PersistentObjectImpl pNewThem, Object pNewKey ) |
1415 |
1408 |
|
{ |
1416 |
1409 |
|
return pPersistentObject.verifyMutabilityOnChangeToOne( pSupplimentedSCDtoOne, // |
1417 |
1410 |
|
pOldThem, pOldKey, // |