Fix (and suppress) some static code analysis warnings in blueprint
[controller.git] / opendaylight / blueprint / src / main / java / org / opendaylight / controller / blueprint / ext / DataStoreAppConfigMetadata.java
index b2ea693ab90181f8dcd3c60a0e56b34177dd1b90..bc4ebe2a64ea9ff3bf58e71e0dcba7fc86e5e2a1 100644 (file)
@@ -8,24 +8,17 @@
 package org.opendaylight.controller.blueprint.ext;
 
 import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import java.io.File;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.apache.aries.blueprint.di.AbstractRecipe;
-import org.apache.aries.blueprint.di.ExecutionContext;
-import org.apache.aries.blueprint.di.Recipe;
-import org.apache.aries.blueprint.ext.DependentComponentFactoryMetadata;
 import org.apache.aries.blueprint.services.ExtendedBlueprintContainer;
-import org.opendaylight.controller.blueprint.BlueprintContainerRestartService;
+import org.opendaylight.controller.blueprint.ext.DataStoreAppConfigDefaultXMLReader.ConfigURLProvider;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
@@ -36,25 +29,14 @@ import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.codec.xml.XmlUtils;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.DomToNormalizedNodeParserFactory;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.osgi.framework.ServiceReference;
 import org.osgi.service.blueprint.container.ComponentDefinitionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,191 +50,97 @@ import org.w3c.dom.Element;
  *
  * @author Thomas Pantelis
  */
