jdk-sandbox: comparison jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java

equal deleted inserted replaced

-:ab2c8b03c328
+:e73af7b6ce47
 /*
-* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2017, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 //System Id for this catalog
 String systemId;
 /*
 A list of catalog entry files from the input, excluding the current catalog.
-Paths in the List are normalized.
+URIs in the List are verified during input validation or property retrieval.
 */
 List<String> inputFiles;
 //A list of catalogs specified using the nextCatalog element
 List<NextCatalog> nextCatalogs;
 //reuse the parser
 SAXParser parser;
 /**
-* Construct a Catalog with specified path.
+* Construct a Catalog with specified URI.
 *
-* @param file The path to a catalog file.
+* @param uris the uri(s) to one or more catalogs
 * @throws CatalogException If an error happens while parsing the specified
 * catalog file.
 */
-public CatalogImpl(CatalogFeatures f, String... file) throws CatalogException {
+public CatalogImpl(CatalogFeatures f, URI... uris) throws CatalogException {
-this(null, f, file);
+this(null, f, uris);
 }
 /**
-* Construct a Catalog with specified path.
+* Construct a Catalog with specified URI.
 *
 * @param parent The parent catalog
-* @param file The path to a catalog file.
+* @param uris the uri(s) to one or more catalogs
 * @throws CatalogException If an error happens while parsing the specified
 * catalog file.
 */
-public CatalogImpl(CatalogImpl parent, CatalogFeatures f, String... file) throws CatalogException {
+public CatalogImpl(CatalogImpl parent, CatalogFeatures f, URI... uris) throws CatalogException {
 super(CatalogEntryType.CATALOG, parent);
 if (f == null) {
 throw new NullPointerException(
 formatMessage(CatalogMessages.ERR_NULL_ARGUMENT, new Object[]{"CatalogFeatures"}));
 }
-if (file.length > 0) {
-CatalogMessages.reportNPEOnNull("The path to the catalog file", file[0]);
-}
 init(f);
 //Path of catalog files
-String[] catalogFile = file;
+String[] catalogFile = null;
-if (level == 0 && file.length == 0) {
+if (level == 0 && uris.length == 0) {
 String files = features.get(Feature.FILES);
 if (files != null) {
-catalogFile = files.split(";[ ]*");
+catalogFile = files.split(";");
+}
+} else {
+catalogFile = new String[uris.length];
+for (int i=0; i<uris.length; i++) {
+catalogFile[i] = uris[i].toASCIIString();
 }
 }
 /*
 In accordance with 8. Resource Failures of the Catalog spec, missing
 */
 if ((catalogFile != null && catalogFile.length > 0)) {
 int start = 0;
 URI uri = null;
 for (String temp : catalogFile) {
-uri = getSystemId(temp);
+uri = URI.create(temp);
 start++;
 if (verifyCatalogFile(uri)) {
-systemId = uri.toASCIIString();
+systemId = temp;
 try {
 baseURI = new URL(systemId);
 } catch (MalformedURLException e) {
 CatalogMessages.reportRunTimeError(CatalogMessages.ERR_INVALID_PATH,
 new Object[]{temp}, e);
 CatalogReader reader = new CatalogReader(this, parser);
 parser.parse(systemId, reader);
 } catch (SAXException | IOException ex) {
 CatalogMessages.reportRunTimeError(CatalogMessages.ERR_PARSING_FAILED, ex);
 }
-}
-/**
-* Resolves the specified file path to an absolute systemId. If it is
-* relative, it shall be resolved using the base or user.dir property if
-* base is not specified.
-*
-* @param file The specified file path
-* @return The systemId of the file
-* @throws CatalogException if the specified file path can not be converted
-* to a system id
-*/
-private URI getSystemId(String file) {
-URI temp = null;
-try {
-temp = Util.verifyAndGetURI(file, baseURI);
-} catch (MalformedURLException | URISyntaxException | IllegalArgumentException e) {
-CatalogMessages.reportRunTimeError(CatalogMessages.ERR_INVALID_PATH,
-new Object[]{file}, e);
-}
-return temp;
 }
 /**
 * Returns a SAXParser instance
 * @return a SAXParser instance
 }
 //Check the input list
 if (c == null && inputFiles != null) {
 while (c == null && inputFilesIndex < inputFiles.size()) {
-c = getCatalog(getSystemId(inputFiles.get(inputFilesIndex++)));
+c = getCatalog(URI.create(inputFiles.get(inputFilesIndex++)));
 }
 }
 return c;
 }
 });
 }
 //loads catalogs from the input list
 if (inputFiles != null) {
-inputFiles.stream().forEach((file) -> {
+inputFiles.stream().forEach((uri) -> {
-getCatalog(getSystemId(file));
+getCatalog(URI.create(uri));
 });
 }
 }
 /**
 if (uri == null) {
 return null;
 }
 CatalogImpl c = null;
-String path = uri.toASCIIString();
 if (verifyCatalogFile(uri)) {
-c = getLoadedCatalog(path);
+c = getLoadedCatalog(uri.toASCIIString());
 if (c == null) {
-c = new CatalogImpl(this, features, path);
+c = new CatalogImpl(this, features, uri);
 c.load();
 }
 }
 return c;
 }

changeset 43121	e73af7b6ce47
parent 40753	7fdd41fa7d26
child 44380	0197177795e9