Better way to check for CGLIB objects

Author: emacarron

src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java

@@ -26,6 +26,8 @@
 
 import javax.sql.DataSource;
 
+import net.sf.cglib.proxy.Factory;
+
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.Configuration;
@@ -339,7 +341,7 @@ public void shouldFetchPostsForBlog() throws Exception {
       List<Post> posts = executor.query(selectPosts, 1, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
       executor.flushStatements();
       assertEquals(2, posts.size());
-      assertTrue(posts.get(1).getClass().getName().contains("CGLIB"));
+      assertTrue(posts.get(1) instanceof Factory);
       assertNotNull(posts.get(1).getBlog());
       assertEquals(1, posts.get(1).getBlog().getId());
       executor.rollback(true);

src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java

@@ -23,6 +23,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import net.sf.cglib.proxy.Factory;
+
 import org.apache.ibatis.executor.ExecutorException;
 import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
 import org.apache.ibatis.session.Configuration;
@@ -42,7 +44,7 @@ public void shouldCreateAProxyForAPartiallyLoadedBean() throws Exception {
     loader.addLoader("id", null, null);
     Object proxy = proxyFactory.createProxy(author, loader, new Configuration(), new DefaultObjectFactory(), new ArrayList<Class<?>>(), new ArrayList<Object>());
     Author author2 = (Author) deserialize(serialize((Serializable) proxy));
-    assertTrue(author2.getClass().getName().contains("CGLIB"));
+    assertTrue(author2 instanceof Factory);
   }
 
   @Test(expected = ExecutorException.class)

src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java

@@ -44,7 +44,6 @@ public void shouldCreateAProxyForAPartiallyLoadedBean() throws Exception {
     loader.addLoader("id", null, null);
     Object proxy = proxyFactory.createProxy(author, loader, new Configuration(), new DefaultObjectFactory(), new ArrayList<Class<?>>(), new ArrayList<Object>());
     Author author2 = (Author) deserialize(serialize((Serializable) proxy));
-//    assertTrue(author2.getClass().getName().contains("CGLIB"));
     assertTrue(author2 instanceof Proxy);
   }
 

src/test/java/org/apache/ibatis/session/SqlSessionTest.java

@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Map;
 
+import net.sf.cglib.proxy.Factory;
+
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.binding.BindingException;
 import org.apache.ibatis.cache.impl.PerpetualCache;
@@ -392,7 +394,7 @@ public void shouldSelectBlogWithPostsAndAuthorUsingSubSelectsLazily() throws Exc
     SqlSession session = sqlMapper.openSession();
     try {
       Blog blog = session.selectOne("domain.blog.mappers.BlogMapper.selectBlogWithPostsUsingSubSelectLazily", 1);
-      Assert.assertTrue(blog.getClass().getName().contains("CGLIB"));
+      Assert.assertTrue(blog instanceof Factory);
       assertEquals("Jim Business", blog.getTitle());
       assertEquals(2, blog.getPosts().size());
       assertEquals("Corn nuts", blog.getPosts().get(0).getSubject());