From 6853999d56e8f9ef02004565d0cdfd2eea881986 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Wed, 16 Dec 2015 08:42:00 +0000
Subject: [PATCH] 8145416: Move sun.misc.ProxyGenerator to java.lang.reflect

Reviewed-by: alanb, mchung, rriggs
---
 .../share/classes/java/lang/reflect/Proxy.java   |  1 -
 .../lang/reflect}/ProxyGenerator.java            | 16 ++++++++--------
 jdk/test/java/lang/reflect/Proxy/CharType.java   |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename jdk/src/java.base/share/classes/{sun/misc => java/lang/reflect}/ProxyGenerator.java (99%)

diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java
index 99b39ce9c76..765713a4afd 100644
--- a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java
@@ -34,7 +34,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiFunction;
-import sun.misc.ProxyGenerator;
 import sun.misc.VM;
 import sun.reflect.CallerSensitive;
 import sun.reflect.Reflection;
diff --git a/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java b/jdk/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
similarity index 99%
rename from jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
rename to jdk/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
index a8d9c55e894..12e1723e0df 100644
--- a/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
+++ b/jdk/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package sun.misc;
+package java.lang.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -53,7 +53,7 @@ import sun.security.action.GetBooleanAction;
  * @author      Peter Jones
  * @since       1.3
  */
-public class ProxyGenerator {
+class ProxyGenerator {
     /*
      * In the comments below, "JVMS" refers to The Java Virtual Machine
      * Specification Second Edition and "JLS" refers to the original
@@ -314,13 +314,13 @@ public class ProxyGenerator {
     private static final boolean saveGeneratedFiles =
         java.security.AccessController.doPrivileged(
             new GetBooleanAction(
-                "sun.misc.ProxyGenerator.saveGeneratedFiles")).booleanValue();
+                "jdk.proxy.ProxyGenerator.saveGeneratedFiles")).booleanValue();
 
     /**
      * Generate a public proxy class given a name and a list of proxy interfaces.
      */
-    public static byte[] generateProxyClass(final String name,
-                                            Class<?>[] interfaces) {
+    static byte[] generateProxyClass(final String name,
+                                     Class<?>[] interfaces) {
         return generateProxyClass(name, interfaces, (ACC_PUBLIC | ACC_FINAL | ACC_SUPER));
     }
 
@@ -331,9 +331,9 @@ public class ProxyGenerator {
      * @param interfaces  proxy interfaces
      * @param accessFlags access flags of the proxy class
     */
-    public static byte[] generateProxyClass(final String name,
-                                            Class<?>[] interfaces,
-                                            int accessFlags)
+    static byte[] generateProxyClass(final String name,
+                                     Class<?>[] interfaces,
+                                     int accessFlags)
     {
         ProxyGenerator gen = new ProxyGenerator(name, interfaces, accessFlags);
         final byte[] classFile = gen.generateClassFile();
diff --git a/jdk/test/java/lang/reflect/Proxy/CharType.java b/jdk/test/java/lang/reflect/Proxy/CharType.java
index d5e817cf682..10e70a3a1a2 100644
--- a/jdk/test/java/lang/reflect/Proxy/CharType.java
+++ b/jdk/test/java/lang/reflect/Proxy/CharType.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4346224
- * @summary Test against a typo in sun.misc.ProxyGenerator:
+ * @summary Test against a typo in ProxyGenerator:
  *          "java/lang/Character" should be used instead of
  *          "java/lang/Char".
  */