From: Robert Varga Date: Tue, 10 Jun 2014 08:58:26 +0000 (+0200) Subject: BUG-272: remove trailing whitespace from Java files X-Git-Tag: release/beryllium~149^2~324^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=477d42cb5e40405e5f23c8e7122772ef67474649;p=mdsal.git BUG-272: remove trailing whitespace from Java files Preparatory patch, bulk-removes all trailing whitespace from Java files. Change-Id: I1fbef5746df7277b3865429d4faa82fc8ba8cbb5 Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBrokerAwareActivator.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBrokerAwareActivator.java index 4d008295a3..6047f058b7 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBrokerAwareActivator.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBrokerAwareActivator.java @@ -23,12 +23,12 @@ public abstract class AbstractBrokerAwareActivator implements BundleActivator { private ServiceTracker tracker; private BindingAwareBroker broker; private ServiceTrackerCustomizer customizer = new ServiceTrackerCustomizer() { - + @Override public BindingAwareBroker addingService(ServiceReference reference) { broker = context.getService(reference); mdActivationPool.execute(new Runnable() { - + @Override public void run() { onBrokerAvailable(broker, context);; @@ -36,50 +36,50 @@ public abstract class AbstractBrokerAwareActivator implements BundleActivator { }); return broker; } - + @Override public void modifiedService(ServiceReference reference, BindingAwareBroker service) { // TODO Auto-generated method stub - + } @Override public void removedService(ServiceReference reference, BindingAwareBroker service) { // TODO Auto-generated method stub - + } }; - - + + @Override public final void start(BundleContext context) throws Exception { this.context = context; startImpl(context); tracker = new ServiceTracker<>(context, BindingAwareBroker.class, customizer); tracker.open(); - + } - + @Override public final void stop(BundleContext context) throws Exception { tracker.close(); stopImpl(context); } - - + + /** * Called when this bundle is started (before * {@link #onSessionInitiated(ProviderContext)} so the Framework can perform * the bundle-specific activities necessary to start this bundle. This * method can be used to register services or to allocate any resources that * this bundle needs. - * + * *

* This method must complete and return to its caller in a timely manner. - * + * * @param context * The execution context of the bundle being started. * @throws Exception @@ -99,10 +99,10 @@ public abstract class AbstractBrokerAwareActivator implements BundleActivator { * started. There should be no active threads that were started by this * bundle when this bundle returns. A stopped bundle must not call any * Framework objects. - * + * *

* This method must complete and return to its caller in a timely manner. - * + * * @param context The execution context of the bundle being stopped. * @throws Exception If this method throws an exception, the bundle is still * marked as stopped, and the Framework will remove the bundle's @@ -112,11 +112,11 @@ public abstract class AbstractBrokerAwareActivator implements BundleActivator { protected void stopImpl(BundleContext context) { // NOOP } - + protected abstract void onBrokerAvailable(BindingAwareBroker broker, BundleContext context); - + protected void onBrokerRemoved(BindingAwareBroker broker, BundleContext context) { - + } } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java index 871abb2117..4327451d21 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java @@ -10,28 +10,28 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; /** - * + * * Defines the component of controller and supplies additional metadata. A * component of the controller or application supplies a concrete implementation * of this interface. - * + * * A user-implemented component (application) which facilitates the SAL and SAL * services to access infrastructure services or providers' functionality. - * - * - * + * + * + * */ public interface BindingAwareConsumer { /** * Callback signaling initialization of the consumer session to the SAL. - * + * * The consumer MUST use the session for all communication with SAL or * retrieving SAL infrastructure services. - * + * * This method is invoked by * {@link BindingAwareBroker#registerConsumer(BindingAwareConsumer)} - * + * * @param session * Unique session between consumer and SAL. */ diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java index 120674fa0d..0812e5f53c 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java @@ -14,24 +14,24 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo import org.opendaylight.yangtools.yang.binding.RpcService; /** - * + * * Defines the component of controller and supplies additional metadata. A * component of the controller or application supplies a concrete implementation * of this interface. - * + * *

* A user-implemented component (application) which facilitates the SAL and SAL * services to access infrastructure services and to provide functionality to * {@link Consumer}s and other providers. - * - * + * + * */ public interface BindingAwareProvider { /** * Returns a set of provided implementations of YANG modules and their rpcs. - * - * + * + * * @return Set of provided implementation of YANG modules and their Rpcs */ Collection getImplementations(); @@ -39,24 +39,24 @@ public interface BindingAwareProvider { /** * Gets a set of implementations of provider functionality to be registered * into system during the provider registration to the SAL. - * + * *

* This method is invoked by {@link Broker#registerProvider(Provider)} to * learn the initial provided functionality - * + * * @return Set of provider's functionality. */ Collection getFunctionality(); /** * Functionality provided by the {@link BindingAwareProvider} - * + * *

* Marker interface used to mark the interfaces describing specific * functionality which could be exposed by providers to other components. - * - * - * + * + * + * */ public interface ProviderFunctionality { 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 b3680568bb..20d69a4ca9 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 @@ -10,20 +10,20 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; /** - * + * * Session-specific instance of the broker functionality. - * + * *

* BindingAwareService is marker interface for infrastructure services provided * by the SAL. These services are session-specific, each * {@link BindingAwareConsumer} and {@link BindingAwareProvider} usually has own * instance of the service with it's own context. - * + * *

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

* {@link BindingAwareService} and {@link BindingAwareProvider} may seem * similar, but provider provides YANG model-based functionality and @@ -31,9 +31,9 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerCo * to implement specific functionality of YANG and to reuse it in the * 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/RpcConsumerRegistry.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/RpcConsumerRegistry.java index f71d69b860..7da0a48517 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/RpcConsumerRegistry.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/RpcConsumerRegistry.java @@ -12,13 +12,13 @@ import org.opendaylight.yangtools.yang.binding.RpcService; /** * Base interface defining contract for retrieving MD-SAL * version of RpcServices - * + * */ public interface RpcConsumerRegistry extends BindingAwareService { /** * Returns a session specific instance (implementation) of requested * YANG module implementation / service provided by consumer. - * + * * @return Session specific implementation of service */ T getRpcService(Class module); diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java index dec44f364f..0d9a90286e 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java @@ -15,9 +15,9 @@ import org.opendaylight.controller.sal.binding.api.data.DataProviderService; * Provider's version of Mount Point, this version allows access to MD-SAL * services specific for this mountpoint and registration / provision of * interfaces for mount point. - * + * * @author ttkacik - * + * */ public interface MountProviderInstance // extends // diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcContextIdentifier.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcContextIdentifier.java index d6374fff90..e3bedd33f9 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcContextIdentifier.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcContextIdentifier.java @@ -15,7 +15,7 @@ public final class RpcContextIdentifier implements Immutable{ public final Class rpcService; public final Class routingContext; - + private RpcContextIdentifier(Class rpcService, Class routingContext) { super(); this.rpcService = rpcService; @@ -29,11 +29,11 @@ public final class RpcContextIdentifier implements Immutable{ public Class getRoutingContext() { return routingContext; } - + public static final RpcContextIdentifier contextForGlobalRpc(Class serviceType) { return new RpcContextIdentifier(serviceType, null); } - + public static final RpcContextIdentifier contextFor(Class serviceType,Class routingContext) { return new RpcContextIdentifier(serviceType, routingContext); } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcRoutingTable.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcRoutingTable.java index cc800b6bbb..61c7cfc953 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcRoutingTable.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/rpc/RpcRoutingTable.java @@ -22,7 +22,7 @@ public interface RpcRoutingTable e /** * Updates route for particular path to specified instance of * {@link RpcService}. - * + * * @param path * Path for which RpcService routing is to be updated * @param service @@ -33,19 +33,19 @@ public interface RpcRoutingTable e /** * Deletes a route for particular path - * + * * @param path * Path for which */ void removeRoute(InstanceIdentifier path); /** - * + * */ S getRoute(InstanceIdentifier nodeInstance); /** - * + * * @return */ Map, S> getRoutes(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java index df3b7ece5d..a11a7d67f5 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java @@ -26,14 +26,14 @@ import org.osgi.framework.BundleContext; */ public class BindingBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModuleFactory { - + @Override public Module createModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext) { BindingBrokerImplModule module = (BindingBrokerImplModule) super.createModule(instanceName, dependencyResolver, bundleContext); module.setBundleContext(bundleContext); return module; } - + @Override public Module createModule(String instanceName, DependencyResolver dependencyResolver, DynamicMBeanWithInstance old, BundleContext bundleContext) throws Exception { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeGenerator.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeGenerator.java index 8aff12b44a..fb6f6ca101 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeGenerator.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/RuntimeCodeGenerator.java @@ -18,7 +18,7 @@ public interface RuntimeCodeGenerator { /** * Returns an instance of provided RpcService type which delegates all calls * to the delegate. - * + * *

* Returned instance: *

    @@ -36,23 +36,23 @@ public interface RuntimeCodeGenerator { * all calls are delegated. *
  • {@link DelegateProxy#setDelegate(Object)} - sets the delegate for * particular instance - * + * *
- * + * * @param serviceType * - Subclass of RpcService for which direct proxy is to be * generated. * @return Instance of RpcService of provided serviceType which implements * and {@link DelegateProxy} * @throws IllegalArgumentException - * + * */ T getDirectProxyFor(Class serviceType) throws IllegalArgumentException; /** * Returns an instance of provided RpcService type which routes all calls to * other instances selected on particular input field. - * + * *

* Returned instance: *

    @@ -80,7 +80,7 @@ public interface RuntimeCodeGenerator { * is not present on any field invocation will be delegated to default * service {@link RpcRouter#getDefaultService()}. *
- * + * * @param serviceType * - Subclass of RpcService for which Router is to be generated. * @return Instance of RpcService of provided serviceType which implements diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java index 3ad1dabffe..75d44db9d1 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java @@ -112,7 +112,7 @@ public class RootBindingAwareBroker implements // LOG.info("Starting Binding Aware Broker: {}", identifier); controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker(), getDataBroker()); - + supportedConsumerServices = ImmutableClassToInstanceMap. builder() .put(NotificationService.class, getRoot()) // @@ -144,19 +144,19 @@ public class RootBindingAwareBroker implements // public void close() throws Exception { // FIXME: Close all sessions } - + @Override public RoutedRpcRegistration addRoutedRpcImplementation(Class type, T implementation) throws IllegalStateException { return getRoot().addRoutedRpcImplementation(type, implementation); } - + @Override public RpcRegistration addRpcImplementation(Class type, T implementation) throws IllegalStateException { return getRoot().addRpcImplementation(type, implementation); } - + @Override public T getRpcService(Class module) { return getRoot().getRpcService(module); @@ -166,7 +166,7 @@ public class RootBindingAwareBroker implements // L arg0) { return getRoot().registerRouteChangeListener(arg0); } - + public class RootSalInstance extends AbstractBindingSalProviderInstance { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingDomConnectorDeployer.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingDomConnectorDeployer.java index 978c79ea02..bfafc1f9b7 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingDomConnectorDeployer.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingDomConnectorDeployer.java @@ -80,7 +80,7 @@ public class BindingDomConnectorDeployer { connector.startDataForwarding(); } - public static void startNotificationForwarding(BindingIndependentConnector connector, + public static void startNotificationForwarding(BindingIndependentConnector connector, NotificationProviderService baService, NotificationPublishService domService) { if(connector.isNotificationForwarding()) { return; diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/forward/DomForwardingUtils.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/forward/DomForwardingUtils.java index e455bea19c..d28b3b5c91 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/forward/DomForwardingUtils.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/forward/DomForwardingUtils.java @@ -21,7 +21,7 @@ public class DomForwardingUtils { DomForwardedBroker forwardedSource = (DomForwardedBroker) source; DomForwardedBroker forwardedTarget = (DomForwardedBroker) target; reuseForwardingFrom(forwardedTarget, forwardedSource); - + } private static void reuseForwardingFrom(DomForwardedBroker target, DomForwardedBroker source) { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java index e34ee28a31..d22335e66e 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java @@ -8,7 +8,7 @@ package org.opendaylight.controller.sal.binding.spi; public interface DelegateProxy { - + void setDelegate(T delegate); T getDelegate(); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java index 526ca40595..068c68a81f 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java @@ -12,13 +12,13 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; public interface RemoteRpcRouter { - - - - + + + + ListenerRegistration registerRouteChangeListener(RouteChangeListener listener); - - + + } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java index 36a172d09c..9f8a443bbf 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java @@ -19,22 +19,22 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp import org.opendaylight.yangtools.yang.data.api.CompositeNode; public class UnionSerializationTest extends AbstractDataServiceTest { - + public static final String PREFIX_STRING = "192.168.0.1/32"; - - + + @Test public void testPrefixSerialization() throws Exception { - + Ipv4Prefix ipv4prefix = new Ipv4Prefix(PREFIX_STRING); IpPrefix ipPrefix = new IpPrefix(ipv4prefix); Prefix prefix = new PrefixBuilder().setPrefix(ipPrefix).build(); - + CompositeNode serialized = testContext.getBindingToDomMappingService().toDataDom(prefix); assertNotNull(serialized); assertNotNull(serialized.getFirstSimpleByName(Prefix.QNAME)); assertEquals(PREFIX_STRING, serialized.getFirstSimpleByName(Prefix.QNAME).getValue()); - + Prefix deserialized = (Prefix) testContext.getBindingToDomMappingService().dataObjectFromDataDom(Prefix.class, serialized); assertNotNull(deserialized); assertNotNull(deserialized.getPrefix()); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java index f7c19ba1c3..6c133728b6 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/BarListener.java @@ -12,7 +12,7 @@ import org.opendaylight.yangtools.yang.binding.NotificationListener; public interface BarListener extends NotificationListener { void onBarUpdate(BarUpdate notification); - + void onFlowDelete(FlowDelete notification); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java index 3b872d0149..cb8020e3fd 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooListener.java @@ -12,5 +12,5 @@ import org.opendaylight.yangtools.yang.binding.NotificationListener; public interface FooListener extends NotificationListener { void onFooUpdate(FooUpdate notification); - + } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java index e844809662..2bd211995d 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/FooService.java @@ -13,11 +13,11 @@ import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.common.RpcResult; public interface FooService extends RpcService { - + Future> foo(); - + Future> simple(SimpleInput obj); - + Future> inheritedContext(InheritedContextInput obj); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java index b4f51f5771..f088c0a0bd 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java @@ -14,6 +14,6 @@ import org.opendaylight.yangtools.concepts.Registration; public interface RegistrationListener> extends EventListener { void onRegister(T registration); - + void onUnregister(T registration); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java index 7d78fd283d..da7efebdfe 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java @@ -16,8 +16,8 @@ import org.opendaylight.yangtools.concepts.Registration; public interface DataProvisionService

, D> { public Registration> registerCommitHandler(P path, DataCommitHandler commitHandler); - - public ListenerRegistration>> + + public ListenerRegistration>> registerCommitHandlerListener(RegistrationListener> commitHandlerListener); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java index 6a906c5b88..f5f03a106b 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java @@ -12,6 +12,6 @@ import java.util.concurrent.ExecutorService; public interface NotificationPublishService { void publish(N notification); - + void publish(N notification,ExecutorService executor); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java index f99c13ecf5..0ecb2c5768 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java @@ -11,7 +11,7 @@ import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.concepts.Path; public interface MutableRoutingTable, T> extends RoutingTable, Mutable { - + void setDefaultRoute(T target); void updateRoute(P path,T target); void removeRoute(P path); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java index fbf735fa75..4bfb30f828 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java @@ -12,6 +12,6 @@ import org.opendaylight.yangtools.concepts.Immutable; public interface Route extends Immutable { C getType(); - + P getPath(); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java index 4402f69a5f..9e72b68cd6 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java @@ -14,10 +14,10 @@ import org.opendaylight.yangtools.concepts.Path; public interface RoutingTable, T> { C getIdentifier(); - + T getDefaultRoute(); - + Map getRoutes(); - + T getRoute(P path); } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java index 4d395267dd..ee9af6cb80 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java @@ -24,7 +24,7 @@ import com.google.common.collect.Multimaps; /** * Base abstract implementation of DataReadRouter, which performs * a read operation on multiple data readers and then merges result. - * + * * @param

* @param */ @@ -50,7 +50,7 @@ public abstract class AbstractDataReadRouter

, D> implements Da /** * Merges data readed by reader instances from specified path - * + * * @param path Path on which read was performed * @param data Data which was returned by read operation. * @return Merged result. @@ -59,11 +59,11 @@ public abstract class AbstractDataReadRouter

, D> implements Da /** * Returns a function which performs configuration read for supplied path - * + * * @param path * @return function which performs configuration read for supplied path */ - + private Function, D> configurationRead(final P path) { return new Function, D>() { @Override @@ -75,7 +75,7 @@ public abstract class AbstractDataReadRouter

, D> implements Da /** * Returns a function which performs operational read for supplied path - * + * * @param path * @return function which performs operational read for supplied path */ @@ -92,10 +92,10 @@ public abstract class AbstractDataReadRouter

, D> implements Da /** * Register's a reader for operational data. - * + * * @param path Path which is served by this reader * @param reader Reader instance which is responsible for reading particular subpath. - * @return + * @return */ public Registration> registerOperationalReader(P path, DataReader reader) { OperationalDataReaderRegistration ret = new OperationalDataReaderRegistration<>(path, reader); @@ -142,15 +142,15 @@ public abstract class AbstractDataReadRouter

, D> implements Da } private Predicate>> affects(final P path) { - + return new Predicate>>() { - + @Override public boolean apply(Entry> input) { final P key = input.getKey(); return key.contains(path) || ((P) path).contains(key); } - + }; } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/DataChangeEventImpl.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/DataChangeEventImpl.java index 691c303688..c86aec96d1 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/DataChangeEventImpl.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/DataChangeEventImpl.java @@ -24,9 +24,9 @@ public class DataChangeEventImpl

, D> implements DataChangeEven private final D updatedOperationalSubtree; private final D updatedConfigurationSubtree; - - - + + + public DataChangeEventImpl(DataChange dataChange, D originalConfigurationSubtree, D originalOperationalSubtree, D updatedOperationalSubtree, D updatedConfigurationSubtree) { super(); diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/InitialDataChangeEventImpl.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/InitialDataChangeEventImpl.java index d904427502..f35d6dc6af 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/InitialDataChangeEventImpl.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/InitialDataChangeEventImpl.java @@ -28,24 +28,24 @@ public class InitialDataChangeEventImpl

,D> implements DataChan updatedConfigurationData = Collections.emptyMap(); updatedOperationalData = Collections.emptyMap(); } - + public InitialDataChangeEventImpl(D configTree, D operTree, Map updatedCfgData, Map updatedOperData) { updatedConfigurationTree = configTree; updatedOperationalTree = operTree; updatedConfigurationData = updatedCfgData; updatedOperationalData = updatedOperData; } - + @Override public Map getCreatedConfigurationData() { return Collections.emptyMap(); } - + @Override public Map getCreatedOperationalData() { return Collections.emptyMap(); } - + @Override public Map getOriginalConfigurationData() { return Collections.emptyMap(); @@ -66,7 +66,7 @@ public class InitialDataChangeEventImpl

,D> implements DataChan public Map getUpdatedConfigurationData() { return updatedConfigurationData; } - + @Override public D getUpdatedConfigurationSubtree() { return updatedConfigurationTree; @@ -75,21 +75,21 @@ public class InitialDataChangeEventImpl

,D> implements DataChan public D getUpdatedOperationalSubtree() { return updatedOperationalTree; } - + @Override public D getOriginalConfigurationSubtree() { return updatedConfigurationTree; } - + @Override public D getOriginalOperationalSubtree() { return updatedOperationalTree; } - + @Override public Map getUpdatedOperationalData() { return updatedOperationalData; } - + } diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/CommitHandlerTransactions.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/CommitHandlerTransactions.java index 5d73b1eefb..1af7ccc79a 100644 --- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/CommitHandlerTransactions.java +++ b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/CommitHandlerTransactions.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult; public class CommitHandlerTransactions { private static class AllwaysSuccessfulTransaction

,D> implements DataCommitTransaction { - + private final DataModification modification; public AllwaysSuccessfulTransaction(DataModification modification) { @@ -32,13 +32,13 @@ public class CommitHandlerTransactions { public RpcResult finish() throws IllegalStateException { return Rpcs.getRpcResult(true, null, Collections.emptyList()); } - + @Override public DataModification getModification() { return modification; } } - + public static final

,D> AllwaysSuccessfulTransaction allwaysSuccessfulTransaction(DataModification modification) { return new AllwaysSuccessfulTransaction<>(modification); } diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java index 86dcba9596..4d41249b4d 100644 --- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java +++ b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/RpcErrors.java @@ -16,20 +16,20 @@ import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; * */ public class RpcErrors { - + /** * @param applicationTag * @param tag * @param info * @param severity * @param message - * @param errorType - * @param cause + * @param errorType + * @param cause * @return {@link RpcError} implementation */ public static RpcError getRpcError(String applicationTag, String tag, String info, ErrorSeverity severity, String message, ErrorType errorType, Throwable cause) { - RpcErrorTO ret = new RpcErrorTO(applicationTag, tag, info, severity, message, + RpcErrorTO ret = new RpcErrorTO(applicationTag, tag, info, severity, message, errorType, cause); return ret; } @@ -94,7 +94,7 @@ public class RpcErrors { public Throwable getCause() { return cause; } - + @Override public ErrorType getErrorType() { return errorType; diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java index 99a38ca43a..c14d5a679c 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java @@ -18,9 +18,9 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer; public abstract class AbstractConsumer implements Consumer, BundleActivator,ServiceTrackerCustomizer { - - - + + + private BundleContext context; private ServiceTracker tracker; private Broker broker; @@ -54,7 +54,7 @@ public abstract class AbstractConsumer implements Consumer, BundleActivator,Serv return Collections.emptySet(); } - + @Override public Broker addingService(ServiceReference reference) { if(broker == null) { @@ -62,15 +62,15 @@ public abstract class AbstractConsumer implements Consumer, BundleActivator,Serv broker.registerConsumer(this, context); return broker; } - + return null; } - + @Override public void modifiedService(ServiceReference reference, Broker service) { // NOOP } - + @Override public void removedService(ServiceReference reference, Broker service) { stopImpl(context); diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java index c1518b1ec6..dec2f7a484 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java @@ -10,28 +10,28 @@ package org.opendaylight.controller.sal.core.api; import org.opendaylight.controller.sal.core.api.Broker.ConsumerSession; /** - * + * * Session-specific instance of the broker functionality. - * + * *

* BrokerService is marker interface for infrastructure services provided by the * SAL. These services are session-specific, each {@link Provider} and * {@link Consumer} usually has own instance of the service with it's own * context. - * + * *

* The consumer's (or provider's) instance of specific service could be obtained * by invoking {@link ConsumerSession#getService(Class)} method on session * assigned to the consumer. - * + * *

* {@link BrokerService} and {@link Provider} may seem similar, but provider * provides YANG model-based functionality and {@link BrokerService} exposes the * necessary supporting functionality to implement specific functionality of * YANG and to reuse it in the development of {@link Consumer}s and * {@link Provider}s. - * - * + * + * */ public interface BrokerService { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java index 3127df521f..a693cd6c49 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java @@ -12,26 +12,26 @@ import java.util.Collection; import org.opendaylight.controller.sal.core.api.Broker.ConsumerSession; /** - * + * * Defines the component of controller and supplies additional metadata. A * component of the controller or application supplies a concrete implementation * of this interface. - * + * * A user-implemented component (application) which facilitates the SAL and SAL * services to access infrastructure services or providers' functionality. - * - * + * + * */ public interface Consumer { /** * Callback signaling initialization of the consumer session to the SAL. - * + * * The consumer MUST use the session for all communication with SAL or * retrieving SAL infrastructure services. - * + * * This method is invoked by {@link Broker#registerConsumer(Consumer)} - * + * * @param session * Unique session between consumer and SAL. */ @@ -40,9 +40,9 @@ public interface Consumer { /** * Get a set of implementations of consumer functionality to be registered * into system during the consumer registration to the SAL. - * + * * This method is invoked by {@link Broker#registerConsumer(Consumer)}. - * + * * @return Set of consumer functionality. */ public Collection getConsumerFunctionality(); @@ -50,8 +50,8 @@ public interface Consumer { /** * The marker interface for the interfaces describing the consumer * functionality contracts. - * - * + * + * */ public interface ConsumerFunctionality { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java index fef8618b2c..0a57d12579 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java @@ -12,30 +12,30 @@ import java.util.Collection; import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; /** - * + * * Defines the component of controller and supplies additional metadata. A * component of the controller or application supplies a concrete implementation * of this interface. - * + * *

* A user-implemented component (application) which facilitates the SAL and SAL * services to access infrastructure services and to provide functionality to * {@link Consumer}s and other providers. - * - * + * + * */ public interface Provider { /** * Callback signaling initialization of the provider session to the SAL. - * + * *

* The provider MUST use the session for all communication with SAL * or retrieving SAL infrastructure services. - * + * *

* This method is invoked by {@link Broker#registerConsumer(Consumer)} - * + * * @param session * Unique session between provider and SAL. */ @@ -44,24 +44,24 @@ public interface Provider { /** * Gets a set of implementations of provider functionality to be registered * into system during the provider registration to the SAL. - * + * *

* This method is invoked by {@link Broker#registerProvider(Provider)} to * learn the initial provided functionality - * + * * @return Set of provider's functionality. */ public Collection getProviderFunctionality(); /** * Functionality provided by the {@link Provider} - * + * *

* Marker interface used to mark the interfaces describing specific * functionality which could be exposed by providers to other components. - * + * - * + * */ public interface ProviderFunctionality { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcConsumptionRegistry.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcConsumptionRegistry.java index 665a50f9ca..da592e9b22 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcConsumptionRegistry.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcConsumptionRegistry.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; public interface RpcConsumptionRegistry { /** * Sends an RPC to other components registered to the broker. - * + * * @see RpcImplementation * @param rpc * Name of RPC diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcProvisionRegistry.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcProvisionRegistry.java index f43dcd6b43..a22a6ef75e 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcProvisionRegistry.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcProvisionRegistry.java @@ -18,17 +18,17 @@ public interface RpcProvisionRegistry extends RpcImplementation, BrokerService, /** * Registers an implementation of the rpc. - * + * *

* The registered rpc functionality will be available to all other * consumers and providers registered to the broker, which are aware of * the {@link QName} assigned to the rpc. - * + * *

* There is no assumption that rpc type is in the set returned by * invoking {@link RpcImplementation#getSupportedRpcs()}. This allows * for dynamic rpc implementations. - * + * * @param rpcType * Name of Rpc * @param implementation @@ -38,7 +38,7 @@ public interface RpcProvisionRegistry extends RpcImplementation, BrokerService, */ RpcRegistration addRpcImplementation(QName rpcType, RpcImplementation implementation) throws IllegalArgumentException; - + ListenerRegistration addRpcRegistrationListener(RpcRegistrationListener listener); RoutedRpcRegistration addRoutedRpcImplementation(QName rpcType, RpcImplementation implementation); diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRegistrationListener.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRegistrationListener.java index 2ba5c4ba20..a0be886b24 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRegistrationListener.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRegistrationListener.java @@ -12,8 +12,8 @@ import java.util.EventListener; import org.opendaylight.yangtools.yang.common.QName; public interface RpcRegistrationListener extends EventListener { - + public void onRpcImplementationAdded(QName name); - + public void onRpcImplementationRemoved(QName name); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java index 64195303e8..66d290f531 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java @@ -15,20 +15,20 @@ import org.opendaylight.yangtools.yang.common.QName; public class RpcRoutingContext implements Immutable, Serializable { /** - * + * */ private static final long serialVersionUID = -9079324728075883325L; - + private final QName context; private final QName rpc; - - + + private RpcRoutingContext(QName context, QName rpc) { super(); this.context = context; this.rpc = rpc; } - + public static final RpcRoutingContext create(QName context, QName rpc) { return new RpcRoutingContext(context, rpc); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java index 2d5f4b2a55..266b6976af 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java @@ -18,12 +18,12 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; /** * DataBrokerService provides unified access to the data stores available in the * system. - * - * + * + * * @see DataProviderService - * + * */ -public interface DataBrokerService extends +public interface DataBrokerService extends BrokerService, // DataReader, // DataModificationTransactionFactory, // diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java index 20fa29dceb..0538660fd7 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java @@ -15,14 +15,14 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; import org.opendaylight.controller.md.sal.common.api.data.DataReader;; -public interface DataProviderService extends +public interface DataProviderService extends DataBrokerService, // DataProvisionService { /** * Adds {@link DataValidator} for specified Data Store - * + * * @param store * Data Store * @param validator @@ -32,7 +32,7 @@ public interface DataProviderService extends /** * Removes {@link DataValidator} from specified Data Store - * + * * @param store * @param validator * Validator @@ -42,7 +42,7 @@ public interface DataProviderService extends /** * Adds {@link DataRefresher} for specified data store - * + * * @param store * @param refresher */ @@ -50,22 +50,22 @@ public interface DataProviderService extends /** * Removes {@link DataRefresher} from specified data store - * + * * @param store * @param refresher */ void removeRefresher(DataStoreIdentifier store, DataRefresher refresher); - + Registration> registerConfigurationReader(InstanceIdentifier path, DataReader reader); Registration> registerOperationalReader(InstanceIdentifier path, DataReader reader); - + public interface DataRefresher extends Provider.ProviderFunctionality { /** * Fired when some component explicitly requested the data refresh. - * + * * The provider which exposed the {@link DataRefresher} should republish * its provided data by editing the data in all affected data stores. */ diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java index 8bdd061871..58ffb38365 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java @@ -15,11 +15,11 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; public interface DataStore extends // DataReader, DataCommitHandler { - - + + Iterable getStoredConfigurationPaths(); Iterable getStoredOperationalPaths(); - + boolean containsConfigurationPath(InstanceIdentifier path); boolean containsOperationalPath(InstanceIdentifier path); diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java index 2bcb84be34..286770b048 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; /** * {@link Provider}-supplied Validator of the data. - * + * *

* The registration could be done by : *

    @@ -27,25 +27,25 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; * as arguments to the * {@link DataProviderService#addValidator(DataStoreIdentifier, DataValidator)} *
- * + * **/ public interface DataValidator extends Provider.ProviderFunctionality { /** * A set of Data Stores supported by implementation. - * + * * The set of {@link DataStoreIdentifier}s which identifies target data * stores which are supported by this implementation. This set is used, when * {@link Provider} is registered to the SAL, to register and expose the * validation functionality to affected data stores. - * + * * @return Set of Data Store identifiers */ Set getSupportedDataStores(); /** * Performs validation on supplied data. - * + * * @param toValidate * Data to validate * @return Validation result. The diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationListener.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationListener.java index f87fee5bce..7dc8cb36c5 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationListener.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationListener.java @@ -21,21 +21,21 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; public interface NotificationListener extends Consumer.ConsumerFunctionality, EventListener { /** * A set of notification types supported by listeners. - * + * * The set of notification {@link QName}s which are supported by this * listener. This set is used, when {@link Consumer} is registered to the * SAL, to automatically register the listener. - * + * * @return Set of QNames identifying supported notifications. */ Set getSupportedNotifications(); /** * Fired when the notification occurs. - * + * * The type of the notification could be learned by * QName type = notification.getNodeType(); - * + * * @param notification * Notification content */ diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java index aa22b90f65..8dab4cd705 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java @@ -13,14 +13,14 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; /** * Notification Publishing Service - * + * * The simplified process of the notification publishing is following: - * + * *
    *
  1. {@link Provider} invokes {@link #sendNotification(CompositeNode)} *
  2. {@link Broker} finds {@link NotificationListener}s which subscribed for * the notification type. - * + * *
  3. For each subscriber {@link Broker} invokes * {@link NotificationListener#onNotification(CompositeNode)} *
@@ -28,11 +28,11 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; public interface NotificationPublishService extends NotificationService { /** * Publishes a notification. - * + * * Notification type is determined by the * {@link CompositeNode#getNodeType()} of the * notification parameter. - * + * * @param notification * Notification to publish */ diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java index f654ca9ad6..7a60f2d677 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java @@ -18,10 +18,10 @@ import org.opendaylight.yangtools.yang.common.QName; /** * NotificationService provides access to the notification functionality of the * SAL. - * + * * NotificationService allows for consumption of notifications by registering * implementations of NotificationListener. - * + * * The registration of notification listeners could be done by: *
    *
  • returning an instance of implementation in the return value of @@ -30,14 +30,14 @@ import org.opendaylight.yangtools.yang.common.QName; * arguments to the * {@link ProviderSession#addRpcImplementation(QName, RpcImplementation)} *
- * - * + * + * */ public interface NotificationService extends BrokerService { /** * Registers a notification listener for supplied notification type. - * + * * @param notification * @param listener */ diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java index 692a0babdf..8e2a11184c 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java @@ -14,13 +14,13 @@ import org.opendaylight.controller.sal.dom.broker.DataBrokerImpl; public class DomBrokerRuntimeMXBeanImpl implements DomBrokerImplRuntimeMXBean { - + private final DataBrokerImpl dataService; private final Transactions transactions = new Transactions(); private final Data data = new Data(); - + public DomBrokerRuntimeMXBeanImpl(DataBrokerImpl dataService) { - this.dataService = dataService; + this.dataService = dataService; } public Transactions getTransactions() { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java index 25e6d04721..10b838a2c6 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java @@ -50,12 +50,12 @@ import com.google.common.util.concurrent.ListeningExecutorService; /** * In-memory DOM Data Store - * + * * Implementation of {@link DOMStore} which uses {@link DataTree} and other * classes such as {@link SnapshotBackedWriteTransaction}. * {@link SnapshotBackedReadTransaction} and {@link ResolveDataChangeEventsTask} * to implement {@link DOMStore} contract. - * + * */ public class InMemoryDOMDataStore implements DOMStore, Identifiable, SchemaContextListener, TransactionReadyPrototype { @@ -108,7 +108,7 @@ public class InMemoryDOMDataStore implements DOMStore, Identifiable, Sch /* * Make sure commit is not occurring right now. Listener has to be * registered and its state capture enqueued at a consistent point. - * + * * FIXME: improve this to read-write lock, such that multiple listener * registrations can occur simultaneously */ diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/SnapshotBackedWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/SnapshotBackedWriteTransaction.java index 717fb11987..534ee64b8a 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/SnapshotBackedWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/SnapshotBackedWriteTransaction.java @@ -26,7 +26,7 @@ import com.google.common.base.Throwables; * Implementation of Write transaction which is backed by * {@link DataTreeSnapshot} and executed according to * {@link TransactionReadyPrototype}. - * + * */ class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransaction implements DOMStoreWriteTransaction { @@ -37,7 +37,7 @@ class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransaction impleme /** * Creates new write-only transaction. - * + * * @param identifier * transaction Identifier * @param snapshot @@ -140,19 +140,19 @@ class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransaction impleme /** * Prototype implementation of * {@link #ready(SnapshotBackedWriteTransaction)} - * + * * This class is intended to be implemented by Transaction factories * responsible for allocation of {@link SnapshotBackedWriteTransaction} and * providing underlying logic for applying implementation. - * + * */ public static interface TransactionReadyPrototype { /** * Returns a commit coordinator associated with supplied transactions. - * + * * This call must not fail. - * + * * @param tx * Transaction on which ready was invoked. * @return DOMStoreThreePhaseCommitCohort associated with transaction diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.java index 7f834351d3..3291afa061 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java index ba3dcc8c86..69f518bb32 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java @@ -27,16 +27,16 @@ public class DataBrokerImpl extends AbstractDataBroker +public class DataTransactionImpl extends AbstractDataTransaction implements DataModificationTransaction { private final ListenerRegistry listeners = new ListenerRegistry(); - - - + + + public DataTransactionImpl(Object identifier,DataBrokerImpl dataBroker) { super(identifier,dataBroker); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataBrokerServiceProxy.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataBrokerServiceProxy.java index 5839db46ca..30027ec929 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataBrokerServiceProxy.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataBrokerServiceProxy.java @@ -37,6 +37,6 @@ public class DataBrokerServiceProxy extends AbstractBrokerServiceProxy>> registerCommitHandlerListener( RegistrationListener> commitHandlerListener) { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java index 74923dd8b8..ebe95d6eb5 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java @@ -18,7 +18,7 @@ public interface NotificationRouter { /** * Registers a notification listener for supplied notification type. - * + * * @param notification * @param listener */ diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java index 8b78b83e2f..9cc96e147f 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java @@ -24,8 +24,8 @@ public class YangDataUtils { // TODO Auto-generated constructor stub } - - + + public static Map,CompositeNode> toIndexMap(List nodes,List keys) { ConcurrentHashMap,CompositeNode> ret = new ConcurrentHashMap<>(); for(CompositeNode node : nodes) { @@ -44,7 +44,7 @@ public class YangDataUtils { checkArgument(keyNode != null,"Node must contains all keys."); Object value = keyNode.getValue(); map.put(key, value); - + } return map; } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java index 7f6918f2a1..a478aaac97 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java @@ -40,7 +40,7 @@ import com.google.common.collect.FluentIterable; public class YangSchemaUtils { private static final Function QNAME_FROM_PATH_ARGUMENT = new Function(){ - + @Override public QName apply(PathArgument input) { if(input == null) { @@ -53,26 +53,26 @@ public class YangSchemaUtils { private YangSchemaUtils() { throw new UnsupportedOperationException("Utility class."); } - - + + public static DataSchemaNode getSchemaNode(SchemaContext schema,InstanceIdentifier path) { checkArgument(schema != null,"YANG Schema must not be null."); checkArgument(path != null,"Path must not be null."); return getSchemaNode(schema, FluentIterable.from(path.getPath()).transform(QNAME_FROM_PATH_ARGUMENT)); } - + public static DataSchemaNode getSchemaNode(SchemaContext schema,Iterable path) { checkArgument(schema != null,"YANG Schema must not be null."); checkArgument(path != null,"Path must not be null."); if(!path.iterator().hasNext()){ return toRootDataNode(schema); } - + QName firstNode = path.iterator().next(); DataNodeContainer previous = schema.findModuleByNamespaceAndRevision(firstNode.getNamespace(), firstNode.getRevision()); Iterator iterator = path.iterator(); - + while (iterator.hasNext()) { checkArgument(previous!= null, "Supplied path does not resolve into valid schema node."); QName arg = iterator.next(); @@ -122,119 +122,119 @@ public class YangSchemaUtils { } private static final class NetconfDataRootNode implements ContainerSchemaNode { - + public NetconfDataRootNode(SchemaContext schema) { // TODO Auto-generated constructor stub } - + @Override public Set> getTypeDefinitions() { // TODO Auto-generated method stub return null; } - + @Override public Set getChildNodes() { // TODO Auto-generated method stub return null; } - + @Override public Set getGroupings() { // TODO Auto-generated method stub return null; } - + @Override public DataSchemaNode getDataChildByName(QName name) { // TODO Auto-generated method stub return null; } - + @Override public DataSchemaNode getDataChildByName(String name) { // TODO Auto-generated method stub return null; } - + @Override public Set getUses() { // TODO Auto-generated method stub return null; } - + @Override public Set getAvailableAugmentations() { // TODO Auto-generated method stub return null; } - + @Override public boolean isAugmenting() { // TODO Auto-generated method stub return false; } - + @Override public boolean isAddedByUses() { // TODO Auto-generated method stub return false; } - + @Override public boolean isConfiguration() { // TODO Auto-generated method stub return false; } - + @Override public ConstraintDefinition getConstraints() { // TODO Auto-generated method stub return null; } - + @Override public QName getQName() { // TODO Auto-generated method stub return null; } - + @Override public SchemaPath getPath() { // TODO Auto-generated method stub return null; } - + @Override public String getDescription() { // TODO Auto-generated method stub return null; } - + @Override public String getReference() { // TODO Auto-generated method stub return null; } - + @Override public Status getStatus() { // TODO Auto-generated method stub return null; } - + @Override public List getUnknownSchemaNodes() { // TODO Auto-generated method stub return null; } - + @Override public boolean isPresenceContainer() { // TODO Auto-generated method stub return false; } - + } } diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java index 94ac8d652e..413d81d029 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java @@ -45,24 +45,24 @@ public class InMemoryDataStoreTest { DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); /** - * + * * Writes /test in writeTx - * + * */ writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); /** - * + * * Reads /test from writeTx Read should return container. - * + * */ ListenableFuture>> writeTxContainer = writeTx.read(TestModel.TEST_PATH); assertTrue(writeTxContainer.get().isPresent()); /** - * + * * Reads /test from readTx Read should return Absent. - * + * */ ListenableFuture>> readTxContainer = readTx.read(TestModel.TEST_PATH); assertFalse(readTxContainer.get().isPresent()); @@ -74,16 +74,16 @@ public class InMemoryDataStoreTest { DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); /** - * + * * Writes /test in writeTx - * + * */ writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); /** - * + * * Reads /test from writeTx Read should return container. - * + * */ ListenableFuture>> writeTxContainer = writeTx.read(TestModel.TEST_PATH); assertTrue(writeTxContainer.get().isPresent()); @@ -123,8 +123,8 @@ public class InMemoryDataStoreTest { /** * We alocate new read-write transaction and write /test - * - * + * + * */ DOMStoreReadWriteTransaction firstTx = txChain.newReadWriteTransaction(); assertTestContainerWrite(firstTx); @@ -142,27 +142,27 @@ public class InMemoryDataStoreTest { DOMStoreReadTransaction secondReadTx = txChain.newReadOnlyTransaction(); /** - * + * * We test if we are able to read data from tx, read should not fail * since we are using chained transaction. - * - * + * + * */ assertTestContainerExists(secondReadTx); /** - * + * * We alocate next transaction, which is still based on first one, but * is read-write. - * + * */ DOMStoreReadWriteTransaction thirdDeleteTx = txChain.newReadWriteTransaction(); /** * We test existence of /test in third transaction container should * still be visible from first one (which is still uncommmited). - * - * + * + * */ assertTestContainerExists(thirdDeleteTx); @@ -178,7 +178,7 @@ public class InMemoryDataStoreTest { /** * We commit first transaction - * + * */ assertThreePhaseCommit(firstWriteTxCohort); @@ -191,7 +191,7 @@ public class InMemoryDataStoreTest { assertTestContainerExists(storeReadTx); /** * We commit third transaction - * + * */ assertThreePhaseCommit(thirdDeleteTxCohort); } @@ -225,9 +225,9 @@ public class InMemoryDataStoreTest { private static Optional> assertTestContainerWrite(final DOMStoreReadWriteTransaction writeTx) throws InterruptedException, ExecutionException { /** - * + * * Writes /test in writeTx - * + * */ writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); @@ -235,9 +235,9 @@ public class InMemoryDataStoreTest { } /** - * + * * Reads /test from readTx Read should return container. - * + * */ private static Optional> assertTestContainerExists(DOMStoreReadTransaction readTx) throws InterruptedException, ExecutionException {