[Joafip-svn] SF.net SVN: joafip:[2926] trunk
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[2926] trunk
|
From: <luc...@us...> - 2011-10-17 03:49:28
|
Revision: 2926
http://joafip.svn.sourceforge.net/joafip/?rev=2926&view=rev
Author: luc_peuvrier
Date: 2011-10-17 03:49:21 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
substitution management refactoring
Modified Paths:
--------------
trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java
trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfoAttributes.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/classinfo/AbstractClassInfoTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -233,43 +233,43 @@
}
@Override
- public void setSubstitution(final Class<?> replaced,
+ public void setWriteSubstitution(final Class<?> replaced,
final Class<?> substitute, final ISubsituteSynchronizer synchronizer)
throws FilePersistenceException {
try {
- store.setSubstitution(replaced, substitute, synchronizer);
+ store.setWriteSubstitution(replaced, substitute, synchronizer);
} catch (final StoreException exception) {
throw new FilePersistenceException(exception);
}
}
@Override
- public void removeSubstitution(final Class<?> replaced)
+ public void removeWriteSubstitution(final Class<?> replaced)
throws FilePersistenceException {
try {
- store.removeSubstitution(replaced);
+ store.removeWriteSubstitution(replaced);
} catch (final StoreException exception) {
throw new FilePersistenceException(exception);
}
}
@Override
- public void setSubstitution(final String replacedName,
+ public void setWriteSubstitution(final String replacedName,
final Class<?> substitute, final ISubsituteSynchronizer synchronizer)
throws FilePersistenceException {
try {
- store.setSubstitution(replacedName, substitute, synchronizer);
+ store.setWriteSubstitution(replacedName, substitute, synchronizer);
} catch (final StoreException exception) {
throw new FilePersistenceException(exception);
}
}
@Override
- public void removeSubstitution(final String replacedName)
+ public void removeWriteSubstitution(final String replacedName)
throws FilePersistenceException,
FilePersistenceClassNotFoundException {
try {
- store.removeSubstitution(replacedName);
+ store.removeWriteSubstitution(replacedName);
} catch (final StoreException exception) {
throw new FilePersistenceException(exception);
} catch (final StoreClassNotFoundException exception) {
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -308,7 +308,7 @@
.forName(synchronizerClassName);
final ISubsituteSynchronizer synchronizer = synchronizerClass
.newInstance();
- setSubstitution(toSubstituteClass, substituteClass,
+ setWriteSubstitution(toSubstituteClass, substituteClass,
synchronizer);
} catch (final ClassNotFoundException exception) {
throw new FilePersistenceException(exception);
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -126,7 +126,7 @@
/**
* record a class substitution at write<br>
* if class is not accessible see
- * {@link #setSubstitution(String, Class, ISubsituteSynchronizer)} <br>
+ * {@link #setWriteSubstitution(String, Class, ISubsituteSynchronizer)} <br>
* (PROPS) can be set using properties file see
* {@link net.sf.joafip.service.FilePersistence#FilePersistence(String, boolean)}
* <br>
@@ -139,11 +139,12 @@
* the state synchronizer for class and its substitute
* @throws FilePersistenceException
*/
- void setSubstitution(Class<?> replaced, Class<?> substitute,
+ void setWriteSubstitution(Class<?> replaced, Class<?> substitute,
ISubsituteSynchronizer synchronizer)
throws FilePersistenceException;
- void removeSubstitution(Class<?> replaced) throws FilePersistenceException;
+ void removeWriteSubstitution(Class<?> replaced)
+ throws FilePersistenceException;
/**
* record a class substitution at write<br>
@@ -159,11 +160,11 @@
* the state synchronizer for class and its substitute
* @throws FilePersistenceException
*/
- void setSubstitution(String replacedName, Class<?> substitute,
+ void setWriteSubstitution(String replacedName, Class<?> substitute,
ISubsituteSynchronizer synchronizer)
throws FilePersistenceException;
- void removeSubstitution(String replacedName)
+ void removeWriteSubstitution(String replacedName)
throws FilePersistenceException,
FilePersistenceClassNotFoundException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -940,24 +940,20 @@
notCheckedMethodSet.add(absoluteMethodName);
}
- public void setSubstitute(final ClassInfo substituteClassInfo,
+ public void setSubstituted(final ClassInfo substituteClassInfo,
final ISubstituteObjectManager substituteObjectManager) {
substituted = true;
this.substituteObjectManager = substituteObjectManager;
this.substituteClassInfo = substituteClassInfo;
+ substituteClassInfo.substituteObjectManager = substituteObjectManager;
+ substituteClassInfo.substitution = true;
+ substituteClassInfo.substituteOfClassInfo = this;
}
public boolean isSubstituted() {
return substituted;
}
- public void setSubstituteOf(final ClassInfo substituteOfClassInfo,
- final ISubstituteObjectManager substituteObjectManager) {
- substitution = true;
- this.substituteObjectManager = substituteObjectManager;
- this.substituteOfClassInfo = substituteOfClassInfo;
- }
-
public ClassInfo getSubstituteOfClassInfo() {
return substituteOfClassInfo;
}
@@ -1139,7 +1135,7 @@
this.useSpecificObjectIO = useSpecificObjectIO;
}
- public void setSubstitution(final ClassInfo substituteClassInfo,
+ public void setWriteSubstituted(final ClassInfo substituteClassInfo,
final ISubsituteSynchronizer subsituteSynchronizer) {
this.substituteClassInfo = substituteClassInfo;
this.subsituteSynchronizer = subsituteSynchronizer;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfoAttributes.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfoAttributes.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfoAttributes.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -63,7 +63,7 @@
private ISubstituteObjectManager substituteObjectManager;
- private Class<?> substitute;
+ private Class<?> writeSubstitution;
private ISubsituteSynchronizer synchronizer;
@@ -172,14 +172,14 @@
return substituteObjectManager;
}
- public void setSubstitution(final Class<?> substitute,
+ public void setWriteSubstitution(final Class<?> writeSubstitution,
final ISubsituteSynchronizer synchronizer) {
- this.substitute = substitute;
+ this.writeSubstitution = writeSubstitution;
this.synchronizer = synchronizer;
}
- public Class<?> getSubstitute() {
- return substitute;
+ public Class<?> getWriteSubstition() {
+ return writeSubstitution;
}
public ISubsituteSynchronizer getSynchronizer() {
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -135,15 +135,15 @@
* the state synchronizer for class and its substitute
* @throws StoreException
*/
- void setSubstitution(Class<?> replaced, Class<?> substitute,
+ void setWriteSubstitution(Class<?> replaced, Class<?> substitute,
ISubsituteSynchronizer synchronizer) throws StoreException;
- void removeSubstitution(Class<?> replaced) throws StoreException;
+ void removeWriteSubstitution(Class<?> replaced) throws StoreException;
- void setSubstitution(String replacedName, Class<?> substitute,
+ void setWriteSubstitution(String replacedName, Class<?> substitute,
ISubsituteSynchronizer synchronizer) throws StoreException;
- void removeSubstitution(String replacedName) throws StoreException,
+ void removeWriteSubstitution(String replacedName) throws StoreException,
StoreClassNotFoundException;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -224,54 +224,56 @@
final MapSynchronizer mapSynchronizer = new MapSynchronizer();
final ListSynchronizer listSynchronizer = new ListSynchronizer();
- setSubstitution(Vector.class, PVector.class, listSynchronizer);
+ setWriteSubstitution(Vector.class, PVector.class, listSynchronizer);
- setSubstitution(LinkedList.class, PLinkedList.class,
+ setWriteSubstitution(LinkedList.class, PLinkedList.class,
listSynchronizer);
- setSubstitution(ArrayList.class, PArrayList.class, listSynchronizer);
+ setWriteSubstitution(ArrayList.class, PArrayList.class,
+ listSynchronizer);
- setSubstitution(HashSet.class, PHashSet.class, setSynchronizer);
+ setWriteSubstitution(HashSet.class, PHashSet.class, setSynchronizer);
- setSubstitution(LinkedHashSet.class, PLinkedHashSet.class,
+ setWriteSubstitution(LinkedHashSet.class, PLinkedHashSet.class,
setSynchronizer);
- setSubstitution(TreeSet.class, PTreeSet.class, setSynchronizer);
+ setWriteSubstitution(TreeSet.class, PTreeSet.class, setSynchronizer);
- setSubstitution(Hashtable.class, PHashMap.class, mapSynchronizer);
+ setWriteSubstitution(Hashtable.class, PHashMap.class,
+ mapSynchronizer);
- setSubstitution(HashMap.class, PHashMap.class, mapSynchronizer);
+ setWriteSubstitution(HashMap.class, PHashMap.class, mapSynchronizer);
- setSubstitution(ConcurrentHashMap.class, PConcurrentHashMap.class,
- mapSynchronizer);
+ setWriteSubstitution(ConcurrentHashMap.class,
+ PConcurrentHashMap.class, mapSynchronizer);
- setSubstitution(LinkedHashMap.class, PLinkedHashMap.class,
+ setWriteSubstitution(LinkedHashMap.class, PLinkedHashMap.class,
mapSynchronizer);
- setSubstitution(TreeMap.class, PTreeMap.class, mapSynchronizer);
+ setWriteSubstitution(TreeMap.class, PTreeMap.class, mapSynchronizer);
} else {
- removeSubstitution(Vector.class);
+ removeWriteSubstitution(Vector.class);
- removeSubstitution(LinkedList.class);
+ removeWriteSubstitution(LinkedList.class);
- removeSubstitution(ArrayList.class);
+ removeWriteSubstitution(ArrayList.class);
- removeSubstitution(HashSet.class);
+ removeWriteSubstitution(HashSet.class);
- removeSubstitution(LinkedHashSet.class);
+ removeWriteSubstitution(LinkedHashSet.class);
- removeSubstitution(TreeSet.class);
+ removeWriteSubstitution(TreeSet.class);
- removeSubstitution(Hashtable.class);
+ removeWriteSubstitution(Hashtable.class);
- removeSubstitution(HashMap.class);
+ removeWriteSubstitution(HashMap.class);
- removeSubstitution(ConcurrentHashMap.class);
+ removeWriteSubstitution(ConcurrentHashMap.class);
- removeSubstitution(LinkedHashMap.class);
+ removeWriteSubstitution(LinkedHashMap.class);
- removeSubstitution(TreeMap.class);
+ removeWriteSubstitution(TreeMap.class);
}
}
@@ -349,7 +351,7 @@
}
@Override
- public final void setSubstitution(final Class<?> replacedClass,
+ public final void setWriteSubstitution(final Class<?> replacedClass,
final Class<?> substituteClass,
final ISubsituteSynchronizer subsituteSynchronizer)
throws StoreException {
@@ -359,7 +361,7 @@
.getNoProxyClassInfo(replacedClass);
final ClassInfo substituteClassInfo = classInfoFactory
.getNoProxyClassInfo(substituteClass);
- replacedClassInfo.setSubstitution(substituteClassInfo,
+ replacedClassInfo.setWriteSubstituted(substituteClassInfo,
subsituteSynchronizer);
} catch (final ClassInfoException exception) {
throw new StoreException(exception);
@@ -368,7 +370,7 @@
}
@Override
- public void removeSubstitution(final Class<?> replacedClass)
+ public void removeWriteSubstitution(final Class<?> replacedClass)
throws StoreException {
synchronized (mutex) {
try {
@@ -382,12 +384,12 @@
}
@Override
- public void setSubstitution(final String replacedName,
+ public void setWriteSubstitution(final String replacedName,
final Class<?> substitute, final ISubsituteSynchronizer synchronizer)
throws StoreException {
synchronized (mutex) {
try {
- classInfoFactory.setSubstitution(replacedName, substitute,
+ classInfoFactory.setWriteSubstitution(replacedName, substitute,
synchronizer);
} catch (final ClassInfoException exception) {
throw new StoreException(exception);
@@ -396,7 +398,7 @@
}
@Override
- public void removeSubstitution(final String replacedName)
+ public void removeWriteSubstitution(final String replacedName)
throws StoreException, StoreClassNotFoundException {
synchronized (mutex) {
try {
@@ -773,10 +775,8 @@
.getNoProxyClassInfo(objectClass);
final ClassInfo substituteClassInfo = classInfoFactory
.getNoProxyClassInfo(substituteObjectClass);
- classInfo.setSubstitute(substituteClassInfo,
+ classInfo.setSubstituted(substituteClassInfo,
substituteObjectManager);
- substituteClassInfo.setSubstituteOf(classInfo,
- substituteObjectManager);
} catch (final Exception exception) {
throw new StoreException(exception);
}
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -394,15 +394,13 @@
if (classInfoAttributes.haveSubstituteObjectManager()) {
final ClassInfo substituteClassInfo = getNoProxyClassInfo(classInfoAttributes
.getSubstituteObjectClass());
- classInfo.setSubstitute(substituteClassInfo,
+ classInfo.setSubstituted(substituteClassInfo,
classInfoAttributes.getSubstituteObjectManager());
- substituteClassInfo.setSubstituteOf(classInfo,
- classInfoAttributes.getSubstituteObjectManager());
}
- if (classInfoAttributes.getSubstitute() != null) {
+ if (classInfoAttributes.getWriteSubstition() != null) {
final ClassInfo substituteClassInfo = getNoProxyClassInfo(classInfoAttributes
- .getSubstitute());
- classInfo.setSubstitution(substituteClassInfo,
+ .getWriteSubstition());
+ classInfo.setWriteSubstituted(substituteClassInfo,
classInfoAttributes.getSynchronizer());
}
if (classInfoAttributes.getObjectInput() != null
@@ -556,24 +554,24 @@
substituteObjectClass, substituteObjectManager);
} else {
final ClassInfo substituteClassInfo = getNoProxyClassInfo(substituteObjectClass);
- classInfo.setSubstitute(substituteClassInfo,
+ classInfo.setSubstituted(substituteClassInfo,
substituteObjectManager);
- substituteClassInfo.setSubstituteOf(classInfo,
+ substituteClassInfo.setSubstituted(classInfo,
substituteObjectManager);
}
}
@Override
- public void setSubstitution(final String replacedName,
+ public void setWriteSubstitution(final String replacedName,
final Class<?> substitute, final ISubsituteSynchronizer synchronizer)
throws ClassInfoException {
final ClassInfo classInfo = classInfoMap.get(replacedName);
if (classInfo == null) {
final ClassInfoAttributes classInfoAttributes = getOrCreateClassInfoAttribute(replacedName);
- classInfoAttributes.setSubstitution(substitute, synchronizer);
+ classInfoAttributes.setWriteSubstitution(substitute, synchronizer);
} else {
final ClassInfo substituteClassInfo = getNoProxyClassInfo(substitute);
- classInfo.setSubstitution(substituteClassInfo, synchronizer);
+ classInfo.setWriteSubstituted(substituteClassInfo, synchronizer);
}
}
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -101,7 +101,7 @@
ISubstituteObjectManager substituteObjectManager)
throws ClassInfoException;
- void setSubstitution(String replacedName, Class<?> substitute,
+ void setWriteSubstitution(String replacedName, Class<?> substitute,
ISubsituteSynchronizer synchronizer) throws ClassInfoException;
void setObjectIOForClass(String objectClassName, IObjectInput objectInput,
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -595,10 +595,8 @@
if (objectAndPersistInfo == null) {
objectAndPersistInfo = createObjectReadingInStore(
dataRecordIdentifier, notLazy);
- } else if (objectAndPersistInfo.isSubstitution()) {
- objectAndPersistInfo = substitutionOrOriginal(objectAndPersistInfo);
}
- return objectAndPersistInfo;
+ return original(objectAndPersistInfo);
}
/**
@@ -710,7 +708,7 @@
}
notToGarbage(dataRecordIdentifier, objectAndPersistInfo);
- return substitutionOrOriginal(objectAndPersistInfo);
+ return original(objectAndPersistInfo);
}
private boolean assertOriginalClassInfo(final ClassInfo classInfo,
@@ -927,15 +925,15 @@
return replacementDefList;
}
- protected ObjectAndPersistInfo substitutionOrOriginal(
+ protected ObjectAndPersistInfo original(
final ObjectAndPersistInfo objectAndPersistInfo)
throws ObjectIOException, ObjectIODataCorruptedException,
ObjectIODataRecordNotFoundException, ObjectIOInvalidClassException,
ObjectIOClassNotFoundException, ObjectIONotSerializableException {
final ObjectAndPersistInfo result;
if (objectAndPersistInfo.isSubstitution()) {
- final ClassInfo classInfo2 = objectAndPersistInfo.objectClassInfo;
- final ISubstituteObjectManager substituteObjectManager = classInfo2
+ final ClassInfo classInfo = objectAndPersistInfo.objectClassInfo;
+ final ISubstituteObjectManager substituteObjectManager = classInfo
.getSubstituteObjectManager();
/*
* substituted in storage, the original object before to be
@@ -947,10 +945,10 @@
/* original/substituted in storage is not persisted, never a proxy */
result = getOrCreateObjectPersistInfoOfObject(substitutedObject,
- Boolean.FALSE, classInfo2.getSubstituteOfClassInfo(), false/*
- * not
- * persisted
- */);
+ Boolean.FALSE, classInfo.getSubstituteOfClassInfo(), false/*
+ * not
+ * persisted
+ */);
} else {
result = objectAndPersistInfo;
}
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -96,7 +96,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
try {
filePersistence.close();
} catch (final Exception exception) {// NOPMD
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/entity/classinfo/AbstractClassInfoTest.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/entity/classinfo/AbstractClassInfoTest.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/entity/classinfo/AbstractClassInfoTest.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -189,7 +189,7 @@
}
@Override
- public void setSubstitution(final String replacedName,
+ public void setWriteSubstitution(final String replacedName,
final Class<?> substitute, final ISubsituteSynchronizer synchronizer)
throws ClassInfoException {
throw new UnsupportedOperationException();
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -624,12 +624,12 @@
public void removeSubstitution(final Class<?> replacedClass)
throws StoreException {
- store.removeSubstitution(replacedClass);
+ store.removeWriteSubstitution(replacedClass);
}
public void removeSubstitution(final String replacedName)
throws StoreException, StoreClassNotFoundException {
- store.removeSubstitution(replacedName);
+ store.removeWriteSubstitution(replacedName);
}
public void save(final boolean closing, final boolean autoSave)
@@ -899,18 +899,18 @@
substituteObjectClass, substituteObjectManager);
}
- public final void setSubstitution(final Class<?> replacedClass,
+ public final void setWriteSubstitution(final Class<?> replacedClass,
final Class<?> substituteClass,
final ISubsituteSynchronizer subsituteSynchronizer)
throws StoreException {
- store.setSubstitution(replacedClass, substituteClass,
+ store.setWriteSubstitution(replacedClass, substituteClass,
subsituteSynchronizer);
}
- public void setSubstitution(final String replacedName,
+ public void setWriteSubstitution(final String replacedName,
final Class<?> substitute, final ISubsituteSynchronizer synchronizer)
throws StoreException {
- store.setSubstitution(replacedName, substitute, synchronizer);
+ store.setWriteSubstitution(replacedName, substitute, synchronizer);
}
public void setSubstitutionOfJavaUtilCollection(final boolean enabled)
Modified: trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
===================================================================
--- trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java 2011-10-17 02:46:26 UTC (rev 2925)
+++ trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java 2011-10-17 03:49:21 UTC (rev 2926)
@@ -24,13 +24,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import net.sf.joafip.service.TestExportImport;
-import net.sf.joafip.service.rel310.TestImport301ConversionA;
-import net.sf.joafip.service.rel310.TestImport301ConversionB;
-import net.sf.joafip.service.rel310.TestUseRuntime301LazyConversionA;
-import net.sf.joafip.service.rel310.TestUseRuntime301LazyConversionB;
-import net.sf.joafip.service.rel310.TestUseRuntime301NotLazyConversionA;
-import net.sf.joafip.service.rel310.TestUseRuntime301NotLazyConversionB;
+import net.sf.joafip.service.bug.savenum.TestEnumKeptInMemory;
+import net.sf.joafip.service.rel300.TestClassLoaderPersistence;
+import net.sf.joafip.service.rel300.TestKeptInMemory;
+import net.sf.joafip.service.rel300.TestSubstitutionSerialize;
+import net.sf.joafip.service.rel300.TestSubstitutionSerializeReadWriteMethod;
+import net.sf.joafip.service.rel300.TestSubstitutionSubstitutedSerializable;
+import net.sf.joafip.service.rel300.TestSubstitutionWithDataAccessSession;
/**
*
@@ -47,13 +47,13 @@
public static Test suite() {
final TestSuite suite = new TestSuite("in error Tests");
// $JUnit-BEGIN$
- suite.addTestSuite(TestExportImport.class);
- suite.addTestSuite(TestImport301ConversionA.class);
- suite.addTestSuite(TestImport301ConversionB.class);
- suite.addTestSuite(TestUseRuntime301LazyConversionA.class);
- suite.addTestSuite(TestUseRuntime301LazyConversionB.class);
- suite.addTestSuite(TestUseRuntime301NotLazyConversionA.class);
- suite.addTestSuite(TestUseRuntime301NotLazyConversionB.class);
+ suite.addTestSuite(TestEnumKeptInMemory.class);
+ suite.addTestSuite(TestSubstitutionWithDataAccessSession.class);
+ suite.addTestSuite(TestSubstitutionSubstitutedSerializable.class);
+ suite.addTestSuite(TestSubstitutionSerialize.class);
+ suite.addTestSuite(TestSubstitutionSerializeReadWriteMethod.class);
+ suite.addTestSuite(TestClassLoaderPersistence.class);
+ suite.addTestSuite(TestKeptInMemory.class);
// suite.addTest(xxxx.suite());
// $JUnit-END$
return suite;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
