diff --git a/jdk/src/java.base/share/classes/java/io/Console.java b/jdk/src/java.base/share/classes/java/io/Console.java index abf8559dd5c..53a91a9c075 100644 --- a/jdk/src/java.base/share/classes/java/io/Console.java +++ b/jdk/src/java.base/share/classes/java/io/Console.java @@ -27,6 +27,8 @@ package java.io; import java.util.*; import java.nio.charset.Charset; +import jdk.internal.misc.JavaIOAccess; +import jdk.internal.misc.SharedSecrets; import sun.nio.cs.StreamDecoder; import sun.nio.cs.StreamEncoder; @@ -519,7 +521,7 @@ public final class Console implements Flushable try { // Add a shutdown hook to restore console's echo state should // it be necessary. - sun.misc.SharedSecrets.getJavaLangAccess() + SharedSecrets.getJavaLangAccess() .registerShutdownHook(0 /* shutdown hook invocation order */, false /* only register if shutdown is not in progress */, new Runnable() { @@ -536,7 +538,7 @@ public final class Console implements Flushable // by a shutdown hook } - sun.misc.SharedSecrets.setJavaIOAccess(new sun.misc.JavaIOAccess() { + SharedSecrets.setJavaIOAccess(new JavaIOAccess() { public Console console() { if (istty()) { if (cons == null) diff --git a/jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java b/jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java index e50288dc617..58df586fec6 100644 --- a/jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java +++ b/jdk/src/java.base/share/classes/java/io/DeleteOnExitHook.java @@ -26,6 +26,7 @@ package java.io; import java.util.*; import java.io.File; +import jdk.internal.misc.SharedSecrets; /** * This class holds a set of filenames to be deleted on VM exit through a shutdown hook. @@ -41,7 +42,7 @@ class DeleteOnExitHook { // delete on exit list and cause the DeleteOnExitHook to be // registered during shutdown in progress. So set the // registerShutdownInProgress parameter to true. - sun.misc.SharedSecrets.getJavaLangAccess() + SharedSecrets.getJavaLangAccess() .registerShutdownHook(2 /* Shutdown hook invocation order */, true /* register even if shutdown in progress */, new Runnable() { diff --git a/jdk/src/java.base/share/classes/java/io/FileOutputStream.java b/jdk/src/java.base/share/classes/java/io/FileOutputStream.java index 20d122048f4..52d1596b3c4 100644 --- a/jdk/src/java.base/share/classes/java/io/FileOutputStream.java +++ b/jdk/src/java.base/share/classes/java/io/FileOutputStream.java @@ -27,8 +27,8 @@ package java.io; import java.nio.channels.FileChannel; import java.util.concurrent.atomic.AtomicBoolean; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; import sun.nio.ch.FileChannelImpl; diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java index 0f7e18df1ee..44336f9ca2b 100644 --- a/jdk/src/java.base/share/classes/java/lang/System.java +++ b/jdk/src/java.base/share/classes/java/lang/System.java @@ -43,6 +43,8 @@ import sun.reflect.Reflection; import sun.security.util.SecurityConstants; import sun.reflect.annotation.AnnotationType; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.JavaLangAccess;; +import jdk.internal.misc.SharedSecrets;; /** * The System class contains several useful class fields @@ -212,7 +214,7 @@ public final class System { public static Console console() { if (cons == null) { synchronized (System.class) { - cons = sun.misc.SharedSecrets.getJavaIOAccess().console(); + cons = SharedSecrets.getJavaIOAccess().console(); } } return cons; @@ -1216,7 +1218,7 @@ public final class System { private static void setJavaLangAccess() { // Allow privileged classes outside of java.lang - sun.misc.SharedSecrets.setJavaLangAccess(new sun.misc.JavaLangAccess(){ + SharedSecrets.setJavaLangAccess(new JavaLangAccess(){ public sun.reflect.ConstantPool getConstantPool(Class klass) { return klass.getConstantPool(); } diff --git a/jdk/src/java.base/share/classes/java/lang/Thread.java b/jdk/src/java.base/share/classes/java/lang/Thread.java index a3ca2fd52fc..2d90d63fd63 100644 --- a/jdk/src/java.base/share/classes/java/lang/Thread.java +++ b/jdk/src/java.base/share/classes/java/lang/Thread.java @@ -233,7 +233,8 @@ class Thread implements Runnable { private volatile Interruptible blocker; private final Object blockerLock = new Object(); - /* Set the blocker field; invoked via sun.misc.SharedSecrets from java.nio code + /* Set the blocker field; invoked via jdk.internal.misc.SharedSecrets + * from java.nio code */ void blockedOn(Interruptible b) { synchronized (blockerLock) { diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java index 3bd631226c9..4c6653f815a 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java @@ -27,9 +27,9 @@ package java.lang.ref; import java.security.PrivilegedAction; import java.security.AccessController; -import sun.misc.JavaLangAccess; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; import sun.misc.ManagedLocalsThread; -import sun.misc.SharedSecrets; import sun.misc.VM; final class Finalizer extends FinalReference { /* Package-private; must be in diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java index c2dd47c78e5..d18f059308f 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java @@ -26,10 +26,10 @@ package java.lang.ref; import sun.misc.Cleaner; -import sun.misc.JavaLangRefAccess; -import sun.misc.ManagedLocalsThread; -import sun.misc.SharedSecrets; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.JavaLangRefAccess; +import jdk.internal.misc.SharedSecrets; +import sun.misc.ManagedLocalsThread; /** * Abstract base class for reference objects. This class defines the diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java index 25f6a3b6151..2e24d47e937 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java @@ -25,6 +25,7 @@ package java.lang.reflect; +import jdk.internal.misc.SharedSecrets; import sun.reflect.CallerSensitive; import sun.reflect.ConstructorAccessor; import sun.reflect.Reflection; @@ -582,7 +583,7 @@ public final class Constructor extends Executable { // A Constructor for an inner class return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes0(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(thisDeclClass), this, thisDeclClass, diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java index 45a2525ec0f..88a9f5de9ac 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Executable.java @@ -28,6 +28,8 @@ package java.lang.reflect; import java.lang.annotation.*; import java.util.Map; import java.util.Objects; + +import jdk.internal.misc.SharedSecrets; import sun.reflect.annotation.AnnotationParser; import sun.reflect.annotation.AnnotationSupport; import sun.reflect.annotation.TypeAnnotationParser; @@ -79,7 +81,7 @@ public abstract class Executable extends AccessibleObject Annotation[][] parseParameterAnnotations(byte[] parameterAnnotations) { return AnnotationParser.parseParameterAnnotations( parameterAnnotations, - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), getDeclaringClass()); } @@ -601,7 +603,7 @@ public abstract class Executable extends AccessibleObject } else { declAnnos = AnnotationParser.parseAnnotations( getAnnotationBytes(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), getDeclaringClass() ); @@ -638,7 +640,7 @@ public abstract class Executable extends AccessibleObject */ AnnotatedType getAnnotatedReturnType0(Type returnType) { return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes0(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), this, getDeclaringClass(), @@ -672,7 +674,7 @@ public abstract class Executable extends AccessibleObject if (Modifier.isStatic(this.getModifiers())) return null; return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes0(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), this, getDeclaringClass(), @@ -696,7 +698,7 @@ public abstract class Executable extends AccessibleObject */ public AnnotatedType[] getAnnotatedParameterTypes() { return TypeAnnotationParser.buildAnnotatedTypes(getTypeAnnotationBytes0(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), this, getDeclaringClass(), @@ -720,7 +722,7 @@ public abstract class Executable extends AccessibleObject */ public AnnotatedType[] getAnnotatedExceptionTypes() { return TypeAnnotationParser.buildAnnotatedTypes(getTypeAnnotationBytes0(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), this, getDeclaringClass(), diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Field.java b/jdk/src/java.base/share/classes/java/lang/reflect/Field.java index cb3cbf5e7d0..ff99cf91b03 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Field.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Field.java @@ -25,6 +25,7 @@ package java.lang.reflect; +import jdk.internal.misc.SharedSecrets; import sun.reflect.CallerSensitive; import sun.reflect.FieldAccessor; import sun.reflect.Reflection; @@ -1152,7 +1153,7 @@ class Field extends AccessibleObject implements Member { } else { declAnnos = AnnotationParser.parseAnnotations( annotations, - sun.misc.SharedSecrets.getJavaLangAccess() + SharedSecrets.getJavaLangAccess() .getConstantPool(getDeclaringClass()), getDeclaringClass()); } @@ -1175,7 +1176,7 @@ class Field extends AccessibleObject implements Member { */ public AnnotatedType getAnnotatedType() { return TypeAnnotationParser.buildAnnotatedType(getTypeAnnotationBytes0(), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), this, getDeclaringClass(), diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Method.java b/jdk/src/java.base/share/classes/java/lang/reflect/Method.java index 174e4ede36e..c4a1db292fd 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Method.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Method.java @@ -26,6 +26,7 @@ package java.lang.reflect; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.SharedSecrets; import sun.reflect.CallerSensitive; import sun.reflect.MethodAccessor; import sun.reflect.Reflection; @@ -626,7 +627,7 @@ public final class Method extends Executable { getReturnType()); Object result = AnnotationParser.parseMemberValue( memberType, ByteBuffer.wrap(annotationDefault), - sun.misc.SharedSecrets.getJavaLangAccess(). + SharedSecrets.getJavaLangAccess(). getConstantPool(getDeclaringClass()), getDeclaringClass()); if (result instanceof sun.reflect.annotation.ExceptionProxy) diff --git a/jdk/src/java.base/share/classes/java/net/HttpCookie.java b/jdk/src/java.base/share/classes/java/net/HttpCookie.java index 4b1ba5200d0..c8d127837ca 100644 --- a/jdk/src/java.base/share/classes/java/net/HttpCookie.java +++ b/jdk/src/java.base/share/classes/java/net/HttpCookie.java @@ -35,6 +35,8 @@ import java.util.GregorianCalendar; import java.util.Date; import java.util.Locale; import java.util.Objects; +import jdk.internal.misc.JavaNetHttpCookieAccess; +import jdk.internal.misc.SharedSecrets; /** * An HttpCookie object represents an HTTP cookie, which carries state @@ -971,8 +973,8 @@ public final class HttpCookie implements Cloneable { } static { - sun.misc.SharedSecrets.setJavaNetHttpCookieAccess( - new sun.misc.JavaNetHttpCookieAccess() { + SharedSecrets.setJavaNetHttpCookieAccess( + new JavaNetHttpCookieAccess() { public List parse(String header) { return HttpCookie.parse(header, true); } diff --git a/jdk/src/java.base/share/classes/java/net/InetAddress.java b/jdk/src/java.base/share/classes/java/net/InetAddress.java index c4f90bb3c37..936a2d65414 100644 --- a/jdk/src/java.base/share/classes/java/net/InetAddress.java +++ b/jdk/src/java.base/share/classes/java/net/InetAddress.java @@ -43,6 +43,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.atomic.AtomicLong; +import jdk.internal.misc.JavaNetInetAddressAccess; +import jdk.internal.misc.SharedSecrets; import sun.security.action.*; import sun.net.InetAddressCachePolicy; import sun.net.util.IPAddressUtil; @@ -215,7 +217,7 @@ class InetAddress implements java.io.Serializable { * DNS forging. * * Oracle JSSE provider is using this original hostname, via - * sun.misc.JavaNetAccess, for SSL/TLS endpoint identification. + * jdk.internal.misc.JavaNetAccess, for SSL/TLS endpoint identification. * * Note: May define a new public method in the future if necessary. */ @@ -297,8 +299,8 @@ class InetAddress implements java.io.Serializable { return null; } }); - sun.misc.SharedSecrets.setJavaNetInetAddressAccess( - new sun.misc.JavaNetInetAddressAccess() { + SharedSecrets.setJavaNetInetAddressAccess( + new JavaNetInetAddressAccess() { public String getOriginalHostName(InetAddress ia) { return ia.holder.getOriginalHostName(); } diff --git a/jdk/src/java.base/share/classes/java/net/URLClassLoader.java b/jdk/src/java.base/share/classes/java/net/URLClassLoader.java index f9772005645..05ebeed39a5 100644 --- a/jdk/src/java.base/share/classes/java/net/URLClassLoader.java +++ b/jdk/src/java.base/share/classes/java/net/URLClassLoader.java @@ -49,6 +49,9 @@ import java.util.jar.Attributes; import java.util.jar.Attributes.Name; import java.util.jar.JarFile; import java.util.jar.Manifest; + +import jdk.internal.misc.JavaNetAccess; +import jdk.internal.misc.SharedSecrets; import sun.misc.Resource; import sun.misc.URLClassPath; import sun.net.www.ParseUtil; @@ -769,9 +772,9 @@ public class URLClassLoader extends SecureClassLoader implements Closeable { } static { - sun.misc.SharedSecrets.setJavaNetAccess ( - new sun.misc.JavaNetAccess() { - public URLClassPath getURLClassPath (URLClassLoader u) { + SharedSecrets.setJavaNetAccess( + new JavaNetAccess() { + public URLClassPath getURLClassPath(URLClassLoader u) { return u.ucp; } } diff --git a/jdk/src/java.base/share/classes/java/nio/Bits.java b/jdk/src/java.base/share/classes/java/nio/Bits.java index 8d3f31533eb..803360ea132 100644 --- a/jdk/src/java.base/share/classes/java/nio/Bits.java +++ b/jdk/src/java.base/share/classes/java/nio/Bits.java @@ -29,8 +29,9 @@ import java.security.AccessController; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.LongAdder; -import sun.misc.JavaLangRefAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaNioAccess; +import jdk.internal.misc.JavaLangRefAccess; +import jdk.internal.misc.SharedSecrets; import sun.misc.Unsafe; import sun.misc.VM; @@ -702,11 +703,11 @@ class Bits { // package-private static { // setup access to this package in SharedSecrets - sun.misc.SharedSecrets.setJavaNioAccess( - new sun.misc.JavaNioAccess() { + SharedSecrets.setJavaNioAccess( + new JavaNioAccess() { @Override - public sun.misc.JavaNioAccess.BufferPool getDirectBufferPool() { - return new sun.misc.JavaNioAccess.BufferPool() { + public JavaNioAccess.BufferPool getDirectBufferPool() { + return new JavaNioAccess.BufferPool() { @Override public String getName() { return "direct"; diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java index e45be24c166..dcf54cb7d0c 100644 --- a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java +++ b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java @@ -34,6 +34,7 @@ import java.lang.reflect.InvocationTargetException; import java.nio.channels.*; import java.security.AccessController; import java.security.PrivilegedAction; +import jdk.internal.misc.SharedSecrets; import sun.nio.ch.Interruptible; @@ -206,9 +207,8 @@ public abstract class AbstractInterruptibleChannel } - // -- sun.misc.SharedSecrets -- + // -- jdk.internal.misc.SharedSecrets -- static void blockedOn(Interruptible intr) { // package-private - sun.misc.SharedSecrets.getJavaLangAccess().blockedOn(Thread.currentThread(), - intr); + SharedSecrets.getJavaLangAccess().blockedOn(Thread.currentThread(), intr); } } diff --git a/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java b/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java index 786d63ce73f..203ec8eed41 100644 --- a/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java +++ b/jdk/src/java.base/share/classes/java/security/ProtectionDomain.java @@ -34,10 +34,10 @@ import java.util.List; import java.util.Map; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; -import sun.misc.JavaSecurityAccess; -import sun.misc.JavaSecurityProtectionDomainAccess; -import static sun.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaSecurityAccess; +import jdk.internal.misc.JavaSecurityProtectionDomainAccess; +import static jdk.internal.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache; +import jdk.internal.misc.SharedSecrets; import sun.security.util.Debug; import sun.security.util.SecurityConstants; diff --git a/jdk/src/java.base/share/classes/java/util/EnumMap.java b/jdk/src/java.base/share/classes/java/util/EnumMap.java index b99a93fda5f..141e10911a8 100644 --- a/jdk/src/java.base/share/classes/java/util/EnumMap.java +++ b/jdk/src/java.base/share/classes/java/util/EnumMap.java @@ -26,7 +26,7 @@ package java.util; import java.util.Map.Entry; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; /** * A specialized {@link Map} implementation for use with enum type keys. All diff --git a/jdk/src/java.base/share/classes/java/util/EnumSet.java b/jdk/src/java.base/share/classes/java/util/EnumSet.java index b337e66450a..52a4b3f19ef 100644 --- a/jdk/src/java.base/share/classes/java/util/EnumSet.java +++ b/jdk/src/java.base/share/classes/java/util/EnumSet.java @@ -25,7 +25,7 @@ package java.util; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; /** * A specialized {@link Set} implementation for use with enum types. All of diff --git a/jdk/src/java.base/share/classes/java/util/StringJoiner.java b/jdk/src/java.base/share/classes/java/util/StringJoiner.java index b08a2f9b711..3dca2df4d46 100644 --- a/jdk/src/java.base/share/classes/java/util/StringJoiner.java +++ b/jdk/src/java.base/share/classes/java/util/StringJoiner.java @@ -24,8 +24,8 @@ */ package java.util; -import sun.misc.JavaLangAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; /** * {@code StringJoiner} is used to construct a sequence of characters separated diff --git a/jdk/src/java.base/share/classes/java/util/UUID.java b/jdk/src/java.base/share/classes/java/util/UUID.java index 39e507df40c..a7f5f6bc63e 100644 --- a/jdk/src/java.base/share/classes/java/util/UUID.java +++ b/jdk/src/java.base/share/classes/java/util/UUID.java @@ -27,8 +27,8 @@ package java.util; import java.security.*; -import sun.misc.JavaLangAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; /** * A class that represents an immutable universally unique identifier (UUID). diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java index 6b7131c272e..6bb76161ce9 100644 --- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java +++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java @@ -36,10 +36,10 @@ import java.security.CodeSigner; import java.security.cert.Certificate; import java.security.AccessController; import java.security.CodeSource; +import jdk.internal.misc.SharedSecrets; import sun.misc.IOUtils; import sun.security.action.GetPropertyAction; import sun.security.util.ManifestEntryVerifier; -import sun.misc.SharedSecrets; import sun.security.util.SignatureFileVerifier; /** diff --git a/jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java b/jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java index 84a72797faa..0844b9171d1 100644 --- a/jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java +++ b/jdk/src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java @@ -30,7 +30,7 @@ import java.net.URL; import java.security.CodeSource; import java.util.Enumeration; import java.util.List; -import sun.misc.JavaUtilJarAccess; +import jdk.internal.misc.JavaUtilJarAccess; class JavaUtilJarAccessImpl implements JavaUtilJarAccess { public boolean jarFileHasClassPathAttribute(JarFile jar) throws IOException { diff --git a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java index 9695b54f6d8..4d0b9cee67a 100644 --- a/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java +++ b/jdk/src/java.base/share/classes/java/util/zip/ZipFile.java @@ -44,6 +44,8 @@ import java.util.Spliterators; import java.util.WeakHashMap; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import jdk.internal.misc.JavaUtilZipFileAccess; +import jdk.internal.misc.SharedSecrets; import static java.util.zip.ZipConstants64.*; @@ -781,12 +783,12 @@ class ZipFile implements ZipConstants, Closeable { } static { - sun.misc.SharedSecrets.setJavaUtilZipFileAccess( - new sun.misc.JavaUtilZipFileAccess() { + SharedSecrets.setJavaUtilZipFileAccess( + new JavaUtilZipFileAccess() { public boolean startsWithLocHeader(ZipFile zip) { return zip.startsWithLocHeader(); } - } + } ); } diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java index f3a0e742036..a839595085f 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java +++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java @@ -27,8 +27,6 @@ package jdk.internal.jimage; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import sun.misc.JavaNioAccess; -import sun.misc.SharedSecrets; public final class ImageNativeSubstrate implements ImageSubstrate { static { @@ -42,8 +40,10 @@ public final class ImageNativeSubstrate implements ImageSubstrate { }); } - private static final JavaNioAccess NIOACCESS = - SharedSecrets.getJavaNioAccess(); + // TODO: Reinstate when the class below, NIOACCESS, is removed. + //private static final JavaNioAccess NIOACCESS = + // SharedSecrets.getJavaNioAccess(); + private final long id; private final long indexAddress; @@ -161,4 +161,59 @@ public final class ImageNativeSubstrate implements ImageSubstrate { public int[] attributeOffsets() { return attributeOffsets(id); } + + // TODO: Remove when JRT-FS no longer indirectly depends on ImageNativeSubstrate + /** + * Reflective wrapper around ShareSecrets JavaNioAccess. + * + * SharedSecrets and friend interfaces moved from 'sun.misc' to 'jdk.internal.misc' + * in 1.9. This class provides the runtime with access to the appropriate + * JavaNioAccess methods whether running on 1.9, or lower. + */ + static class NIOACCESS { + + private static final String PKG_PREFIX = "jdk.internal.misc"; + private static final String LEGACY_PKG_PREFIX = "sun.misc"; + + private static final Object javaNioAccess; + private static final java.lang.reflect.Method newDirectByteBufferMethod; + + static { + try { + Class c = getJDKClass("JavaNioAccess"); + + java.lang.reflect.Method m = + getJDKClass("SharedSecrets").getDeclaredMethod("getJavaNioAccess"); + javaNioAccess = m.invoke(null); + + newDirectByteBufferMethod = c.getDeclaredMethod("newDirectByteBuffer", + long.class, + int.class, + Object.class); + } catch (ReflectiveOperationException x) { + throw new InternalError(x); + } + } + + private static Class getJDKClass(String name) throws ClassNotFoundException { + try { + return Class.forName(PKG_PREFIX + "." + name); + } catch (ClassNotFoundException x) { + try { + return Class.forName(LEGACY_PKG_PREFIX + "." + name); + } catch (ClassNotFoundException ex) { + x.addSuppressed(ex); + throw x; + } + } + } + + static ByteBuffer newDirectByteBuffer(long addr, int cap, Object ob) { + try { + return (ByteBuffer) newDirectByteBufferMethod.invoke(javaNioAccess, addr, cap, ob); + } catch (ReflectiveOperationException x) { + throw new InternalError(x); + } + } + } } diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java index 7b24dc451bd..3b4e269ae92 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; public interface JavaAWTAccess { diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java index 079d94fb39b..5b29eb7350a 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java @@ -27,7 +27,7 @@ * SharedSecrets interface used for the access from java.text.Bidi */ -package sun.misc; +package jdk.internal.misc; public interface JavaAWTFontAccess { diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaBeansAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaBeansAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java index ef1b696d717..e2451e41fe1 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaBeansAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java similarity index 97% rename from jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java index ab2888bfc5d..b4e8926f1f7 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java @@ -23,7 +23,8 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; + import java.io.Console; import java.nio.charset.Charset; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java index 478c4a8c8cc..14fc9f9c8a4 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package sun.misc; +package jdk.internal.misc; import java.io.FileDescriptor; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java similarity index 99% rename from jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java index db37e18fffe..656898fb006 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.lang.annotation.Annotation; import java.lang.reflect.Executable; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java index e3e232292ad..374ca55c847 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; public interface JavaLangRefAccess { diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetAccess.java similarity index 96% rename from jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetAccess.java index 82571efdbd4..2f4420363da 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetAccess.java @@ -23,9 +23,10 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.net.URLClassLoader; +import sun.misc.URLClassPath; public interface JavaNetAccess { /** diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java index 61f856f3f9e..39051b98823 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.net.HttpCookie; import java.util.List; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaNetInetAddressAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaNetInetAddressAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java index c14c3416cdb..34754d474b7 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaNetInetAddressAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.net.InetAddress; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java index 8a1d68d0473..91ff9ac35c7 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.nio.Buffer; import java.nio.ByteBuffer; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java index ac305826e6c..3de82542b07 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.security.AccessControlContext; import java.security.PrivilegedAction; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java index 95560ffab68..263d2c653fd 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package sun.misc; +package jdk.internal.misc; import java.security.PermissionCollection; import java.security.ProtectionDomain; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java index 3453855d5f2..bf59351dee6 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.io.IOException; import java.net.URL; diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java index 0534f3400af..df10fda22ca 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.util.zip.ZipFile; diff --git a/jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java b/jdk/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java similarity index 99% rename from jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java index c8321ed7173..39bbbc625a1 100644 --- a/jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java @@ -23,14 +23,14 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import java.util.jar.JarFile; import java.io.Console; import java.io.FileDescriptor; import java.security.ProtectionDomain; - import java.security.AccessController; +import sun.misc.Unsafe; /** A repository of "shared secrets", which are a mechanism for calling implementation-private methods in another package without diff --git a/jdk/src/java.base/share/classes/sun/misc/URLClassPath.java b/jdk/src/java.base/share/classes/sun/misc/URLClassPath.java index 56482db0a23..942858a7044 100644 --- a/jdk/src/java.base/share/classes/sun/misc/URLClassPath.java +++ b/jdk/src/java.base/share/classes/sun/misc/URLClassPath.java @@ -66,6 +66,8 @@ import java.util.jar.Attributes.Name; import jdk.internal.jimage.ImageLocation; import jdk.internal.jimage.ImageReader; +import jdk.internal.misc.JavaUtilZipFileAccess; +import jdk.internal.misc.SharedSecrets; import sun.net.util.URLUtil; import sun.net.www.ParseUtil; @@ -622,8 +624,8 @@ public class URLClassPath { private URLStreamHandler handler; private HashMap lmap; private boolean closed = false; - private static final sun.misc.JavaUtilZipFileAccess zipAccess = - sun.misc.SharedSecrets.getJavaUtilZipFileAccess(); + private static final JavaUtilZipFileAccess zipAccess = + SharedSecrets.getJavaUtilZipFileAccess(); /* * Creates a new JarLoader for the specified URL referring to diff --git a/jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java b/jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java index 721468372ac..d24a7fed491 100644 --- a/jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java +++ b/jdk/src/java.base/share/classes/sun/net/sdp/SdpSupport.java @@ -29,8 +29,8 @@ import java.io.IOException; import java.io.FileDescriptor; import java.security.AccessController; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; /** diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java index 12f40820016..5e846f6c39c 100644 --- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java +++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java @@ -65,6 +65,8 @@ import java.util.HashSet; import java.util.HashMap; import java.util.Set; import java.util.StringJoiner; +import jdk.internal.misc.JavaNetHttpCookieAccess; +import jdk.internal.misc.SharedSecrets; import sun.net.*; import sun.net.www.*; import sun.net.www.http.HttpClient; @@ -2878,8 +2880,8 @@ public class HttpURLConnection extends java.net.HttpURLConnection { if (cookieHandler == null || value.length() == 0) return value; - sun.misc.JavaNetHttpCookieAccess access = - sun.misc.SharedSecrets.getJavaNetHttpCookieAccess(); + JavaNetHttpCookieAccess access = + SharedSecrets.getJavaNetHttpCookieAccess(); StringJoiner retValue = new StringJoiner(","); // RFC 2965, comma separated List cookies = access.parse(value); for (HttpCookie cookie : cookies) { diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java index 16578a1d1ae..1c4e1ca5075 100644 --- a/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java +++ b/jdk/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java @@ -44,9 +44,10 @@ import java.security.AccessController; import java.util.ArrayList; import java.util.List; +import jdk.internal.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.JavaNioAccess; +import jdk.internal.misc.SharedSecrets; import sun.misc.Cleaner; -import sun.misc.JavaIOFileDescriptorAccess; -import sun.misc.SharedSecrets; import sun.security.action.GetPropertyAction; public class FileChannelImpl @@ -976,8 +977,8 @@ public class FileChannelImpl * Invoked by sun.management.ManagementFactoryHelper to create the management * interface for mapped buffers. */ - public static sun.misc.JavaNioAccess.BufferPool getMappedBufferPool() { - return new sun.misc.JavaNioAccess.BufferPool() { + public static JavaNioAccess.BufferPool getMappedBufferPool() { + return new JavaNioAccess.BufferPool() { @Override public String getName() { return "mapped"; diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java index 62025493a98..ee3a6c6d0c0 100644 --- a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java +++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationSupport.java @@ -35,12 +35,12 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import sun.misc.JavaLangAccess; -import sun.reflect.LangReflectAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; import sun.reflect.ReflectionFactory; public final class AnnotationSupport { - private static final JavaLangAccess LANG_ACCESS = sun.misc.SharedSecrets.getJavaLangAccess(); + private static final JavaLangAccess LANG_ACCESS = SharedSecrets.getJavaLangAccess(); /** * Finds and returns all annotations in {@code annotations} matching diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java index 12ee34e6099..7402560e45e 100644 --- a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java +++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java @@ -25,13 +25,13 @@ package sun.reflect.annotation; -import sun.misc.JavaLangAccess; - import java.lang.annotation.*; import java.lang.reflect.*; import java.util.*; import java.security.AccessController; import java.security.PrivilegedAction; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; /** * Represents an annotation type at run time. Used to type-check annotations @@ -79,7 +79,7 @@ public class AnnotationType { public static AnnotationType getInstance( Class annotationClass) { - JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess(); + JavaLangAccess jla = SharedSecrets.getJavaLangAccess(); AnnotationType result = jla.getAnnotationType(annotationClass); // volatile read if (result == null) { result = new AnnotationType(annotationClass); @@ -134,7 +134,7 @@ public class AnnotationType { // of the corresponding annotation types breaks infinite recursion. if (annotationClass != Retention.class && annotationClass != Inherited.class) { - JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess(); + JavaLangAccess jla = SharedSecrets.getJavaLangAccess(); Map, Annotation> metaAnnotations = AnnotationParser.parseSelectAnnotations( jla.getRawClassAnnotations(annotationClass), diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java index e495026d420..da0c068a0d7 100644 --- a/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java +++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java @@ -35,7 +35,8 @@ import java.util.List; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import sun.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; import sun.reflect.ConstantPool; import static sun.reflect.annotation.TypeAnnotation.*; @@ -309,7 +310,7 @@ public final class TypeAnnotationParser { static TypeAnnotation[] parseAllTypeAnnotations(AnnotatedElement decl) { Class container; byte[] rawBytes; - JavaLangAccess javaLangAccess = sun.misc.SharedSecrets.getJavaLangAccess(); + JavaLangAccess javaLangAccess = SharedSecrets.getJavaLangAccess(); if (decl instanceof Class) { container = (Class)decl; rawBytes = javaLangAccess.getRawClassTypeAnnotations(container); diff --git a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java index 58d483e4293..a9af102f563 100644 --- a/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java +++ b/jdk/src/java.base/share/classes/sun/security/provider/PolicyFile.java @@ -41,9 +41,9 @@ import java.io.FilePermission; import java.net.SocketPermission; import java.net.NetPermission; import java.util.concurrent.atomic.AtomicReference; -import sun.misc.JavaSecurityProtectionDomainAccess; -import static sun.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaSecurityProtectionDomainAccess; +import static jdk.internal.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache; +import jdk.internal.misc.SharedSecrets; import sun.security.util.PolicyUtil; import sun.security.util.PropertyExpander; import sun.security.util.Debug; diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java index 9892ceecc44..249ae505ec8 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java @@ -42,8 +42,8 @@ import javax.crypto.BadPaddingException; import javax.net.ssl.*; import sun.misc.ManagedLocalsThread; -import sun.misc.JavaNetInetAddressAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaNetInetAddressAccess; +import jdk.internal.misc.SharedSecrets; /** * Implementation of an SSL socket. This is a normal connection type @@ -2094,7 +2094,7 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { */ private static String getOriginalHostname(InetAddress inetAddress) { /* - * Get the original hostname via sun.misc.SharedSecrets. + * Get the original hostname via jdk.internal.misc.SharedSecrets. */ JavaNetInetAddressAccess jna = SharedSecrets.getJavaNetInetAddressAccess(); String originalHostname = jna.getOriginalHostName(inetAddress); diff --git a/jdk/src/java.base/share/classes/sun/security/util/Password.java b/jdk/src/java.base/share/classes/sun/security/util/Password.java index 619011f77ee..5aca69b713b 100644 --- a/jdk/src/java.base/share/classes/sun/security/util/Password.java +++ b/jdk/src/java.base/share/classes/sun/security/util/Password.java @@ -29,6 +29,7 @@ import java.io.*; import java.nio.*; import java.nio.charset.*; import java.util.Arrays; +import jdk.internal.misc.SharedSecrets; /** * A utility class for reading passwords @@ -139,7 +140,7 @@ public class Password { private static byte[] convertToBytes(char[] pass) { if (enc == null) { synchronized (Password.class) { - enc = sun.misc.SharedSecrets.getJavaIOAccess() + enc = SharedSecrets.getJavaIOAccess() .charset() .newEncoder() .onMalformedInput(CodingErrorAction.REPLACE) diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java b/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java index 9ea7b98b000..5e2fa026e7d 100644 --- a/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java +++ b/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java @@ -52,8 +52,8 @@ import java.lang.reflect.Array; import java.text.AttributedCharacterIterator; import java.text.Bidi; import java.util.Arrays; -import sun.misc.JavaAWTFontAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaAWTFontAccess; +import jdk.internal.misc.SharedSecrets; import sun.text.normalizer.UBiDiProps; import sun.text.normalizer.UCharacter; import sun.text.normalizer.UTF16; diff --git a/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java b/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java index bd5c47e63ef..66de672d02c 100644 --- a/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java +++ b/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java @@ -39,8 +39,8 @@ import java.time.ZonedDateTime; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import sun.misc.JavaLangAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; /** * Platform logger provides an API for the JRE components to log diff --git a/jdk/src/java.base/unix/classes/java/io/FileDescriptor.java b/jdk/src/java.base/unix/classes/java/io/FileDescriptor.java index fefb1b53e4a..218d33dd558 100644 --- a/jdk/src/java.base/unix/classes/java/io/FileDescriptor.java +++ b/jdk/src/java.base/unix/classes/java/io/FileDescriptor.java @@ -27,6 +27,8 @@ package java.io; import java.util.ArrayList; import java.util.List; +import jdk.internal.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; /** * Instances of the file descriptor class serve as an opaque handle @@ -145,8 +147,8 @@ public final class FileDescriptor { // Set up JavaIOFileDescriptorAccess in SharedSecrets static { - sun.misc.SharedSecrets.setJavaIOFileDescriptorAccess( - new sun.misc.JavaIOFileDescriptorAccess() { + SharedSecrets.setJavaIOFileDescriptorAccess( + new JavaIOFileDescriptorAccess() { public void set(FileDescriptor obj, int fd) { obj.fd = fd; } diff --git a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java index 92624f4b6d2..27f58c6751a 100644 --- a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java +++ b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java @@ -46,6 +46,8 @@ import static java.security.AccessController.doPrivileged; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import jdk.internal.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; /** * java.lang.Process subclass in the UNIX environment. @@ -57,8 +59,8 @@ import java.security.PrivilegedExceptionAction; * @since 1.5 */ final class ProcessImpl extends Process { - private static final sun.misc.JavaIOFileDescriptorAccess fdAccess - = sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); + private static final JavaIOFileDescriptorAccess fdAccess + = SharedSecrets.getJavaIOFileDescriptorAccess(); // Linux platforms support a normal (non-forcible) kill signal. static final boolean SUPPORTS_NORMAL_TERMINATION = true; diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java index bc194f960ae..d13681998c3 100644 --- a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java +++ b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java @@ -30,11 +30,11 @@ import java.nio.channels.*; import java.io.FileDescriptor; import java.util.Set; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; import sun.nio.ch.FileChannelImpl; import sun.nio.ch.ThreadPool; import sun.nio.ch.SimpleAsynchronousFileChannelImpl; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; import static sun.nio.fs.UnixNativeDispatcher.*; import static sun.nio.fs.UnixConstants.*; diff --git a/jdk/src/java.base/windows/classes/java/io/FileDescriptor.java b/jdk/src/java.base/windows/classes/java/io/FileDescriptor.java index bd82be034e5..5468cc004bf 100644 --- a/jdk/src/java.base/windows/classes/java/io/FileDescriptor.java +++ b/jdk/src/java.base/windows/classes/java/io/FileDescriptor.java @@ -27,6 +27,8 @@ package java.io; import java.util.ArrayList; import java.util.List; +import jdk.internal.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; /** * Instances of the file descriptor class serve as an opaque handle @@ -70,8 +72,8 @@ public final class FileDescriptor { // Set up JavaIOFileDescriptorAccess in SharedSecrets static { - sun.misc.SharedSecrets.setJavaIOFileDescriptorAccess( - new sun.misc.JavaIOFileDescriptorAccess() { + SharedSecrets.setJavaIOFileDescriptorAccess( + new JavaIOFileDescriptorAccess() { public void set(FileDescriptor obj, int fd) { obj.fd = fd; } diff --git a/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java b/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java index 25c7bff50aa..6d2040fcd68 100644 --- a/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java +++ b/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java @@ -42,6 +42,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import jdk.internal.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; /* This class is for the exclusive use of ProcessBuilder.start() to * create new processes. @@ -51,8 +53,8 @@ import java.util.regex.Pattern; */ final class ProcessImpl extends Process { - private static final sun.misc.JavaIOFileDescriptorAccess fdAccess - = sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); + private static final JavaIOFileDescriptorAccess fdAccess + = SharedSecrets.getJavaIOFileDescriptorAccess(); // Windows platforms support a forcible kill signal. static final boolean SUPPORTS_NORMAL_TERMINATION = false; diff --git a/jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java index 725337e0db3..88a7ddcfdb0 100644 --- a/jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java +++ b/jdk/src/java.base/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java @@ -25,8 +25,8 @@ package java.net; import java.io.IOException; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; /** * This class defines the plain DatagramSocketImpl that is used on diff --git a/jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java index c25c8086e53..6792a411842 100644 --- a/jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java +++ b/jdk/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java @@ -26,8 +26,8 @@ package java.net; import java.io.IOException; import java.io.FileDescriptor; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; /** * This class defines the plain SocketImpl that is used on Windows platforms diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java index a8c20e2bb58..4b812d35a4d 100644 --- a/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java +++ b/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java @@ -28,8 +28,8 @@ package sun.nio.ch; import java.io.FileDescriptor; import java.io.IOException; import java.security.PrivilegedAction; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; class FileDispatcherImpl extends FileDispatcher { diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java index 69bdd93d239..6a5879f6a2e 100644 --- a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java +++ b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java @@ -31,8 +31,8 @@ import java.nio.ByteBuffer; import java.nio.BufferOverflowException; import java.io.IOException; import java.io.FileDescriptor; -import sun.misc.SharedSecrets; -import sun.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; /** * Windows implementation of AsynchronousFileChannel using overlapped I/O. diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java index de8cc8d7f5c..4a1139a2a73 100644 --- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java +++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java @@ -36,8 +36,8 @@ import java.util.Set; import com.sun.nio.file.ExtendedOpenOption; -import sun.misc.JavaIOFileDescriptorAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaIOFileDescriptorAccess; +import jdk.internal.misc.SharedSecrets; import sun.nio.ch.FileChannelImpl; import sun.nio.ch.ThreadPool; import sun.nio.ch.WindowsAsynchronousFileChannelImpl; diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java index 84fbca4be39..a30cca32ffd 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java +++ b/jdk/src/java.desktop/share/classes/com/sun/beans/decoder/DocumentHandler.java @@ -50,7 +50,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; /** * The main class to parse JavaBeans XML archive. diff --git a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java b/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java index ae728fe295f..56a2ab8164d 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java +++ b/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java @@ -47,8 +47,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.security.AccessControlContext; -import sun.misc.SharedSecrets; -import sun.misc.JavaSecurityAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaSecurityAccess; /** * EventQueue is a platform-independent class diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java b/jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java index a15b9311fb9..cd4c9fdf224 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java +++ b/jdk/src/java.desktop/share/classes/java/awt/font/JavaAWTFontAccessImpl.java @@ -26,9 +26,9 @@ package java.awt.font; import java.lang.reflect.Field; -import sun.misc.JavaAWTFontAccess; +import jdk.internal.misc.JavaAWTFontAccess; -class JavaAWTFontAccessImpl implements sun.misc.JavaAWTFontAccess { +class JavaAWTFontAccessImpl implements JavaAWTFontAccess { // java.awt.font.TextAttribute constants public Object getTextAttributeConstant(String name) { diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java b/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java index aed4a05482d..639ea12b600 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java +++ b/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java @@ -31,7 +31,7 @@ import java.util.Arrays; import java.util.Comparator; import java.util.EnumSet; import java.util.Set; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; /** * The NumericShaper class is used to convert Latin-1 (European) diff --git a/jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java b/jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java index aaac5cc5d1c..9296d787912 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java +++ b/jdk/src/java.desktop/share/classes/java/awt/font/TextAttribute.java @@ -44,7 +44,7 @@ import java.io.InvalidObjectException; import java.text.AttributedCharacterIterator.Attribute; import java.util.Map; import java.util.HashMap; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; /** * The TextAttribute class defines attribute keys and diff --git a/jdk/src/java.desktop/share/classes/java/beans/Introspector.java b/jdk/src/java.desktop/share/classes/java/beans/Introspector.java index 6b88e9a87fb..2ab3b5b8171 100644 --- a/jdk/src/java.desktop/share/classes/java/beans/Introspector.java +++ b/jdk/src/java.desktop/share/classes/java/beans/Introspector.java @@ -47,9 +47,9 @@ import java.util.Iterator; import java.util.EventObject; import java.util.List; import java.util.TreeMap; -import sun.misc.JavaBeansAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaBeansAccess; +import jdk.internal.misc.SharedSecrets; import sun.reflect.misc.ReflectUtil; /** diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java index 5f7755a159b..c9d265a4614 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java @@ -35,13 +35,13 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.applet.*; +import jdk.internal.misc.JavaSecurityAccess; +import jdk.internal.misc.SharedSecrets; import sun.awt.AWTAccessor; import sun.awt.AppContext; import sun.awt.DisplayChangedListener; import sun.awt.SunToolkit; import sun.java2d.SunGraphicsEnvironment; -import sun.misc.JavaSecurityAccess; -import sun.misc.SharedSecrets; import sun.security.action.GetPropertyAction; import com.sun.java.swing.SwingUtilities3; diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java b/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java index 886b41b7a2c..7f7e899a50a 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java @@ -47,8 +47,8 @@ import java.security.PrivilegedAction; import java.security.AccessControlContext; import java.security.ProtectionDomain; -import sun.misc.SharedSecrets; -import sun.misc.JavaSecurityAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaSecurityAccess; import sun.awt.AWTAccessor; diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java index c6e0b02b834..48c90d7d82e 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java @@ -44,6 +44,8 @@ import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; import java.lang.ref.SoftReference; +import jdk.internal.misc.JavaAWTAccess; +import jdk.internal.misc.SharedSecrets; import sun.misc.ManagedLocalsThread; import sun.util.logging.PlatformLogger; import java.util.concurrent.locks.Condition; @@ -839,7 +841,7 @@ public final class AppContext { // Set up JavaAWTAccess in SharedSecrets static { - sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() { + SharedSecrets.setJavaAWTAccess(new JavaAWTAccess() { private boolean hasRootThreadGroup(final AppContext ecx) { return AccessController.doPrivileged(new PrivilegedAction() { @Override @@ -878,13 +880,13 @@ public final class AppContext { // the window of opportunity in which that issue could // happen. if (numAppContexts.get() > 0) { - // Defaults to thread group caching. - // This is probably not required as we only really need - // isolation in a deployed applet environment, in which - // case ecx will not be null when we reach here - // However it helps emulate the deployed environment, - // in tests for instance. - ecx = ecx != null ? ecx : getAppContext(); + // Defaults to thread group caching. + // This is probably not required as we only really need + // isolation in a deployed applet environment, in which + // case ecx will not be null when we reach here + // However it helps emulate the deployed environment, + // in tests for instance. + ecx = ecx != null ? ecx : getAppContext(); } // getAppletContext() may be called when initializing the main @@ -895,8 +897,8 @@ public final class AppContext { // the root TG as its thread group. // See: JDK-8023258 final boolean isMainAppContext = ecx == null - || mainAppContext == ecx - || mainAppContext == null && hasRootThreadGroup(ecx); + || mainAppContext == ecx + || mainAppContext == null && hasRootThreadGroup(ecx); return isMainAppContext ? null : ecx; } diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java index f9173d6902a..110fca4d366 100644 --- a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java +++ b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java @@ -34,9 +34,9 @@ import java.lang.ref.WeakReference; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReentrantLock; -import sun.misc.JavaAWTAccess; +import jdk.internal.misc.JavaAWTAccess; +import jdk.internal.misc.SharedSecrets; import sun.misc.ManagedLocalsThread; -import sun.misc.SharedSecrets; /** * There is a single global LogManager object that is used to diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java b/jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java index b9887417299..45aca1f9c0e 100644 --- a/jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java +++ b/jdk/src/java.logging/share/classes/java/util/logging/LogRecord.java @@ -31,8 +31,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.io.*; import java.time.Clock; -import sun.misc.JavaLangAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; /** * LogRecord objects are used to pass logging requests between diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java index 92dc59c0b64..a303f2d288d 100644 --- a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java +++ b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java @@ -56,8 +56,6 @@ import java.security.AccessController; import javax.management.AttributeNotFoundException; import javax.management.openmbean.CompositeData; -import sun.misc.JavaBeansAccess; -import sun.misc.SharedSecrets; import sun.reflect.misc.MethodUtil; import sun.reflect.misc.ReflectUtil; diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java index 9f050bd6b11..bd2edb6b9fb 100644 --- a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java +++ b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/JavaBeansAccessor.java @@ -26,8 +26,8 @@ package com.sun.jmx.mbeanserver; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import sun.misc.JavaBeansAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaBeansAccess; +import jdk.internal.misc.SharedSecrets; /** * A centralized place for gaining access to java.beans related functionality - diff --git a/jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java index 16110614cf6..9f50196219b 100644 --- a/jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java +++ b/jdk/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java @@ -80,8 +80,8 @@ import javax.management.RuntimeErrorException; import javax.management.RuntimeOperationsException; import javax.management.ServiceNotFoundException; import javax.management.loading.ClassLoaderRepository; -import sun.misc.JavaSecurityAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaSecurityAccess; +import jdk.internal.misc.SharedSecrets; import sun.reflect.misc.MethodUtil; import sun.reflect.misc.ReflectUtil; diff --git a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java index a8d4279d862..740f483a44f 100644 --- a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java +++ b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java @@ -36,6 +36,9 @@ import javax.management.RuntimeOperationsException; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; + +import jdk.internal.misc.JavaNioAccess; +import jdk.internal.misc.SharedSecrets; import sun.util.logging.LoggingSupport; import java.util.ArrayList; import java.util.List; @@ -208,7 +211,7 @@ public class ManagementFactoryHelper { public static synchronized List getBufferPoolMXBeans() { if (bufferPools == null) { bufferPools = new ArrayList<>(2); - bufferPools.add(createBufferPoolMXBean(sun.misc.SharedSecrets.getJavaNioAccess() + bufferPools.add(createBufferPoolMXBean(SharedSecrets.getJavaNioAccess() .getDirectBufferPool())); bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl .getMappedBufferPool())); @@ -222,7 +225,7 @@ public class ManagementFactoryHelper { * Creates management interface for the given buffer pool. */ private static BufferPoolMXBean - createBufferPoolMXBean(final sun.misc.JavaNioAccess.BufferPool pool) + createBufferPoolMXBean(final JavaNioAccess.BufferPool pool) { return new BufferPoolMXBean() { private volatile ObjectName objname; // created lazily diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java index 17e7bc13779..47292fefa59 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/VersionHelper.java @@ -25,7 +25,7 @@ package com.sun.jndi.ldap; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; import java.net.MalformedURLException; import java.net.URL; diff --git a/jdk/src/java.sql/share/classes/java/sql/Date.java b/jdk/src/java.sql/share/classes/java/sql/Date.java index 40593e69412..c74bffc4eb6 100644 --- a/jdk/src/java.sql/share/classes/java/sql/Date.java +++ b/jdk/src/java.sql/share/classes/java/sql/Date.java @@ -27,8 +27,8 @@ package java.sql; import java.time.Instant; import java.time.LocalDate; -import sun.misc.SharedSecrets; -import sun.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; /** *

A thin wrapper around a millisecond value that allows diff --git a/jdk/src/java.sql/share/classes/java/sql/Time.java b/jdk/src/java.sql/share/classes/java/sql/Time.java index ec4863a7535..b5d9b5cbbde 100644 --- a/jdk/src/java.sql/share/classes/java/sql/Time.java +++ b/jdk/src/java.sql/share/classes/java/sql/Time.java @@ -27,8 +27,8 @@ package java.sql; import java.time.Instant; import java.time.LocalTime; -import sun.misc.SharedSecrets; -import sun.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; /** *

A thin wrapper around the java.util.Date class that allows the JDBC diff --git a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java index ed2b99e8671..c1d36e39e82 100644 --- a/jdk/src/java.sql/share/classes/java/sql/Timestamp.java +++ b/jdk/src/java.sql/share/classes/java/sql/Timestamp.java @@ -27,8 +27,8 @@ package java.sql; import java.time.Instant; import java.time.LocalDateTime; -import sun.misc.SharedSecrets; -import sun.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; /** *

A thin wrapper around {@code java.util.Date} that allows diff --git a/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java b/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java index 9609948438d..5a3f7c4e989 100644 --- a/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java +++ b/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java @@ -26,7 +26,7 @@ import java.security.AccessController; import java.security.DomainCombiner; import java.security.PrivilegedAction; import java.security.ProtectionDomain; -import sun.misc.SharedSecrets; +import jdk.internal.misc.SharedSecrets; /* * @test @@ -34,7 +34,7 @@ import sun.misc.SharedSecrets; * @summary Make sure that JavaSecurityAccess.doIntersectionPrivilege() * is not dropping the information about the domain combiner of * the stack ACC - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc */ public class PreserveCombinerTest { diff --git a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java index 38e47e6124c..36e0301e3f7 100644 --- a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java +++ b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java @@ -35,13 +35,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.LogManager; import java.util.logging.Logger; +import jdk.internal.misc.JavaAWTAccess; +import jdk.internal.misc.SharedSecrets; /** * @test * @bug 8065991 * @summary check that when LogManager is initialized, a deadlock similar * to that described in 8065709 will not occur. - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @run main/othervm LogManagerAppContextDeadlock UNSECURE * @run main/othervm LogManagerAppContextDeadlock SECURE * @@ -97,7 +99,7 @@ public class LogManagerAppContextDeadlock { } static { - sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() { + SharedSecrets.setJavaAWTAccess(new JavaAWTAccess() { @Override public Object getAppletContext() { if (numAppContexts.get() == 0) return null; @@ -341,7 +343,7 @@ public class LogManagerAppContextDeadlock { // FileHandlers because we're passing invalid parameters // which will make the creation fail... permissions = new Permissions(); - permissions.add(new RuntimePermission("accessClassInPackage.sun.misc")); + permissions.add(new RuntimePermission("accessClassInPackage.jdk.internal.misc")); // these are used for configuring the test itself... allPermissions = new Permissions(); diff --git a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java index 6e4f584d84e..9fe785b3ae0 100644 --- a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java +++ b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java @@ -34,15 +34,15 @@ import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; import java.util.logging.LoggingPermission; -import sun.misc.JavaAWTAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaAWTAccess; +import jdk.internal.misc.SharedSecrets; /** * @test * @bug 8030850 * @summary Tests that setting .level=FINEST for the root logger in logging * configuration file does work. - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @run main/othervm RootLevelInConfigFile * * @author danielfuchs @@ -181,7 +181,7 @@ public class RootLevelInConfigFile { perms.add(new PropertyPermission("java.util.logging.config.class","read")); perms.add(new PropertyPermission("java.util.logging.config.file","read")); perms.add(new FilePermission(configFile, "read")); - perms.add(new RuntimePermission("accessClassInPackage.sun.misc")); + perms.add(new RuntimePermission("accessClassInPackage.jdk.internal.misc")); } @Override diff --git a/jdk/test/java/util/logging/TestAppletLoggerContext.java b/jdk/test/java/util/logging/TestAppletLoggerContext.java index 4bb3a59e9b0..aa6ee76f5a5 100644 --- a/jdk/test/java/util/logging/TestAppletLoggerContext.java +++ b/jdk/test/java/util/logging/TestAppletLoggerContext.java @@ -33,8 +33,8 @@ import java.util.Map; import java.util.logging.LogManager; import java.util.logging.Logger; import java.util.logging.LoggingPermission; -import sun.misc.JavaAWTAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaAWTAccess; +import jdk.internal.misc.SharedSecrets; /* * @test @@ -42,7 +42,7 @@ import sun.misc.SharedSecrets; * @summary NPE when using Logger.getAnonymousLogger or * LogManager.getLogManager().getLogger * - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingApplet * @run main/othervm -Dtest.security=on TestAppletLoggerContext LoadingApplet * @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingMain diff --git a/jdk/test/java/util/logging/TestGetLoggerNPE.java b/jdk/test/java/util/logging/TestGetLoggerNPE.java index 6bc2a6c95a5..c1cbf06834b 100644 --- a/jdk/test/java/util/logging/TestGetLoggerNPE.java +++ b/jdk/test/java/util/logging/TestGetLoggerNPE.java @@ -26,8 +26,8 @@ import java.security.Policy; import java.security.ProtectionDomain; import java.util.logging.LogManager; import java.util.logging.Logger; -import sun.misc.JavaAWTAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaAWTAccess; +import jdk.internal.misc.SharedSecrets; /* * @test @@ -35,7 +35,7 @@ import sun.misc.SharedSecrets; * * @summary NPE with logging while launching webstart * - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @build TestGetLoggerNPE * @run main/othervm TestGetLoggerNPE getLogger * @run main/othervm TestGetLoggerNPE getLogManager diff --git a/jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java b/jdk/test/jdk/internal/misc/JavaLangAccess/FormatUnsigned.java similarity index 96% rename from jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java rename to jdk/test/jdk/internal/misc/JavaLangAccess/FormatUnsigned.java index c734f817c8c..e1e4b4288e1 100644 --- a/jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java +++ b/jdk/test/jdk/internal/misc/JavaLangAccess/FormatUnsigned.java @@ -21,14 +21,14 @@ * questions. */ -import sun.misc.JavaLangAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; /* * @test * @bug 8050114 * @summary Test JavaLangAccess.formatUnsignedInt/-Long - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc */ public class FormatUnsigned { diff --git a/jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java b/jdk/test/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java similarity index 96% rename from jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java rename to jdk/test/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java index 64d11c4fac5..50235107153 100644 --- a/jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java +++ b/jdk/test/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java @@ -23,14 +23,14 @@ import java.util.Objects; import java.util.Comparator; -import sun.misc.JavaLangAccess; -import sun.misc.SharedSecrets; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; /* * @test * @bug 8013528 * @summary Test JavaLangAccess.newUnsafeString - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @compile -XDignore.symbol.file NewUnsafeString.java */ public class NewUnsafeString {