-public class DataStoreAppConfigMetadata implements DependentComponentFactoryMetadata {
+public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactoryMetadata {
     private static final Logger LOG = LoggerFactory.getLogger(DataStoreAppConfigMetadata.class);
 
     static final String BINDING_CLASS = "binding-class";
     static final String DEFAULT_CONFIG = "default-config";
+    static final String DEFAULT_CONFIG_FILE_NAME = "default-config-file-name";
     static final String LIST_KEY_VALUE = "list-key-value";
 
-    private final String id;
+    private static final String DEFAULT_APP_CONFIG_FILE_PATH = "etc" + File.separator + "opendaylight" + File.separator
+            + "datastore" + File.separator + "initial" + File.separator + "config";
+
     private final Element defaultAppConfigElement;
+    private final String defaultAppConfigFileName;
     private final String appConfigBindingClassName;
     private final String appConfigListKeyValue;
+    private final UpdateStrategy appConfigUpdateStrategy;
     private final AtomicBoolean readingInitialAppConfig = new AtomicBoolean(true);
-    private final AtomicBoolean started = new AtomicBoolean();
 
     private volatile BindingContext bindingContext;
-    private volatile ExtendedBlueprintContainer container;
-    private volatile StaticServiceReferenceRecipe dataBrokerServiceRecipe;
-    private volatile StaticServiceReferenceRecipe bindingCodecServiceRecipe;
     private volatile ListenerRegistration<?> appConfigChangeListenerReg;
     private volatile DataObject currentAppConfig;
-    private volatile SatisfactionCallback satisfactionCallback;
-    private volatile String failureMessage;
-    private volatile String dependendencyDesc;
 
     // Note: the BindingNormalizedNodeSerializer interface is annotated as deprecated because there's an
     // equivalent interface in the mdsal project but the corresponding binding classes in the controller
     // project are still used - conversion to the mdsal binding classes hasn't occurred yet.
     private volatile BindingNormalizedNodeSerializer bindingSerializer;
 
-    public DataStoreAppConfigMetadata(@Nonnull String id, @Nonnull String appConfigBindingClassName,
-            @Nullable String appConfigListKeyValue, @Nullable Element defaultAppConfigElement) {
-        this.id = Preconditions.checkNotNull(id);
+    public DataStoreAppConfigMetadata(@Nonnull final String id, @Nonnull final String appConfigBindingClassName,
+            @Nullable final String appConfigListKeyValue, @Nullable final String defaultAppConfigFileName,
+            @Nonnull final UpdateStrategy updateStrategyValue, @Nullable final Element defaultAppConfigElement) {
+        super(id);
         this.defaultAppConfigElement = defaultAppConfigElement;
+        this.defaultAppConfigFileName = defaultAppConfigFileName;
         this.appConfigBindingClassName = appConfigBindingClassName;
         this.appConfigListKeyValue = appConfigListKeyValue;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public int getActivation() {
-        return ACTIVATION_EAGER;
-    }
-
-    @Override
-    public List<String> getDependsOn() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public boolean isSatisfied() {
-        return currentAppConfig != null;
+        this.appConfigUpdateStrategy = updateStrategyValue;
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public void init(ExtendedBlueprintContainer container) {
-        LOG.debug("{}: In init", id);
-
-        this.container = container;
+    public void init(final ExtendedBlueprintContainer container) {
+        super.init(container);
 
         Class<DataObject> appConfigBindingClass;
         try {
             Class<?> bindingClass = container.getBundleContext().getBundle().loadClass(appConfigBindingClassName);
-            if(!DataObject.class.isAssignableFrom(bindingClass)) {
+            if (!DataObject.class.isAssignableFrom(bindingClass)) {
                 throw new ComponentDefinitionException(String.format(
                         "%s: Specified app config binding class %s does not extend %s",
-                        id, appConfigBindingClassName, DataObject.class.getName()));
+                        logName(), appConfigBindingClassName, DataObject.class.getName()));
             }
 
             appConfigBindingClass = (Class<DataObject>) bindingClass;
-        } catch(ClassNotFoundException e) {
+        } catch (ClassNotFoundException e) {
             throw new ComponentDefinitionException(String.format("%s: Error loading app config binding class %s",
-                    id, appConfigBindingClassName), e);
+                    logName(), appConfigBindingClassName), e);
         }
 
-        if(Identifiable.class.isAssignableFrom(appConfigBindingClass)) {
-            // The binding class corresponds to a yang list.
-            if(Strings.isNullOrEmpty(appConfigListKeyValue)) {
-                throw new ComponentDefinitionException(String.format(
-                        "%s: App config binding class %s represents a yang list therefore \"%s\" must be specified",
-                        id, appConfigBindingClassName, LIST_KEY_VALUE));
-            }
-
-            try {
-                bindingContext = ListBindingContext.newInstance(appConfigBindingClass, appConfigListKeyValue);
-            } catch(Exception e) {
-                throw new ComponentDefinitionException(String.format(
-                        "%s: Error initializing for app config list binding class %s",
-                        id, appConfigBindingClassName), e);
-            }
-
-        } else {
-            bindingContext = new ContainerBindingContext(appConfigBindingClass);
-        }
+        bindingContext = BindingContext.create(logName(), appConfigBindingClass, appConfigListKeyValue);
     }
 
     @Override
     public Object create() throws ComponentDefinitionException {
-        LOG.debug("{}: In create - currentAppConfig: {}", id, currentAppConfig);
+        LOG.debug("{}: In create - currentAppConfig: {}", logName(), currentAppConfig);
 
-        if(failureMessage != null) {
-            throw new ComponentDefinitionException(failureMessage);
-        }
-
-        // The following code is a bit odd so requires some explanation. A little background... If a bean
-        // is a prototype then the corresponding Recipe create method does not register the bean as created
-        // with the BlueprintRepository and thus the destroy method isn't called on container destroy. We
-        // rely on destroy being called to close our DTCL registration. Unfortunately the default setting
-        // for the prototype flag in AbstractRecipe is true and the DependentComponentFactoryRecipe, which
-        // is created for DependentComponentFactoryMetadata types of which we are one, doesn't have a way for
-        // us to indicate the prototype state via our metadata.
-        //
-        // The ExecutionContext is actually backed by the BlueprintRepository so we access it here to call
-        // the removePartialObject method which removes any partially created instance, which does not apply
-        // in our case, and also has the side effect of registering our bean as created as if it wasn't a
-        // prototype. We also obtain our corresponding Recipe instance and clear the prototype flag. This
-        // doesn't look to be necessary but is done so for completeness. Better late than never. Note we have
-        // to do this here rather than in startTracking b/c the ExecutionContext is not available yet at that
-        // point.
-        //
-        // Now the stopTracking method is called on container destroy but startTracking/stopTracking can also
-        // be called multiple times during the container creation process for Satisfiable recipes as bean
-        // processors may modify the metadata which could affect how dependencies are satisfied. An example of
-        // this is with service references where the OSGi filter metadata can be modified by bean processors
-        // after the initial service dependency is satisfied. However we don't have any metadata that could
-        // be modified by a bean processor and we don't want to register/unregister our DTCL multiple times
-        // so we only process startTracking once and close the DTCL registration once on container destroy.
-        ExecutionContext executionContext = ExecutionContext.Holder.getContext();
-        executionContext.removePartialObject(id);
-
-        Recipe myRecipe = executionContext.getRecipe(id);
-        if(myRecipe instanceof AbstractRecipe) {
-            LOG.debug("{}: setPrototype to false", id);
-            ((AbstractRecipe)myRecipe).setPrototype(false);
-        } else {
-            LOG.warn("{}: Recipe is null or not an AbstractRecipe", id);
-        }
+        super.onCreate();
 
         return currentAppConfig;
     }
 
     @Override
-    public void startTracking(final SatisfactionCallback satisfactionCallback) {
-        if(!started.compareAndSet(false, true)) {
-            return;
-        }
-
-        LOG.debug("{}: In startTracking", id);
-
-        this.satisfactionCallback = satisfactionCallback;
-
+    protected void startTracking() {
         // First get the BindingNormalizedNodeSerializer OSGi service. This will be used to create a default
         // instance of the app config binding class, if necessary.
 
-        bindingCodecServiceRecipe = new StaticServiceReferenceRecipe(id + "-binding-codec", container,
-                BindingNormalizedNodeSerializer.class.getName());
-        dependendencyDesc = bindingCodecServiceRecipe.getOsgiFilter();
-
-        bindingCodecServiceRecipe.startTracking(service -> {
+        retrieveService("binding-codec", BindingNormalizedNodeSerializer.class, service -> {
             bindingSerializer = (BindingNormalizedNodeSerializer)service;
             retrieveDataBrokerService();
         });
     }
 
     private void retrieveDataBrokerService() {
-        LOG.debug("{}: In retrieveDataBrokerService", id);
-
+        LOG.debug("{}: In retrieveDataBrokerService", logName());
         // Get the binding DataBroker OSGi service.
-
-        dataBrokerServiceRecipe = new StaticServiceReferenceRecipe(id + "-data-broker", container,
-                DataBroker.class.getName());
-        dependendencyDesc = dataBrokerServiceRecipe.getOsgiFilter();
-
-        dataBrokerServiceRecipe.startTracking(service -> retrieveInitialAppConfig((DataBroker)service));
-
+        retrieveService("data-broker", DataBroker.class, service -> retrieveInitialAppConfig((DataBroker)service));
     }
 
-    private void retrieveInitialAppConfig(DataBroker dataBroker) {
-        LOG.debug("{}: Got DataBroker instance - reading app config {}", id, bindingContext.appConfigPath);
+    private void retrieveInitialAppConfig(final DataBroker dataBroker) {
+        LOG.debug("{}: Got DataBroker instance - reading app config {}", logName(), bindingContext.appConfigPath);
 
-        dependendencyDesc = "Initial app config " + bindingContext.appConfigBindingClass.getSimpleName();
+        setDependencyDesc("Initial app config " + bindingContext.appConfigBindingClass.getSimpleName());
 
         // We register a DTCL to get updates and also read the app config data from the data store. If
         // the app config data is present then both the read and initial DTCN update will return it. If the
@@ -262,39 +150,34 @@ public class DataStoreAppConfigMetadata implements DependentComponentFactoryMeta
         DataTreeIdentifier<DataObject> dataTreeId = new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,
                 bindingContext.appConfigPath);
         appConfigChangeListenerReg = dataBroker.registerDataTreeChangeListener(dataTreeId,
-                new ClusteredDataTreeChangeListener<DataObject>() {
-                    @Override
-                    public void onDataTreeChanged(Collection<DataTreeModification<DataObject>> changes) {
-                        onAppConfigChanged(changes);
-                    }
-                });
+                (ClusteredDataTreeChangeListener<DataObject>) this::onAppConfigChanged);
 
         readInitialAppConfig(dataBroker);
     }
 
     private void readInitialAppConfig(final DataBroker dataBroker) {
-
+        @SuppressWarnings("resource") // it's closed in the callback
         final ReadOnlyTransaction readOnlyTx = dataBroker.newReadOnlyTransaction();
         CheckedFuture<Optional<DataObject>, ReadFailedException> future = readOnlyTx.read(
                 LogicalDatastoreType.CONFIGURATION, bindingContext.appConfigPath);
         Futures.addCallback(future, new FutureCallback<Optional<DataObject>>() {
             @Override
-            public void onSuccess(Optional<DataObject> possibleAppConfig) {
-                LOG.debug("{}: Read of app config {} succeeded: {}", id, bindingContext.appConfigBindingClass.getName(),
-                        possibleAppConfig);
+            public void onSuccess(final Optional<DataObject> possibleAppConfig) {
+                LOG.debug("{}: Read of app config {} succeeded: {}", logName(), bindingContext
+                        .appConfigBindingClass.getName(), possibleAppConfig);
 
                 readOnlyTx.close();
                 setInitialAppConfig(possibleAppConfig);
             }
 
             @Override
-            public void onFailure(Throwable t) {
+            public void onFailure(final Throwable failure) {
                 readOnlyTx.close();
 
                 // We may have gotten the app config via the data tree change listener so only retry if not.
-                if(readingInitialAppConfig.get()) {
-                    LOG.warn("{}: Read of app config {} failed - retrying", id,
-                            bindingContext.appConfigBindingClass.getName(), t);
+                if (readingInitialAppConfig.get()) {
+                    LOG.warn("{}: Read of app config {} failed - retrying", logName(),
+                            bindingContext.appConfigBindingClass.getName(), failure);
 
                     readInitialAppConfig(dataBroker);
                 }
@@ -302,37 +185,41 @@ public class DataStoreAppConfigMetadata implements DependentComponentFactoryMeta
         });
     }
 
-    private void onAppConfigChanged(Collection<DataTreeModification<DataObject>> changes) {
-        for(DataTreeModification<DataObject> change: changes) {
+    private void onAppConfigChanged(final Collection<DataTreeModification<DataObject>> changes) {
+        for (DataTreeModification<DataObject> change: changes) {
             DataObjectModification<DataObject> changeRoot = change.getRootNode();
             ModificationType type = changeRoot.getModificationType();
 
-            LOG.debug("{}: onAppConfigChanged: {}, {}", id, type, change.getRootPath());
+            LOG.debug("{}: onAppConfigChanged: {}, {}", logName(), type, change.getRootPath());
 
-            if(type == ModificationType.SUBTREE_MODIFIED || type == ModificationType.WRITE) {
+            if (type == ModificationType.SUBTREE_MODIFIED || type == ModificationType.WRITE) {
                 DataObject newAppConfig = changeRoot.getDataAfter();
 
                 LOG.debug("New app config instance: {}, previous: {}", newAppConfig, currentAppConfig);
 
-                if(!setInitialAppConfig(Optional.of(newAppConfig)) &&
-                        !Objects.equals(currentAppConfig, newAppConfig)) {
-                    LOG.debug("App config was updated - scheduling container for restart");
+                if (!setInitialAppConfig(Optional.of(newAppConfig))
+                        && !Objects.equals(currentAppConfig, newAppConfig)) {
+                    LOG.debug("App config was updated");
 
-                    restartContainer();
+                    if (appConfigUpdateStrategy == UpdateStrategy.RELOAD) {
+                        restartContainer();
+                    }
                 }
-            } else if(type == ModificationType.DELETE) {
-                LOG.debug("App config was deleted - scheduling container for restart");
+            } else if (type == ModificationType.DELETE) {
+                LOG.debug("App config was deleted");
 
-                restartContainer();
+                if (appConfigUpdateStrategy == UpdateStrategy.RELOAD) {
+                    restartContainer();
+                }
             }
         }
     }
 
-    private boolean setInitialAppConfig(Optional<DataObject> possibleAppConfig) {
+    private boolean setInitialAppConfig(final Optional<DataObject> possibleAppConfig) {
         boolean result = readingInitialAppConfig.compareAndSet(true, false);
-        if(result) {
+        if (result) {
             DataObject localAppConfig;
-            if(possibleAppConfig.isPresent()) {
+            if (possibleAppConfig.isPresent()) {
                 localAppConfig = possibleAppConfig.get();
             } else {
                 // No app config data is present so create an empty instance via the bindingSerializer service.
@@ -340,241 +227,89 @@ public class DataStoreAppConfigMetadata implements DependentComponentFactoryMeta
                 localAppConfig = createDefaultInstance();
             }
 
-            LOG.debug("{}: Setting currentAppConfig instance: {}", id, localAppConfig);
+            LOG.debug("{}: Setting currentAppConfig instance: {}", logName(), localAppConfig);
 
             // Now publish the app config instance to the volatile field and notify the callback to let the
             // container know our dependency is now satisfied.
             currentAppConfig = localAppConfig;
-            satisfactionCallback.notifyChanged();
+            setSatisfied();
         }
 
         return result;
     }
 
     private DataObject createDefaultInstance() {
-        YangInstanceIdentifier yangPath = bindingSerializer.toYangInstanceIdentifier(bindingContext.appConfigPath);
-
-        LOG.debug("{}: Creating app config instance from path {}, Qname: {}", id, yangPath, bindingContext.bindingQName);
-
-        SchemaService schemaService = getOSGiService(SchemaService.class);
-        if(schemaService == null) {
-            failureMessage = String.format("%s: Could not obtain the SchemaService OSGi service", id);
-            return null;
-        }
-
-        SchemaContext schemaContext = schemaService.getGlobalContext();
-
-        Module module = schemaContext.findModuleByNamespaceAndRevision(bindingContext.bindingQName.getNamespace(),
-                bindingContext.bindingQName.getRevision());
-        if(module == null) {
-            failureMessage = String.format("%s: Could not obtain the module schema for namespace %s, revision %s",
-                    id, bindingContext.bindingQName.getNamespace(), bindingContext.bindingQName.getRevision());
-            return null;
-        }
+        try {
+            @SuppressWarnings("resource")
+            ConfigURLProvider inputStreamProvider = appConfigFileName -> {
+                File appConfigFile = new File(DEFAULT_APP_CONFIG_FILE_PATH, appConfigFileName);
+                LOG.debug("{}: parsePossibleDefaultAppConfigXMLFile looking for file {}", logName(),
+                        appConfigFile.getAbsolutePath());
+
+                if (!appConfigFile.exists()) {
+                    return Optional.absent();
+                }
 
-        DataSchemaNode dataSchema = module.getDataChildByName(bindingContext.bindingQName);
-        if(dataSchema == null) {
-            failureMessage = String.format("%s: Could not obtain the schema for %s", id, bindingContext.bindingQName);
-            return null;
-        }
+                LOG.debug("{}: Found file {}", logName(), appConfigFile.getAbsolutePath());
+
+                return Optional.of(appConfigFile.toURI().toURL());
+            };
+
+            DataStoreAppConfigDefaultXMLReader<?> reader = new DataStoreAppConfigDefaultXMLReader(logName(),
+                    defaultAppConfigFileName, getOSGiService(SchemaService.class), bindingSerializer, bindingContext,
+                    inputStreamProvider);
+            return reader.createDefaultInstance((schemaContext, dataSchema) -> {
+                // Fallback if file cannot be read, try XML from Config
+                NormalizedNode<?, ?> dataNode = parsePossibleDefaultAppConfigElement(schemaContext, dataSchema);
+                if (dataNode == null) {
+                    // or, as last resort, defaults from the model
+                    return bindingContext.newDefaultNode(dataSchema);
+                } else {
+                    return dataNode;
+                }
+            });
 
-        if(!bindingContext.schemaType.isAssignableFrom(dataSchema.getClass())) {
-            failureMessage = String.format("%s: Expected schema type %s for %s but actual type is %s", id,
-                    bindingContext.schemaType, bindingContext.bindingQName, dataSchema.getClass());
+        } catch (ConfigXMLReaderException e) {
+            if (e.getCause() == null) {
+                setFailureMessage(e.getMessage());
+            } else {
+                setFailure(e.getMessage(), e);
+            }
             return null;
         }
-
-        NormalizedNode<?, ?> dataNode = parsePossibleDefaultAppConfigElement(schemaContext, dataSchema);
-        if(dataNode == null) {
-            dataNode = bindingContext.newDefaultNode(dataSchema);
-        }
-
-        DataObject appConfig = bindingSerializer.fromNormalizedNode(yangPath, dataNode).getValue();
-
-        if(appConfig == null) {
-            // This shouldn't happen but need to handle it in case...
-            failureMessage = String.format("%s: Could not create instance for app config binding %s",
-                    id, bindingContext.appConfigBindingClass);
-        }
-
-        return appConfig;
     }
 
     @Nullable
-    private NormalizedNode<?, ?> parsePossibleDefaultAppConfigElement(SchemaContext schemaContext,
-            DataSchemaNode dataSchema) {
-        if(defaultAppConfigElement == null) {
+    private NormalizedNode<?, ?> parsePossibleDefaultAppConfigElement(final SchemaContext schemaContext,
+            final DataSchemaNode dataSchema) {
+        if (defaultAppConfigElement == null) {
             return null;
         }
 
-        LOG.debug("{}: parsePossibleDefaultAppConfigElement for {}", id, bindingContext.bindingQName);
+        LOG.debug("{}: parsePossibleDefaultAppConfigElement for {}", logName(), bindingContext.bindingQName);
 
         DomToNormalizedNodeParserFactory parserFactory = DomToNormalizedNodeParserFactory.getInstance(
                 XmlUtils.DEFAULT_XML_CODEC_PROVIDER, schemaContext);
 
 
-        LOG.debug("{}: Got app config schema: {}", id, dataSchema);
+        LOG.debug("{}: Got app config schema: {}", logName(), dataSchema);
 
         NormalizedNode<?, ?> dataNode = bindingContext.parseDataElement(defaultAppConfigElement, dataSchema,
                 parserFactory);
 
-        LOG.debug("{}: Parsed data node: {}", id, dataNode);
+        LOG.debug("{}: Parsed data node: {}", logName(), dataNode);
 
         return dataNode;
     }
 
-    private void restartContainer() {
-        BlueprintContainerRestartService restartService = getOSGiService(BlueprintContainerRestartService.class);
-        if(restartService != null) {
-            restartService.restartContainerAndDependents(container.getBundleContext().getBundle());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Nullable
-    private <T> T getOSGiService(Class<T> serviceInterface) {
-        try {
-            ServiceReference<T> serviceReference =
-                    container.getBundleContext().getServiceReference(serviceInterface);
-            if(serviceReference == null) {
-                LOG.warn("{}: {} reference not found", id, serviceInterface.getSimpleName());
-                return null;
-            }
-
-            T service = (T)container.getService(serviceReference);
-            if(service == null) {
-                // This could happen on shutdown if the service was already unregistered so we log as debug.
-                LOG.debug("{}: {} was not found", id, serviceInterface.getSimpleName());
-            }
-
-            return service;
-        } catch(IllegalStateException e) {
-            // This is thrown if the BundleContext is no longer valid which is possible on shutdown so we
-            // log as debug.
-            LOG.debug("{}: Error obtaining {}", id, serviceInterface.getSimpleName(), e);
-        }
-
-        return null;
-    }
-
     @Override
-    public void stopTracking() {
-        LOG.debug("{}: In stopTracking", id);
+    public void destroy(final Object instance) {
+        super.destroy(instance);
 
-        stopServiceRecipes();
-    }
-
-    @Override
-    public void destroy(Object instance) {
-        LOG.debug("{}: In destroy", id);
-
-        if(appConfigChangeListenerReg != null) {
+        if (appConfigChangeListenerReg != null) {
             appConfigChangeListenerReg.close();
             appConfigChangeListenerReg = null;
         }
-
-        stopServiceRecipes();
-    }
-
-    private void stopServiceRecipes() {
-        stopServiceRecipe(dataBrokerServiceRecipe);
-        stopServiceRecipe(bindingCodecServiceRecipe);
-        dataBrokerServiceRecipe = null;
-        bindingCodecServiceRecipe = null;
-    }
-
-    private void stopServiceRecipe(StaticServiceReferenceRecipe recipe) {
-        if(recipe != null) {
-            recipe.stop();
-        }
-    }
-
-    @Override
-    public String getDependencyDescriptor() {
-        return dependendencyDesc;
-    }
-
-    /**
-     * Internal base class to abstract binding type-specific behavior.
-     */
-    private static abstract class BindingContext {
-        final InstanceIdentifier<DataObject> appConfigPath;
-        final Class<DataObject> appConfigBindingClass;
-        final Class<? extends DataSchemaNode> schemaType;
-        final QName bindingQName;
-
-        protected BindingContext(Class<DataObject> appConfigBindingClass, InstanceIdentifier<DataObject> appConfigPath,
-                Class<? extends DataSchemaNode> schemaType) {
-            this.appConfigBindingClass = appConfigBindingClass;
-            this.appConfigPath = appConfigPath;
-            this.schemaType = schemaType;
-
-            bindingQName = BindingReflections.findQName(appConfigBindingClass);
-        }
-
-        abstract NormalizedNode<?, ?> parseDataElement(Element element, DataSchemaNode dataSchema,
-                DomToNormalizedNodeParserFactory parserFactory);
-
-        abstract NormalizedNode<?, ?> newDefaultNode(DataSchemaNode dataSchema);
     }
 
-    /**
-     * BindingContext implementation for a container binding.
-     */
-    private static class ContainerBindingContext extends BindingContext {
-        ContainerBindingContext(Class<DataObject> appConfigBindingClass) {
-            super(appConfigBindingClass, InstanceIdentifier.create(appConfigBindingClass), ContainerSchemaNode.class);
-        }
-
-        @Override
-        NormalizedNode<?, ?> newDefaultNode(DataSchemaNode dataSchema) {
-            return ImmutableNodes.containerNode(bindingQName);
-        }
-
-        @Override
-        NormalizedNode<?, ?> parseDataElement(Element element, DataSchemaNode dataSchema,
-                DomToNormalizedNodeParserFactory parserFactory) {
-            return parserFactory.getContainerNodeParser().parse(Collections.singletonList(element),
-                    (ContainerSchemaNode)dataSchema);
-        }
-    }
-
-    /**
-     * BindingContext implementation for a list binding.
-     */
-    private static class ListBindingContext extends BindingContext {
-        final String appConfigListKeyValue;
-
-        ListBindingContext(Class<DataObject> appConfigBindingClass, InstanceIdentifier<DataObject> appConfigPath,
-                String appConfigListKeyValue) {
-            super(appConfigBindingClass, appConfigPath, ListSchemaNode.class);
-            this.appConfigListKeyValue = appConfigListKeyValue;
-        }
-
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        private static ListBindingContext newInstance(Class<DataObject> bindingClass, String listKeyValue)
-                throws Exception {
-            // We assume the yang list key type is string.
-            Identifier keyInstance = (Identifier) bindingClass.getMethod("getKey").getReturnType().
-                    getConstructor(String.class).newInstance(listKeyValue);
-            InstanceIdentifier appConfigPath = InstanceIdentifier.builder((Class)bindingClass, keyInstance).build();
-            return new ListBindingContext(bindingClass, appConfigPath, listKeyValue);
-        }
-
-        @Override
-        NormalizedNode<?, ?> newDefaultNode(DataSchemaNode dataSchema) {
-            // We assume there's only one key for the list.
-            List<QName> keys = ((ListSchemaNode)dataSchema).getKeyDefinition();
-            Preconditions.checkArgument(keys.size() == 1, "Expected only 1 key for list %s", appConfigBindingClass);
-            QName listKeyQName = keys.iterator().next();
-            return ImmutableNodes.mapEntryBuilder(bindingQName, listKeyQName, appConfigListKeyValue).build();
-        }
-
-        @Override
-        NormalizedNode<?, ?> parseDataElement(Element element, DataSchemaNode dataSchema,
-                DomToNormalizedNodeParserFactory parserFactory) {
-            return parserFactory.getMapEntryNodeParser().parse(Collections.singletonList(element),
-                    (ListSchemaNode)dataSchema);
-        }
-    }
 }