X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FOpendaylightNamespaceHandler.java;h=80417e8bd076fb39fd8b7db1a02090bf5ae8567c;hp=0b361263f60516fab8031e5036eee4d9d6b8fc06;hb=762f30c90106b79a775478f0485e0db76ea361ff;hpb=83c5bbb865803e0a06e0c24e9de849af10bb4993 diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java index 0b361263f6..80417e8bd0 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java @@ -14,6 +14,7 @@ import java.util.Set; import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.ParserContext; +import org.apache.aries.blueprint.ext.ComponentFactoryMetadata; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; import org.apache.aries.blueprint.mutable.MutableRefMetadata; import org.apache.aries.blueprint.mutable.MutableReferenceMetadata; @@ -21,6 +22,8 @@ import org.apache.aries.blueprint.mutable.MutableServiceMetadata; import org.apache.aries.blueprint.mutable.MutableServiceReferenceMetadata; import org.apache.aries.blueprint.mutable.MutableValueMetadata; import org.opendaylight.controller.blueprint.BlueprintContainerRestartService; +import org.opendaylight.controller.md.sal.binding.api.NotificationService; +import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; @@ -43,12 +46,19 @@ import org.w3c.dom.Node; */ public class OpendaylightNamespaceHandler implements NamespaceHandler { public static final String NAMESPACE_1_0_0 = "http://opendaylight.org/xmlns/blueprint/v1.0.0"; + static final String ROUTED_RPC_REG_CONVERTER_NAME = "org.opendaylight.blueprint.RoutedRpcRegConverter"; + static final String RPC_REGISTRY_NAME = "org.opendaylight.blueprint.RpcRegistry"; + static final String NOTIFICATION_SERVICE_NAME = "org.opendaylight.blueprint.NotificationService"; private static final Logger LOG = LoggerFactory.getLogger(OpendaylightNamespaceHandler.class); private static final String COMPONENT_PROCESSOR_NAME = ComponentProcessor.class.getName(); private static final String RESTART_DEPENDENTS_ON_UPDATES = "restart-dependents-on-updates"; private static final String USE_DEFAULT_FOR_REFERENCE_TYPES = "use-default-for-reference-types"; private static final String TYPE_ATTR = "type"; + private static final String INTERFACE = "interface"; + private static final String REF_ATTR = "ref"; + private static final String ID_ATTR = "id"; + private static final String RPC_SERVICE = "rpc-service"; @SuppressWarnings("rawtypes") @Override @@ -70,6 +80,17 @@ public class OpendaylightNamespaceHandler implements NamespaceHandler { @Override public Metadata parse(Element element, ParserContext context) { LOG.debug("In parse for {}", element); + + if (nodeNameEquals(element, RpcImplementationBean.RPC_IMPLEMENTATION)) { + return parseRpcImplementation(element, context); + } else if (nodeNameEquals(element, RoutedRpcMetadata.ROUTED_RPC_IMPLEMENTATION)) { + return parseRoutedRpcImplementation(element, context); + } else if (nodeNameEquals(element, RPC_SERVICE)) { + return parseRpcService(element, context); + } else if (nodeNameEquals(element, NotificationListenerBean.NOTIFICATION_LISTENER)) { + return parseNotificationListener(element, context); + } + throw new ComponentDefinitionException("Unsupported standalone element: " + element.getNodeName()); } @@ -160,7 +181,7 @@ public class OpendaylightNamespaceHandler implements NamespaceHandler { LOG.debug("{}: {}", propertyName, attr.getValue()); - if(!Boolean.TRUE.equals(Boolean.valueOf(attr.getValue()))) { + if(!Boolean.parseBoolean(attr.getValue())) { return component; } @@ -193,6 +214,101 @@ public class OpendaylightNamespaceHandler implements NamespaceHandler { return metadata; } + private Metadata parseRpcImplementation(Element element, ParserContext context) { + registerRpcRegistryServiceRefBean(context); + + MutableBeanMetadata metadata = context.createMetadata(MutableBeanMetadata.class); + metadata.setId(context.generateId()); + metadata.setScope(BeanMetadata.SCOPE_SINGLETON); + metadata.setActivation(ReferenceMetadata.ACTIVATION_EAGER); + metadata.setRuntimeClass(RpcImplementationBean.class); + metadata.setInitMethod("init"); + metadata.setDestroyMethod("destroy"); + metadata.addProperty("bundle", createRef(context, "blueprintBundle")); + metadata.addProperty("rpcRegistry", createRef(context, RPC_REGISTRY_NAME)); + metadata.addProperty("implementation", createRef(context, element.getAttribute(REF_ATTR))); + + if(element.hasAttribute(INTERFACE)) { + metadata.addProperty("interfaceName", createValue(context, element.getAttribute(INTERFACE))); + } + + LOG.debug("parseAddRpcImplementation returning {}", metadata); + + return metadata; + } + + private Metadata parseRoutedRpcImplementation(Element element, ParserContext context) { + registerRpcRegistryServiceRefBean(context); + registerRoutedRpcRegistrationConverter(context); + + ComponentFactoryMetadata metadata = new RoutedRpcMetadata(getId(context, element), + element.getAttribute(INTERFACE), element.getAttribute(REF_ATTR)); + + LOG.debug("parseRoutedRpcImplementation returning {}", metadata); + + return metadata; + } + + private Metadata parseRpcService(Element element, ParserContext context) { + registerRpcRegistryServiceRefBean(context); + + ComponentFactoryMetadata metadata = new RpcServiceMetadata(getId(context, element), + element.getAttribute(INTERFACE)); + + LOG.debug("parseRpcService returning {}", metadata); + + return metadata; + } + + private void registerRoutedRpcRegistrationConverter(ParserContext context) { + ComponentDefinitionRegistry registry = context.getComponentDefinitionRegistry(); + if(registry.getComponentDefinition(ROUTED_RPC_REG_CONVERTER_NAME) == null) { + MutableBeanMetadata metadata = context.createMetadata(MutableBeanMetadata.class); + metadata.setId(ROUTED_RPC_REG_CONVERTER_NAME); + metadata.setScope(BeanMetadata.SCOPE_SINGLETON); + metadata.setActivation(ReferenceMetadata.ACTIVATION_LAZY); + metadata.setRuntimeClass(RoutedRpcRegistrationConverter.class); + registry.registerTypeConverter(metadata); + } + } + + private void registerRpcRegistryServiceRefBean(ParserContext context) { + ComponentDefinitionRegistry registry = context.getComponentDefinitionRegistry(); + if(registry.getComponentDefinition(RPC_REGISTRY_NAME) == null) { + MutableReferenceMetadata metadata = createServiceRef(context, RpcProviderRegistry.class, null); + metadata.setId(RPC_REGISTRY_NAME); + registry.registerComponentDefinition(metadata); + } + } + + private Metadata parseNotificationListener(Element element, ParserContext context) { + registerNotificationServiceRefBean(context); + + MutableBeanMetadata metadata = context.createMetadata(MutableBeanMetadata.class); + metadata.setId(context.generateId()); + metadata.setScope(BeanMetadata.SCOPE_SINGLETON); + metadata.setActivation(ReferenceMetadata.ACTIVATION_EAGER); + metadata.setRuntimeClass(NotificationListenerBean.class); + metadata.setInitMethod("init"); + metadata.setDestroyMethod("destroy"); + metadata.addProperty("bundle", createRef(context, "blueprintBundle")); + metadata.addProperty("notificationService", createRef(context, NOTIFICATION_SERVICE_NAME)); + metadata.addProperty("notificationListener", createRef(context, element.getAttribute(REF_ATTR))); + + LOG.debug("parseNotificationListener returning {}", metadata); + + return metadata; + } + + private void registerNotificationServiceRefBean(ParserContext context) { + ComponentDefinitionRegistry registry = context.getComponentDefinitionRegistry(); + if(registry.getComponentDefinition(NOTIFICATION_SERVICE_NAME) == null) { + MutableReferenceMetadata metadata = createServiceRef(context, NotificationService.class, null); + metadata.setId(NOTIFICATION_SERVICE_NAME); + registry.registerComponentDefinition(metadata); + } + } + private static ValueMetadata createValue(ParserContext context, String value) { MutableValueMetadata m = context.createMetadata(MutableValueMetadata.class); m.setStringValue(value); @@ -213,12 +329,20 @@ public class OpendaylightNamespaceHandler implements NamespaceHandler { return m; } - private static RefMetadata createRef(ParserContext context, String value) { + private static RefMetadata createRef(ParserContext context, String id) { MutableRefMetadata metadata = context.createMetadata(MutableRefMetadata.class); - metadata.setComponentId(value); + metadata.setComponentId(id); return metadata; } + private static String getId(ParserContext context, Element element) { + if(element.hasAttribute(ID_ATTR)) { + return element.getAttribute(ID_ATTR); + } else { + return context.generateId(); + } + } + private static boolean nodeNameEquals(Node node, String name) { return name.equals(node.getNodeName()) || name.equals(node.getLocalName()); }