X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FOpendaylightNamespaceHandler.java;h=af26acae0a16e1d7fd1a40d67181b8f2f682a51b;hb=e84f63ee098fff5b02cbce1281ca0d1208f966fa;hp=20f29ca7d04bd34baa1be9b0eaa62a606b9cddbe;hpb=88330d2f3ff048ab4e2e6f348ec3ea56e4c02cd4;p=controller.git 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 20f29ca7d0..af26acae0a 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 @@ -24,10 +24,10 @@ 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.md.sal.dom.api.DOMRpcProviderService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.mdsal.binding.api.NotificationService; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; +import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.osgi.service.blueprint.reflect.BeanMetadata; @@ -55,8 +55,9 @@ import org.xml.sax.SAXException; public final 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_PROVIDER_SERVICE_NAME = "org.opendaylight.blueprint.DOMRpcProviderService"; + static final String DOM_RPC_PROVIDER_SERVICE_NAME = "org.opendaylight.blueprint.DOMRpcProviderService"; static final String RPC_REGISTRY_NAME = "org.opendaylight.blueprint.RpcRegistry"; + static final String BINDING_RPC_PROVIDER_SERVICE_NAME = "org.opendaylight.blueprint.RpcProviderService"; static final String SCHEMA_SERVICE_NAME = "org.opendaylight.blueprint.SchemaService"; static final String NOTIFICATION_SERVICE_NAME = "org.opendaylight.blueprint.NotificationService"; static final String TYPE_ATTR = "type"; @@ -98,8 +99,6 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { 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)) { @@ -206,7 +205,7 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { + " can only be used on the root element"); } - LOG.debug("{}: {}", propertyName, attr.getValue()); + LOG.debug("Property {} = {}", propertyName, attr.getValue()); if (!Boolean.parseBoolean(attr.getValue())) { return component; @@ -222,14 +221,9 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { ComponentDefinitionRegistry registry = context.getComponentDefinitionRegistry(); MutableBeanMetadata metadata = (MutableBeanMetadata) registry.getComponentDefinition(COMPONENT_PROCESSOR_NAME); if (metadata == null) { - metadata = context.createMetadata(MutableBeanMetadata.class); + metadata = createBeanMetadata(context, COMPONENT_PROCESSOR_NAME, ComponentProcessor.class, false, true); metadata.setProcessor(true); - metadata.setId(COMPONENT_PROCESSOR_NAME); - metadata.setActivation(BeanMetadata.ACTIVATION_EAGER); - metadata.setScope(BeanMetadata.SCOPE_SINGLETON); - metadata.setRuntimeClass(ComponentProcessor.class); - metadata.setDestroyMethod("destroy"); - metadata.addProperty("bundle", createRef(context, "blueprintBundle")); + addBlueprintBundleRefProperty(context, metadata); metadata.addProperty("blueprintContainerRestartService", createServiceRef(context, BlueprintContainerRestartService.class, null)); @@ -242,20 +236,15 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { } private static Metadata parseActionProvider(final Element element, final ParserContext context) { - registerRpcProviderServiceRefBean(context); - registerRpcRegistryServiceRefBean(context); + registerDomRpcProviderServiceRefBean(context); + registerBindingRpcProviderServiceRefBean(context); registerSchemaServiceRefBean(context); - MutableBeanMetadata metadata = context.createMetadata(MutableBeanMetadata.class); - metadata.setId(context.generateId()); - metadata.setScope(BeanMetadata.SCOPE_SINGLETON); - metadata.setActivation(ReferenceMetadata.ACTIVATION_EAGER); - metadata.setRuntimeClass(ActionProviderBean.class); - metadata.setInitMethod("init"); - metadata.setDestroyMethod("destroy"); - metadata.addProperty("bundle", createRef(context, "blueprintBundle")); - metadata.addProperty("rpcProviderService", createRef(context, RPC_PROVIDER_SERVICE_NAME)); - metadata.addProperty("rpcRegistry", createRef(context, RPC_REGISTRY_NAME)); + MutableBeanMetadata metadata = createBeanMetadata(context, context.generateId(), ActionProviderBean.class, + true, true); + addBlueprintBundleRefProperty(context, metadata); + metadata.addProperty("domRpcProvider", createRef(context, DOM_RPC_PROVIDER_SERVICE_NAME)); + metadata.addProperty("bindingRpcProvider", createRef(context, BINDING_RPC_PROVIDER_SERVICE_NAME)); metadata.addProperty("schemaService", createRef(context, SCHEMA_SERVICE_NAME)); metadata.addProperty("interfaceName", createValue(context, element.getAttribute(INTERFACE))); @@ -267,18 +256,14 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { return metadata; } + private static Metadata parseRpcImplementation(final Element element, final ParserContext context) { - registerRpcRegistryServiceRefBean(context); + registerBindingRpcProviderServiceRefBean(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)); + MutableBeanMetadata metadata = createBeanMetadata(context, context.generateId(), RpcImplementationBean.class, + true, true); + addBlueprintBundleRefProperty(context, metadata); + metadata.addProperty("rpcProvider", createRef(context, BINDING_RPC_PROVIDER_SERVICE_NAME)); metadata.addProperty("implementation", createRef(context, element.getAttribute(REF_ATTR))); if (element.hasAttribute(INTERFACE)) { @@ -289,18 +274,6 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { return metadata; } - private static Metadata parseRoutedRpcImplementation(final Element element, final 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 static Metadata parseActionService(final Element element, final ParserContext context) { ComponentFactoryMetadata metadata = new ActionServiceMetadata(getId(context, element), element.getAttribute(INTERFACE)); @@ -319,28 +292,16 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { return metadata; } - private static void registerRoutedRpcRegistrationConverter(final 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 static void registerRpcProviderServiceRefBean(final ParserContext context) { - registerRefBean(context, RPC_PROVIDER_SERVICE_NAME, DOMRpcProviderService.class); + private static void registerDomRpcProviderServiceRefBean(final ParserContext context) { + registerRefBean(context, DOM_RPC_PROVIDER_SERVICE_NAME, DOMRpcProviderService.class); } - private static void registerRpcRegistryServiceRefBean(final ParserContext context) { - registerRefBean(context, RPC_REGISTRY_NAME, RpcProviderRegistry.class); + private static void registerBindingRpcProviderServiceRefBean(final ParserContext context) { + registerRefBean(context, BINDING_RPC_PROVIDER_SERVICE_NAME, RpcProviderService.class); } private static void registerSchemaServiceRefBean(final ParserContext context) { - registerRefBean(context, SCHEMA_SERVICE_NAME, SchemaService.class); + registerRefBean(context, SCHEMA_SERVICE_NAME, DOMSchemaService.class); } private static void registerRefBean(final ParserContext context, final String name, final Class clazz) { @@ -355,14 +316,9 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { private static Metadata parseNotificationListener(final Element element, final 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")); + MutableBeanMetadata metadata = createBeanMetadata(context, context.generateId(), NotificationListenerBean.class, + true, true); + addBlueprintBundleRefProperty(context, metadata); metadata.addProperty("notificationService", createRef(context, NOTIFICATION_SERVICE_NAME)); metadata.addProperty("notificationListener", createRef(context, element.getAttribute(REF_ATTR))); @@ -491,4 +447,27 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { private static boolean nodeNameEquals(final Node node, final String name) { return name.equals(node.getNodeName()) || name.equals(node.getLocalName()); } + + private static void addBlueprintBundleRefProperty(final ParserContext context, final MutableBeanMetadata metadata) { + metadata.addProperty("bundle", createRef(context, "blueprintBundle")); + } + + private static MutableBeanMetadata createBeanMetadata(final ParserContext context, final String id, + final Class runtimeClass, final boolean initMethod, final boolean destroyMethod) { + MutableBeanMetadata metadata = context.createMetadata(MutableBeanMetadata.class); + metadata.setId(id); + metadata.setScope(BeanMetadata.SCOPE_SINGLETON); + metadata.setActivation(ReferenceMetadata.ACTIVATION_EAGER); + metadata.setRuntimeClass(runtimeClass); + + if (initMethod) { + metadata.setInitMethod("init"); + } + + if (destroyMethod) { + metadata.setDestroyMethod("destroy"); + } + + return metadata; + } }