jdk-sandbox: comparison langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java

equal deleted inserted replaced

-:9fffb959eb41
+:443efec4bf09
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.ZipFile;
 import javax.tools.JavaFileManager;
 // Used by Locations(for now) to indicate that the PLATFORM_CLASS_PATH
 // should use the jrt: file system.
 // When Locations has been converted to use java.nio.file.Path,
 // Locations can use Paths.get(URI.create("jrt:"))
-static final File JRT_MARKER_FILE = new File("JRT_MARKER_FILE");
+static final Path JRT_MARKER_FILE = Paths.get("JRT_MARKER_FILE");
 public Locations() {
 initHandlers();
 }
 this.log = log;
 warn = lint.isEnabled(Lint.LintCategory.PATH);
 this.fsInfo = fsInfo;
 }
-public Collection<File> bootClassPath() {
+public Collection<Path> bootClassPath() {
 return getLocation(PLATFORM_CLASS_PATH);
 }
 public boolean isDefaultBootClassPath() {
 BootClassPathLocationHandler h
 = (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
 return h.isDefault();
 }
-public Collection<File> userClassPath() {
+public Collection<Path> userClassPath() {
 return getLocation(CLASS_PATH);
 }
-public Collection<File> sourcePath() {
+public Collection<Path> sourcePath() {
-Collection<File> p = getLocation(SOURCE_PATH);
+Collection<Path> p = getLocation(SOURCE_PATH);
 // TODO: this should be handled by the LocationHandler
 return p == null || p.isEmpty() ? null : p;
 }
 /**
-* Split a path into its elements. Empty path elements will be ignored.
+* Split a search path into its elements. Empty path elements will be ignored.
 *
-* @param path The path to be split
+* @param searchPath The search path to be split
 * @return The elements of the path
 */
-private static Iterable<File> getPathEntries(String path) {
+private static Iterable<Path> getPathEntries(String searchPath) {
-return getPathEntries(path, null);
+return getPathEntries(searchPath, null);
 }
 /**
-* Split a path into its elements. If emptyPathDefault is not null, all empty elements in the
+* Split a search path into its elements. If emptyPathDefault is not null, all empty elements in the
 * path, including empty elements at either end of the path, will be replaced with the value of
 * emptyPathDefault.
 *
-* @param path The path to be split
+* @param searchPath The search path to be split
 * @param emptyPathDefault The value to substitute for empty path elements, or null, to ignore
 * empty path elements
 * @return The elements of the path
 */
-private static Iterable<File> getPathEntries(String path, File emptyPathDefault) {
+private static Iterable<Path> getPathEntries(String searchPath, Path emptyPathDefault) {
-ListBuffer<File> entries = new ListBuffer<>();
+ListBuffer<Path> entries = new ListBuffer<>();
-int start = 0;
+for (String s: searchPath.split(Pattern.quote(File.pathSeparator), -1)) {
-while (start <= path.length()) {
+if (s.isEmpty()) {
-int sep = path.indexOf(File.pathSeparatorChar, start);
+if (emptyPathDefault != null) {
-if (sep == -1) {
+entries.add(emptyPathDefault);
-sep = path.length();
+}
-}
+} else {
-if (start < sep) {
+entries.add(Paths.get(s));
-entries.add(new File(path.substring(start, sep)));
+}
-} else if (emptyPathDefault != null) {
-entries.add(emptyPathDefault);
-}
-start = sep + 1;
 }
 return entries;
 }
 /**
 * Utility class to help evaluate a path option. Duplicate entries are ignored, jar class paths
 * can be expanded.
 */
-private class SearchPath extends LinkedHashSet<File> {
+private class SearchPath extends LinkedHashSet<Path> {
 private static final long serialVersionUID = 0;
 private boolean expandJarClassPaths = false;
-private final Set<File> canonicalValues = new HashSet<>();
+private final Set<Path> canonicalValues = new HashSet<>();
 public SearchPath expandJarClassPaths(boolean x) {
 expandJarClassPaths = x;
 return this;
 }
 /**
 * What to use when path element is the empty string
 */
-private File emptyPathDefault = null;
+private Path emptyPathDefault = null;
-public SearchPath emptyPathDefault(File x) {
+public SearchPath emptyPathDefault(Path x) {
 emptyPathDefault = x;
 return this;
 }
 public SearchPath addDirectories(String dirs, boolean warn) {
 boolean prev = expandJarClassPaths;
 expandJarClassPaths = true;
 try {
 if (dirs != null) {
-for (File dir : getPathEntries(dirs)) {
+for (Path dir : getPathEntries(dirs)) {
 addDirectory(dir, warn);
 }
 }
 return this;
 } finally {
 public SearchPath addDirectories(String dirs) {
 return addDirectories(dirs, warn);
 }
-private void addDirectory(File dir, boolean warn) {
+private void addDirectory(Path dir, boolean warn) {
-if (!dir.isDirectory()) {
+if (!Files.isDirectory(dir)) {
 if (warn) {
 log.warning(Lint.LintCategory.PATH,
 "dir.path.element.not.found", dir);
 }
 return;
 }
-File[] files = dir.listFiles();
+try (Stream<Path> s = Files.list(dir)) {
-if (files == null) {
+s.filter(dirEntry -> isArchive(dirEntry))
-return;
+.forEach(dirEntry -> addFile(dirEntry, warn));
-}
+} catch (IOException ignore) {
-for (File direntry : files) {
-if (isArchive(direntry)) {
-addFile(direntry, warn);
-}
 }
 }
 public SearchPath addFiles(String files, boolean warn) {
 if (files != null) {
 public SearchPath addFiles(String files) {
 return addFiles(files, warn);
 }
-public SearchPath addFiles(Iterable<? extends File> files, boolean warn) {
+public SearchPath addFiles(Iterable<? extends Path> files, boolean warn) {
 if (files != null) {
-for (File file : files) {
+for (Path file : files) {
 addFile(file, warn);
 }
 }
 return this;
 }
-public SearchPath addFiles(Iterable<? extends File> files) {
+public SearchPath addFiles(Iterable<? extends Path> files) {
 return addFiles(files, warn);
 }
-public void addFile(File file, boolean warn) {
+public void addFile(Path file, boolean warn) {
 if (contains(file)) {
 // discard duplicates
 return;
 }
 }
 super.add(file);
 return;
 }
-File canonFile = fsInfo.getCanonicalFile(file);
+Path canonFile = fsInfo.getCanonicalFile(file);
 if (canonicalValues.contains(canonFile)) {
 /* Discard duplicates and avoid infinite recursion */
 return;
 }
 if (fsInfo.isFile(file)) {
 /* File is an ordinary file. */
-if (!isArchive(file) && !file.getName().endsWith(".jimage")) {
+if (!isArchive(file) && !file.getFileName().toString().endsWith(".jimage")) {
 /* Not a recognized extension; open it to see if
 it looks like a valid zip file. */
 try {
-ZipFile z = new ZipFile(file);
+ZipFile z = new ZipFile(file.toFile());
 z.close();
 if (warn) {
 log.warning(Lint.LintCategory.PATH,
 "unexpected.archive.file", file);
 }
 /* Now what we have left is either a directory or a file name
 conforming to archive naming convention */
 super.add(file);
 canonicalValues.add(canonFile);
-if (expandJarClassPaths && fsInfo.isFile(file) && !file.getName().endsWith(".jimage")) {
+if (expandJarClassPaths && fsInfo.isFile(file) && !file.getFileName().toString().endsWith(".jimage")) {
 addJarClassPath(file, warn);
 }
 }
 // Adds referenced classpath elements from a jar's Class-Path
 // Manifest entry.  In some future release, we may want to
 // update this code to recognize URLs rather than simple
 // filenames, but if we do, we should redo all path-related code.
-private void addJarClassPath(File jarFile, boolean warn) {
+private void addJarClassPath(Path jarFile, boolean warn) {
 try {
-for (File f : fsInfo.getJarClassPath(jarFile)) {
+for (Path f : fsInfo.getJarClassPath(jarFile)) {
 addFile(f, warn);
 }
 } catch (IOException e) {
 log.error("error.reading.file", jarFile, JavacFileManager.getMessage(e));
 }
 abstract boolean handleOption(Option option, String value);
 /**
 * @see StandardJavaFileManager#getLocation
 */
-abstract Collection<File> getLocation();
+abstract Collection<Path> getLocation();
 /**
 * @see StandardJavaFileManager#setLocation
 */
-abstract void setLocation(Iterable<? extends File> files) throws IOException;
+abstract void setLocation(Iterable<? extends Path> files) throws IOException;
 }
 /**
 * General purpose implementation for output locations, such as -d/CLASS_OUTPUT and
 * -s/SOURCE_OUTPUT. All options are treated as equivalent (i.e. aliases.) The value is a single
 * file, possibly null.
 */
 private class OutputLocationHandler extends LocationHandler {
-private File outputDir;
+private Path outputDir;
 OutputLocationHandler(Location location, Option... options) {
 super(location, options);
 }
 // TODO: could/should validate outputDir exists and is a directory
 // need to decide how best to report issue for benefit of
 // direct API call on JavaFileManager.handleOption(specifies IAE)
 // vs. command line decoding.
-outputDir = (value == null) ? null : new File(value);
+outputDir = (value == null) ? null : Paths.get(value);
 return true;
 }
 @Override
-Collection<File> getLocation() {
+Collection<Path> getLocation() {
 return (outputDir == null) ? null : Collections.singleton(outputDir);
 }
 @Override
-void setLocation(Iterable<? extends File> files) throws IOException {
+void setLocation(Iterable<? extends Path> files) throws IOException {
 if (files == null) {
 outputDir = null;
 } else {
-Iterator<? extends File> pathIter = files.iterator();
+Iterator<? extends Path> pathIter = files.iterator();
 if (!pathIter.hasNext()) {
 throw new IllegalArgumentException("empty path for directory");
 }
-File dir = pathIter.next();
+Path dir = pathIter.next();
 if (pathIter.hasNext()) {
 throw new IllegalArgumentException("path too long for directory");
 }
-if (!dir.exists()) {
+if (!Files.exists(dir)) {
 throw new FileNotFoundException(dir + ": does not exist");
-} else if (!dir.isDirectory()) {
+} else if (!Files.isDirectory(dir)) {
 throw new IOException(dir + ": not a directory");
 }
 outputDir = dir;
 }
 }
 * -processorPath/ANNOTATION_PROCESS_PATH. All options are treated as equivalent (i.e. aliases.)
 * The value is an ordered set of files and/or directories.
 */
 private class SimpleLocationHandler extends LocationHandler {
-protected Collection<File> searchPath;
+protected Collection<Path> searchPath;
 SimpleLocationHandler(Location location, Option... options) {
 super(location, options);
 }
 : Collections.unmodifiableCollection(createPath().addFiles(value));
 return true;
 }
 @Override
-Collection<File> getLocation() {
+Collection<Path> getLocation() {
 return searchPath;
 }
 @Override
-void setLocation(Iterable<? extends File> files) {
+void setLocation(Iterable<? extends Path> files) {
 SearchPath p;
 if (files == null) {
 p = computePath(null);
 } else {
 p = createPath().addFiles(files);
 super(StandardLocation.CLASS_PATH,
 Option.CLASSPATH, Option.CP);
 }
 @Override
-Collection<File> getLocation() {
+Collection<Path> getLocation() {
 lazy();
 return searchPath;
 }
 @Override
 @Override
 protected SearchPath createPath() {
 return new SearchPath()
 .expandJarClassPaths(true) // Only search user jars for Class-Paths
-.emptyPathDefault(new File("."));  // Empty path elt ==> current directory
+.emptyPathDefault(Paths.get("."));  // Empty path elt ==> current directory
 }
 private void lazy() {
 if (searchPath == null) {
 setLocation(null);
 * reverts to using default values for options that have not been set. Setting -bootclasspath or
 * -Xbootclasspath overrides any existing value for -Xbootclasspath/p: and -Xbootclasspath/a:.
 */
 private class BootClassPathLocationHandler extends LocationHandler {
-private Collection<File> searchPath;
+private Collection<Path> searchPath;
 final Map<Option, String> optionValues = new EnumMap<>(Option.class);
 /**
 * Is the bootclasspath the default?
 */
 return option;
 }
 }
 @Override
-Collection<File> getLocation() {
+Collection<Path> getLocation() {
 lazy();
 return searchPath;
 }
 @Override
-void setLocation(Iterable<? extends File> files) {
+void setLocation(Iterable<? extends Path> files) {
 if (files == null) {
 searchPath = null;  // reset to "uninitialized"
 } else {
 isDefault = false;
 SearchPath p = new SearchPath().addFiles(files, false);
 if (bootclasspathOpt != null) {
 path.addFiles(bootclasspathOpt);
 } else {
 // Standard system classes for this compiler's release.
-Collection<File> systemClasses = systemClasses(java_home);
+Collection<Path> systemClasses = systemClasses(java_home);
 if (systemClasses != null) {
 path.addFiles(systemClasses, false);
 } else {
 // fallback to the value of sun.boot.class.path
 String files = System.getProperty("sun.boot.class.path");
 // that they are.
 if (extdirsOpt != null) {
 path.addDirectories(extdirsOpt);
 } else {
 // Add lib/jfxrt.jar to the search path
-File jfxrt = new File(new File(java_home, "lib"), "jfxrt.jar");
+Path jfxrt = Paths.get(java_home, "lib", "jfxrt.jar");
-if (jfxrt.exists()) {
+if (Files.exists(jfxrt)) {
 path.addFile(jfxrt, false);
 }
 path.addDirectories(System.getProperty("java.ext.dirs"), false);
 }
 * Return a collection of files containing system classes.
 * Returns {@code null} if not running on a modular image.
 *
 * @throws UncheckedIOException if an I/O errors occurs
 */
-private Collection<File> systemClasses(String java_home) throws IOException {
+private Collection<Path> systemClasses(String java_home) throws IOException {
 // Return .jimage files if available
 Path libModules = Paths.get(java_home, "lib", "modules");
 if (Files.exists(libModules)) {
 try (Stream<Path> files = Files.list(libModules)) {
 boolean haveJImageFiles =
 // Temporary: if no .jimage files, return individual modules
 if (Files.exists(libModules.resolve("java.base"))) {
 return Files.list(libModules)
 .map(d -> d.resolve("classes"))
-.map(Path::toFile)
 .collect(Collectors.toList());
 }
 // Exploded module image
 Path modules = Paths.get(java_home, "modules");
 if (Files.isDirectory(modules.resolve("java.base"))) {
 return Files.list(modules)
-.map(Path::toFile)
 .collect(Collectors.toList());
 }
 // not a modular image that we know about
 return null;
 public boolean handleOption(Option option, String value) {
 LocationHandler h = handlersForOption.get(option);
 return (h == null ? false : h.handleOption(option, value));
 }
-Collection<File> getLocation(Location location) {
+Collection<Path> getLocation(Location location) {
 LocationHandler h = getHandler(location);
 return (h == null ? null : h.getLocation());
 }
-File getOutputLocation(Location location) {
+Path getOutputLocation(Location location) {
 if (!location.isOutputLocation()) {
 throw new IllegalArgumentException();
 }
 LocationHandler h = getHandler(location);
 return ((OutputLocationHandler) h).outputDir;
 }
-void setLocation(Location location, Iterable<? extends File> files) throws IOException {
+void setLocation(Location location, Iterable<? extends Path> files) throws IOException {
 LocationHandler h = getHandler(location);
 if (h == null) {
 if (location.isOutputLocation()) {
 h = new OutputLocationHandler(location);
 } else {
 }
 /**
 * Is this the name of an archive file?
 */
-private boolean isArchive(File file) {
+private boolean isArchive(Path file) {
-String n = StringUtils.toLowerCase(file.getName());
+String n = StringUtils.toLowerCase(file.getFileName().toString());
 return fsInfo.isFile(file)
 && (n.endsWith(".jar") || n.endsWith(".zip"));
 }
 /**
 * Utility method for converting a search path string to an array of directory and JAR file
 * URLs.
 *
-* Note that this method is called by apt and the DocletInvoker.
+* Note that this method is called by the DocletInvoker.
 *
 * @param path the search path string
 * @return the resulting array of directory and JAR file URLs
 */
 public static URL[] pathToURLs(String path) {
-StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
+java.util.List<URL> urls = new ArrayList<>();
-URL[] urls = new URL[st.countTokens()];
+for (String s: path.split(Pattern.quote(File.pathSeparator))) {
-int count = 0;
+if (!s.isEmpty()) {
-while (st.hasMoreTokens()) {
+URL url = fileToURL(Paths.get(s));
-URL url = fileToURL(new File(st.nextToken()));
+if (url != null) {
-if (url != null) {
+urls.add(url);
-urls[count++] = url;
+}
 }
 }
-urls = Arrays.copyOf(urls, count);
+return urls.toArray(new URL[urls.size()]);
-return urls;
 }
 /**
 * Returns the directory or JAR file URL corresponding to the specified local file name.
 *
-* @param file the File object
+* @param file the Path object
 * @return the resulting directory or JAR file URL, or null if unknown
 */
-private static URL fileToURL(File file) {
+private static URL fileToURL(Path file) {
-String name;
+Path p;
 try {
-name = file.getCanonicalPath();
+p = file.toRealPath();
 } catch (IOException e) {
-name = file.getAbsolutePath();
+p = file.toAbsolutePath();
-}
-name = name.replace(File.separatorChar, '/');
-if (!name.startsWith("/")) {
-name = "/" + name;
-}
-// If the file does not exist, then assume that it's a directory
-if (!file.isFile()) {
-name = name + "/";
 }
 try {
-return new URL("file", "", name);
+return p.normalize().toUri().toURL();
 } catch (MalformedURLException e) {
-throw new IllegalArgumentException(file.toString());
+return null;
 }
 }
 }

changeset 27858	443efec4bf09
parent 27579	d1a63c99cdd5
parent 27852	2e6ad0e4fe20
child 28332	cd3ea1087d2b