archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8211122: Reduce the number of internal classes made accessible to jdk.unsupported

Browse source 
Reviewed-by: alanb, dfuchs, kvn
This commit is contained in:
Mandy Chung 2018-11-06 10:01:16 -08:00
parent 29f03ebf2c
commit 9ffe7e1205
257 changed files with 764 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/util/ArrayDeque.java
View file

@ -37,8 +37,8 @@ package java.util;
import java.io.Serializable;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* Resizable-array implementation of the {@link Deque} interface. Array

2
src/java.base/share/classes/java/util/ArrayList.java
View file

@ -28,7 +28,7 @@ package java.util;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* Resizable-array implementation of the {@code List} interface. Implements

2
src/java.base/share/classes/java/util/EnumMap.java
View file

@ -25,7 +25,7 @@
package java.util;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* A specialized {@link Map} implementation for use with enum type keys. All

2
src/java.base/share/classes/java/util/EnumSet.java
View file

@ -25,7 +25,7 @@
package java.util;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* A specialized {@link Set} implementation for use with enum types. All of

2
src/java.base/share/classes/java/util/HashMap.java
View file

@ -34,7 +34,7 @@ import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* Hash table based implementation of the {@code Map} interface. This

2
src/java.base/share/classes/java/util/HashSet.java
View file

@ -26,7 +26,7 @@
package java.util;
import java.io.InvalidObjectException;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* This class implements the {@code Set} interface, backed by a hash table

2
src/java.base/share/classes/java/util/Hashtable.java
View file

@ -29,7 +29,7 @@ import java.io.*;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.BiFunction;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* This class implements a hash table, which maps keys to values. Any

2
src/java.base/share/classes/java/util/IdentityHashMap.java
View file

@ -29,7 +29,7 @@ import java.lang.reflect.Array;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* This class implements the {@code Map} interface with a hash table, using

2
src/java.base/share/classes/java/util/ImmutableCollections.java
View file

@ -35,7 +35,7 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
import jdk.internal.misc.VM;
import jdk.internal.vm.annotation.Stable;

2
src/java.base/share/classes/java/util/PriorityQueue.java
View file

@ -27,7 +27,7 @@ package java.util;
import java.util.function.Consumer;
import java.util.function.Predicate;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* An unbounded priority {@linkplain Queue queue} based on a priority heap.

4
src/java.base/share/classes/java/util/Properties.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -46,7 +46,7 @@ import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Function;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
import jdk.internal.misc.Unsafe;
import jdk.internal.util.xml.PropertiesDefaultHandler;

4
src/java.base/share/classes/java/util/ResourceBundle.java
View file

@ -66,8 +66,8 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.internal.loader.BootLoader;
import jdk.internal.misc.JavaUtilResourceBundleAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.JavaUtilResourceBundleAccess;
import jdk.internal.access.SharedSecrets;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
import sun.security.action.GetPropertyAction;

4
src/java.base/share/classes/java/util/ServiceLoader.java
View file

@ -47,8 +47,8 @@ import java.util.stream.StreamSupport;
import jdk.internal.loader.BootLoader;
import jdk.internal.loader.ClassLoaders;
import jdk.internal.misc.JavaLangAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.JavaLangAccess;
import jdk.internal.access.SharedSecrets;
import jdk.internal.misc.VM;
import jdk.internal.module.ServicesCatalog;
import jdk.internal.module.ServicesCatalog.ServiceProvider;

6
src/java.base/share/classes/java/util/UUID.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -27,8 +27,8 @@ package java.util;
import java.security.*;
import jdk.internal.misc.JavaLangAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.JavaLangAccess;
import jdk.internal.access.SharedSecrets;
/**
* A class that represents an immutable universally unique identifier (UUID).

2
src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
View file

@ -51,7 +51,7 @@ import java.util.Spliterators;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* A thread-safe variant of {@link java.util.ArrayList} in which all mutative

2
src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
View file

@ -52,7 +52,7 @@ import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer;
import java.util.function.Predicate;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.SharedSecrets;
/**
* An unbounded {@linkplain BlockingQueue blocking queue} that uses

6
src/java.base/share/classes/java/util/jar/JarFile.java
View file

@ -25,8 +25,8 @@
package java.util.jar;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.misc.JavaUtilZipFileAccess;
import jdk.internal.access.SharedSecrets;
import jdk.internal.access.JavaUtilZipFileAccess;
import sun.security.action.GetPropertyAction;
import sun.security.util.ManifestEntryVerifier;
import sun.security.util.SignatureFileVerifier;
@ -172,7 +172,7 @@ class JarFile extends ZipFile {
// Set up JavaUtilJarAccess in SharedSecrets
SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl());
// Get JavaUtilZipFileAccess from SharedSecrets
JUZFA = jdk.internal.misc.SharedSecrets.getJavaUtilZipFileAccess();
JUZFA = SharedSecrets.getJavaUtilZipFileAccess();
// multi-release jar file versions >= 9
BASE_VERSION = Runtime.Version.parse(Integer.toString(8));
BASE_VERSION_FEATURE = BASE_VERSION.feature();

2
src/java.base/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
View file

@ -30,7 +30,7 @@ import java.net.URL;
import java.security.CodeSource;
import java.util.Enumeration;
import java.util.List;
import jdk.internal.misc.JavaUtilJarAccess;
import jdk.internal.access.JavaUtilJarAccess;
class JavaUtilJarAccessImpl implements JavaUtilJarAccess {
public boolean jarFileHasClassPathAttribute(JarFile jar) throws IOException {

6
src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,8 +25,8 @@
package java.util.spi;
import jdk.internal.misc.JavaUtilResourceBundleAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.JavaUtilResourceBundleAccess;
import jdk.internal.access.SharedSecrets;
import java.io.IOException;
import java.io.InputStream;

6
src/java.base/share/classes/java/util/zip/ZipCoder.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,8 +41,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
class ZipCoder {
private static final jdk.internal.misc.JavaLangAccess JLA =
jdk.internal.misc.SharedSecrets.getJavaLangAccess();
private static final jdk.internal.access.JavaLangAccess JLA =
jdk.internal.access.SharedSecrets.getJavaLangAccess();
static final class UTF8 extends ZipCoder {

8
src/java.base/share/classes/java/util/zip/ZipFile.java
View file

@ -58,9 +58,9 @@ import java.util.function.IntFunction;
import java.util.jar.JarEntry;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import jdk.internal.misc.JavaLangAccess;
import jdk.internal.misc.JavaUtilZipFileAccess;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.access.JavaLangAccess;
import jdk.internal.access.JavaUtilZipFileAccess;
import jdk.internal.access.SharedSecrets;
import jdk.internal.misc.VM;
import jdk.internal.perf.PerfCounter;
import jdk.internal.ref.CleanerFactory;
@ -1071,7 +1071,7 @@ class ZipFile implements ZipConstants, Closeable {
}
}
);
JLA = jdk.internal.misc.SharedSecrets.getJavaLangAccess();
JLA = SharedSecrets.getJavaLangAccess();
isWindows = VM.getSavedProperty("os.name").contains("Windows");
}