From 59635eddf195875361102180495d1d31939f7a4e Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 24 Oct 2013 21:45:11 +0200
Subject: [PATCH] [Minor] modified how objects are added to the ObjectFilter

Now objects are not added by their class names, but the type is
retrieved from the object reference
---
 src/main/java/ch/eitchnet/xmlpers/api/ObjectDao.java | 12 ++++++------
 .../api/PersistenceContextFactoryDelegator.java      |  2 --
 .../ch/eitchnet/xmlpers/test/impl/TestConstants.java |  7 ++-----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/ch/eitchnet/xmlpers/api/ObjectDao.java b/src/main/java/ch/eitchnet/xmlpers/api/ObjectDao.java
index c884db65f..aba2fc7b5 100644
--- a/src/main/java/ch/eitchnet/xmlpers/api/ObjectDao.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/ObjectDao.java
@@ -58,7 +58,7 @@ public class ObjectDao {
 		PersistenceContext<T> ctx = createCtx(object);
 		ctx.setObject(object);
 		ctx.getObjectRef().lock();
-		this.objectFilter.add(object.getClass().getName(), ctx);
+		this.objectFilter.add(ctx.getObjectRef().getType(), ctx);
 	}
 
 	public <T> void addAll(List<T> objects) {
@@ -69,7 +69,7 @@ public class ObjectDao {
 				PersistenceContext<T> ctx = createCtx(object);
 				ctx.setObject(object);
 				ctx.getObjectRef().lock();
-				this.objectFilter.add(object.getClass().getName(), ctx);
+				this.objectFilter.add(ctx.getObjectRef().getType(), ctx);
 			}
 		}
 	}
@@ -80,7 +80,7 @@ public class ObjectDao {
 		PersistenceContext<T> ctx = createCtx(object);
 		ctx.setObject(object);
 		ctx.getObjectRef().lock();
-		this.objectFilter.update(object.getClass().getName(), ctx);
+		this.objectFilter.update(ctx.getObjectRef().getType(), ctx);
 	}
 
 	public <T> void updateAll(List<T> objects) {
@@ -91,7 +91,7 @@ public class ObjectDao {
 				PersistenceContext<T> ctx = createCtx(object);
 				ctx.setObject(object);
 				ctx.getObjectRef().lock();
-				this.objectFilter.update(object.getClass().getName(), ctx);
+				this.objectFilter.update(ctx.getObjectRef().getType(), ctx);
 			}
 		}
 	}
@@ -102,7 +102,7 @@ public class ObjectDao {
 		PersistenceContext<T> ctx = createCtx(object);
 		ctx.setObject(object);
 		ctx.getObjectRef().lock();
-		this.objectFilter.remove(object.getClass().getName(), ctx);
+		this.objectFilter.remove(ctx.getObjectRef().getType(), ctx);
 	}
 
 	public <T> void removeAll(List<T> objects) {
@@ -113,7 +113,7 @@ public class ObjectDao {
 				PersistenceContext<T> ctx = createCtx(object);
 				ctx.setObject(object);
 				ctx.getObjectRef().lock();
-				this.objectFilter.remove(object.getClass().getName(), ctx);
+				this.objectFilter.remove(ctx.getObjectRef().getType(), ctx);
 			}
 		}
 	}
diff --git a/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContextFactoryDelegator.java b/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContextFactoryDelegator.java
index bddabd33c..da0a8056e 100644
--- a/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContextFactoryDelegator.java
+++ b/src/main/java/ch/eitchnet/xmlpers/api/PersistenceContextFactoryDelegator.java
@@ -44,8 +44,6 @@ public class PersistenceContextFactoryDelegator {
 
 		this.contextFactoryCacheByClass.put(classType, ctxFactory);
 		this.contextFactoryCacheByType.put(type, ctxFactory);
-		if (!classType.getName().equals(type))
-			this.contextFactoryCacheByType.put(classType.getName(), ctxFactory);
 	}
 
 	public <T> PersistenceContextFactory<T> getCtxFactory(Class<?> classType) {
diff --git a/src/test/java/ch/eitchnet/xmlpers/test/impl/TestConstants.java b/src/test/java/ch/eitchnet/xmlpers/test/impl/TestConstants.java
index 1ac98b08c..18ec8cafd 100644
--- a/src/test/java/ch/eitchnet/xmlpers/test/impl/TestConstants.java
+++ b/src/test/java/ch/eitchnet/xmlpers/test/impl/TestConstants.java
@@ -21,15 +21,12 @@
  */
 package ch.eitchnet.xmlpers.test.impl;
 
-import ch.eitchnet.xmlpers.test.model.Book;
-import ch.eitchnet.xmlpers.test.model.Resource;
-
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
  * 
  */
 public class TestConstants {
 
-	public static final String TYPE_RES = Resource.class.getSimpleName();
-	public static final String TYPE_BOOK = Book.class.getSimpleName();
+	public static final String TYPE_RES = "Resource"; //$NON-NLS-1$
+	public static final String TYPE_BOOK = "Book"; //$NON-NLS-1$
 }