First Attempt Migrating CGLIB to ByteBuddy

Author: Xiang Zhong

ipp-v3-java-devkit/pom.xml

@@ -119,7 +119,12 @@
       <artifactId>jmockit</artifactId>  
       <version>1.25</version>  
       <scope>test</scope> 
-    </dependency> 
+    </dependency>
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy</artifactId>
+      <version>1.12.10</version>
+    </dependency>
   </dependencies>  
   <build> 
     <testResources> 

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/query/GenerateQuery.java

@@ -19,6 +19,11 @@
 import java.util.Calendar;
 import java.util.Date;
 
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
+import net.bytebuddy.implementation.MethodDelegation;
+import net.bytebuddy.implementation.SuperMethodCall;
+import net.bytebuddy.matcher.ElementMatchers;
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.CallbackFilter;
 import net.sf.cglib.proxy.Enhancer;
@@ -34,25 +39,25 @@
 
 /**
  * Class used to generate the query string
- * 
+ *
  */
 public final class GenerateQuery {
 
 	/**
 	 * logger instance
 	 */
 	private static final org.slf4j.Logger LOG = Logger.getLogger();
-	
+
 	/**
 	 * variable LEN_3
 	 */
 	private static final int LEN_3 = 3;
-	
+
 	/**
 	 * variable path
 	 */
 	public static ThreadLocal<Path<?>> path = new ThreadLocal<Path<?>>();
-	
+
 	/**
 	 * varriable message
 	 */
@@ -64,53 +69,94 @@ public final class GenerateQuery {
 	private GenerateQuery() {
 	}
 
-	/**
-	 * Method to create the query entity for the given class
-	 * 
-	 * @param cl the class
-	 * @return the proxified object
-	 */
+//	/**
+//	 * Method to create the query entity for the given class
+//	 *
+//	 * @param cl the class
+//	 * @return the proxified object
+//	 */
+//	@SuppressWarnings("unchecked")
+//	public static <T> T createQueryEntity(Class<T> cl) {
+//		Enhancer enhancer = new Enhancer();
+//		if (cl.isInterface()) {
+//			LOG.debug("The given class is interface");
+//			//enhancer.setInterfaces(new Class[] { cl });
+//			//enhancer.setCallback(new MyMethodInterceptor());
+//		} else {
+//			enhancer.setSuperclass(cl);
+//		}
+//		enhancer.setCallbackFilter(CALLBACK_FILTER);
+//		enhancer.setCallbacks(new Callback[] {NoOp.INSTANCE, new MyMethodInterceptor()});
+//		return (T) enhancer.create();
+//	}
+//
+//	/**
+//	 * Method to create the query for the given entity
+//	 *
+//	 * @param entity the entity
+//	 * @return the proxified object
+//	 */
+//	@SuppressWarnings("unchecked")
+//	public static <T> T createQueryEntity(T entity) {
+//		Class<?> cl = entity.getClass();
+//		Enhancer enhancer = new Enhancer();
+//		if (cl.isInterface()) {
+//			LOG.debug("The given entity is interface");
+//			//enhancer.setInterfaces(new Class[] { cl });
+//			//enhancer.setCallback(new MyMethodInterceptor());
+//		} else {
+//			enhancer.setSuperclass(cl);
+//			enhancer.setCallbackFilter(CALLBACK_FILTER);
+//			enhancer.setCallbacks(new Callback[] {NoOp.INSTANCE, new MyMethodInterceptor()});
+//		}
+//		return (T) enhancer.create();
+//	}
+
+
 	@SuppressWarnings("unchecked")
 	public static <T> T createQueryEntity(Class<T> cl) {
-		Enhancer enhancer = new Enhancer();
+		Class<?> proxied = null;
 		if (cl.isInterface()) {
 			LOG.debug("The given class is interface");
-			//enhancer.setInterfaces(new Class[] { cl });
-			//enhancer.setCallback(new MyMethodInterceptor());
 		} else {
-			enhancer.setSuperclass(cl);
+			proxied = new ByteBuddy()
+					.subclass(cl)
+					.method(ElementMatchers.any())
+					.intercept(MethodDelegation.to(new MyMethodInterceptor()))
+					.method(ElementMatchers.isClone().or(ElementMatchers.isFinalizer()).or(ElementMatchers.isEquals()).or(ElementMatchers.isHashCode()).or(ElementMatchers.isToString()))
+					.intercept(SuperMethodCall.INSTANCE)
+					.make()
+					.load(cl.getClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
+					.getLoaded();
 		}
-		enhancer.setCallbackFilter(CALLBACK_FILTER);
-		enhancer.setCallbacks(new Callback[] {NoOp.INSTANCE, new MyMethodInterceptor()});
-		return (T) enhancer.create();
+		return (T) proxied;
 	}
 
-	/**
-	 * Method to create the query for the given entity
-	 * 
-	 * @param entity the entity
-	 * @return the proxified object
-	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T createQueryEntity(T entity) {
 		Class<?> cl = entity.getClass();
-		Enhancer enhancer = new Enhancer();
+		Class<?> proxied = null;
 		if (cl.isInterface()) {
 			LOG.debug("The given entity is interface");
-			//enhancer.setInterfaces(new Class[] { cl });
-			//enhancer.setCallback(new MyMethodInterceptor());
 		} else {
-			enhancer.setSuperclass(cl);
-			enhancer.setCallbackFilter(CALLBACK_FILTER);
-			enhancer.setCallbacks(new Callback[] {NoOp.INSTANCE, new MyMethodInterceptor()});
+			proxied = new ByteBuddy()
+					.subclass(cl)
+					.method(ElementMatchers.any())
+					.intercept(MethodDelegation.to(new MyMethodInterceptor()))
+					.method(ElementMatchers.isClone().or(ElementMatchers.isFinalizer()).or(ElementMatchers.isEquals()).or(ElementMatchers.isHashCode()).or(ElementMatchers.isToString()))
+					.intercept(SuperMethodCall.INSTANCE)
+					.make()
+					.load(cl.getClassLoader(), ClassLoadingStrategy.Default.WRAPPER)
+					.getLoaded();
 		}
-		return (T) enhancer.create();
+		return (T) proxied;
 	}
 
+
 	/**
 	 * when no handler for specific return type is defined which means properties of that type cannot be inserted in filter expression but can be
 	 * listed in select part, it will return Path
-	 * 
+	 *
 	 * @param ret the object
 	 * @return path the path
 	 */
@@ -129,7 +175,7 @@ public static <T> T createQueryEntity(T entity) {
 	/**
 	 * When return type is Calendar, it will create CalendarPath which will expose filter methods accepting java.util.Calendar, java.util.Date and
 	 * java.sql.Date
-	 * 
+	 *
 	 * @param ret
 	 * @return
 	 */
@@ -141,7 +187,7 @@ public static <T> T createQueryEntity(T entity) {
 
 	/**
 	 * Method to get the calendar path
-	 * 
+	 *
 	 * @param ret the date
 	 * @return CalendarPath the calendar path
 	 */
@@ -153,7 +199,7 @@ public static <T> T createQueryEntity(T entity) {
 
 	/**
 	 * When return type is String, it will create StringPath which will expose filter methods accepting only String
-	 * 
+	 *
 	 * @param ret the string
 	 * @return StringPath the string path
 	 */
@@ -165,7 +211,7 @@ public static <T> T createQueryEntity(T entity) {
 
 	/**
 	 * Method to get the number path
-	 * 
+	 *
 	 * @param ret the number
 	 * @return NumberPath the number path
 	 */
@@ -177,7 +223,7 @@ public static <T> T createQueryEntity(T entity) {
 
 	/**
 	 * Method to get the boolean path
-	 * 
+	 *
 	 * @param ret the boolean
 	 * @return BooleanPath the boolean path
 	 */
@@ -189,7 +235,7 @@ public static <T> T createQueryEntity(T entity) {
 
 	/**
 	 * Method to get the Enum path
-	 * 
+	 *
 	 * @param ret the enum
 	 * @return EnumPath the enum path
 	 */
@@ -201,7 +247,7 @@ public static <T> T createQueryEntity(T entity) {
 
 	/**
 	 * Method to get the optional syntax
-	 * 
+	 *
 	 * @param path the path
 	 * @param pathlist the path list
 	 * @return OptionalSyntax the optional syntax
@@ -222,7 +268,7 @@ public static <T extends IEntity> OptionalSyntax select(Path<?> path, Path<?>...
 
 	/**
 	 * Method to get the optional syntax for the given entity
-	 * 
+	 *
 	 * @param entity the entity
 	 * @return OptionalSyntax the optional syntax
 	 */
@@ -240,7 +286,7 @@ public static <T extends IEntity> OptionalSyntax selectCount(T entity) {
 
 	/**
 	 * Method to get the query message
-	 * 
+	 *
 	 * @return QueryMessage the query message
 	 */
 	public static QueryMessage getMessage() {
@@ -249,7 +295,7 @@ public static QueryMessage getMessage() {
 
 	/**
 	 * Method to set the query message
-	 * 
+	 *
 	 * @param mess the query message
 	 */
 	public static void setMessage(QueryMessage mess) {

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/query/MyMethodInterceptor.java

@@ -28,41 +28,42 @@
 import com.intuit.ipp.exception.FMSException;
 import com.intuit.ipp.util.Logger;
 
+import net.bytebuddy.implementation.bind.annotation.*;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
 
 /**
  * For intercepting method and adding the name of method called in threadlocal stringbuilder.
- * 
+ *
  * @author lokeshg
- * 
+ *
  */
-public class MyMethodInterceptor implements MethodInterceptor {
+public class MyMethodInterceptor {
 
 	/**
 	 * logger instance
 	 */
 	private static final org.slf4j.Logger LOG = Logger.getLogger();
-	
+
 	/**
 	 * variable NUM_3
 	 */
 	private static final int NUM_3 = 3;
-	
+
 	/**
 	 * variable NUM_2
 	 */
 	private static final int NUM_2 = 2;
-	
+
 	/**
 	 * Constructor MyMethodInterceptor
-	 * 
+	 *
 	 */
 	public MyMethodInterceptor() {
 	}
 
-	@Override
-	public Object intercept(Object arg0, Method arg1, Object[] arg2, MethodProxy arg3) throws FMSException {
+	@RuntimeType
+	public Object intercept(@This Object arg0, @Origin Method arg1, @AllArguments Object[] arg2, @SuperMethod Method arg3) throws FMSException {
 
 		if (GenerateQuery.path.get() == null) {
 			GenerateQuery.path.set(new Path<Object>(extractPropertyName(arg1), extractEntity(arg0)));
@@ -89,7 +90,7 @@ private String extractEntity(Object obj) {
 
 	/**
 	 * extract the name of property from method called.
-	 * 
+	 *
 	 * @param method
 	 * @return
 	 */
@@ -101,13 +102,13 @@ protected String extractPropertyName(Method method) {
 
 	/**
 	 * create the object for linked method call or object of leaf node
-	 * 
+	 *
 	 * @param type
 	 * @return
-	 * @throws Throwable 
+	 * @throws Throwable
 	 */
 	@SuppressWarnings("unchecked")
-	public <T> T createInstance(Object arg0, Method arg1, Object[] arg2, MethodProxy arg3) 
+	public <T> T createInstance(Object arg0, Method arg1, Object[] arg2, Method arg3)
 			throws FMSException {
 		Object obj = null;
 		Class<?> type = arg1.getReturnType();
@@ -144,7 +145,7 @@ public <T> T createInstance(Object arg0, Method arg1, Object[] arg2, MethodProxy
 				Type t = arg1.getGenericReturnType();
 				Object value = getObject(t);
 				Object queryValue = GenerateQuery.createQueryEntity(value);
-				obj = arg3.invokeSuper(arg0, arg2);
+				obj = arg3.invoke(arg0, arg2);
 				((List<Object>) obj).add(queryValue);
 			} catch (Throwable t) {
 				throw new FMSException(t);
@@ -165,7 +166,7 @@ public <T> T createInstance(Object arg0, Method arg1, Object[] arg2, MethodProxy
 
 	/**
 	 * Method to get the object for the given type
-	 * 
+	 *
 	 * @param type the type
 	 * @return Object the object
 	 * @throws Throwable
@@ -182,5 +183,5 @@ public Object getObject(Type type) throws FMSException {
 			}
 		}
 		return obj;
-	}	
+	}
 }