From: markt Date: Thu, 20 Nov 2008 01:39:30 +0000 (+0000) Subject: Generics for o.a.naming.* X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=587aadeec2b8ae6feb604265abdcb8377a684285;p=tomcat7.0 Generics for o.a.naming.* A little messy in places due to differences in env handling. Properties, Hashtable, Hashtable and Hashtable readOnlyContexts = + new Hashtable(); /** * Security tokens repository. */ - private static Hashtable securityTokens = new Hashtable(); + private static Hashtable securityTokens = + new Hashtable(); // --------------------------------------------------------- Public Methods diff --git a/java/org/apache/naming/ContextBindings.java b/java/org/apache/naming/ContextBindings.java index 523848b94..3b5080f9a 100644 --- a/java/org/apache/naming/ContextBindings.java +++ b/java/org/apache/naming/ContextBindings.java @@ -42,31 +42,36 @@ public class ContextBindings { /** * Bindings name - naming context. Keyed by name. */ - private static Hashtable contextNameBindings = new Hashtable(); + private static Hashtable contextNameBindings = + new Hashtable(); /** * Bindings thread - naming context. Keyed by thread id. */ - private static Hashtable threadBindings = new Hashtable(); + private static Hashtable threadBindings = + new Hashtable(); /** * Bindings thread - name. Keyed by thread id. */ - private static Hashtable threadNameBindings = new Hashtable(); + private static Hashtable threadNameBindings = + new Hashtable(); /** * Bindings class loader - naming context. Keyed by CL id. */ - private static Hashtable clBindings = new Hashtable(); + private static Hashtable clBindings = + new Hashtable(); /** * Bindings class loader - name. Keyed by CL id. */ - private static Hashtable clNameBindings = new Hashtable(); + private static Hashtable clNameBindings = + new Hashtable(); /** @@ -132,7 +137,7 @@ public class ContextBindings { * @param name Name of the context */ static Context getContext(Object name) { - return (Context) contextNameBindings.get(name); + return contextNameBindings.get(name); } @@ -156,7 +161,7 @@ public class ContextBindings { public static void bindThread(Object name, Object token) throws NamingException { if (ContextAccessController.checkSecurityToken(name, token)) { - Context context = (Context) contextNameBindings.get(name); + Context context = contextNameBindings.get(name); if (context == null) throw new NamingException (sm.getString("contextBindings.unknownContext", name)); @@ -195,8 +200,7 @@ public class ContextBindings { */ public static Context getThread() throws NamingException { - Context context = - (Context) threadBindings.get(Thread.currentThread()); + Context context = threadBindings.get(Thread.currentThread()); if (context == null) throw new NamingException (sm.getString("contextBindings.noContextBoundToThread")); @@ -259,7 +263,7 @@ public class ContextBindings { ClassLoader classLoader) throws NamingException { if (ContextAccessController.checkSecurityToken(name, token)) { - Context context = (Context) contextNameBindings.get(name); + Context context = contextNameBindings.get(name); if (context == null) throw new NamingException (sm.getString("contextBindings.unknownContext", name)); @@ -318,7 +322,7 @@ public class ContextBindings { ClassLoader cl = Thread.currentThread().getContextClassLoader(); Context context = null; do { - context = (Context) clBindings.get(cl); + context = clBindings.get(cl); if (context != null) { return context; } diff --git a/java/org/apache/naming/HandlerRef.java b/java/org/apache/naming/HandlerRef.java index d9a6973f5..c6dd3c955 100644 --- a/java/org/apache/naming/HandlerRef.java +++ b/java/org/apache/naming/HandlerRef.java @@ -166,9 +166,9 @@ public class HandlerRef sb.append(getFactoryClassLocation()); sb.append(",factoryClassName="); sb.append(getFactoryClassName()); - Enumeration refAddrs = getAll(); + Enumeration refAddrs = getAll(); while (refAddrs.hasMoreElements()) { - RefAddr refAddr = (RefAddr) refAddrs.nextElement(); + RefAddr refAddr = refAddrs.nextElement(); sb.append(",{type="); sb.append(refAddr.getType()); sb.append(",content="); diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java index 092a0937c..b22f12384 100644 --- a/java/org/apache/naming/NamingContext.java +++ b/java/org/apache/naming/NamingContext.java @@ -21,10 +21,13 @@ package org.apache.naming; import java.util.HashMap; import java.util.Hashtable; import java.util.Enumeration; + +import javax.naming.Binding; import javax.naming.Context; import javax.naming.Name; import javax.naming.LinkRef; import javax.naming.CompositeName; +import javax.naming.NameClassPair; import javax.naming.NameParser; import javax.naming.Referenceable; import javax.naming.Reference; @@ -65,17 +68,17 @@ public class NamingContext implements Context { /** * Builds a naming context using the given environment. */ - public NamingContext(Hashtable env, String name) + public NamingContext(Hashtable env, String name) throws NamingException { - this.bindings = new HashMap(); - this.env = new Hashtable(); + this.bindings = new HashMap(); + this.env = new Hashtable(); // FIXME ? Could be put in the environment ? this.name = name; // Populating the environment hashtable if (env != null ) { - Enumeration envEntries = env.keys(); + Enumeration envEntries = env.keys(); while (envEntries.hasMoreElements()) { - String entryName = (String) envEntries.nextElement(); + String entryName = envEntries.nextElement(); addToEnvironment(entryName, env.get(entryName)); } } @@ -85,7 +88,8 @@ public class NamingContext implements Context { /** * Builds a naming context using the given environment. */ - public NamingContext(Hashtable env, String name, HashMap bindings) + public NamingContext(Hashtable env, String name, + HashMap bindings) throws NamingException { this(env, name); this.bindings = bindings; @@ -98,7 +102,7 @@ public class NamingContext implements Context { /** * Environment. */ - protected Hashtable env; + protected Hashtable env; /** @@ -110,7 +114,7 @@ public class NamingContext implements Context { /** * Bindings in this Context. */ - protected HashMap bindings; + protected HashMap bindings; /** @@ -248,7 +252,7 @@ public class NamingContext implements Context { throw new NamingException (sm.getString("namingContext.invalidName")); - NamingEntry entry = (NamingEntry) bindings.get(name.get(0)); + NamingEntry entry = bindings.get(name.get(0)); if (entry == null) { throw new NameNotFoundException @@ -330,7 +334,7 @@ public class NamingContext implements Context { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(Name name) + public NamingEnumeration list(Name name) throws NamingException { // Removing empty parts while ((!name.isEmpty()) && (name.get(0).length() == 0)) @@ -339,7 +343,7 @@ public class NamingContext implements Context { return new NamingContextEnumeration(bindings.values().iterator()); } - NamingEntry entry = (NamingEntry) bindings.get(name.get(0)); + NamingEntry entry = bindings.get(name.get(0)); if (entry == null) { throw new NameNotFoundException @@ -363,7 +367,7 @@ public class NamingContext implements Context { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(String name) + public NamingEnumeration list(String name) throws NamingException { return list(new CompositeName(name)); } @@ -382,7 +386,7 @@ public class NamingContext implements Context { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(Name name) + public NamingEnumeration listBindings(Name name) throws NamingException { // Removing empty parts while ((!name.isEmpty()) && (name.get(0).length() == 0)) @@ -391,7 +395,7 @@ public class NamingContext implements Context { return new NamingContextBindingsEnumeration(bindings.values().iterator(), this); } - NamingEntry entry = (NamingEntry) bindings.get(name.get(0)); + NamingEntry entry = bindings.get(name.get(0)); if (entry == null) { throw new NameNotFoundException @@ -415,7 +419,7 @@ public class NamingContext implements Context { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(String name) + public NamingEnumeration listBindings(String name) throws NamingException { return listBindings(new CompositeName(name)); } @@ -457,7 +461,7 @@ public class NamingContext implements Context { throw new NamingException (sm.getString("namingContext.invalidName")); - NamingEntry entry = (NamingEntry) bindings.get(name.get(0)); + NamingEntry entry = bindings.get(name.get(0)); if (entry == null) { throw new NameNotFoundException @@ -695,7 +699,7 @@ public class NamingContext implements Context { * @return the environment of this context; never null * @exception NamingException if a naming exception is encountered */ - public Hashtable getEnvironment() + public Hashtable getEnvironment() throws NamingException { return env; } @@ -764,7 +768,7 @@ public class NamingContext implements Context { return new NamingContext(env, this.name, bindings); } - NamingEntry entry = (NamingEntry) bindings.get(name.get(0)); + NamingEntry entry = bindings.get(name.get(0)); if (entry == null) { throw new NameNotFoundException @@ -836,7 +840,7 @@ public class NamingContext implements Context { throw new NamingException (sm.getString("namingContext.invalidName")); - NamingEntry entry = (NamingEntry) bindings.get(name.get(0)); + NamingEntry entry = bindings.get(name.get(0)); if (name.size() > 1) { if (entry == null) { diff --git a/java/org/apache/naming/NamingContextBindingsEnumeration.java b/java/org/apache/naming/NamingContextBindingsEnumeration.java index 27adb0de6..3f7ec2233 100644 --- a/java/org/apache/naming/NamingContextBindingsEnumeration.java +++ b/java/org/apache/naming/NamingContextBindingsEnumeration.java @@ -34,13 +34,14 @@ import javax.naming.NamingException; */ public class NamingContextBindingsEnumeration - implements NamingEnumeration { + implements NamingEnumeration { // ----------------------------------------------------------- Constructors - public NamingContextBindingsEnumeration(Iterator entries, Context ctx) { + public NamingContextBindingsEnumeration(Iterator entries, + Context ctx) { iterator = entries; this.ctx = ctx; } @@ -51,7 +52,7 @@ public class NamingContextBindingsEnumeration /** * Underlying enumeration. */ - protected Iterator iterator; + protected Iterator iterator; /** @@ -66,7 +67,7 @@ public class NamingContextBindingsEnumeration /** * Retrieves the next element in the enumeration. */ - public Object next() + public Binding next() throws NamingException { return nextElementInternal(); } @@ -94,7 +95,7 @@ public class NamingContextBindingsEnumeration } - public Object nextElement() { + public Binding nextElement() { try { return nextElementInternal(); } catch (NamingException e) { @@ -102,8 +103,8 @@ public class NamingContextBindingsEnumeration } } - private Object nextElementInternal() throws NamingException { - NamingEntry entry = (NamingEntry) iterator.next(); + private Binding nextElementInternal() throws NamingException { + NamingEntry entry = iterator.next(); // If the entry is a reference, resolve it if (entry.type == NamingEntry.REFERENCE diff --git a/java/org/apache/naming/NamingContextEnumeration.java b/java/org/apache/naming/NamingContextEnumeration.java index 239bb4e9a..1101f06fc 100644 --- a/java/org/apache/naming/NamingContextEnumeration.java +++ b/java/org/apache/naming/NamingContextEnumeration.java @@ -32,13 +32,13 @@ import javax.naming.NamingException; */ public class NamingContextEnumeration - implements NamingEnumeration { + implements NamingEnumeration { // ----------------------------------------------------------- Constructors - public NamingContextEnumeration(Iterator entries) { + public NamingContextEnumeration(Iterator entries) { iterator = entries; } @@ -49,7 +49,7 @@ public class NamingContextEnumeration /** * Underlying enumeration. */ - protected Iterator iterator; + protected Iterator iterator; // --------------------------------------------------------- Public Methods @@ -58,7 +58,7 @@ public class NamingContextEnumeration /** * Retrieves the next element in the enumeration. */ - public Object next() + public NameClassPair next() throws NamingException { return nextElement(); } @@ -86,8 +86,8 @@ public class NamingContextEnumeration } - public Object nextElement() { - NamingEntry entry = (NamingEntry) iterator.next(); + public NameClassPair nextElement() { + NamingEntry entry = iterator.next(); return new NameClassPair(entry.name, entry.value.getClass().getName()); } diff --git a/java/org/apache/naming/ResourceRef.java b/java/org/apache/naming/ResourceRef.java index 3456fdea0..0d198abdf 100644 --- a/java/org/apache/naming/ResourceRef.java +++ b/java/org/apache/naming/ResourceRef.java @@ -147,9 +147,9 @@ public class ResourceRef sb.append(getFactoryClassLocation()); sb.append(",factoryClassName="); sb.append(getFactoryClassName()); - Enumeration refAddrs = getAll(); + Enumeration refAddrs = getAll(); while (refAddrs.hasMoreElements()) { - RefAddr refAddr = (RefAddr) refAddrs.nextElement(); + RefAddr refAddr = refAddrs.nextElement(); sb.append(",{type="); sb.append(refAddr.getType()); sb.append(",content="); diff --git a/java/org/apache/naming/SelectorContext.java b/java/org/apache/naming/SelectorContext.java index c44ca6963..263f0a1f4 100644 --- a/java/org/apache/naming/SelectorContext.java +++ b/java/org/apache/naming/SelectorContext.java @@ -19,8 +19,11 @@ package org.apache.naming; import java.util.Hashtable; + +import javax.naming.Binding; import javax.naming.Context; import javax.naming.Name; +import javax.naming.NameClassPair; import javax.naming.NameParser; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -62,7 +65,7 @@ public class SelectorContext implements Context { /** * Builds a Catalina selector context using the given environment. */ - public SelectorContext(Hashtable env) { + public SelectorContext(Hashtable env) { this.env = env; } @@ -70,7 +73,8 @@ public class SelectorContext implements Context { /** * Builds a Catalina selector context using the given environment. */ - public SelectorContext(Hashtable env, boolean initialContext) { + public SelectorContext(Hashtable env, + boolean initialContext) { this(env); this.initialContext = initialContext; } @@ -82,7 +86,7 @@ public class SelectorContext implements Context { /** * Environment. */ - protected Hashtable env; + protected Hashtable env; /** @@ -287,7 +291,7 @@ public class SelectorContext implements Context { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(Name name) + public NamingEnumeration list(Name name) throws NamingException { return getBoundContext().list(parseName(name)); } @@ -302,7 +306,7 @@ public class SelectorContext implements Context { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(String name) + public NamingEnumeration list(String name) throws NamingException { return getBoundContext().list(parseName(name)); } @@ -321,7 +325,7 @@ public class SelectorContext implements Context { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(Name name) + public NamingEnumeration listBindings(Name name) throws NamingException { return getBoundContext().listBindings(parseName(name)); } @@ -336,7 +340,7 @@ public class SelectorContext implements Context { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(String name) + public NamingEnumeration listBindings(String name) throws NamingException { return getBoundContext().listBindings(parseName(name)); } @@ -562,7 +566,7 @@ public class SelectorContext implements Context { * @return the environment of this context; never null * @exception NamingException if a naming exception is encountered */ - public Hashtable getEnvironment() + public Hashtable getEnvironment() throws NamingException { return getBoundContext().getEnvironment(); } diff --git a/java/org/apache/naming/ServiceRef.java b/java/org/apache/naming/ServiceRef.java index ebeed76c8..ff6e3e0e7 100644 --- a/java/org/apache/naming/ServiceRef.java +++ b/java/org/apache/naming/ServiceRef.java @@ -195,9 +195,9 @@ public class ServiceRef sb.append(getFactoryClassLocation()); sb.append(",factoryClassName="); sb.append(getFactoryClassName()); - Enumeration refAddrs = getAll(); + Enumeration refAddrs = getAll(); while (refAddrs.hasMoreElements()) { - RefAddr refAddr = (RefAddr) refAddrs.nextElement(); + RefAddr refAddr = refAddrs.nextElement(); sb.append(",{type="); sb.append(refAddr.getType()); sb.append(",content="); diff --git a/java/org/apache/naming/StringManager.java b/java/org/apache/naming/StringManager.java index 1183d0b4d..4f978183c 100644 --- a/java/org/apache/naming/StringManager.java +++ b/java/org/apache/naming/StringManager.java @@ -113,7 +113,7 @@ public class StringManager { Object nonNullArgs[] = args; for (int i=0; i managers = + new Hashtable(); /** * Get the StringManager for a particular package. If a manager for @@ -208,7 +209,7 @@ public class StringManager { */ public synchronized static StringManager getManager(String packageName) { - StringManager mgr = (StringManager)managers.get(packageName); + StringManager mgr = managers.get(packageName); if (mgr == null) { mgr = new StringManager(packageName); managers.put(packageName, mgr); diff --git a/java/org/apache/naming/factory/BeanFactory.java b/java/org/apache/naming/factory/BeanFactory.java index e85c195f8..b05c3f2bd 100644 --- a/java/org/apache/naming/factory/BeanFactory.java +++ b/java/org/apache/naming/factory/BeanFactory.java @@ -108,7 +108,7 @@ public class BeanFactory * @param obj The reference object describing the Bean */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws NamingException { if (obj instanceof ResourceRef) { @@ -117,7 +117,7 @@ public class BeanFactory Reference ref = (Reference) obj; String beanClassName = ref.getClassName(); - Class beanClass = null; + Class beanClass = null; ClassLoader tcl = Thread.currentThread().getContextClassLoader(); if (tcl != null) { @@ -142,10 +142,10 @@ public class BeanFactory Object bean = beanClass.newInstance(); - Enumeration e = ref.getAll(); + Enumeration e = ref.getAll(); while (e.hasMoreElements()) { - RefAddr ra = (RefAddr) e.nextElement(); + RefAddr ra = e.nextElement(); String propName = ra.getType(); if (propName.equals(Constants.FACTORY) || @@ -162,7 +162,7 @@ public class BeanFactory if (pda[i].getName().equals(propName)) { - Class propType = pda[i].getPropertyType(); + Class propType = pda[i].getPropertyType(); if (propType.equals(String.class)) { valueArray[0] = value; diff --git a/java/org/apache/naming/factory/EjbFactory.java b/java/org/apache/naming/factory/EjbFactory.java index 958e7c73d..5a890e24a 100644 --- a/java/org/apache/naming/factory/EjbFactory.java +++ b/java/org/apache/naming/factory/EjbFactory.java @@ -60,7 +60,7 @@ public class EjbFactory * @param obj The reference object describing the DataSource */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws Exception { if (obj instanceof EjbRef) { @@ -110,7 +110,7 @@ public class EjbFactory // Loading factory ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - Class factoryClass = null; + Class factoryClass = null; if (tcl != null) { try { factoryClass = tcl.loadClass(factoryClassName); diff --git a/java/org/apache/naming/factory/MailSessionFactory.java b/java/org/apache/naming/factory/MailSessionFactory.java index 1261eb9dc..14d1e9373 100644 --- a/java/org/apache/naming/factory/MailSessionFactory.java +++ b/java/org/apache/naming/factory/MailSessionFactory.java @@ -89,7 +89,7 @@ public class MailSessionFactory implements ObjectFactory { * @exception Exception if an error occurs during object creation */ public Object getObjectInstance(Object refObj, Name name, Context context, - Hashtable env) throws Exception + Hashtable env) throws Exception { // Return null if we cannot create an object of the requested type @@ -102,8 +102,8 @@ public class MailSessionFactory implements ObjectFactory { // exceptions. // // Bugzilla 31288, 33077: add support for authentication. - return AccessController.doPrivileged( new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged(new PrivilegedAction() { + public Session run() { // Create the JavaMail properties we will use Properties props = new Properties(); @@ -112,9 +112,9 @@ public class MailSessionFactory implements ObjectFactory { String password = null; - Enumeration attrs = ref.getAll(); + Enumeration attrs = ref.getAll(); while (attrs.hasMoreElements()) { - RefAddr attr = (RefAddr) attrs.nextElement(); + RefAddr attr = attrs.nextElement(); if ("factory".equals(attr.getType())) { continue; } @@ -124,7 +124,7 @@ public class MailSessionFactory implements ObjectFactory { continue; } - props.put(attr.getType(), (String) attr.getContent()); + props.put(attr.getType(), attr.getContent()); } Authenticator auth = null; diff --git a/java/org/apache/naming/factory/OpenEjbFactory.java b/java/org/apache/naming/factory/OpenEjbFactory.java index 9a88ba51c..ad7db6e84 100644 --- a/java/org/apache/naming/factory/OpenEjbFactory.java +++ b/java/org/apache/naming/factory/OpenEjbFactory.java @@ -55,7 +55,7 @@ public class OpenEjbFactory implements ObjectFactory { * @param obj The reference object describing the DataSource */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws Exception { Object beanObj = null; diff --git a/java/org/apache/naming/factory/ResourceEnvFactory.java b/java/org/apache/naming/factory/ResourceEnvFactory.java index 781a284b5..2ebec4b2b 100644 --- a/java/org/apache/naming/factory/ResourceEnvFactory.java +++ b/java/org/apache/naming/factory/ResourceEnvFactory.java @@ -59,7 +59,7 @@ public class ResourceEnvFactory * @param obj The reference object describing the DataSource */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws Exception { if (obj instanceof ResourceEnvRef) { @@ -73,7 +73,7 @@ public class ResourceEnvFactory // Loading factory ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - Class factoryClass = null; + Class factoryClass = null; if (tcl != null) { try { factoryClass = tcl.loadClass(factoryClassName); diff --git a/java/org/apache/naming/factory/ResourceFactory.java b/java/org/apache/naming/factory/ResourceFactory.java index 341c0d108..46cf0647f 100644 --- a/java/org/apache/naming/factory/ResourceFactory.java +++ b/java/org/apache/naming/factory/ResourceFactory.java @@ -59,7 +59,7 @@ public class ResourceFactory * @param obj The reference object describing the DataSource */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws Exception { if (obj instanceof ResourceRef) { @@ -73,7 +73,7 @@ public class ResourceFactory // Loading factory ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - Class factoryClass = null; + Class factoryClass = null; if (tcl != null) { try { factoryClass = tcl.loadClass(factoryClassName); diff --git a/java/org/apache/naming/factory/ResourceLinkFactory.java b/java/org/apache/naming/factory/ResourceLinkFactory.java index babbce244..9e2371626 100644 --- a/java/org/apache/naming/factory/ResourceLinkFactory.java +++ b/java/org/apache/naming/factory/ResourceLinkFactory.java @@ -77,7 +77,7 @@ public class ResourceLinkFactory * @param obj The reference object describing the DataSource */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws NamingException { if (!(obj instanceof ResourceLinkRef)) diff --git a/java/org/apache/naming/factory/SendMailFactory.java b/java/org/apache/naming/factory/SendMailFactory.java index 82ce32b5a..5dcb5e579 100644 --- a/java/org/apache/naming/factory/SendMailFactory.java +++ b/java/org/apache/naming/factory/SendMailFactory.java @@ -80,7 +80,7 @@ public class SendMailFactory implements ObjectFactory "javax.mail.internet.MimePartDataSource"; public Object getObjectInstance(Object RefObj, Name Nm, Context Ctx, - Hashtable Env) throws Exception + Hashtable Env) throws Exception { final Reference Ref = (Reference)RefObj; @@ -88,23 +88,24 @@ public class SendMailFactory implements ObjectFactory // so that javamail can read its default properties without // throwing Security Exceptions if (Ref.getClassName().equals(DataSourceClassName)) { - return AccessController.doPrivileged( new PrivilegedAction() + return AccessController.doPrivileged( + new PrivilegedAction() { - public Object run() { + public MimePartDataSource run() { // set up the smtp session that will send the message Properties props = new Properties(); // enumeration of all refaddr - Enumeration list = Ref.getAll(); + Enumeration list = Ref.getAll(); // current refaddr to be set RefAddr refaddr; // set transport to smtp props.put("mail.transport.protocol", "smtp"); while (list.hasMoreElements()) { - refaddr = (RefAddr)list.nextElement(); + refaddr = list.nextElement(); // set property - props.put(refaddr.getType(), (String)refaddr.getContent()); + props.put(refaddr.getType(), refaddr.getContent()); } MimeMessage message = new MimeMessage( Session.getInstance(props)); diff --git a/java/org/apache/naming/factory/TransactionFactory.java b/java/org/apache/naming/factory/TransactionFactory.java index 7541f14f6..fefd36aec 100644 --- a/java/org/apache/naming/factory/TransactionFactory.java +++ b/java/org/apache/naming/factory/TransactionFactory.java @@ -59,7 +59,7 @@ public class TransactionFactory * @param obj The reference object describing the DataSource */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws Exception { if (obj instanceof TransactionRef) { @@ -73,7 +73,7 @@ public class TransactionFactory // Loading factory ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - Class factoryClass = null; + Class factoryClass = null; if (tcl != null) { try { factoryClass = tcl.loadClass(factoryClassName); diff --git a/java/org/apache/naming/java/javaURLContextFactory.java b/java/org/apache/naming/java/javaURLContextFactory.java index 2f759e9f1..100ae9a2e 100644 --- a/java/org/apache/naming/java/javaURLContextFactory.java +++ b/java/org/apache/naming/java/javaURLContextFactory.java @@ -79,11 +79,11 @@ public class javaURLContextFactory * Crete a new Context's instance. */ public Object getObjectInstance(Object obj, Name name, Context nameCtx, - Hashtable environment) + Hashtable environment) throws NamingException { if ((ContextBindings.isThreadBound()) || (ContextBindings.isClassLoaderBound())) { - return new SelectorContext(environment); + return new SelectorContext((Hashtable)environment); } else { return null; } @@ -93,16 +93,18 @@ public class javaURLContextFactory /** * Get a new (writable) initial context. */ - public Context getInitialContext(Hashtable environment) + public Context getInitialContext(Hashtable environment) throws NamingException { if (ContextBindings.isThreadBound() || (ContextBindings.isClassLoaderBound())) { // Redirect the request to the bound initial context - return new SelectorContext(environment, true); + return new SelectorContext( + (Hashtable)environment, true); } else { // If the thread is not bound, return a shared writable context if (initialContext == null) - initialContext = new NamingContext(environment, MAIN); + initialContext = new NamingContext( + (Hashtable)environment, MAIN); return initialContext; } } diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java index 834500109..788ff5f03 100644 --- a/java/org/apache/naming/resources/BaseDirContext.java +++ b/java/org/apache/naming/resources/BaseDirContext.java @@ -20,8 +20,10 @@ package org.apache.naming.resources; import java.util.Hashtable; +import javax.naming.Binding; import javax.naming.Context; import javax.naming.Name; +import javax.naming.NameClassPair; import javax.naming.NameParser; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -29,6 +31,7 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import org.apache.naming.NameParserImpl; import org.apache.naming.StringManager; @@ -53,14 +56,14 @@ public abstract class BaseDirContext implements DirContext { * Builds a base directory context. */ public BaseDirContext() { - this.env = new Hashtable(); + this.env = new Hashtable(); } /** * Builds a base directory context using the given environment. */ - public BaseDirContext(Hashtable env) { + public BaseDirContext(Hashtable env) { this.env = env; } @@ -77,7 +80,7 @@ public abstract class BaseDirContext implements DirContext { /** * Environment. */ - protected Hashtable env; + protected Hashtable env; /** @@ -221,7 +224,7 @@ public abstract class BaseDirContext implements DirContext { * Allocate resources for this directory context. */ public void allocate() { - ; // No action taken by the default implementation + // No action taken by the default implementation } @@ -229,7 +232,7 @@ public abstract class BaseDirContext implements DirContext { * Release any resources allocated for this directory context. */ public void release() { - ; // No action taken by the default implementation + // No action taken by the default implementation } @@ -408,7 +411,7 @@ public abstract class BaseDirContext implements DirContext { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(Name name) + public NamingEnumeration list(Name name) throws NamingException { return list(name.toString()); } @@ -423,7 +426,7 @@ public abstract class BaseDirContext implements DirContext { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public abstract NamingEnumeration list(String name) + public abstract NamingEnumeration list(String name) throws NamingException; @@ -440,7 +443,7 @@ public abstract class BaseDirContext implements DirContext { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(Name name) + public NamingEnumeration listBindings(Name name) throws NamingException { return listBindings(name.toString()); } @@ -455,7 +458,7 @@ public abstract class BaseDirContext implements DirContext { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public abstract NamingEnumeration listBindings(String name) + public abstract NamingEnumeration listBindings(String name) throws NamingException; @@ -675,7 +678,7 @@ public abstract class BaseDirContext implements DirContext { * @return the environment of this context; never null * @exception NamingException if a naming exception is encountered */ - public Hashtable getEnvironment() + public Hashtable getEnvironment() throws NamingException { return env; } @@ -1045,8 +1048,8 @@ public abstract class BaseDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration search(Name name, + Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { return search(name.toString(), matchingAttributes, attributesToReturn); } @@ -1068,7 +1071,7 @@ public abstract class BaseDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public abstract NamingEnumeration search + public abstract NamingEnumeration search (String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException; @@ -1089,8 +1092,8 @@ public abstract class BaseDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, Attributes matchingAttributes) - throws NamingException { + public NamingEnumeration search(Name name, + Attributes matchingAttributes) throws NamingException { return search(name.toString(), matchingAttributes); } @@ -1108,7 +1111,7 @@ public abstract class BaseDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public abstract NamingEnumeration search + public abstract NamingEnumeration search (String name, Attributes matchingAttributes) throws NamingException; @@ -1132,7 +1135,7 @@ public abstract class BaseDirContext implements DirContext { * contain invalid settings * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search + public NamingEnumeration search (Name name, String filter, SearchControls cons) throws NamingException { return search(name.toString(), filter, cons); @@ -1158,8 +1161,8 @@ public abstract class BaseDirContext implements DirContext { * contain invalid settings * @exception NamingException if a naming exception is encountered */ - public abstract NamingEnumeration search(String name, String filter, - SearchControls cons) + public abstract NamingEnumeration search(String name, + String filter, SearchControls cons) throws NamingException; @@ -1187,7 +1190,7 @@ public abstract class BaseDirContext implements DirContext { * represents an invalid search filter * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, String filterExpr, + public NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { return search(name.toString(), filterExpr, filterArgs, cons); @@ -1218,7 +1221,7 @@ public abstract class BaseDirContext implements DirContext { * represents an invalid search filter * @exception NamingException if a naming exception is encountered */ - public abstract NamingEnumeration search + public abstract NamingEnumeration search (String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException; diff --git a/java/org/apache/naming/resources/DirContextURLConnection.java b/java/org/apache/naming/resources/DirContextURLConnection.java index 35c4c7358..7db98baba 100644 --- a/java/org/apache/naming/resources/DirContextURLConnection.java +++ b/java/org/apache/naming/resources/DirContextURLConnection.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Vector; import javax.naming.NamingException; @@ -238,7 +239,7 @@ public class DirContextURLConnection /** * Returns an unmodifiable Map of the header fields. */ - public Map getHeaderFields() { + public Map> getHeaderFields() { if (!connected) { // Try to connect (silently) @@ -251,15 +252,17 @@ public class DirContextURLConnection if (attributes == null) return (Collections.EMPTY_MAP); - HashMap headerFields = new HashMap(attributes.size()); - NamingEnumeration attributeEnum = attributes.getIDs(); + HashMap> headerFields = + new HashMap>(attributes.size()); + NamingEnumeration attributeEnum = attributes.getIDs(); try { while (attributeEnum.hasMore()) { - String attributeID = (String)attributeEnum.next(); + String attributeID = attributeEnum.next(); Attribute attribute = attributes.get(attributeID); if (attribute == null) continue; - ArrayList attributeValueList = new ArrayList(attribute.size()); - NamingEnumeration attributeValues = attribute.getAll(); + ArrayList attributeValueList = + new ArrayList(attribute.size()); + NamingEnumeration attributeValues = attribute.getAll(); while (attributeValues.hasMore()) { Object attrValue = attributeValues.next(); attributeValueList.add(getHeaderValueAsString(attrValue)); @@ -292,10 +295,10 @@ public class DirContextURLConnection if (attributes == null) return (null); - NamingEnumeration attributeEnum = attributes.getIDs(); + NamingEnumeration attributeEnum = attributes.getIDs(); try { while (attributeEnum.hasMore()) { - String attributeID = (String)attributeEnum.next(); + String attributeID = attributeEnum.next(); if (attributeID.equalsIgnoreCase(name)) { Attribute attribute = attributes.get(attributeID); if (attribute == null) return null; @@ -391,7 +394,7 @@ public class DirContextURLConnection * List children of this collection. The names given are relative to this * URI's path. The full uri of the children is then : path + "/" + name. */ - public Enumeration list() + public Enumeration list() throws IOException { if (!connected) { @@ -402,13 +405,14 @@ public class DirContextURLConnection throw new FileNotFoundException(); } - Vector result = new Vector(); + Vector result = new Vector(); if (collection != null) { try { - NamingEnumeration enumeration = context.list(getURL().getFile()); + NamingEnumeration enumeration = + context.list(getURL().getFile()); while (enumeration.hasMoreElements()) { - NameClassPair ncp = (NameClassPair) enumeration.nextElement(); + NameClassPair ncp = enumeration.nextElement(); result.addElement(ncp.getName()); } } catch (NamingException e) { diff --git a/java/org/apache/naming/resources/DirContextURLStreamHandler.java b/java/org/apache/naming/resources/DirContextURLStreamHandler.java index 389042d26..b2af7aea5 100644 --- a/java/org/apache/naming/resources/DirContextURLStreamHandler.java +++ b/java/org/apache/naming/resources/DirContextURLStreamHandler.java @@ -53,13 +53,15 @@ public class DirContextURLStreamHandler /** * Bindings class loader - directory context. Keyed by CL id. */ - private static Hashtable clBindings = new Hashtable(); + private static Hashtable clBindings = + new Hashtable(); /** * Bindings thread - directory context. Keyed by thread id. */ - private static Hashtable threadBindings = new Hashtable(); + private static Hashtable threadBindings = + new Hashtable(); // ----------------------------------------------------- Instance Variables @@ -203,17 +205,17 @@ public class DirContextURLStreamHandler ClassLoader currentCL = currentThread.getContextClassLoader(); // Checking CL binding - result = (DirContext) clBindings.get(currentCL); + result = clBindings.get(currentCL); if (result != null) return result; // Checking thread biding - result = (DirContext) threadBindings.get(currentThread); + result = threadBindings.get(currentThread); // Checking parent CL binding currentCL = currentCL.getParent(); while (currentCL != null) { - result = (DirContext) clBindings.get(currentCL); + result = clBindings.get(currentCL); if (result != null) return result; currentCL = currentCL.getParent(); @@ -247,7 +249,7 @@ public class DirContextURLStreamHandler * Get the bound context. */ public static DirContext get(ClassLoader cl) { - return (DirContext) clBindings.get(cl); + return clBindings.get(cl); } @@ -255,7 +257,7 @@ public class DirContextURLStreamHandler * Get the bound context. */ public static DirContext get(Thread thread) { - return (DirContext) threadBindings.get(thread); + return threadBindings.get(thread); } diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index bd9546d4b..c90a0095c 100644 --- a/java/org/apache/naming/resources/FileDirContext.java +++ b/java/org/apache/naming/resources/FileDirContext.java @@ -28,7 +28,9 @@ import java.util.Arrays; import java.util.Date; import java.util.Hashtable; +import javax.naming.Binding; import javax.naming.NameAlreadyBoundException; +import javax.naming.NameClassPair; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.OperationNotSupportedException; @@ -36,6 +38,7 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import org.apache.naming.NamingContextBindingsEnumeration; import org.apache.naming.NamingContextEnumeration; @@ -76,7 +79,7 @@ public class FileDirContext extends BaseDirContext { /** * Builds a file directory context using the given environment. */ - public FileDirContext(Hashtable env) { + public FileDirContext(Hashtable env) { super(env); } @@ -293,7 +296,7 @@ public class FileDirContext extends BaseDirContext { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(String name) + public NamingEnumeration list(String name) throws NamingException { File file = file(name); @@ -320,7 +323,7 @@ public class FileDirContext extends BaseDirContext { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(String name) + public NamingEnumeration listBindings(String name) throws NamingException { File file = file(name); @@ -666,8 +669,8 @@ public class FileDirContext extends BaseDirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration search(String name, + Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { return null; } @@ -688,8 +691,8 @@ public class FileDirContext extends BaseDirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, Attributes matchingAttributes) - throws NamingException { + public NamingEnumeration search(String name, + Attributes matchingAttributes) throws NamingException { return null; } @@ -713,7 +716,7 @@ public class FileDirContext extends BaseDirContext { * contain invalid settings * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, String filter, + public NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException { return null; @@ -744,8 +747,8 @@ public class FileDirContext extends BaseDirContext { * represents an invalid search filter * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, String filterExpr, - Object[] filterArgs, SearchControls cons) + public NamingEnumeration search(String name, + String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { return null; } @@ -884,9 +887,9 @@ public class FileDirContext extends BaseDirContext { * @param file Collection * @return Vector containg NamingEntry objects */ - protected ArrayList list(File file) { + protected ArrayList list(File file) { - ArrayList entries = new ArrayList(); + ArrayList entries = new ArrayList(); if (!file.isDirectory()) return entries; String[] names = file.list(); diff --git a/java/org/apache/naming/resources/ProxyDirContext.java b/java/org/apache/naming/resources/ProxyDirContext.java index e75bed886..2569c9d26 100644 --- a/java/org/apache/naming/resources/ProxyDirContext.java +++ b/java/org/apache/naming/resources/ProxyDirContext.java @@ -35,6 +35,7 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import org.apache.naming.StringManager; @@ -61,7 +62,8 @@ public class ProxyDirContext implements DirContext { /** * Builds a proxy directory context using the given environment. */ - public ProxyDirContext(Hashtable env, DirContext dirContext) { + public ProxyDirContext(Hashtable env, + DirContext dirContext) { this.env = env; this.dirContext = dirContext; if (dirContext instanceof BaseDirContext) { @@ -86,8 +88,8 @@ public class ProxyDirContext implements DirContext { } } } - hostName = (String) env.get(HOST); - contextName = (String) env.get(CONTEXT); + hostName = env.get(HOST); + contextName = env.get(CONTEXT); } @@ -126,7 +128,7 @@ public class ProxyDirContext implements DirContext { /** * Environment. */ - protected Hashtable env; + protected Hashtable env; /** @@ -750,7 +752,7 @@ public class ProxyDirContext implements DirContext { * @return the environment of this context; never null * @exception NamingException if a naming exception is encountered */ - public Hashtable getEnvironment() + public Hashtable getEnvironment() throws NamingException { return dirContext.getEnvironment(); } @@ -1183,8 +1185,8 @@ public class ProxyDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration search(Name name, + Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { return dirContext.search(parseName(name), matchingAttributes, attributesToReturn); @@ -1207,8 +1209,8 @@ public class ProxyDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration search(String name, + Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { return dirContext.search(parseName(name), matchingAttributes, attributesToReturn); @@ -1230,8 +1232,8 @@ public class ProxyDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, Attributes matchingAttributes) - throws NamingException { + public NamingEnumeration search(Name name, + Attributes matchingAttributes) throws NamingException { return dirContext.search(parseName(name), matchingAttributes); } @@ -1249,8 +1251,8 @@ public class ProxyDirContext implements DirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, Attributes matchingAttributes) - throws NamingException { + public NamingEnumeration search(String name, + Attributes matchingAttributes) throws NamingException { return dirContext.search(parseName(name), matchingAttributes); } @@ -1274,7 +1276,7 @@ public class ProxyDirContext implements DirContext { * contain invalid settings * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, String filter, + public NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException { return dirContext.search(parseName(name), filter, cons); @@ -1300,7 +1302,7 @@ public class ProxyDirContext implements DirContext { * contain invalid settings * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, String filter, + public NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException { return dirContext.search(parseName(name), filter, cons); @@ -1331,7 +1333,7 @@ public class ProxyDirContext implements DirContext { * represents an invalid search filter * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(Name name, String filterExpr, + public NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { return dirContext.search(parseName(name), filterExpr, filterArgs, @@ -1363,8 +1365,8 @@ public class ProxyDirContext implements DirContext { * represents an invalid search filter * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, String filterExpr, - Object[] filterArgs, SearchControls cons) + public NamingEnumeration search(String name, + String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { return dirContext.search(parseName(name), filterExpr, filterArgs, cons); @@ -1584,13 +1586,13 @@ public class ProxyDirContext implements DirContext { } entry.resource.setContent(b); } catch (IOException e) { - ; // Ignore + // Ignore } finally { try { if (is != null) is.close(); } catch (IOException e) { - ; // Ignore + // Ignore } } } diff --git a/java/org/apache/naming/resources/RecyclableNamingEnumeration.java b/java/org/apache/naming/resources/RecyclableNamingEnumeration.java index efd31c486..818abe4ac 100644 --- a/java/org/apache/naming/resources/RecyclableNamingEnumeration.java +++ b/java/org/apache/naming/resources/RecyclableNamingEnumeration.java @@ -31,14 +31,14 @@ import javax.naming.NamingException; * @version $Revision$ $Date$ */ -public class RecyclableNamingEnumeration - implements NamingEnumeration { +public class RecyclableNamingEnumeration + implements NamingEnumeration { // ----------------------------------------------------------- Constructors - public RecyclableNamingEnumeration(Vector entries) { + public RecyclableNamingEnumeration(Vector entries) { this.entries = entries; recycle(); } @@ -50,13 +50,13 @@ public class RecyclableNamingEnumeration /** * Entries. */ - protected Vector entries; + protected Vector entries; /** * Underlying enumeration. */ - protected Enumeration enumeration; + protected Enumeration enumeration; // --------------------------------------------------------- Public Methods @@ -65,7 +65,7 @@ public class RecyclableNamingEnumeration /** * Retrieves the next element in the enumeration. */ - public Object next() + public E next() throws NamingException { return nextElement(); } @@ -93,7 +93,7 @@ public class RecyclableNamingEnumeration } - public Object nextElement() { + public E nextElement() { return enumeration.nextElement(); } diff --git a/java/org/apache/naming/resources/ResourceAttributes.java b/java/org/apache/naming/resources/ResourceAttributes.java index 42cc018df..c053bfa0b 100644 --- a/java/org/apache/naming/resources/ResourceAttributes.java +++ b/java/org/apache/naming/resources/ResourceAttributes.java @@ -311,11 +311,11 @@ public class ResourceAttributes implements Attributes { try { contentLength = Long.parseLong(value.toString()); } catch (NumberFormatException e) { - ; // Ignore + // Ignore } } } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -364,7 +364,7 @@ public class ResourceAttributes implements Attributes { try { result = formats[i].parse(creationDateValue); } catch (ParseException e) { - ; + // Ignore } } if (result != null) { @@ -373,7 +373,7 @@ public class ResourceAttributes implements Attributes { } } } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -426,7 +426,7 @@ public class ResourceAttributes implements Attributes { try { result = formats[i].parse(creationDateValue); } catch (ParseException e) { - ; + // Ignore } } if (result != null) { @@ -435,7 +435,7 @@ public class ResourceAttributes implements Attributes { } } } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -486,7 +486,7 @@ public class ResourceAttributes implements Attributes { result = formats[i].parse(lastModifiedDateValue); } catch (ParseException e) { - ; + // Ignore } } if (result != null) { @@ -495,7 +495,7 @@ public class ResourceAttributes implements Attributes { } } } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -560,7 +560,7 @@ public class ResourceAttributes implements Attributes { result = formats[i].parse(lastModifiedDateValue); } catch (ParseException e) { - ; + // Ignore } } if (result != null) { @@ -569,7 +569,7 @@ public class ResourceAttributes implements Attributes { } } } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -648,7 +648,7 @@ public class ResourceAttributes implements Attributes { try { name = attribute.get().toString(); } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -681,7 +681,7 @@ public class ResourceAttributes implements Attributes { try { result = attribute.get().toString(); } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -720,7 +720,7 @@ public class ResourceAttributes implements Attributes { try { result = attribute.get().toString(); } catch (NamingException e) { - ; // No value for the attribute + // No value for the attribute } } } @@ -870,9 +870,9 @@ public class ResourceAttributes implements Attributes { /** * Get all attributes. */ - public NamingEnumeration getAll() { + public NamingEnumeration getAll() { if (attributes == null) { - Vector attributes = new Vector(); + Vector attributes = new Vector(); Date creationDate = getCreationDate(); if (creationDate != null) { attributes.addElement(new BasicAttribute @@ -907,7 +907,7 @@ public class ResourceAttributes implements Attributes { attributes.addElement(new BasicAttribute(ETAG, etag)); attributes.addElement(new BasicAttribute(ALTERNATE_ETAG, etag)); } - return new RecyclableNamingEnumeration(attributes); + return new RecyclableNamingEnumeration(attributes); } else { return attributes.getAll(); } @@ -917,9 +917,9 @@ public class ResourceAttributes implements Attributes { /** * Get all attribute IDs. */ - public NamingEnumeration getIDs() { + public NamingEnumeration getIDs() { if (attributes == null) { - Vector attributeIDs = new Vector(); + Vector attributeIDs = new Vector(); Date creationDate = getCreationDate(); if (creationDate != null) { attributeIDs.addElement(CREATION_DATE); @@ -948,7 +948,7 @@ public class ResourceAttributes implements Attributes { attributeIDs.addElement(ETAG); attributeIDs.addElement(ALTERNATE_ETAG); } - return new RecyclableNamingEnumeration(attributeIDs); + return new RecyclableNamingEnumeration(attributeIDs); } else { return attributes.getIDs(); } diff --git a/java/org/apache/naming/resources/ResourceCache.java b/java/org/apache/naming/resources/ResourceCache.java index 2e6fc6a18..126c6170d 100644 --- a/java/org/apache/naming/resources/ResourceCache.java +++ b/java/org/apache/naming/resources/ResourceCache.java @@ -56,7 +56,8 @@ public class ResourceCache { /** * Not found cache. */ - protected HashMap notFoundCache = new HashMap(); + protected HashMap notFoundCache = + new HashMap(); /** @@ -298,7 +299,7 @@ public class ResourceCache { } if (cacheEntry == null) { try { - cacheEntry = (CacheEntry) notFoundCache.get(name); + cacheEntry = notFoundCache.get(name); } catch (Exception e) { // Ignore: the reliability of this lookup is not critical } diff --git a/java/org/apache/naming/resources/WARDirContext.java b/java/org/apache/naming/resources/WARDirContext.java index 788a1620b..bed5a186a 100644 --- a/java/org/apache/naming/resources/WARDirContext.java +++ b/java/org/apache/naming/resources/WARDirContext.java @@ -30,8 +30,10 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; +import javax.naming.Binding; import javax.naming.CompositeName; import javax.naming.Name; +import javax.naming.NameClassPair; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.OperationNotSupportedException; @@ -39,6 +41,7 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import org.apache.naming.NamingContextBindingsEnumeration; import org.apache.naming.NamingContextEnumeration; @@ -70,7 +73,7 @@ public class WARDirContext extends BaseDirContext { /** * Builds a WAR directory context using the given environment. */ - public WARDirContext(Hashtable env) { + public WARDirContext(Hashtable env) { super(env); } @@ -257,7 +260,7 @@ public class WARDirContext extends BaseDirContext { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(String name) + public NamingEnumeration list(String name) throws NamingException { return list(new CompositeName(name)); } @@ -276,7 +279,7 @@ public class WARDirContext extends BaseDirContext { * this context. Each element of the enumeration is of type NameClassPair. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration list(Name name) + public NamingEnumeration list(Name name) throws NamingException { if (name.isEmpty()) return new NamingContextEnumeration(list(entries).iterator()); @@ -301,7 +304,7 @@ public class WARDirContext extends BaseDirContext { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(String name) + public NamingEnumeration listBindings(String name) throws NamingException { return listBindings(new CompositeName(name)); } @@ -320,7 +323,7 @@ public class WARDirContext extends BaseDirContext { * Each element of the enumeration is of type Binding. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration listBindings(Name name) + public NamingEnumeration listBindings(Name name) throws NamingException { if (name.isEmpty()) return new NamingContextBindingsEnumeration(list(entries).iterator(), @@ -622,8 +625,8 @@ public class WARDirContext extends BaseDirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration search(String name, + Attributes matchingAttributes, String[] attributesToReturn) throws NamingException { throw new OperationNotSupportedException(); } @@ -644,8 +647,8 @@ public class WARDirContext extends BaseDirContext { * context named by name. * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, Attributes matchingAttributes) - throws NamingException { + public NamingEnumeration search(String name, + Attributes matchingAttributes) throws NamingException { throw new OperationNotSupportedException(); } @@ -669,7 +672,7 @@ public class WARDirContext extends BaseDirContext { * contain invalid settings * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, String filter, + public NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException { throw new OperationNotSupportedException(); @@ -700,7 +703,7 @@ public class WARDirContext extends BaseDirContext { * represents an invalid search filter * @exception NamingException if a naming exception is encountered */ - public NamingEnumeration search(String name, String filterExpr, + public NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException { throw new OperationNotSupportedException(); @@ -731,12 +734,12 @@ public class WARDirContext extends BaseDirContext { try { - Enumeration entryList = base.entries(); + Enumeration entryList = base.entries(); entries = new Entry("/", new ZipEntry("/")); while (entryList.hasMoreElements()) { - ZipEntry entry = (ZipEntry) entryList.nextElement(); + ZipEntry entry = entryList.nextElement(); String name = normalize(entry); int pos = name.lastIndexOf('/'); // Check that parent entries exist and, if not, create them. @@ -801,9 +804,9 @@ public class WARDirContext extends BaseDirContext { /** * List children as objects. */ - protected ArrayList list(Entry entry) { + protected ArrayList list(Entry entry) { - ArrayList entries = new ArrayList(); + ArrayList entries = new ArrayList(); Entry[] children = entry.getChildren(); Arrays.sort(children); NamingEntry namingEntry = null; @@ -832,7 +835,7 @@ public class WARDirContext extends BaseDirContext { /** * Entries structure. */ - protected class Entry implements Comparable { + protected class Entry implements Comparable { // -------------------------------------------------------- Constructor