From 92f71dc73fdb308c571ce456349e2af72aa3925e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 10 Jun 2014 14:34:16 +0200 Subject: [PATCH] BUG-272: fix sal-binding-api Fixes various small issues in sal-binding-api Change-Id: I6dbf33169e693cb8f449c42062dfedbf6a3e105e Signed-off-by: Robert Varga --- .../sal/binding/api/BindingAwareBroker.java | 14 ++------------ .../sal/binding/api/BindingAwareService.java | 13 +++---------- .../api/data/DataModificationTransaction.java | 14 +++----------- .../sal/binding/api/data/DataProviderService.java | 7 +------ 4 files changed, 9 insertions(+), 39 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java index 5b700703bc..453ff44911 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java @@ -9,8 +9,6 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.controller.md.sal.common.api.routing.RoutedRegistration; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider.ProviderFunctionality; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.binding.BaseIdentity; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -39,8 +37,8 @@ import org.osgi.framework.BundleContext; *
  • Notification Service - see {@link NotificationService} and * {@link NotificationProviderService} *
  • Functionality and Data model - *
  • Data Store access and modification - see {@link DataBrokerService} and - * {@link DataProviderService} + *
  • Data Store access and modification - see {@link org.opendaylight.controller.sal.binding.api.data.DataBrokerService} and + * {@link org.opendaylight.controller.sal.binding.api.data.DataProviderService} * * * The services are exposed via session. @@ -52,9 +50,6 @@ import org.osgi.framework.BundleContext; * * For more information about session-based access see {@link ConsumerContext} * and {@link ProviderContext} - * - * - * */ public interface BindingAwareBroker { /** @@ -122,9 +117,6 @@ public interface BindingAwareBroker { * functionality) for the consumer and provides access to the SAL * infrastructure services and other functionality provided by * {@link Provider}s. - * - * - * */ public interface ConsumerContext extends RpcConsumerRegistry { @@ -137,8 +129,6 @@ public interface BindingAwareBroker { * @return Session specific implementation of service */ T getSALService(Class service); - - } /** diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareService.java index 20d69a4ca9..adaa27f3e6 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareService.java @@ -7,10 +7,7 @@ */ package org.opendaylight.controller.sal.binding.api; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; - /** - * * Session-specific instance of the broker functionality. * *

    @@ -21,19 +18,15 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerCo * *

    * The consumer's (or provider's) instance of specific service could be obtained - * by invoking {@link ConsumerContext#getSALService(Class)} method on session + * by invoking {@link org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext#getSALService(Class)} method on session * assigned to the consumer. * *

    - * {@link BindingAwareService} and {@link BindingAwareProvider} may seem + * {@link org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext} and {@link BindingAwareProvider} may seem * similar, but provider provides YANG model-based functionality and * {@link BindingAwareProvider} exposes the necessary supporting functionality * to implement specific functionality of YANG and to reuse it in the - * development of {@link BindingAwareConsumer}s and {@link BindingAwareProvider} - * s. - * - * - * + * development of {@link BindingAwareConsumer}s and {@link BindingAwareProvider}s. */ public interface BindingAwareService { diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java index 7190638323..5fafabbd1b 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java @@ -11,7 +11,6 @@ import java.util.EventListener; import java.util.concurrent.Future; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler; import org.opendaylight.controller.md.sal.common.api.data.DataModification; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -19,13 +18,12 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; public interface DataModificationTransaction extends DataModification, DataObject> { - /** * Returns an unique identifier for transaction * */ @Override - public Object getIdentifier(); + Object getIdentifier(); /** * Initiates a two-phase commit of candidate data. @@ -44,7 +42,7 @@ public interface DataModificationTransaction extends DataModification> commit(); - - + Future> commit(); /** * Register a listener for transaction @@ -64,12 +60,8 @@ public interface DataModificationTransaction extends DataModification registerListener(DataTransactionListener listener); - - /** * Listener for transaction state changes - * - * */ public interface DataTransactionListener extends EventListener { /** diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java index 7d662cfcf2..b496d1dfb4 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java @@ -7,22 +7,17 @@ */ package org.opendaylight.controller.sal.binding.api.data; - import org.opendaylight.controller.md.sal.common.api.data.DataProvisionService; import org.opendaylight.controller.md.sal.common.api.data.DataReader; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** - * DataProviderService is common access point for {@link BindingAwareProvider} providers + * DataProviderService is common access point for {@link org.opendaylight.controller.sal.binding.api.BindingAwareProvider} providers * to access data trees described by the YANG model. - * */ public interface DataProviderService extends DataBrokerService, DataProvisionService, DataObject> { - - /** * Registers a data reader for particular subtree of overal YANG data tree. * -- 2.36.6