6380849: RFE: Automatic discovery of PersistanceDelegates
Reviewed-by: rupashka, alexp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+import java.beans.BeanDescriptor;
+import java.beans.BeanInfo;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * This is utility class that provides functionality
+ * to find a {@link BeanInfo} for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class BeanInfoFinder
+ extends InstanceFinder<BeanInfo> {
+
+ private static final String DEFAULT = "sun.beans.infos";
+
+ public BeanInfoFinder() {
+ super(BeanInfo.class, true, "BeanInfo", DEFAULT);
+ }
+
+ private static boolean isValid(Class<?> type, Method method) {
+ return (method != null) && type.equals(method.getDeclaringClass());
+ }
+
+ @Override
+ protected BeanInfo instantiate(Class<?> type, String name) {
+ BeanInfo info = super.instantiate(type, name);
+ if (info != null) {
+ // make sure that the returned BeanInfo matches the class
+ BeanDescriptor bd = info.getBeanDescriptor();
+ if (bd != null) {
+ if (type.equals(bd.getBeanClass())) {
+ return info;
+ }
+ }
+ else {
+ PropertyDescriptor[] pds = info.getPropertyDescriptors();
+ if (pds != null) {
+ for (PropertyDescriptor pd : pds) {
+ Method method = pd.getReadMethod();
+ if (method == null) {
+ method = pd.getWriteMethod();
+ }
+ if (isValid(type, method)) {
+ return info;
+ }
+ }
+ }
+ else {
+ MethodDescriptor[] mds = info.getMethodDescriptors();
+ if (mds != null) {
+ for (MethodDescriptor md : mds) {
+ if (isValid(type, md.getMethod())) {
+ return info;
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
+ // this optimization will only use the BeanInfo search path
+ // if is has changed from the original
+ // or trying to get the ComponentBeanInfo
+ return !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name)
+ ? super.instantiate(type, prefix, name)
+ : null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/InstanceFinder.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+/**
+ * This is utility class that provides basic functionality
+ * to find an auxiliary class for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+class InstanceFinder<T> {
+
+ private static final String[] EMPTY = { };
+
+ private final Class<? extends T> type;
+ private final boolean allow;
+ private final String suffix;
+ private String[] packages;
+
+ InstanceFinder(Class<? extends T> type, boolean allow, String suffix, String... packages) {
+ this.type = type;
+ this.allow = allow;
+ this.suffix = suffix;
+ this.packages = packages.clone();
+ }
+
+ public String[] getPackages() {
+ return (this.packages.length > 0)
+ ? this.packages.clone()
+ : this.packages;
+ }
+
+ public void setPackages(String... packages) {
+ this.packages = (packages != null) && (packages.length > 0)
+ ? packages.clone()
+ : EMPTY;
+ }
+
+ public T find(Class<?> type) {
+ if (type == null) {
+ return null;
+ }
+ String name = type.getName() + this.suffix;
+ T object = instantiate(type, name);
+ if (object != null) {
+ return object;
+ }
+ if (this.allow) {
+ object = instantiate(type, null);
+ if (object != null) {
+ return object;
+ }
+ }
+ int index = name.lastIndexOf('.') + 1;
+ if (index > 0) {
+ name = name.substring(index);
+ }
+ for (String prefix : this.packages) {
+ object = instantiate(type, prefix, name);
+ if (object != null) {
+ return object;
+ }
+ }
+ return null;
+ }
+
+ protected T instantiate(Class<?> type, String name) {
+ if (type != null) {
+ try {
+ if (name != null) {
+ type = ClassFinder.findClass(name, type.getClassLoader());
+ }
+ if (this.type.isAssignableFrom(type)) {
+ return (T) type.newInstance();
+ }
+ }
+ catch (Exception exception) {
+ // ignore any exceptions
+ }
+ }
+ return null;
+ }
+
+ protected T instantiate(Class<?> type, String prefix, String name) {
+ return instantiate(type, prefix + '.' + name);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+import java.beans.PersistenceDelegate;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This is utility class that provides functionality
+ * to find a {@link PersistenceDelegate} for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class PersistenceDelegateFinder
+ extends InstanceFinder<PersistenceDelegate> {
+
+ private final Map<Class<?>, PersistenceDelegate> registry;
+
+ public PersistenceDelegateFinder() {
+ super(PersistenceDelegate.class, true, "PersistenceDelegate");
+ this.registry = new HashMap<Class<?>, PersistenceDelegate>();
+ }
+
+ public void register(Class<?> type, PersistenceDelegate delegate) {
+ if (delegate != null) {
+ this.registry.put(type, delegate);
+ }
+ else {
+ this.registry.remove(type);
+ }
+ }
+
+ @Override
+ public PersistenceDelegate find(Class<?> type) {
+ PersistenceDelegate delegate = this.registry.get(type);
+ return (delegate != null) ? delegate : super.find(type);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+import com.sun.beans.WeakCache;
+
+import java.beans.PropertyEditor;
+
+import sun.beans.editors.BooleanEditor;
+import sun.beans.editors.ByteEditor;
+import sun.beans.editors.DoubleEditor;
+import sun.beans.editors.EnumEditor;
+import sun.beans.editors.FloatEditor;
+import sun.beans.editors.IntegerEditor;
+import sun.beans.editors.LongEditor;
+import sun.beans.editors.ShortEditor;
+
+/**
+ * This is utility class that provides functionality
+ * to find a {@link PropertyEditor} for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class PropertyEditorFinder
+ extends InstanceFinder<PropertyEditor> {
+
+ private final WeakCache<Class<?>, Class<?>> registry;
+
+ public PropertyEditorFinder() {
+ super(PropertyEditor.class, false, "Editor", "sun.beans.editors");
+
+ this.registry = new WeakCache<Class<?>, Class<?>>();
+ this.registry.put(Byte.TYPE, ByteEditor.class);
+ this.registry.put(Short.TYPE, ShortEditor.class);
+ this.registry.put(Integer.TYPE, IntegerEditor.class);
+ this.registry.put(Long.TYPE, LongEditor.class);
+ this.registry.put(Boolean.TYPE, BooleanEditor.class);
+ this.registry.put(Float.TYPE, FloatEditor.class);
+ this.registry.put(Double.TYPE, DoubleEditor.class);
+ }
+
+ public void register(Class<?> type, Class<?> editor) {
+ this.registry.put(type, editor);
+ }
+
+ @Override
+ public PropertyEditor find(Class<?> type) {
+ PropertyEditor editor = instantiate(this.registry.get(type), null);
+ if (editor == null) {
+ editor = super.find(type);
+ if ((editor == null) && (null != type.getEnumConstants())) {
+ editor = new EnumEditor(type);
+ }
+ }
+ return editor;
+ }
+}
--- a/jdk/src/share/classes/java/beans/Encoder.java Tue Jun 30 09:38:16 2009 +0900
+++ b/jdk/src/share/classes/java/beans/Encoder.java Thu Jul 02 19:48:11 2009 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. 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
@@ -24,7 +24,8 @@
*/
package java.beans;
-import java.util.Collections;
+import com.sun.beans.finder.PersistenceDelegateFinder;
+
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Map;
@@ -45,8 +46,7 @@
*/
public class Encoder {
- private final Map<Class<?>, PersistenceDelegate> delegates
- = Collections.synchronizedMap(new HashMap<Class<?>, PersistenceDelegate>());
+ private final PersistenceDelegateFinder finder = new PersistenceDelegateFinder();
private Map bindings = new IdentityHashMap();
private ExceptionListener exceptionListener;
boolean executeStatements = true;
@@ -166,8 +166,13 @@
* @see java.beans.BeanInfo#getBeanDescriptor
*/
public PersistenceDelegate getPersistenceDelegate(Class<?> type) {
- PersistenceDelegate pd = this.delegates.get(type);
- return (pd != null) ? pd : MetaData.getPersistenceDelegate(type);
+ synchronized (this.finder) {
+ PersistenceDelegate pd = this.finder.find(type);
+ if (pd != null) {
+ return pd;
+ }
+ }
+ return MetaData.getPersistenceDelegate(type);
}
/**
@@ -184,10 +189,8 @@
public void setPersistenceDelegate(Class<?> type,
PersistenceDelegate persistenceDelegate)
{
- if (persistenceDelegate != null) {
- this.delegates.put(type, persistenceDelegate);
- } else {
- this.delegates.remove(type);
+ synchronized (this.finder) {
+ this.finder.register(type, persistenceDelegate);
}
}
--- a/jdk/src/share/classes/java/beans/Introspector.java Tue Jun 30 09:38:16 2009 +0900
+++ b/jdk/src/share/classes/java/beans/Introspector.java Thu Jul 02 19:48:11 2009 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. 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
@@ -25,6 +25,7 @@
package java.beans;
+import com.sun.beans.finder.BeanInfoFinder;
import com.sun.beans.finder.ClassFinder;
import java.lang.ref.Reference;
@@ -45,6 +46,8 @@
import java.util.List;
import java.util.WeakHashMap;
import java.util.TreeMap;
+
+import sun.awt.AppContext;
import sun.reflect.misc.ReflectUtil;
/**
@@ -137,10 +140,6 @@
// events maps from String names to EventSetDescriptors
private Map events;
- private final static String DEFAULT_INFO_PATH = "sun.beans.infos";
-
- private static String[] searchPath = { DEFAULT_INFO_PATH };
-
private final static EventSetDescriptor[] EMPTY_EVENTSETDESCRIPTORS = new EventSetDescriptor[0];
static final String ADD_PREFIX = "add";
@@ -149,7 +148,7 @@
static final String SET_PREFIX = "set";
static final String IS_PREFIX = "is";
- private static final String BEANINFO_SUFFIX = "BeanInfo";
+ private static final Object FINDER_KEY = new Object();
//======================================================================
// Public methods
@@ -309,13 +308,11 @@
* Sun implementation initially sets to {"sun.beans.infos"}.
*/
- public static synchronized String[] getBeanInfoSearchPath() {
- // Return a copy of the searchPath.
- String result[] = new String[searchPath.length];
- for (int i = 0; i < searchPath.length; i++) {
- result[i] = searchPath[i];
+ public static String[] getBeanInfoSearchPath() {
+ BeanInfoFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.getPackages();
}
- return result;
}
/**
@@ -334,12 +331,15 @@
* @see SecurityManager#checkPropertiesAccess
*/
- public static synchronized void setBeanInfoSearchPath(String path[]) {
+ public static void setBeanInfoSearchPath(String[] path) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- searchPath = path;
+ BeanInfoFinder finder = getFinder();
+ synchronized (finder) {
+ finder.setPackages(path);
+ }
}
@@ -447,67 +447,14 @@
* then it checks to see if the class is its own BeanInfo. Finally,
* the BeanInfo search path is prepended to the class and searched.
*
+ * @param beanClass the class type of the bean
* @return Instance of an explicit BeanInfo class or null if one isn't found.
*/
- private static synchronized BeanInfo findExplicitBeanInfo(Class beanClass) {
- String name = beanClass.getName() + BEANINFO_SUFFIX;
- try {
- return (java.beans.BeanInfo)instantiate(beanClass, name);
- } catch (Exception ex) {
- // Just drop through
-
- }
- // Now try checking if the bean is its own BeanInfo.
- try {
- if (isSubclass(beanClass, java.beans.BeanInfo.class)) {
- return (java.beans.BeanInfo)beanClass.newInstance();
- }
- } catch (Exception ex) {
- // Just drop through
+ private static BeanInfo findExplicitBeanInfo(Class beanClass) {
+ BeanInfoFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.find(beanClass);
}
- // Now try looking for <searchPath>.fooBeanInfo
- name = name.substring(name.lastIndexOf('.')+1);
-
- for (int i = 0; i < searchPath.length; i++) {
- // This optimization will only use the BeanInfo search path if is has changed
- // from the original or trying to get the ComponentBeanInfo.
- if (!DEFAULT_INFO_PATH.equals(searchPath[i]) ||
- DEFAULT_INFO_PATH.equals(searchPath[i]) && "ComponentBeanInfo".equals(name)) {
- try {
- String fullName = searchPath[i] + "." + name;
- java.beans.BeanInfo bi = (java.beans.BeanInfo)instantiate(beanClass, fullName);
-
- // Make sure that the returned BeanInfo matches the class.
- if (bi.getBeanDescriptor() != null) {
- if (bi.getBeanDescriptor().getBeanClass() == beanClass) {
- return bi;
- }
- } else if (bi.getPropertyDescriptors() != null) {
- PropertyDescriptor[] pds = bi.getPropertyDescriptors();
- for (int j = 0; j < pds.length; j++) {
- Method method = pds[j].getReadMethod();
- if (method == null) {
- method = pds[j].getWriteMethod();
- }
- if (method != null && method.getDeclaringClass() == beanClass) {
- return bi;
- }
- }
- } else if (bi.getMethodDescriptors() != null) {
- MethodDescriptor[] mds = bi.getMethodDescriptors();
- for (int j = 0; j < mds.length; j++) {
- Method method = mds[j].getMethod();
- if (method != null && method.getDeclaringClass() == beanClass) {
- return bi;
- }
- }
- }
- } catch (Exception ex) {
- // Silently ignore any errors.
- }
- }
- }
- return null;
}
/**
@@ -1483,6 +1430,16 @@
return false;
}
+ private static BeanInfoFinder getFinder() {
+ AppContext context = AppContext.getAppContext();
+ Object object = context.get(FINDER_KEY);
+ if (object instanceof BeanInfoFinder) {
+ return (BeanInfoFinder) object;
+ }
+ BeanInfoFinder finder = new BeanInfoFinder();
+ context.put(FINDER_KEY, finder);
+ return finder;
+ }
/**
* Try to create an instance of a named class.
--- a/jdk/src/share/classes/java/beans/PropertyEditorManager.java Tue Jun 30 09:38:16 2009 +0900
+++ b/jdk/src/share/classes/java/beans/PropertyEditorManager.java Thu Jul 02 19:48:11 2009 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. 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
@@ -25,8 +25,8 @@
package java.beans;
-import com.sun.beans.WeakCache;
-import sun.beans.editors.*;
+import com.sun.beans.finder.PropertyEditorFinder;
+import sun.awt.AppContext;
/**
* The PropertyEditorManager can be used to locate a property editor for
@@ -55,6 +55,8 @@
public class PropertyEditorManager {
+ private static final Object FINDER_KEY = new Object();
+
/**
* Registers an editor class to edit values of the given target class.
* If the editor class is {@code null},
@@ -74,12 +76,15 @@
*
* @see SecurityManager#checkPropertiesAccess
*/
- public static synchronized void registerEditor(Class<?> targetType, Class<?> editorClass) {
+ public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- registry.put(targetType, editorClass);
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ finder.register(targetType, editorClass);
+ }
}
/**
@@ -89,46 +94,11 @@
* @return An editor object for the given target class.
* The result is null if no suitable editor can be found.
*/
- public static synchronized PropertyEditor findEditor(Class<?> targetType) {
- Class editorClass = registry.get(targetType);
- if (editorClass != null) {
- try {
- Object o = editorClass.newInstance();
- return (PropertyEditor)o;
- } catch (Exception ex) {
- System.err.println("Couldn't instantiate type editor \"" +
- editorClass.getName() + "\" : " + ex);
- }
- }
-
- // Now try adding "Editor" to the class name.
-
- String editorName = targetType.getName() + "Editor";
- try {
- return (PropertyEditor) Introspector.instantiate(targetType, editorName);
- } catch (Exception ex) {
- // Silently ignore any errors.
+ public static PropertyEditor findEditor(Class<?> targetType) {
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.find(targetType);
}
-
- // Now try looking for <searchPath>.fooEditor
- int index = editorName.lastIndexOf('.') + 1;
- if (index > 0) {
- editorName = editorName.substring(index);
- }
- for (String path : searchPath) {
- String name = path + '.' + editorName;
- try {
- return (PropertyEditor) Introspector.instantiate(targetType, name);
- } catch (Exception ex) {
- // Silently ignore any errors.
- }
- }
-
- if (null != targetType.getEnumConstants()) {
- return new EnumEditor(targetType);
- }
- // We couldn't find a suitable Editor.
- return null;
}
/**
@@ -139,8 +109,11 @@
* <p> The default value for this array is implementation-dependent,
* e.g. Sun implementation initially sets to {"sun.beans.editors"}.
*/
- public static synchronized String[] getEditorSearchPath() {
- return searchPath.clone();
+ public static String[] getEditorSearchPath() {
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.getPackages();
+ }
}
/**
@@ -156,28 +129,25 @@
* of system properties.
* @see SecurityManager#checkPropertiesAccess
*/
- public static synchronized void setEditorSearchPath(String[] path) {
+ public static void setEditorSearchPath(String[] path) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- searchPath = (path != null)
- ? path.clone()
- : EMPTY;
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ finder.setPackages(path);
+ }
}
- private static String[] searchPath = { "sun.beans.editors" };
- private static final String[] EMPTY = {};
- private static final WeakCache<Class<?>, Class<?>> registry;
-
- static {
- registry = new WeakCache<Class<?>, Class<?>>();
- registry.put(Byte.TYPE, ByteEditor.class);
- registry.put(Short.TYPE, ShortEditor.class);
- registry.put(Integer.TYPE, IntegerEditor.class);
- registry.put(Long.TYPE, LongEditor.class);
- registry.put(Boolean.TYPE, BooleanEditor.class);
- registry.put(Float.TYPE, FloatEditor.class);
- registry.put(Double.TYPE, DoubleEditor.class);
+ private static PropertyEditorFinder getFinder() {
+ AppContext context = AppContext.getAppContext();
+ Object object = context.get(FINDER_KEY);
+ if (object instanceof PropertyEditorFinder) {
+ return (PropertyEditorFinder) object;
+ }
+ PropertyEditorFinder finder = new PropertyEditorFinder();
+ context.put(FINDER_KEY, finder);
+ return finder;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/TestBeanInfo.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2009 Sun Microsystems, Inc. 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6380849
+ * @summary Tests BeanInfo finder
+ * @author Sergey Malenkov
+ */
+
+import beans.FirstBean;
+import beans.FirstBeanBeanInfo;
+import beans.SecondBean;
+import beans.ThirdBean;
+
+import infos.SecondBeanBeanInfo;
+import infos.ThirdBeanBeanInfo;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.lang.reflect.Field;
+
+import sun.awt.SunToolkit;
+
+public class TestBeanInfo implements Runnable {
+
+ private static final String[] SEARCH_PATH = { "infos" }; // NON-NLS: package name
+
+ public static void main(String[] args) throws InterruptedException {
+ TestBeanInfo test = new TestBeanInfo();
+ test.run();
+ // the following tests fails on previous build
+ ThreadGroup group = new ThreadGroup("$$$"); // NON-NLS: unique thread name
+ Thread thread = new Thread(group, test);
+ thread.start();
+ thread.join();
+ }
+
+ private static void test(Class<?> type, Class<? extends BeanInfo> expected) {
+ BeanInfo actual;
+ try {
+ actual = Introspector.getBeanInfo(type);
+ type = actual.getClass();
+ Field field = type.getDeclaredField("targetBeanInfo"); // NON-NLS: field name
+ field.setAccessible(true);
+ actual = (BeanInfo) field.get(actual);
+ }
+ catch (Exception exception) {
+ throw new Error("unexpected error", exception);
+ }
+ if ((actual == null) && (expected != null)) {
+ throw new Error("expected info is not found");
+ }
+ if ((actual != null) && !actual.getClass().equals(expected)) {
+ throw new Error("found unexpected info");
+ }
+ }
+
+ private boolean passed;
+
+ public void run() {
+ if (this.passed) {
+ SunToolkit.createNewAppContext();
+ }
+ Introspector.flushCaches();
+
+ test(FirstBean.class, FirstBeanBeanInfo.class);
+ test(SecondBean.class, null);
+ test(ThirdBean.class, null);
+ test(ThirdBeanBeanInfo.class, ThirdBeanBeanInfo.class);
+
+ Introspector.setBeanInfoSearchPath(SEARCH_PATH);
+ Introspector.flushCaches();
+
+ test(FirstBean.class, FirstBeanBeanInfo.class);
+ test(SecondBean.class, SecondBeanBeanInfo.class);
+ test(ThirdBean.class, null);
+ test(ThirdBeanBeanInfo.class, ThirdBeanBeanInfo.class);
+
+ this.passed = true;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/FirstBean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,4 @@
+package beans;
+
+public class FirstBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,11 @@
+package beans;
+
+import java.beans.BeanDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class FirstBeanBeanInfo extends SimpleBeanInfo {
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+ return new BeanDescriptor(FirstBean.class);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/SecondBean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,4 @@
+package beans;
+
+public class SecondBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/ThirdBean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,4 @@
+package beans;
+
+public class ThirdBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,13 @@
+package infos;
+
+import beans.SecondBean;
+
+import java.beans.BeanDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class SecondBeanBeanInfo extends SimpleBeanInfo {
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+ return new BeanDescriptor(SecondBean.class);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,11 @@
+package infos;
+
+import java.beans.BeanDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class ThirdBeanBeanInfo extends SimpleBeanInfo {
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+ return new BeanDescriptor(ThirdBeanBeanInfo.class);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/FirstBean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,2 @@
+public class FirstBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,4 @@
+import java.beans.PropertyEditorSupport;
+
+public class FirstBeanEditor extends PropertyEditorSupport {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/SecondBean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,2 @@
+public class SecondBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,141 @@
+/**
+ * Copyright 2009 Sun Microsystems, Inc. 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6380849
+ * @summary Tests PropertyEditor finder
+ * @author Sergey Malenkov
+ */
+
+import editors.SecondBeanEditor;
+import editors.ThirdBeanEditor;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorManager;
+
+import sun.awt.SunToolkit;
+import sun.beans.editors.BooleanEditor;
+import sun.beans.editors.ByteEditor;
+import sun.beans.editors.ColorEditor;
+import sun.beans.editors.DoubleEditor;
+import sun.beans.editors.EnumEditor;
+import sun.beans.editors.FloatEditor;
+import sun.beans.editors.FontEditor;
+import sun.beans.editors.IntegerEditor;
+import sun.beans.editors.LongEditor;
+import sun.beans.editors.ShortEditor;
+import sun.beans.editors.StringEditor;
+
+public class TestPropertyEditor implements Runnable {
+
+ private enum Enumeration {
+ FIRST, SECOND, THIRD
+ }
+
+ private static final String[] SEARCH_PATH = { "editors" }; // NON-NLS: package name
+
+ public static void main(String[] args) throws InterruptedException {
+ TestPropertyEditor test = new TestPropertyEditor();
+ test.run();
+ // the following tests fails on previous build
+ ThreadGroup group = new ThreadGroup("$$$"); // NON-NLS: unique thread name
+ Thread thread = new Thread(group, test);
+ thread.start();
+ thread.join();
+ }
+
+ private static void test(Class<?> type, Class<? extends PropertyEditor> expected) {
+ PropertyEditor actual = PropertyEditorManager.findEditor(type);
+ if ((actual == null) && (expected != null)) {
+ throw new Error("expected editor is not found");
+ }
+ if ((actual != null) && !actual.getClass().equals(expected)) {
+ throw new Error("found unexpected editor");
+ }
+ }
+
+ private boolean passed;
+
+ public void run() {
+ if (this.passed) {
+ SunToolkit.createNewAppContext();
+ }
+ PropertyEditorManager.registerEditor(ThirdBean.class, ThirdBeanEditor.class);
+
+ test(FirstBean.class, FirstBeanEditor.class);
+ test(SecondBean.class, null);
+ test(ThirdBean.class, ThirdBeanEditor.class);
+ // test editors for default primitive types
+ test(Byte.TYPE, ByteEditor.class);
+ test(Short.TYPE, ShortEditor.class);
+ test(Integer.TYPE, IntegerEditor.class);
+ test(Long.TYPE, LongEditor.class);
+ test(Boolean.TYPE, BooleanEditor.class);
+ test(Float.TYPE, FloatEditor.class);
+ test(Double.TYPE, DoubleEditor.class);
+ // test editors for default object types
+ test(Byte.class, ByteEditor.class);
+ test(Short.class, ShortEditor.class);
+ test(Integer.class, IntegerEditor.class);
+ test(Long.class, LongEditor.class);
+ test(Boolean.class, BooleanEditor.class);
+ test(Float.class, FloatEditor.class);
+ test(Double.class, DoubleEditor.class);
+ test(String.class, StringEditor.class);
+ test(Color.class, ColorEditor.class);
+ test(Font.class, FontEditor.class);
+ test(Enumeration.class, EnumEditor.class);
+
+ PropertyEditorManager.registerEditor(ThirdBean.class, null);
+ PropertyEditorManager.setEditorSearchPath(SEARCH_PATH);
+
+ test(FirstBean.class, FirstBeanEditor.class);
+ test(SecondBean.class, SecondBeanEditor.class);
+ test(ThirdBean.class, ThirdBeanEditor.class);
+ // test editors for default primitive types
+ test(Byte.TYPE, ByteEditor.class);
+ test(Short.TYPE, ShortEditor.class);
+ test(Integer.TYPE, IntegerEditor.class);
+ test(Long.TYPE, LongEditor.class);
+ test(Boolean.TYPE, BooleanEditor.class);
+ test(Float.TYPE, FloatEditor.class);
+ test(Double.TYPE, DoubleEditor.class);
+ // test editors for default object types
+ test(Byte.class, null);
+ test(Short.class, null);
+ test(Integer.class, null);
+ test(Long.class, null);
+ test(Boolean.class, null);
+ test(Float.class, null);
+ test(Double.class, null);
+ test(String.class, null);
+ test(Color.class, null);
+ test(Font.class, null);
+ test(Enumeration.class, EnumEditor.class);
+
+ this.passed = true;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/ThirdBean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,2 @@
+public class ThirdBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,6 @@
+package editors;
+
+import java.beans.PropertyEditorSupport;
+
+public class SecondBeanEditor extends PropertyEditorSupport {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,6 @@
+package editors;
+
+import java.beans.PropertyEditorSupport;
+
+public class ThirdBeanEditor extends PropertyEditorSupport {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6380849/Bean.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,2 @@
+public class Bean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,5 @@
+import java.beans.DefaultPersistenceDelegate;
+
+public class BeanPersistenceDelegate
+ extends DefaultPersistenceDelegate {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java Thu Jul 02 19:48:11 2009 +0400
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2009 Sun Microsystems, Inc. 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6380849
+ * @summary Tests PersistenceDelegate finder
+ * @author Sergey Malenkov
+ */
+
+import java.beans.PersistenceDelegate;
+import java.beans.XMLEncoder;
+import java.beans.DefaultPersistenceDelegate;
+
+public class TestPersistenceDelegate {
+
+ private static final XMLEncoder ENCODER = new XMLEncoder(System.out);
+
+ public static void main(String[] args) throws InterruptedException {
+ Class<?> type = TestPersistenceDelegate.class;
+ test(type, DefaultPersistenceDelegate.class);
+ ENCODER.setPersistenceDelegate(type, new BeanPersistenceDelegate());
+ test(type, BeanPersistenceDelegate.class);
+ ENCODER.setPersistenceDelegate(type, null);
+ test(type, DefaultPersistenceDelegate.class);
+ // the following tests fails on previous build
+ test(Bean.class, BeanPersistenceDelegate.class);
+ test(BeanPersistenceDelegate.class, BeanPersistenceDelegate.class);
+ }
+
+ private static void test(Class<?> type, Class<? extends PersistenceDelegate> expected) {
+ PersistenceDelegate actual = ENCODER.getPersistenceDelegate(type);
+ if ((actual == null) && (expected != null)) {
+ throw new Error("expected delegate is not found");
+ }
+ if ((actual != null) && !actual.getClass().equals(expected)) {
+ throw new Error("found unexpected delegate");
+ }
+ }
+}