X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDatastoreContextIntrospector.java;h=06d57595be891c88cade0387584e0296a1805aef;hb=refs%2Fchanges%2F27%2F100827%2F7;hp=a6f5f019307097835d3bc699ccb723da737d0e97;hpb=b65e66f7b1bafb0d0c5fbe1c569835eb890f672a;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java index a6f5f01930..06d57595be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java @@ -12,12 +12,6 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Primitives; -import java.beans.BeanInfo; -import java.beans.ConstructorProperties; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.MethodDescriptor; -import java.beans.PropertyDescriptor; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,10 +20,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.function.Function; +import javax.management.ConstructorParameters; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.WordUtils; import org.checkerframework.checker.lock.qual.GuardedBy; @@ -72,7 +68,7 @@ public class DatastoreContextIntrospector { introspectDatastoreContextBuilder(); introspectDataStoreProperties(); introspectPrimitiveTypes(); - } catch (final IntrospectionException e) { + } catch (final IllegalArgumentException e) { LOG.error("Error initializing DatastoreContextIntrospector", e); } } @@ -87,12 +83,12 @@ public class DatastoreContextIntrospector { private static void introspectPrimitiveTypes() { final Set> primitives = ImmutableSet.>builder().addAll( Primitives.allWrapperTypes()).add(String.class).build(); - for (final Class primitive: primitives) { + for (final Class primitive : primitives) { try { processPropertyType(primitive); } catch (final NoSuchMethodException e) { // Ignore primitives that can't be constructed from a String, eg Character and Void. - } catch (SecurityException | IntrospectionException e) { + } catch (SecurityException | IllegalArgumentException e) { LOG.error("Error introspect primitive type {}", primitive, e); } } @@ -117,24 +113,26 @@ public class DatastoreContextIntrospector { * yang grouping. We use the bean Introspector to find the types of all the properties defined * in the interface (this is the type returned from the getter method). For each type, we find * the appropriate constructor that we will use. + * + * @throws IllegalArgumentException if failed to process yang-defined property */ - private static void introspectDataStoreProperties() throws IntrospectionException { - final BeanInfo beanInfo = Introspector.getBeanInfo(DataStoreProperties.class); - for (final PropertyDescriptor desc: beanInfo.getPropertyDescriptors()) { - processDataStoreProperty(desc.getName(), desc.getPropertyType(), desc.getReadMethod()); + private static void introspectDataStoreProperties() { + for (final Method method : DataStoreProperties.class.getDeclaredMethods()) { + final String propertyName = getPropertyName(method); + if (propertyName != null) { + processDataStoreProperty(propertyName, method.getReturnType(), method); + } } + } - // Getter methods that return Boolean and start with "is" instead of "get" aren't recognized as - // properties and thus aren't returned from getPropertyDescriptors. A getter starting with - // "is" is only supported if it returns primitive boolean. So we'll check for these via - // getMethodDescriptors. - for (final MethodDescriptor desc: beanInfo.getMethodDescriptors()) { - final String methodName = desc.getName(); - if (Boolean.class.equals(desc.getMethod().getReturnType()) && methodName.startsWith("is")) { - final String propertyName = WordUtils.uncapitalize(methodName.substring(2)); - processDataStoreProperty(propertyName, Boolean.class, desc.getMethod()); - } + private static String getPropertyName(final Method method) { + final String methodName = method.getName(); + if (Boolean.class.equals(method.getReturnType()) && methodName.startsWith("is")) { + return WordUtils.uncapitalize(methodName.substring(2)); + } else if (methodName.startsWith("get")) { + return WordUtils.uncapitalize(methodName.substring(3)); } + return null; } /** @@ -157,9 +155,11 @@ public class DatastoreContextIntrospector { /** * Finds the appropriate constructor for the specified type that we will use to construct * instances. + * + * @throws IllegalArgumentException if yang-defined type has no property, annotated by ConstructorParameters */ private static void processPropertyType(final Class propertyType) - throws NoSuchMethodException, SecurityException, IntrospectionException { + throws NoSuchMethodException, SecurityException { final Class wrappedType = Primitives.wrap(propertyType); if (CONSTRUCTORS.containsKey(wrappedType)) { return; @@ -176,9 +176,9 @@ public class DatastoreContextIntrospector { // validation (eg range checking). The yang-generated types have a couple single-argument // constructors but the one we want has the bean ConstructorProperties annotation. for (final Constructor ctor: propertyType.getConstructors()) { - final ConstructorProperties ctorPropsAnnotation = ctor.getAnnotation(ConstructorProperties.class); - if (ctor.getParameterCount() == 1 && ctorPropsAnnotation != null) { - findYangTypeGetter(propertyType, ctorPropsAnnotation.value()[0]); + final ConstructorParameters ctorParAnnotation = ctor.getAnnotation(ConstructorParameters.class); + if (ctor.getParameterCount() == 1 && ctorParAnnotation != null) { + findYangTypeGetter(propertyType, ctorParAnnotation.value()[0]); CONSTRUCTORS.put(propertyType, ctor); break; } @@ -188,17 +188,19 @@ public class DatastoreContextIntrospector { /** * Finds the getter method on a yang-generated type for the specified property name. + * + * @throws IllegalArgumentException if passed type has no passed property */ - private static void findYangTypeGetter(final Class type, final String propertyName) - throws IntrospectionException { - for (final PropertyDescriptor desc: Introspector.getBeanInfo(type).getPropertyDescriptors()) { - if (desc.getName().equals(propertyName)) { - YANG_TYPE_GETTERS.put(type, desc.getReadMethod()); + private static void findYangTypeGetter(final Class type, final String propertyName) { + for (Method method : type.getDeclaredMethods()) { + final String property = getPropertyName(method); + if (property != null && property.equals(propertyName)) { + YANG_TYPE_GETTERS.put(type, method); return; } } - throw new IntrospectionException(String.format( + throw new IllegalArgumentException(String.format( "Getter method for constructor property %s not found for YANG type %s", propertyName, type)); } @@ -336,8 +338,12 @@ public class DatastoreContextIntrospector { // Call the setter method on the Builder instance. final Method setter = BUILDER_SETTERS.get(key); - setter.invoke(builder, constructorValueRecursively( - Primitives.wrap(setter.getParameterTypes()[0]), value.toString())); + if (value.getClass().isEnum()) { + setter.invoke(builder, value); + } else { + setter.invoke(builder, constructorValueRecursively( + Primitives.wrap(setter.getParameterTypes()[0]), value.toString())); + } return true; } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException @@ -372,6 +378,17 @@ public class DatastoreContextIntrospector { LOG.debug("Type for property {}: {}, converting value {} ({})", name, propertyType.getSimpleName(), from, from.getClass().getSimpleName()); + if (propertyType.isEnum()) { + try { + final Method enumConstructor = propertyType.getDeclaredMethod("forName", String.class); + if (enumConstructor.getReturnType().equals(propertyType)) { + return enumConstructor.invoke(null, from.toString().toLowerCase(Locale.ROOT)); + } + } catch (NoSuchMethodException e) { + LOG.error("Error constructing value ({}) for enum {}", from, propertyType); + } + } + // Recurse the chain of constructors depth-first to get the resulting value. Eg, if the // property type is the yang-generated NonZeroUint32Type, it's constructor takes a Long so // we have to first construct a Long instance from the input value.