jdk-sandbox: comparison jaxp/src/javax/xml/xpath/XPathFactory.java

equal deleted inserted replaced

-:c9f8ddb618be
+:3aff554ad461
 * @return Instance of an <code>XPathFactory</code>.
 *
 * @throws RuntimeException When there is a failure in creating an
 *   <code>XPathFactory</code> for the default object model.
 */
-public static final XPathFactory newInstance() {
+public static XPathFactory newInstance() {
 try {
 return newInstance(DEFAULT_OBJECT_MODEL_URI);
 } catch (XPathFactoryConfigurationException xpathFactoryConfigurationException) {
 throw new RuntimeException(
 *   <li>
 *     ${java.home}/lib/jaxp.properties is read and the value associated with the key being the system property above is looked for.
 *     If present, the value is processed just like above.
 *   </li>
 *   <li>
-*     The class loader is asked for service provider provider-configuration files matching <code>javax.xml.xpath.XPathFactory</code>
+*     Use the service-provider loading facilities, defined by the
-*     in the resource directory META-INF/services.
+*     {@link java.util.ServiceLoader} class, to attempt to locate and load an
-*     See the JAR File Specification for file format and parsing rules.
+*     implementation of the service.
-*     Each potential service provider is required to implement the method:
+*     <br>
-*     <pre>
+*     Each potential service provider is required to implement the method
-*       {@link #isObjectModelSupported(String objectModel)}
+*     {@link #isObjectModelSupported(String objectModel)}.
-*     </pre>
+*     The first service provider found that supports the specified object
-*     The first service provider found in class loader order that supports the specified object model is returned.
+*     model is returned.
+*     <br>
+*     In case of {@link java.util.ServiceConfigurationError} an
+*     {@link XPathFactoryConfigurationException} will be thrown.
 *   </li>
 *   <li>
 *     Platform default <code>XPathFactory</code> is located in a platform specific way.
 *     There must be a platform default XPathFactory for the W3C DOM, i.e. {@link #DEFAULT_OBJECT_MODEL_URI}.
 *   </li>
 *   <code>http://java.sun.com/jaxp/xpath/dom</code> for the W3C DOM,
 *   the org.w3c.dom package, and implementations are free to introduce other URIs for other object models.
 *
 * @return Instance of an <code>XPathFactory</code>.
 *
-* @throws XPathFactoryConfigurationException If the specified object model is unavailable.
+* @throws XPathFactoryConfigurationException If the specified object model
+*      is unavailable, or if there is a configuration error.
 * @throws NullPointerException If <code>uri</code> is <code>null</code>.
 * @throws IllegalArgumentException If <code>uri</code> is <code>null</code>
 *   or <code>uri.length() == 0</code>.
 */
-public static final XPathFactory newInstance(final String uri)
+public static XPathFactory newInstance(final String uri)
 throws XPathFactoryConfigurationException {
 if (uri == null) {
 throw new NullPointerException(
-"XPathFactory#newInstance(String uri) cannot be called with uri == null"
+"XPathFactory#newInstance(String uri) cannot be called with uri == null");
-);
+}
-}
+if (uri.length() == 0) {
-if (uri.length() == 0) {
+throw new IllegalArgumentException(
-throw new IllegalArgumentException(
+"XPathFactory#newInstance(String uri) cannot be called with uri == \"\"");
-"XPathFactory#newInstance(String uri) cannot be called with uri == \"\""
+}
-);
-}
+ClassLoader classLoader = ss.getContextClassLoader();
-ClassLoader classLoader = ss.getContextClassLoader();
 if (classLoader == null) {
 //use the current class loader
 classLoader = XPathFactory.class.getClassLoader();
 }
 XPathFactory xpathFactory = new XPathFactoryFinder(classLoader).newFactory(uri);
 if (xpathFactory == null) {
 throw new XPathFactoryConfigurationException(
 "No XPathFactory implementation found for the object model: "
-+ uri
++ uri);
-);
+}
-}
+return xpathFactory;
-return xpathFactory;
 }
 /**
 * <p>Obtain a new instance of a <code>XPathFactory</code> from a factory class name. <code>XPathFactory</code>
 * is returned if specified factory class supports the specified object model.
 public static XPathFactory newInstance(String uri, String factoryClassName, ClassLoader classLoader)
 throws XPathFactoryConfigurationException{
 ClassLoader cl = classLoader;
 if (uri == null) {
 throw new NullPointerException(
-"XPathFactory#newInstance(String uri) cannot be called with uri == null"
+"XPathFactory#newInstance(String uri) cannot be called with uri == null");
-);
+}
-}
+if (uri.length() == 0) {
-if (uri.length() == 0) {
+throw new IllegalArgumentException(
-throw new IllegalArgumentException(
+"XPathFactory#newInstance(String uri) cannot be called with uri == \"\"");
-"XPathFactory#newInstance(String uri) cannot be called with uri == \"\""
+}
-);
-}
 if (cl == null) {
 cl = ss.getContextClassLoader();
 }
 XPathFactory f = new XPathFactoryFinder(cl).createInstance(factoryClassName);
 if (f == null) {
 throw new XPathFactoryConfigurationException(
 "No XPathFactory implementation found for the object model: "
-+ uri
++ uri);
-);
 }
 //if this factory supports the given schemalanguage return this factory else thrown exception
-if(f.isObjectModelSupported(uri)){
+if (f.isObjectModelSupported(uri)) {
 return f;
-}else{
+} else {
-throw new XPathFactoryConfigurationException("Factory " + factoryClassName + " doesn't support given " + uri + " object model");
+throw new XPathFactoryConfigurationException("Factory "
++ factoryClassName + " doesn't support given " + uri
++ " object model");
 }
 }
 /**
 * <p>Is specified object model supported by this <code>XPathFactory</code>?</p>
 *
 * @param objectModel Specifies the object model which the returned <code>XPathFactory</code> will understand.
 *
 * @return <code>true</code> if <code>XPathFactory</code> supports <code>objectModel</code>, else <code>false</code>.
 *
 * @throws NullPointerException If <code>objectModel</code> is <code>null</code>.
 * @throws IllegalArgumentException If <code>objectModel.length() == 0</code>.
 */
 public abstract boolean isObjectModelSupported(String objectModel);
 /**
 * <p>Set a feature for this <code>XPathFactory</code> and
 * <code>XPath</code>s created by this factory.</p>
 *
 *
 * @throws XPathFactoryConfigurationException if this <code>XPathFactory</code> or the <code>XPath</code>s
 *   it creates cannot support this feature.
 * @throws NullPointerException if <code>name</code> is <code>null</code>.
 */
 public abstract void setFeature(String name, boolean value)
 throws XPathFactoryConfigurationException;
 /**
 * <p>Get the state of the named feature.</p>
 *
 * <p>
 * @throws XPathFactoryConfigurationException if this
 *   <code>XPathFactory</code> or the <code>XPath</code>s
 *   it creates cannot support this feature.
 * @throws NullPointerException if <code>name</code> is <code>null</code>.
 */
 public abstract boolean getFeature(String name)
 throws XPathFactoryConfigurationException;
 /**
 * <p>Establish a default variable resolver.</p>
 *
 * <p>Any <code>XPath</code> objects constructed from this factory will use
 *   <code>null</code>.
 */
 public abstract void setXPathVariableResolver(XPathVariableResolver resolver);
 /**
 * <p>Establish a default function resolver.</p>
 *
 * <p>Any <code>XPath</code> objects constructed from this factory will
 * use the specified resolver by default.</p>
 *
 * <p>A <code>NullPointerException</code> is thrown if
 * <code>resolver</code> is <code>null</code>.</p>
 *
 * @param resolver XPath function resolver.
 *
 * @throws NullPointerException If <code>resolver</code> is
 *   <code>null</code>.
 */
 public abstract void setXPathFunctionResolver(XPathFunctionResolver resolver);
 /**
 * <p>Return a new <code>XPath</code> using the underlying object
 * model determined when the <code>XPathFactory</code> was instantiated.</p>

changeset 17264	3aff554ad461
parent 12457	c348e06f0e82
child 20581	65d17ea72da3