Introduced SpringNamingPolicy for CGLIB

Issue: SPR-11398
(cherry picked from commit 8c4e372)

spring-core/src/main/java/org/springframework/cglib/core/SpringNamingPolicy.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cglib.core;
+
+/**
+ * Custom extension of CGLIB's {@link DefaultNamingPolicy}, modifying
+ * the tag in generated class names from "ByCGLIB" to "BySpringCGLIB".
+ *
+ * <p>This is primarily designed to avoid clashes between a regular CGLIB
+ * version (used by some other library) and Spring's embedded variant,
+ * in case the same class happens to get proxied for different purposes.
+ *
+ * @author Juergen Hoeller
+ * @since 3.2.8
+ */
+public class SpringNamingPolicy extends DefaultNamingPolicy {
+
+	public static final SpringNamingPolicy INSTANCE = new SpringNamingPolicy();
+
+	@Override
+	protected String getTag() {
+		return "BySpringCGLIB";
+	}
+
+}

spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,20 +25,22 @@ import org.springframework.cglib.transform.MethodFilterTransformer;
 import org.springframework.cglib.transform.TransformingClassGenerator;
 
 /**
- * Memory safe variant of {@link UndeclaredThrowableStrategy} ported from the latest
- * as yet unreleased cglib code.
+ * Memory-safe variant of {@link UndeclaredThrowableStrategy} ported from the latest
+ * as yet unreleased CGLIB code.
+ *
+ * @author Phillip Webb
+ * @since 3.2.4
  */
 public class MemorySafeUndeclaredThrowableStrategy extends DefaultGeneratorStrategy {
 
 	private static final MethodFilter TRANSFORM_FILTER = new MethodFilter() {
-		public boolean accept(int access, String name, String desc, String signature,
-				String[] exceptions) {
+		public boolean accept(int access, String name, String desc, String signature, String[] exceptions) {
 			return !TypeUtils.isPrivate(access) && name.indexOf('$') < 0;
 		}
 	};
 
 
-	private Class wrapper;
+	private Class<?> wrapper;
 
 
 	public MemorySafeUndeclaredThrowableStrategy(Class wrapper) {
@@ -51,4 +53,5 @@ public class MemorySafeUndeclaredThrowableStrategy extends DefaultGeneratorStrat
 		tr = new MethodFilterTransformer(TRANSFORM_FILTER, tr);
 		return new TransformingClassGenerator(cg, tr);
 	}
+
 }