jdk-sandbox: comparison src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java

equal deleted inserted replaced

-:00c47178ea6c
+:526f5cf13972
 * questions.
 */
 package jdk.javadoc.internal.doclets.toolkit.util;
-import java.io.*;
+import java.io.BufferedReader;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
 import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
 import javax.tools.DocumentationTool;
 import jdk.javadoc.doclet.Reporter;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 * Stores the info for one external doc set
 */
 private class Item {
 /**
-* Element name, found in the "element-list" file in the {@link path}.
+* Element name, found in the "element-list" file in the {@link #path}.
 */
 final String elementName;
 /**
 * The URL or the directory path at which the element documentation will be
 * @param elementName name of the element.
 * @return true if the element is a module
 */
 public boolean isModule(String elementName) {
 Item elem = moduleItems.get(elementName);
-return (elem == null) ? false : true;
+return elem != null;
 }
 /**
 * Convert a link to be an external link if appropriate.
 *
 reporter.print(Diagnostic.Kind.ERROR, f.getMessage());
 return false;
 }
 }
-private URL toURL(String url) throws Fault {
-try {
-return new URL(url);
-} catch (MalformedURLException e) {
-throw new Fault(resources.getText("doclet.MalformedURL", url), e);
-}
-}
 private class Fault extends Exception {
 private static final long serialVersionUID = 0;
 Fault(String msg, Exception cause) {
 super(msg, cause);
 * @param elemlisturlpath URL or the path to the "element-list" file.
 */
 private void readElementListFromURL(String urlpath, URL elemlisturlpath) throws Fault {
 try {
 URL link = elemlisturlpath.toURI().resolve(DocPaths.ELEMENT_LIST.getPath()).toURL();
-readElementList(link.openStream(), urlpath, false);
+try (InputStream in = open(link)) {
+readElementList(in, urlpath, false);
+}
 } catch (URISyntaxException | MalformedURLException exc) {
 throw new Fault(resources.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc);
 } catch (IOException exc) {
 readAlternateURL(urlpath, elemlisturlpath);
 }
 * @param elemlisturlpath URL or the path to the "package-list" file.
 */
 private void readAlternateURL(String urlpath, URL elemlisturlpath) throws Fault {
 try {
 URL link = elemlisturlpath.toURI().resolve(DocPaths.PACKAGE_LIST.getPath()).toURL();
-readElementList(link.openStream(), urlpath, false);
+try (InputStream in = open(link)) {
+readElementList(in, urlpath, false);
+}
 } catch (URISyntaxException | MalformedURLException exc) {
 throw new Fault(resources.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc);
 } catch (IOException exc) {
 throw new Fault(resources.getText("doclet.URL_error", elemlisturlpath.toString()), exc);
 }
 * @throws IOException if there is a problem reading or closing the stream
 */
 private void readElementList(InputStream input, String path, boolean relative)
 throws Fault, IOException {
 try (BufferedReader in = new BufferedReader(new InputStreamReader(input))) {
-String elemname = null;
+String elemname;
+DocPath elempath;
 String moduleName = null;
-DocPath elempath = null;
 DocPath basePath  = DocPath.create(path);
 while ((elemname = in.readLine()) != null) {
 if (elemname.length() > 0) {
 elempath = basePath;
 if (elemname.startsWith(DocletConstants.MODULE_PREFIX)) {
 }
 }
 }
 }
+private void checkLinkCompatibility(String packageName, String moduleName, String path) throws Fault {
+PackageElement pe = utils.elementUtils.getPackageElement(packageName);
+if (pe != null) {
+ModuleElement me = (ModuleElement)pe.getEnclosingElement();
+if (me == null || me.isUnnamed()) {
+if (moduleName != null) {
+throw new Fault(resources.getText("doclet.linkMismatch_PackagedLinkedtoModule",
+path), null);
+}
+} else if (moduleName == null) {
+throw new Fault(resources.getText("doclet.linkMismatch_ModuleLinkedtoPackage",
+path), null);
+}
+}
+}
 public boolean isUrl (String urlCandidate) {
 try {
-URL ignore = new URL(urlCandidate);
+new URL(urlCandidate);
 //No exception was thrown, so this must really be a URL.
 return true;
 } catch (MalformedURLException e) {
 //Since exception is thrown, this must be a directory path.
 return false;
 }
 }
-private void checkLinkCompatibility(String packageName, String moduleName, String path) throws Fault {
+private URL toURL(String url) throws Fault {
-PackageElement pe = configuration.utils.elementUtils.getPackageElement(packageName);
+try {
-if (pe != null) {
+return new URL(url);
-ModuleElement me = (ModuleElement)pe.getEnclosingElement();
+} catch (MalformedURLException e) {
-if (me == null || me.isUnnamed()) {
+throw new Fault(resources.getText("doclet.MalformedURL", url), e);
-if (moduleName != null)
+}
-throw new Fault(resources.getText("doclet.linkMismatch_PackagedLinkedtoModule",
+}
-path), null);
-} else if (moduleName == null)
+/**
-throw new Fault(resources.getText("doclet.linkMismatch_ModuleLinkedtoPackage",
+* Open a stream to a URL, following a limited number of redirects
-path), null);
+* if necessary.
-}
+*
+* @param url the URL
+* @return the stream
+* @throws IOException if an error occurred accessing the URL
+*/
+private InputStream open(URL url) throws IOException {
+URLConnection conn = url.openConnection();
+boolean redir;
+int redirects = 0;
+InputStream in;
+do {
+// Open the input stream before getting headers,
+// because getHeaderField() et al swallow IOExceptions.
+in = conn.getInputStream();
+redir = false;
+if (conn instanceof HttpURLConnection) {
+HttpURLConnection http = (HttpURLConnection)conn;
+int stat = http.getResponseCode();
+// See:
+// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
+// https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_Redirection
+switch (stat) {
+case 300: // Multiple Choices
+case 301: // Moved Permanently
+case 302: // Found (previously Moved Temporarily)
+case 303: // See Other
+case 307: // Temporary Redirect
+case 308: // Permanent Redirect
+URL base = http.getURL();
+String loc = http.getHeaderField("Location");
+URL target = null;
+if (loc != null) {
+target = new URL(base, loc);
+}
+http.disconnect();
+if (target == null || redirects >= 5) {
+throw new IOException("illegal URL redirect");
+}
+redir = true;
+conn = target.openConnection();
+redirects++;
+}
+}
+} while (redir);
+if (!url.equals(conn.getURL())) {
+configuration.getReporter().print(Kind.WARNING,
+resources.getText("doclet.urlRedirected", url, conn.getURL()));
+}
+return in;
 }
 }

changeset 52687	526f5cf13972
parent 52644	43efb4ca6d6c
child 53310	8ce4083fc831