jdk-sandbox: comparison src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java

equal deleted inserted replaced

-:0f93a75b9213
+:3810c9a2efa1
 * URI in which the link to the new resource is defined and the baseURI of the
 * file/entity in which the URI occurs (the baseURI is the same as the SystemId).
 */
 public class ResourceResolver {
-/** {@link org.apache.commons.logging} logging facility */
+private static final com.sun.org.slf4j.internal.Logger LOG =
-private static java.util.logging.Logger log =
+com.sun.org.slf4j.internal.LoggerFactory.getLogger(ResourceResolver.class);
-java.util.logging.Logger.getLogger(ResourceResolver.class.getName());
 /** these are the system-wide resolvers */
-private static List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
+private static final List<ResourceResolver> resolverList = new ArrayList<>();
 /** Field resolverSpi */
 private final ResourceResolverSpi resolverSpi;
 /**
 }
 /**
 * Method getInstance
 *
-* @param uri
+* @param uriAttr
-* @param baseURI
-* @return the instance
-*
-* @throws ResourceResolverException
-*/
-public static final ResourceResolver getInstance(Attr uri, String baseURI)
-throws ResourceResolverException {
-return getInstance(uri, baseURI, false);
-}
-/**
-* Method getInstance
-*
-* @param uri
 * @param baseURI
 * @param secureValidation
 * @return the instance
 *
 * @throws ResourceResolverException
 for (ResourceResolver resolver : resolverList) {
 ResourceResolver resolverTmp = resolver;
 if (!resolver.resolverSpi.engineIsThreadSafe()) {
 try {
 @SuppressWarnings("deprecation")
-ResourceResolver tmp = new ResourceResolver(resolver.resolverSpi.getClass().newInstance());
+ResourceResolver tmp =
+new ResourceResolver(resolver.resolverSpi.getClass().newInstance());
 resolverTmp = tmp;
-;
 } catch (InstantiationException e) {
-throw new ResourceResolverException("", e, context.attr, context.baseUri);
+throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "");
 } catch (IllegalAccessException e) {
-throw new ResourceResolverException("", e, context.attr, context.baseUri);
+throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "");
 }
 }
-if (log.isLoggable(java.util.logging.Level.FINE)) {
+LOG.debug("check resolvability by class {}", resolverTmp.getClass().getName());
-log.log(java.util.logging.Level.FINE,
-"check resolvability by class " + resolverTmp.getClass().getName()
+if (resolverTmp != null && resolverTmp.canResolve(context)) {
-);
-}
-if ((resolverTmp != null) && resolverTmp.canResolve(context)) {
 // Check to see whether the Resolver is allowed
 if (context.secureValidation
 && (resolverTmp.resolverSpi instanceof ResolverLocalFilesystem
 || resolverTmp.resolverSpi instanceof ResolverDirectHTTP)) {
 Object exArgs[] = { resolverTmp.resolverSpi.getClass().getName() };
 throw new ResourceResolverException(
-"signature.Reference.ForbiddenResolver", exArgs, context.attr, context.baseUri
+"signature.Reference.ForbiddenResolver", exArgs, context.uriToResolve, context.baseUri
 );
 }
 return resolverTmp;
 }
 }
 }
-Object exArgs[] = { ((context.uriToResolve != null)
+Object exArgs[] = { context.uriToResolve != null
-? context.uriToResolve : "null"), context.baseUri };
+? context.uriToResolve : "null", context.baseUri };
-throw new ResourceResolverException("utils.resolver.noClass", exArgs, context.attr, context.baseUri);
+throw new ResourceResolverException("utils.resolver.noClass", exArgs, context.uriToResolve, context.baseUri);
 }
 /**
 * Method getInstance
 *
 * @throws ResourceResolverException
 */
 public static ResourceResolver getInstance(
 Attr uri, String baseURI, List<ResourceResolver> individualResolvers
 ) throws ResourceResolverException {
-return getInstance(uri, baseURI, individualResolvers, false);
+return getInstance(uri, baseURI, individualResolvers, true);
 }
 /**
 * Method getInstance
 *
 * @throws ResourceResolverException
 */
 public static ResourceResolver getInstance(
 Attr uri, String baseURI, List<ResourceResolver> individualResolvers, boolean secureValidation
 ) throws ResourceResolverException {
-if (log.isLoggable(java.util.logging.Level.FINE)) {
+LOG.debug(
-log.log(java.util.logging.Level.FINE,
+"I was asked to create a ResourceResolver and got {}",
-"I was asked to create a ResourceResolver and got "
+(individualResolvers == null ? 0 : individualResolvers.size())
-+ (individualResolvers == null ? 0 : individualResolvers.size())
+);
-);
-}
 ResourceResolverContext context = new ResourceResolverContext(uri, baseURI, secureValidation);
 // first check the individual Resolvers
 if (individualResolvers != null) {
 for (int i = 0; i < individualResolvers.size(); i++) {
 ResourceResolver resolver = individualResolvers.get(i);
 if (resolver != null) {
-if (log.isLoggable(java.util.logging.Level.FINE)) {
+String currentClass = resolver.resolverSpi.getClass().getName();
-String currentClass = resolver.resolverSpi.getClass().getName();
+LOG.debug("check resolvability by class {}", currentClass);
-log.log(java.util.logging.Level.FINE, "check resolvability by class " + currentClass);
-}
 if (resolver.canResolve(context)) {
 return resolver;
 }
 }
 return internalGetInstance(context);
 }
 /**
-* Registers a ResourceResolverSpi class. This method logs a warning if
+* Registers a ResourceResolverSpi class. This method LOGs a warning if
 * the class cannot be registered.
 *
 * @param className the name of the ResourceResolverSpi class to be registered
 * @throws SecurityException if a security manager is installed and the
 *    caller does not have permission to register a resource resolver
 @SuppressWarnings("unchecked")
 public static void register(String className) {
 JavaUtils.checkRegisterPermission();
 try {
 Class<ResourceResolverSpi> resourceResolverClass =
-(Class<ResourceResolverSpi>) Class.forName(className);
+(Class<ResourceResolverSpi>)
+ClassLoaderUtils.loadClass(className, ResourceResolver.class);
 register(resourceResolverClass, false);
 } catch (ClassNotFoundException e) {
-log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+LOG.warn("Error loading resolver " + className + " disabling it");
 }
 }
 /**
 * Registers a ResourceResolverSpi class at the beginning of the provider
-* list. This method logs a warning if the class cannot be registered.
+* list. This method LOGs a warning if the class cannot be registered.
 *
 * @param className the name of the ResourceResolverSpi class to be registered
 * @throws SecurityException if a security manager is installed and the
 *    caller does not have permission to register a resource resolver
 */
 @SuppressWarnings("unchecked")
 public static void registerAtStart(String className) {
 JavaUtils.checkRegisterPermission();
 try {
 Class<ResourceResolverSpi> resourceResolverClass =
-(Class<ResourceResolverSpi>) Class.forName(className);
+(Class<ResourceResolverSpi>)
+ClassLoaderUtils.loadClass(className, ResourceResolver.class);
 register(resourceResolverClass, true);
 } catch (ClassNotFoundException e) {
-log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+LOG.warn("Error loading resolver " + className + " disabling it");
 }
 }
 /**
-* Registers a ResourceResolverSpi class. This method logs a warning if the class
+* Registers a ResourceResolverSpi class. This method LOGs a warning if the class
 * cannot be registered.
 * @param className
 * @param start
 * @throws SecurityException if a security manager is installed and the
 *    caller does not have permission to register a resource resolver
 try {
 @SuppressWarnings("deprecation")
 ResourceResolverSpi resourceResolverSpi = className.newInstance();
 register(resourceResolverSpi, start);
 } catch (IllegalAccessException e) {
-log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+LOG.warn("Error loading resolver " + className + " disabling it");
 } catch (InstantiationException e) {
-log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+LOG.warn("Error loading resolver " + className + " disabling it");
 }
 }
 /**
-* Registers a ResourceResolverSpi instance. This method logs a warning if the class
+* Registers a ResourceResolverSpi instance. This method LOGs a warning if the class
 * cannot be registered.
 * @param resourceResolverSpi
 * @param start
 * @throws SecurityException if a security manager is installed and the
 *    caller does not have permission to register a resource resolver
 resolverList.add(0, new ResourceResolver(resourceResolverSpi));
 } else {
 resolverList.add(new ResourceResolver(resourceResolverSpi));
 }
 }
-if (log.isLoggable(java.util.logging.Level.FINE)) {
+LOG.debug("Registered resolver: {}", resourceResolverSpi.toString());
-log.log(java.util.logging.Level.FINE, "Registered resolver: " + resourceResolverSpi.toString());
-}
 }
 /**
 * This method registers the default resolvers.
 */
 resolverList.add(new ResourceResolver(new ResolverDirectHTTP()));
 }
 }
 /**
-* @deprecated New clients should use {@link #resolve(Attr, String, boolean)}
-*/
-@Deprecated
-public XMLSignatureInput resolve(Attr uri, String baseURI)
-throws ResourceResolverException {
-return resolve(uri, baseURI, true);
-}
-/**
 * Method resolve
 *
 * @param uri
 * @param baseURI
 * @return the resource

changeset 50614	3810c9a2efa1
parent 47216	71c04702a3d5
child 54731	81de17a33575