Import #1298

Replace CGLIB with custom code to generate "enhancers" and "fast-classes".

Some user visible changes from using cglib:
- intercepted method that has a return type of int but returns null from the interceptor will no longer be automatically converted to 0, instead a NullPointerException will be thrown.
- Scope implementation can no longer check for circular proxy instance using CircularDependencyProxy marker class, instead should use Scopes.isCircularProxy
- Depending on which custom class loading option is used, Guice enhanced class may no longer be mockable/spyable
- Generated class name is slightly longer.

Closes #1298

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=320433559

build.properties

@@ -36,4 +36,4 @@ javadoc.packagenames=com.google.inject,com.google.inject.spi,\
  com.google.inject.testing.fieldbinder
 test.class=com.google.inject.AllTests
 module=com.google.inject
-imports=!net.sf.cglib.*,!org.objectweb.asm.*
+imports=!org.objectweb.asm.*

core/pom.xml

@@ -27,18 +27,13 @@
  <artifactId>guava</artifactId>
  </dependency>
  <!--
- | CGLIB is embedded by default by the JarJar build profile
+ | ASM is embedded by default by the JarJar build profile
  -->
  <dependency>
  <groupId>org.ow2.asm</groupId>
  <artifactId>asm</artifactId>
  <optional>true</optional>
  </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <optional>true</optional>
- </dependency>
  <!--
  | Test dependencies
  -->
@@ -106,6 +101,31 @@
  <exclude>**/TypeConversionTest*</exclude>
  </excludes>
  </configuration>
+ <executions>
+ <execution>
+ <id>anonymous-class-loading</id>
+ <phase>test</phase>
+ <goals><goal>test</goal></goals>
+ <configuration>
+ <argLine>-Dguice_custom_class_loading=ANONYMOUS</argLine>
+ </configuration>
+ </execution>
+ <execution>
+ <id>child-class-loading</id>
+ <phase>test</phase>
+ <goals><goal>test</goal></goals>
+ <configuration>
+ <argLine>-Dguice_custom_class_loading=CHILD</argLine>
+ <!--
+ | These tests rely on package access which CHILD loading doesn't have
+ -->
+ <excludes combine.children="append">
+ <exclude>**/BytecodeGenTest*</exclude>
+ <exclude>**/ProviderMethodsTest*</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
  </plugin>
  <!--
  | Add OSGi manifest
@@ -116,7 +136,7 @@
  <configuration>
  <instructions>
  <Bundle-Name>${project.artifactId}$(if;$(classes;NAMED;*.MethodAspect);; (no_aop))</Bundle-Name>
- <Import-Package>!net.sf.cglib.*,!org.objectweb.asm.*,!com.google.inject.*,*</Import-Package>
+ <Import-Package>!org.objectweb.asm.*,!com.google.inject.*,*</Import-Package>
  <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
  </instructions>
  </configuration>
@@ -180,6 +200,7 @@
  <configuration>
  <symbols>NO_AOP</symbols>
  <excludes>
+ **/aop/*.java,
  **/InterceptorBinding.java,
  **/InterceptorBindingProcessor.java,
  **/InterceptorStackCallback.java,
@@ -222,7 +243,7 @@
  </profile>
  <profile>
  <!--
- | JarJar build profile: Embed CGLIB (and ASM) classes under a Guice namespace
+ | JarJar build profile: Embed ASM classes under a Guice namespace
  -->
  <id>guice.with.jarjar</id>
  <activation>
@@ -247,17 +268,8 @@
  <overwrite>true</overwrite>
  <includes>
  <include>*:asm*</include>
- <include>*:cglib</include>
  </includes>
  <rules>
- <rule>
- <pattern>net.sf.cglib.*</pattern>
- <result>com.google.inject.internal.cglib.$@1</result>
- </rule>
- <rule>
- <pattern>net.sf.cglib.**.*</pattern>
- <result>com.google.inject.internal.cglib.@1.$@2</result>
- </rule>
  <rule>
  <pattern>org.objectweb.asm.*</pattern>
  <result>com.google.inject.internal.asm.$@1</result>

core/src/com/google/inject/Scopes.java

@@ -17,7 +17,7 @@
 package com.google.inject;
 
 import com.google.inject.internal.BindingImpl;
-import com.google.inject.internal.CircularDependencyProxy;
+import com.google.inject.internal.BytecodeGen;
 import com.google.inject.internal.SingletonScope;
 import com.google.inject.spi.BindingScopingVisitor;
 import com.google.inject.spi.ExposedBinding;
@@ -197,6 +197,6 @@ private static Injector getInjector(LinkedKeyBinding<?> linkedKeyBinding) {
  * @since 4.0
  */
  public static boolean isCircularProxy(Object object) {
- return object instanceof CircularDependencyProxy;
+ return BytecodeGen.isCircularProxy(object);
  }
 }