Bug 6859 - Binding generator v1 refactoring

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / md / sal / binding / impl / BindingToNormalizedNodeCodecFactory.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodecFactory.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodecFactory.java
index bb123a15f1cb6461d8f739b3ccea5e8417c183d8..8f284f260dddc47a2df6dfeecc31029533a159ec 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodecFactory.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodecFactory.java
@@ -7,13 +7,17 @@
  */
 package org.opendaylight.controller.md.sal.binding.impl;
 
+import java.util.Dictionary;
+import java.util.Hashtable;
 import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
+import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy;
 import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator;
 import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 
 /**
  * Factory class for creating and initializing the BindingToNormalizedNodeCodec instances.
@@ -29,11 +33,11 @@ public class BindingToNormalizedNodeCodecFactory {
      * @return BindingToNormalizedNodeCodec instance
      */
     @Deprecated
-    public static BindingToNormalizedNodeCodec getOrCreateInstance(ClassLoadingStrategy classLoadingStrategy,
-                            SchemaService schemaService) {
-        BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(
+    public static BindingToNormalizedNodeCodec getOrCreateInstance(final ClassLoadingStrategy classLoadingStrategy,
+                            final SchemaService schemaService) {
+        final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(
                 StreamWriterGenerator.create(SingletonHolder.JAVASSIST));
-        BindingToNormalizedNodeCodec instance = new BindingToNormalizedNodeCodec(
+        final BindingToNormalizedNodeCodec instance = new BindingToNormalizedNodeCodec(
                                classLoadingStrategy, codecRegistry, true);
         schemaService.registerSchemaContextListener(instance);
         return instance;
@@ -45,8 +49,8 @@ public class BindingToNormalizedNodeCodecFactory {
      * @param classLoadingStrategy
      * @return the BindingToNormalizedNodeCodec instance
      */
-    public static BindingToNormalizedNodeCodec newInstance(ClassLoadingStrategy classLoadingStrategy) {
-        BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(
+    public static BindingToNormalizedNodeCodec newInstance(final ClassLoadingStrategy classLoadingStrategy) {
+        final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(
                 StreamWriterGenerator.create(SingletonHolder.JAVASSIST));
         return new BindingToNormalizedNodeCodec(classLoadingStrategy, codecRegistry, true);
     }
@@ -58,8 +62,31 @@ public class BindingToNormalizedNodeCodecFactory {
      * @param schemaService the SchemaService.
      * @return the ListenerRegistration
      */
-    public static ListenerRegistration<SchemaContextListener> registerInstance(BindingToNormalizedNodeCodec instance,
-            SchemaService schemaService) {
+    public static ListenerRegistration<SchemaContextListener> registerInstance(final BindingToNormalizedNodeCodec instance,
+            final SchemaService schemaService) {
         return schemaService.registerSchemaContextListener(instance);
     }
+
+    /**
+     * This method is called via blueprint to register a BindingToNormalizedNodeCodec instance with the OSGI
+     * service registry. This is done in code instead of directly via blueprint because the BindingToNormalizedNodeCodec
+     * instance must be advertised with the actual class for backwards compatibility with CSS modules and blueprint
+     * will try to create a proxy wrapper which is problematic with BindingToNormalizedNodeCodec because it's final
+     * and has final methods which can't be proxied.
+     *
+     * @param instance the BindingToNormalizedNodeCodec instance
+     * @param bundleContext the BundleContext
+     * @return ServiceRegistration instance
+     */
+    public static ServiceRegistration<BindingToNormalizedNodeCodec> registerOSGiService(final BindingToNormalizedNodeCodec instance,
+            final BundleContext bundleContext) {
+        final Dictionary<String, String> props = new Hashtable<>();
+
+        // Set the appropriate service properties so the corresponding CSS module is restarted if this
+        // blueprint container is restarted
+        props.put("config-module-namespace", "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl");
+        props.put("config-module-name", "runtime-generated-mapping");
+        props.put("config-instance-name", "runtime-mapping-singleton");
+        return bundleContext.registerService(BindingToNormalizedNodeCodec.class, instance, props );
+    }
 }