jdk-sandbox: comparison jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ServiceLoaderUtil.java

equal deleted inserted replaced

-:5b500c93ce48
+:a542f8dcbbf8
 * questions.
 */
 package javax.xml.bind;
-import java.io.File;
+import java.lang.reflect.InvocationTargetException;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 /**
 class ServiceLoaderUtil {
 private static final String OSGI_SERVICE_LOADER_CLASS_NAME = "com.sun.org.glassfish.hk2.osgiresourcelocator.ServiceLoader";
 private static final String OSGI_SERVICE_LOADER_METHOD_NAME = "lookupProviderClasses";
-static <P> P firstByServiceLoader(Class<P> spiClass, Logger logger) {
+static <P, T extends Exception> P firstByServiceLoader(Class<P> spiClass,
+Logger logger,
+ExceptionHandler<T> handler) throws T {
 // service discovery
-ServiceLoader<P> serviceLoader = ServiceLoader.load(spiClass);
+try {
-for (P impl : serviceLoader) {
+ServiceLoader<P> serviceLoader = ServiceLoader.load(spiClass);
-logger.fine("ServiceProvider loading Facility used; returning object [" + impl.getClass().getName() + "]");
-return impl;
+for (P impl : serviceLoader) {
+logger.fine("ServiceProvider loading Facility used; returning object [" +
+impl.getClass().getName() + "]");
+return impl;
+}
+} catch (Throwable t) {
+throw handler.createException(t, "Error while searching for service [" + spiClass.getName() + "]");
 }
 return null;
 }
-static boolean isOsgi(Logger logger) {
+static Object lookupUsingOSGiServiceLoader(String factoryId, Logger logger) {
-try {
-Class.forName(OSGI_SERVICE_LOADER_CLASS_NAME);
-return true;
-} catch (ClassNotFoundException ignored) {
-logger.log(Level.FINE, "OSGi classes not found, OSGi not available.", ignored);
-}
-return false;
-}
-static Object lookupUsingOSGiServiceLoader(String factoryId, Logger logger) {
 try {
 // Use reflection to avoid having any dependendcy on ServiceLoader class
 Class serviceClass = Class.forName(factoryId);
 Class target = Class.forName(OSGI_SERVICE_LOADER_CLASS_NAME);
 Method m = target.getMethod(OSGI_SERVICE_LOADER_METHOD_NAME, Class.class);
 Iterator iter = ((Iterable) m.invoke(null, serviceClass)).iterator();
 if (iter.hasNext()) {
 Object next = iter.next();
-logger.fine("Found implementation using OSGi facility; returning object [" + next.getClass().getName() + "].");
+logger.fine("Found implementation using OSGi facility; returning object [" +
+next.getClass().getName() + "].");
 return next;
 } else {
 return null;
 }
-} catch (Exception ignored) {
+} catch (IllegalAccessException |
+InvocationTargetException |
+ClassNotFoundException |
+NoSuchMethodException ignored) {
 logger.log(Level.FINE, "Unable to find from OSGi: [" + factoryId + "]", ignored);
 return null;
 }
-}
-static String propertyFileLookup(final String configFullPath, final String factoryId) throws IOException {
-File f = new File(configFullPath);
-String factoryClassName = null;
-if (f.exists()) {
-Properties props = new Properties();
-FileInputStream stream = null;
-try {
-stream = new FileInputStream(f);
-props.load(stream);
-factoryClassName = props.getProperty(factoryId);
-} finally {
-if (stream != null) {
-try {
-stream.close();
-} catch (IOException ignored) {
-}
-}
-}
-}
-return factoryClassName;
 }
 static void checkPackageAccess(String className) {
 // make sure that the current thread has an access to the package of the given name.
 SecurityManager s = System.getSecurityManager();
 } else {
 return classLoader.loadClass(className);
 }
 }
-/**
+// Returns instance of required class. It checks package access (security)
-* Returns instance of required class. It checks package access (security) unless it is defaultClassname. It means if you
+// unless it is defaultClassname. It means if you are trying to instantiate
-* are trying to instantiate default implementation (fallback), pass the class name to both first and second parameter.
+// default implementation (fallback), pass the class name to both first and second parameter.
-*
+static <T extends Exception> Object newInstance(String className,
-* @param className          class to be instantiated
+String defaultImplClassName,
-* @param isDefaultClassname says whether default implementation class
+final ExceptionHandler<T> handler) throws T {
-* @param handler            exception handler - necessary for wrapping exceptions and logging
-* @param <T>                Type of exception being thrown (necessary to distinguish between Runtime and checked exceptions)
-* @return instantiated object or throws Runtime/checked exception, depending on ExceptionHandler's type
-* @throws T
-*/
-static <T extends Exception> Object newInstance(String className, String defaultImplClassName, final ExceptionHandler<T> handler) throws T {
 try {
 return safeLoadClass(className, defaultImplClassName, contextClassLoader(handler)).newInstance();
 } catch (ClassNotFoundException x) {
 throw handler.createException(x, "Provider " + className + " not found");
 } catch (Exception x) {
 throw handler.createException(x, "Provider " + className + " could not be instantiated: " + x);
 }
 }
-static Class safeLoadClass(String className, String defaultImplClassName, ClassLoader classLoader) throws ClassNotFoundException {
+static Class safeLoadClass(String className,
+String defaultImplClassName,
+ClassLoader classLoader) throws ClassNotFoundException {
 try {
 checkPackageAccess(className);
 } catch (SecurityException se) {
 // anyone can access the platform default factory class without permission
 if (defaultImplClassName != null && defaultImplClassName.equals(className)) {
 }
 // not platform default implementation ...
 throw se;
 }
 return nullSafeLoadClass(className, classLoader);
-}
-static String getJavaHomeLibConfigPath(String filename) {
-String javah = AccessController.doPrivileged(new PrivilegedAction<String>() {
-@Override
-public String run() {
-return System.getProperty("java.home");
-}
-});
-return javah + File.separator + "lib" + File.separator + filename;
 }
 static ClassLoader contextClassLoader(ExceptionHandler exceptionHandler) throws Exception {
 try {
 return Thread.currentThread().getContextClassLoader();

changeset 31109	a542f8dcbbf8
parent 29839	6d5d546e953b