From 1ee71ae58a03de1c1f8fd8c789e7921508ba9f59 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 10 Jun 2014 10:58:26 +0200 Subject: [PATCH] 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 --- .../FromSalConversionsUtils.java | 14 ++--- .../compatibility/ToSalConversionsUtils.java | 2 +- .../compatibility/test/NodeMappingTest.java | 2 +- .../test/TestToSalConversionsUtils.java | 14 ++--- .../frm/AbstractChangeListener.java | 16 +++--- .../controller/frm/FRMActivator.java | 8 +-- .../frm/flow/FlowChangeListener.java | 28 +++++----- .../controller/frm/flow/FlowProvider.java | 4 +- .../frm/flow/FlowTransactionValidator.java | 2 +- .../frm/group/GroupChangeListener.java | 26 +++++----- .../controller/frm/group/GroupProvider.java | 6 +-- .../frm/meter/MeterChangeListener.java | 28 +++++----- .../controller/frm/meter/MeterProvider.java | 4 +- .../inventory/manager/NodeChangeCommiter.java | 8 +-- .../api/AbstractBrokerAwareActivator.java | 36 ++++++------- .../sal/binding/api/BindingAwareConsumer.java | 16 +++--- .../sal/binding/api/BindingAwareProvider.java | 24 ++++----- .../sal/binding/api/BindingAwareService.java | 14 ++--- .../sal/binding/api/RpcConsumerRegistry.java | 4 +- .../api/mount/MountProviderInstance.java | 4 +- .../binding/api/rpc/RpcContextIdentifier.java | 6 +-- .../sal/binding/api/rpc/RpcRoutingTable.java | 8 +-- .../impl/BindingBrokerImplModuleFactory.java | 4 +- .../binding/codegen/RuntimeCodeGenerator.java | 12 ++--- .../binding/impl/RootBindingAwareBroker.java | 10 ++-- .../dom/BindingDomConnectorDeployer.java | 2 +- .../impl/forward/DomForwardingUtils.java | 2 +- .../sal/binding/spi/DelegateProxy.java | 2 +- .../binding/spi/remote/RemoteRpcRouter.java | 12 ++--- .../test/bugfix/UnionSerializationTest.java | 12 ++--- .../sal/binding/test/mock/BarListener.java | 2 +- .../sal/binding/test/mock/FooListener.java | 2 +- .../sal/binding/test/mock/FooService.java | 6 +-- .../bugfix/RpcRegistrationNullPointer.java | 6 +-- .../connect/dom/BrokerIntegrationTest.java | 4 +- .../dom/MessageCapturingFlowService.java | 8 +-- .../sal/common/api/RegistrationListener.java | 2 +- .../common/api/data/DataProvisionService.java | 4 +- .../notify/NotificationPublishService.java | 2 +- .../api/routing/MutableRoutingTable.java | 2 +- .../md/sal/common/api/routing/Route.java | 2 +- .../sal/common/api/routing/RoutingTable.java | 6 +-- .../impl/routing/AbstractDataReadRouter.java | 20 +++---- .../impl/service/DataChangeEventImpl.java | 6 +-- .../service/InitialDataChangeEventImpl.java | 18 +++---- .../util/CommitHandlerTransactions.java | 6 +-- .../controller/sal/common/util/RpcErrors.java | 10 ++-- .../compability/ToSalPropertyClassUtils.java | 20 +++---- .../connector/api/BindingAwareRpcRouter.java | 8 +-- .../api/BindingAwareZeroMqRpcRouter.java | 6 +-- .../sal/connector/api/Connector.java | 6 +-- .../sal/connector/api/RpcRouter.java | 20 +++---- .../sal/core/api/AbstractConsumer.java | 14 ++--- .../sal/core/api/BrokerService.java | 12 ++--- .../controller/sal/core/api/Consumer.java | 22 ++++---- .../controller/sal/core/api/Provider.java | 24 ++++----- .../sal/core/api/RpcConsumptionRegistry.java | 2 +- .../sal/core/api/RpcProvisionRegistry.java | 8 +-- .../sal/core/api/RpcRegistrationListener.java | 4 +- .../sal/core/api/RpcRoutingContext.java | 10 ++-- .../sal/core/api/data/DataBrokerService.java | 8 +-- .../core/api/data/DataProviderService.java | 16 +++--- .../sal/core/api/data/DataStore.java | 6 +-- .../sal/core/api/data/DataValidator.java | 10 ++-- .../core/api/notify/NotificationListener.java | 8 +-- .../notify/NotificationPublishService.java | 10 ++-- .../core/api/notify/NotificationService.java | 10 ++-- .../DomBrokerRuntimeMXBeanImpl.java | 6 +-- .../dom/store/impl/InMemoryDOMDataStore.java | 6 +-- .../impl/SnapshotBackedWriteTransaction.java | 12 ++--- .../sal/dom/broker/BrokerConfigActivator.java | 2 +- .../sal/dom/broker/DataBrokerImpl.java | 8 +-- .../sal/dom/broker/DataTransactionImpl.java | 8 +-- .../broker/osgi/DataBrokerServiceProxy.java | 4 +- .../broker/osgi/DataProviderServiceProxy.java | 2 +- .../dom/broker/spi/NotificationRouter.java | 2 +- .../sal/dom/broker/util/YangDataUtils.java | 6 +-- .../sal/dom/broker/util/YangSchemaUtils.java | 52 +++++++++---------- .../dom/store/impl/InMemoryDataStoreTest.java | 50 +++++++++--------- .../remote/rpc/ZeroMQServerModuleFactory.java | 2 +- .../remoterpc/dto/MessageWrapper.java | 2 +- .../zeromq/provider/ExampleProvider.java | 2 +- .../sample/zeromq/test/it/RouterTest.java | 4 +- .../sal/rest/api/RestconfService.java | 18 +++---- .../controller/sal/rest/impl/RestUtil.java | 12 ++--- .../sal/restconf/impl/EmptyNodeWrapper.java | 16 +++--- .../sal/restconf/impl/IdentityValuesDTO.java | 28 +++++----- .../sal/restconf/impl/NodeWrapper.java | 10 ++-- .../sal/restconf/impl/RestCodec.java | 10 ++-- .../sal/restconf/impl/SimpleNodeWrapper.java | 18 +++---- .../streams/listeners/ListenerAdapter.java | 50 +++++++++--------- .../sal/streams/listeners/Notificator.java | 16 +++--- .../websockets/WebSocketServerHandler.java | 8 +-- .../to/json/test/CnSnJsonChoiceCaseTest.java | 6 +-- .../to/json/test/CnSnToJsonLeafrefType.java | 4 +- .../test/CnSnInstanceIdentifierToXmlTest.java | 6 +-- ...SnToXmlWithDataFromSeveralModulesTest.java | 6 +-- .../sal/restconf/impl/test/DummyFuture.java | 20 +++---- .../impl/test/RestDeleteOperationTest.java | 4 +- .../sal/restconf/impl/test/TestUtils.java | 4 +- .../impl/test/structures/CompareLf.java | 2 +- .../test/XmlAugmentedElementToCnSnTest.java | 2 +- .../sal/rest/doc/impl/DocGeneratorTest.java | 2 +- .../manager/NodeStatisticsHandler.java | 18 +++---- .../manager/StatisticsProvider.java | 4 +- .../manager/StatisticsRequestScheduler.java | 20 +++---- .../topology/lldp/LLDPDiscoveryListener.java | 6 +-- .../topology/lldp/LLDPLinkAger.java | 10 ++-- .../lldp/utils/LLDPDiscoveryUtils.java | 8 +-- 109 files changed, 568 insertions(+), 568 deletions(-) diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java index 53257f8c83..a879a36f8c 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java @@ -261,11 +261,11 @@ public class FromSalConversionsUtils { .setType(etherType); targetEthMatchBuild.setEthernetType(ethType.build()); } - if((sourceMatch.getField(DL_SRC) != null && sourceMatch.getField(DL_SRC).getValue() != null) || - (sourceMatch.getField(DL_DST) != null && sourceMatch.getField(DL_DST).getValue() != null)|| + if((sourceMatch.getField(DL_SRC) != null && sourceMatch.getField(DL_SRC).getValue() != null) || + (sourceMatch.getField(DL_DST) != null && sourceMatch.getField(DL_DST).getValue() != null)|| dataLinkType != null ) { - return targetEthMatchBuild.build(); - } + return targetEthMatchBuild.build(); + } return null; } @@ -372,7 +372,7 @@ public class FromSalConversionsUtils { .toAddrString(inetDestAddress); layer4MatchBuild .setIpv4Destination(new Ipv4Prefix(inetDstAddressString)); - } + } return layer4MatchBuild.build(); } @@ -388,13 +388,13 @@ public class FromSalConversionsUtils { } if(inetDestAddress != null) { String inetDstAddressString = InetAddresses - .toAddrString(inetDestAddress); + .toAddrString(inetDestAddress); layer6MatchBuild .setIpv6Destination(new Ipv6Prefix(inetDstAddressString)); } return layer6MatchBuild.build(); } - + public static boolean flowEquals(Flow statsFlow, Flow storedFlow) { if (statsFlow.getClass() != storedFlow.getClass()) { return false; diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java index 74b94c7cba..4913c33c4d 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java @@ -585,7 +585,7 @@ public class ToSalConversionsUtils { } return macAddress; } - + public static byte[] bytesFromDpid(long dpid) { byte[] mac = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/NodeMappingTest.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/NodeMappingTest.java index b9a2f5bff0..041924af33 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/NodeMappingTest.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/NodeMappingTest.java @@ -45,7 +45,7 @@ public class NodeMappingTest { {(byte) 0x7f, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff}, {(byte) 0x76, (byte) 0x4a, (byte) 0xe9, (byte) 0xac, (byte) 0xe6, (byte) 0x5a} }; - + Assert.assertEquals(expectedMacs.length, nodeIds.length); for (int i = 0; i < expectedMacs.length; i++) { diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java index 71f2e94805..e1fd294d2f 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java @@ -155,9 +155,9 @@ public class TestToSalConversionsUtils { public void testToSalConversion() throws ConstructionException { FlowAddedBuilder odNodeFlowBuilder = new FlowAddedBuilder(); odNodeFlowBuilder = prepareOdFlowCommon(); - + Node node = new Node(NodeIDType.OPENFLOW,(long)1); - + Flow salFlow = ToSalConversionsUtils.toFlow(prepareOdFlow(odNodeFlowBuilder, MtchType.other), node); checkSalMatch(salFlow.getMatch(), MtchType.other); @@ -185,7 +185,7 @@ public class TestToSalConversionsUtils { private void checkSalMatch(org.opendaylight.controller.sal.match.Match match, MtchType mt) { switch (mt) { case other: - /*assertNotNull("DL_DST isn't equal.", "3C:A9:F4:00:E0:C8", + /*assertNotNull("DL_DST isn't equal.", "3C:A9:F4:00:E0:C8", new String((byte[]) match.getField(MatchType.DL_DST).getValue())); assertEquals("DL_SRC isn't equal.", "24:77:03:7C:C5:F1", new String((byte[]) match.getField(MatchType.DL_SRC).getValue())); @@ -431,14 +431,14 @@ public class TestToSalConversionsUtils { odActions.add(new ActionBuilder().setAction(setVlanPcpActionBuilder.build()).build()); odActions.add(new ActionBuilder().setAction(swPathActionBuilder.build()).build()); - + ApplyActionsCase innerInst = new ApplyActionsCaseBuilder().setApplyActions(new ApplyActionsBuilder().setAction(odActions).build()).build(); Instruction applyActions = new InstructionBuilder().setInstruction(innerInst).build(); List instructions = Collections.singletonList(applyActions ); InstructionsBuilder instBuilder = new InstructionsBuilder(); - + instBuilder.setInstruction(instructions); - + return instBuilder.build(); } @@ -492,7 +492,7 @@ public class TestToSalConversionsUtils { private void prepareActionSetNwDst(List odActions) { // test case for IPv4 - + SetNwDstActionBuilder setNwDstActionBuilderIpv4 = new SetNwDstActionBuilder(); setNwDstActionBuilderIpv4.setAddress(prapareIpv4Address("192.168.100.101")); odActions.add(new ActionBuilder().setAction(new SetNwDstActionCaseBuilder().setSetNwDstAction(setNwDstActionBuilderIpv4.build()).build()).build()); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/AbstractChangeListener.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/AbstractChangeListener.java index 426f4ba2d5..c8a7f01e13 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/AbstractChangeListener.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/AbstractChangeListener.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** - * + * * @author Vaclav Demcak * */ @@ -32,17 +32,17 @@ public abstract class AbstractChangeListener implements DataChangeListener { public void onDataChanged(DataChangeEvent, DataObject> changeEvent) { this.transactionId = this.newTransactionIdentifier().toString(); - final Set, DataObject>> createdEntries = + final Set, DataObject>> createdEntries = changeEvent.getCreatedConfigurationData().entrySet(); - final Set, DataObject>> updatedEntries = + final Set, DataObject>> updatedEntries = new HashSet, DataObject>>(); - Set, DataObject>> updateConfigEntrySet = + Set, DataObject>> updateConfigEntrySet = changeEvent.getUpdatedConfigurationData().entrySet(); updatedEntries.addAll(updateConfigEntrySet); updatedEntries.removeAll(createdEntries); - final Set> removeEntriesInstanceIdentifiers = + final Set> removeEntriesInstanceIdentifiers = changeEvent.getRemovedConfigurationData(); for (final Entry, DataObject> createdEntry : createdEntries) { @@ -52,7 +52,7 @@ public abstract class AbstractChangeListener implements DataChangeListener { } for (final Entry, DataObject> updatedEntrie : updatedEntries) { - Map, DataObject> origConfigData = + Map, DataObject> origConfigData = changeEvent.getOriginalConfigurationData(); InstanceIdentifier u_key = updatedEntrie.getKey(); @@ -62,7 +62,7 @@ public abstract class AbstractChangeListener implements DataChangeListener { } for (final InstanceIdentifier instanceId : removeEntriesInstanceIdentifiers) { - Map, DataObject> origConfigData = + Map, DataObject> origConfigData = changeEvent.getOriginalConfigurationData(); final DataObject removeValue = origConfigData.get(instanceId); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java index 929c489eaf..2f986ea5bc 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -24,10 +24,10 @@ public class FRMActivator extends AbstractBindingAwareProvider { private final static Logger LOG = LoggerFactory.getLogger(FRMActivator.class); - private static FlowProvider flowProvider = new FlowProvider(); + private static FlowProvider flowProvider = new FlowProvider(); private static GroupProvider groupProvider = new GroupProvider(); private static MeterProvider meterProvider = new MeterProvider(); - + @Override public void onSessionInitiated(final ProviderContext session) { DataProviderService flowSalService = session.getSALService(DataProviderService.class); @@ -46,7 +46,7 @@ public class FRMActivator extends AbstractBindingAwareProvider { FRMActivator.meterProvider.setSalMeterService(rpcMeterSalService); FRMActivator.meterProvider.start(); } - + @Override protected void stopImpl(final BundleContext context) { try { diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowChangeListener.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowChangeListener.java index df086c7acc..b60424513f 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowChangeListener.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowChangeListener.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * + * * @author Vaclav Demcak * */ @@ -45,7 +45,7 @@ public class FlowChangeListener extends AbstractChangeListener { public SalFlowService getSalFlowService() { return this.salFlowService; } - + public FlowChangeListener(final SalFlowService manager) { this.salFlowService = manager; } @@ -58,16 +58,16 @@ public class FlowChangeListener extends AbstractChangeListener { @Override protected void remove(InstanceIdentifier identifier, DataObject removeDataObj) { if ((removeDataObj instanceof Flow)) { - + final Flow flow = ((Flow) removeDataObj); final InstanceIdentifier tableInstanceId = identifier.
firstIdentifierOf(Table.class); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final RemoveFlowInputBuilder builder = new RemoveFlowInputBuilder(flow); - + builder.setFlowRef(new FlowRef(identifier)); builder.setNode(new NodeRef(nodeInstanceId)); builder.setFlowTable(new FlowTableRef(tableInstanceId)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); this.salFlowService.removeFlow((RemoveFlowInput) builder.build()); @@ -78,21 +78,21 @@ public class FlowChangeListener extends AbstractChangeListener { @Override protected void update(InstanceIdentifier identifier, DataObject original, DataObject update) { if (original instanceof Flow && update instanceof Flow) { - + final Flow originalFlow = ((Flow) original); final Flow updatedFlow = ((Flow) update); final InstanceIdentifier nodeInstanceId = identifier.firstIdentifierOf(Node.class); final UpdateFlowInputBuilder builder = new UpdateFlowInputBuilder(); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setFlowRef(new FlowRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); - + builder.setUpdatedFlow((UpdatedFlow) (new UpdatedFlowBuilder(updatedFlow)).build()); builder.setOriginalFlow((OriginalFlow) (new OriginalFlowBuilder(originalFlow)).build()); - + this.salFlowService.updateFlow((UpdateFlowInput) builder.build()); LOG.debug("Transaction {} - Update Flow has updated flow {} with {}", new Object[]{uri, original, update}); } @@ -101,16 +101,16 @@ public class FlowChangeListener extends AbstractChangeListener { @Override protected void add(InstanceIdentifier identifier, DataObject addDataObj) { if ((addDataObj instanceof Flow)) { - + final Flow flow = ((Flow) addDataObj); final InstanceIdentifier
tableInstanceId = identifier.
firstIdentifierOf(Table.class); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final AddFlowInputBuilder builder = new AddFlowInputBuilder(flow); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setFlowRef(new FlowRef(identifier)); builder.setFlowTable(new FlowTableRef(tableInstanceId)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); this.salFlowService.addFlow((AddFlowInput) builder.build()); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowProvider.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowProvider.java index afdd628bbb..33db529598 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowProvider.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -42,7 +42,7 @@ public class FlowProvider implements AutoCloseable { InstanceIdentifierBuilder
tableChild = augmentFlowCapNode.
child(Table.class); InstanceIdentifierBuilder flowChild = tableChild. child(Flow.class); final InstanceIdentifier flowDataObjectPath = flowChild.toInstance(); - + /* DataChangeListener registration */ this.flowDataChangeListener = new FlowChangeListener(this.salFlowService); this.flowDataChangeListenerRegistration = this.dataService.registerDataChangeListener(flowDataObjectPath, flowDataChangeListener); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowTransactionValidator.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowTransactionValidator.java index 4ef93a55e9..9cd42466a6 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowTransactionValidator.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/flow/FlowTransactionValidator.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupChangeListener.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupChangeListener.java index 1260f0ec53..54f12bfdcf 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupChangeListener.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupChangeListener.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * + * * @author Vaclav Demcak * */ @@ -43,7 +43,7 @@ public class GroupChangeListener extends AbstractChangeListener { public SalGroupService getSalGroupService() { return this.salGroupService; } - + public GroupChangeListener(final SalGroupService manager) { this.salGroupService = manager; } @@ -56,14 +56,14 @@ public class GroupChangeListener extends AbstractChangeListener { @Override protected void remove(InstanceIdentifier identifier, DataObject removeDataObj) { if ((removeDataObj instanceof Group)) { - + final Group group = ((Group) removeDataObj); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final RemoveGroupInputBuilder builder = new RemoveGroupInputBuilder(group); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setGroupRef(new GroupRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); this.salGroupService.removeGroup((RemoveGroupInput) builder.build()); @@ -74,21 +74,21 @@ public class GroupChangeListener extends AbstractChangeListener { @Override protected void update(InstanceIdentifier identifier, DataObject original, DataObject update) { if (original instanceof Group && update instanceof Group) { - + final Group originalGroup = ((Group) original); final Group updatedGroup = ((Group) update); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final UpdateGroupInputBuilder builder = new UpdateGroupInputBuilder(); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setGroupRef(new GroupRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); - + builder.setUpdatedGroup((UpdatedGroup) (new UpdatedGroupBuilder(updatedGroup)).build()); builder.setOriginalGroup((OriginalGroup) (new OriginalGroupBuilder(originalGroup)).build()); - + this.salGroupService.updateGroup((UpdateGroupInput) builder.build()); LOG.debug("Transaction {} - Update Group has updated group {} with group {}", new Object[]{uri, original, update}); } @@ -100,10 +100,10 @@ public class GroupChangeListener extends AbstractChangeListener { final Group group = ((Group) addDataObj); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final AddGroupInputBuilder builder = new AddGroupInputBuilder(group); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setGroupRef(new GroupRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); this.salGroupService.addGroup((AddGroupInput) builder.build()); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupProvider.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupProvider.java index 14b1b6f2fd..9f2806e929 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupProvider.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/group/GroupProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -46,11 +46,11 @@ public class GroupProvider implements AutoCloseable { this.groupDataChangeListenerRegistration = this.dataService.registerDataChangeListener(groupDataObjectPath, groupDataChangeListener); LOG.info("Group Config Provider started."); } - + protected DataModificationTransaction startChange() { return this.dataService.beginTransaction(); } - + public void close() throws Exception { if(groupDataChangeListenerRegistration != null){ groupDataChangeListenerRegistration.close(); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterChangeListener.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterChangeListener.java index 839e556fbc..48d5257978 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterChangeListener.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterChangeListener.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * + * * @author Vaclav Demcak * */ @@ -43,7 +43,7 @@ public class MeterChangeListener extends AbstractChangeListener { public SalMeterService getSalMeterService() { return this.salMeterService; } - + public MeterChangeListener(final SalMeterService manager) { this.salMeterService = manager; } @@ -56,14 +56,14 @@ public class MeterChangeListener extends AbstractChangeListener { @Override protected void remove(InstanceIdentifier identifier, DataObject removeDataObj) { if ((removeDataObj instanceof Meter)) { - + final Meter meter = ((Meter) removeDataObj); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final RemoveMeterInputBuilder builder = new RemoveMeterInputBuilder(meter); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setMeterRef(new MeterRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); this.salMeterService.removeMeter((RemoveMeterInput) builder.build()); @@ -74,21 +74,21 @@ public class MeterChangeListener extends AbstractChangeListener { @Override protected void update(InstanceIdentifier identifier, DataObject original, DataObject update) { if (original instanceof Meter && update instanceof Meter) { - + final Meter originalMeter = ((Meter) original); final Meter updatedMeter = ((Meter) update); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final UpdateMeterInputBuilder builder = new UpdateMeterInputBuilder(); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setMeterRef(new MeterRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); - + builder.setUpdatedMeter((UpdatedMeter) (new UpdatedMeterBuilder(updatedMeter)).build()); builder.setOriginalMeter((OriginalMeter) (new OriginalMeterBuilder(originalMeter)).build()); - + this.salMeterService.updateMeter((UpdateMeterInput) builder.build()); LOG.debug("Transaction {} - Update Meter has updated meter {} with {}", new Object[]{uri, original, update}); } @@ -97,14 +97,14 @@ public class MeterChangeListener extends AbstractChangeListener { @Override protected void add(InstanceIdentifier identifier, DataObject addDataObj) { if ((addDataObj instanceof Meter)) { - + final Meter meter = ((Meter) addDataObj); final InstanceIdentifier nodeInstanceId = identifier. firstIdentifierOf(Node.class); final AddMeterInputBuilder builder = new AddMeterInputBuilder(meter); - + builder.setNode(new NodeRef(nodeInstanceId)); builder.setMeterRef(new MeterRef(identifier)); - + Uri uri = new Uri(this.getTransactionId()); builder.setTransactionUri(uri); this.salMeterService.addMeter((AddMeterInput) builder.build()); diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterProvider.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterProvider.java index 620801fba5..8596c3fec6 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterProvider.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/meter/MeterProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2014 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 @@ -46,7 +46,7 @@ public class MeterProvider implements AutoCloseable { this.meterDataChangeListenerRegistration = this.dataService.registerDataChangeListener(meterDataObjectPath, meterDataChangeListener); LOG.info("Meter Config Provider started."); } - + protected DataModificationTransaction startChange() { return this.dataService.beginTransaction(); } diff --git a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java index 2a3d8fd37e..674ae398d3 100644 --- a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java +++ b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java @@ -126,7 +126,7 @@ public class NodeChangeCommiter implements OpendaylightInventoryListener { Future> commitResult = it.commit(); listenOnTransactionState(it.getIdentifier(), commitResult, "node update", ref.getValue()); } - + /** * @param txId transaction identificator * @param future transaction result @@ -136,13 +136,13 @@ public class NodeChangeCommiter implements OpendaylightInventoryListener { private static void listenOnTransactionState(final Object txId, Future> future, final String action, final InstanceIdentifier nodeConnectorPath) { Futures.addCallback(JdkFutureAdapters.listenInPoolThread(future),new FutureCallback>() { - + @Override public void onFailure(Throwable t) { LOG.error("Action {} [{}] failed for Tx:{}", action, nodeConnectorPath, txId, t); - + } - + @Override public void onSuccess(RpcResult result) { if(!result.isSuccessful()) { 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-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java index 23ae4cd532..b54461c7c1 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java @@ -9,7 +9,7 @@ package org.opendaylight.controller.sal.binding.test.bugfix; public class RpcRegistrationNullPointer { - - - + + + } diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java index 1480f0c610..6d0226849f 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java @@ -78,14 +78,14 @@ public class BrokerIntegrationTest extends AbstractDataServiceTest { /** * We create transaction no 2 - * + * */ DataModificationTransaction removalTransaction = baDataService.beginTransaction(); assertNotNull(transaction); /** * We remove node 1 - * + * */ removalTransaction.removeConfigurationData(node1.getValue()); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java index cfdab37651..df287791ef 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java @@ -114,16 +114,16 @@ public class MessageCapturingFlowService implements SalFlowService, AutoCloseabl registration.unregisterPath(context, path); return this; } - + public static MessageCapturingFlowService create() { return new MessageCapturingFlowService(); } - + public static MessageCapturingFlowService create(RpcProviderRegistry registry) { MessageCapturingFlowService ret = new MessageCapturingFlowService(); ret.registerTo(registry); return ret; } - - + + } 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-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java b/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java index ff9f037f5a..670a7c8f22 100644 --- a/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java +++ b/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java @@ -14,36 +14,36 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No public class ToSalPropertyClassUtils { public static Bandwidth salAdvertisedBandwidthFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); + FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); PortFeatures portFeatures = flowCapNodeConn.getAdvertisedFeatures(); return new AdvertisedBandwidth(resolveBandwidth(portFeatures)); } public static Bandwidth salPeerBandwidthFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); + FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); PortFeatures portFeatures = flowCapNodeConn.getPeerFeatures(); return new PeerBandwidth(resolveBandwidth(portFeatures)); } public static Bandwidth salSupportedBandwidthFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); + FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); PortFeatures portFeatures = flowCapNodeConn.getSupported(); return new SupportedBandwidth(resolveBandwidth(portFeatures)); } public static MacAddress salMacAddressFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); + FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); String hwAddress = flowCapNodeConn.getHardwareAddress().getValue(); - return new MacAddress(bytesFrom(hwAddress)); + return new MacAddress(bytesFrom(hwAddress)); } - - + + public static Name salNameFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); + FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); return new Name(flowCapNodeConn.getName()); } - - + + private static byte[] bytesFrom(String hwAddress) { String[] mac = hwAddress.split(":"); diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java index a1d573db08..cf59eb4a90 100644 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java +++ b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/BindingAwareRpcRouter.java @@ -53,8 +53,8 @@ public interface BindingAwareRpcRouter extends RpcRouter> receivedRequest(RpcRequest input) { - + return mdSalRouter.sendRpc(input); } diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java index efa24d099f..519d21bf4f 100644 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java +++ b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java @@ -15,11 +15,11 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; public interface Connector extends RpcImplementation, NotificationListener { - - + + Set getConfigurationPrefixes(); Set getRuntimePrefixes(); - + void registerListener(ConnectorListener listener); void unregisterListener(ConnectorListener listener); } diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java index f161644f6d..fa4c8048fa 100644 --- a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java +++ b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/RpcRouter.java @@ -10,7 +10,7 @@ package org.opendaylight.controller.sal.connector.api; import java.util.concurrent.Future; /** - * + * * @author ttkacik * * @param Routing Context Identifier @@ -20,14 +20,14 @@ import java.util.concurrent.Future; */ public interface RpcRouter { - - + + Future> sendRpc(RpcRequest input); - - + + /** - * - * @author + * + * @author * * @param Routing Context Identifier * @param Route Type @@ -39,14 +39,14 @@ public interface RpcRouter { RouteIdentifier getRoutingInformation(); D getPayload(); } - + public interface RouteIdentifier { - + C getContext(); // defines a routing table (e.g. NodeContext) T getType(); // rpc type R getRoute(); // e.g. (node identity) } - + public interface RpcReply { D getPayload(); } 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 { diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModuleFactory.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModuleFactory.java index c8d6806344..0c2a370e06 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModuleFactory.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModuleFactory.java @@ -24,7 +24,7 @@ public class ZeroMQServerModuleFactory extends org.opendaylight.controller.confi 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-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/MessageWrapper.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/MessageWrapper.java index 8d2198c365..85f4113663 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/MessageWrapper.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/MessageWrapper.java @@ -16,7 +16,7 @@ public class MessageWrapper { private Message _message; private ZMQ.Socket _receiveSocket; - + public MessageWrapper(Message message, ZMQ.Socket receiveSocket) { this._message = message; this._receiveSocket = receiveSocket; diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/src/main/java/org/opendaylight/controller/sample/zeromq/provider/ExampleProvider.java b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/src/main/java/org/opendaylight/controller/sample/zeromq/provider/ExampleProvider.java index e33011b92b..5703799bb5 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/src/main/java/org/opendaylight/controller/sample/zeromq/provider/ExampleProvider.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/src/main/java/org/opendaylight/controller/sample/zeromq/provider/ExampleProvider.java @@ -91,7 +91,7 @@ public class ExampleProvider extends AbstractProvider implements RpcImplementati } return false; } - + // Adds a child SimpleNode containing the value "success" to the input CompositeNode private CompositeNode addSuccessNode(CompositeNode input) { List> list = new ArrayList>(input.getChildren()); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java index 5ee982009e..30f8fd4ed1 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java @@ -67,7 +67,7 @@ public class RouterTest { @Inject @Filter(timeout=60*1000) Broker broker; - + private ZMQ.Context zmqCtx = ZMQ.context(1); //private Server router; //private ExampleProvider provider; @@ -336,7 +336,7 @@ public class RouterTest { return msg; } - + private void printState(){ Bundle[] b = ctx.getBundles(); _logger.debug("\n\nNumber of bundles [{}]\n\n]", b.length); diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java index 067b7d96ec..4d9b198795 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java @@ -31,12 +31,12 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; *
    *
  • /restconf - {@link #getRoot()} *
      - *
    • /config - {@link #readConfigurationData(String)} + *
    • /config - {@link #readConfigurationData(String)} * {@link #updateConfigurationData(String, CompositeNode)} * {@link #createConfigurationData(CompositeNode)} * {@link #createConfigurationData(String, CompositeNode)} * {@link #deleteConfigurationData(String)} - *
    • /operational - {@link #readOperationalData(String)} + *
    • /operational - {@link #readOperationalData(String)} *
    • /modules - {@link #getModules()} *
        *
      • /module @@ -95,41 +95,41 @@ public interface RestconfService { Draft02.MediaTypes.DATA+JSON, Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public StructuredData invokeRpc(@Encoded @PathParam("identifier") String identifier, CompositeNode payload); - + @POST @Path("/operations/{identifier:.+}") @Produces({Draft02.MediaTypes.OPERATION+JSON, Draft02.MediaTypes.OPERATION+XML, Draft02.MediaTypes.DATA+JSON, Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public StructuredData invokeRpc(@Encoded @PathParam("identifier") String identifier, @DefaultValue("") String noPayload); - + @GET @Path("/config/{identifier:.+}") - @Produces({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, + @Produces({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public StructuredData readConfigurationData(@Encoded @PathParam("identifier") String identifier); @GET @Path("/operational/{identifier:.+}") - @Produces({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, + @Produces({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public StructuredData readOperationalData(@Encoded @PathParam("identifier") String identifier); @PUT @Path("/config/{identifier:.+}") - @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, + @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public Response updateConfigurationData(@Encoded @PathParam("identifier") String identifier, CompositeNode payload); @POST @Path("/config/{identifier:.+}") - @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, + @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public Response createConfigurationData(@Encoded @PathParam("identifier") String identifier, CompositeNode payload); @POST @Path("/config") - @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, + @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) public Response createConfigurationData(CompositeNode payload); diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestUtil.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestUtil.java index ba3e315e72..290d976b28 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestUtil.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestUtil.java @@ -20,7 +20,7 @@ import org.opendaylight.controller.sal.restconf.impl.IdentityValuesDTO.Predicate import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public final class RestUtil { - + public static final String SQUOTE = "'"; public static final String DQUOTE = "\""; private static final Pattern PREDICATE_PATTERN = Pattern.compile("\\[(.*?)\\]"); @@ -45,29 +45,29 @@ public final class RestUtil { IdentityValuesDTO identityValuesDTO = new IdentityValuesDTO(value); for (int i = 1; i < xPathParts.length; i++) { String xPathPartTrimmed = xPathParts[i].trim(); - + String xPathPartStr = getIdAndPrefixAsStr(xPathPartTrimmed); IdentityValue identityValue = toIdentity(xPathPartStr, prefixMap); if (identityValue == null) { return null; } - + List predicates = toPredicates(xPathPartTrimmed, prefixMap); if (predicates == null) { return null; } identityValue.setPredicates(predicates); - + identityValuesDTO.add(identityValue); } return identityValuesDTO.getValuesWithNamespaces().isEmpty() ? null : identityValuesDTO; } - + private static String getIdAndPrefixAsStr(String pathPart) { int predicateStartIndex = pathPart.indexOf("["); return predicateStartIndex == -1 ? pathPart : pathPart.substring(0, predicateStartIndex); } - + private static IdentityValue toIdentity(String xPathPart, PrefixesMaping prefixMap) { String xPathPartTrimmed = xPathPart.trim(); if (xPathPartTrimmed.isEmpty()) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/EmptyNodeWrapper.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/EmptyNodeWrapper.java index f7f70e8d87..934d4434c3 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/EmptyNodeWrapper.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/EmptyNodeWrapper.java @@ -18,9 +18,9 @@ import org.opendaylight.yangtools.yang.data.impl.NodeFactory; import com.google.common.base.Preconditions; public final class EmptyNodeWrapper implements NodeWrapper>, Node { - + private Node unwrapped; - + private String localName; private URI namespace; private QName name; @@ -30,27 +30,27 @@ public final class EmptyNodeWrapper implements NodeWrapper>, Node public boolean isComposite() { return composite; } - + public void setComposite(boolean composite) { this.composite = composite; } - + public EmptyNodeWrapper(URI namespace, String localName) { this.localName = Preconditions.checkNotNull(localName); this.namespace = namespace; } - + @Override public void setQname(QName name) { Preconditions.checkState(unwrapped == null, "Cannot change the object, due to data inconsistencies."); this.name = name; } - + @Override public QName getQname() { return name; } - + @Override public String getLocalName() { if (unwrapped != null) { @@ -58,7 +58,7 @@ public final class EmptyNodeWrapper implements NodeWrapper>, Node } return localName; } - + @Override public URI getNamespace() { if (unwrapped != null) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java index 14a558967d..d66e1610a5 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/IdentityValuesDTO.java @@ -20,11 +20,11 @@ public final class IdentityValuesDTO { elementData.add(new IdentityValue(namespace, value, prefix)); this.originValue = originValue; } - + public IdentityValuesDTO(String originValue) { this.originValue = originValue; } - + public IdentityValuesDTO() { originValue = null; } @@ -32,21 +32,21 @@ public final class IdentityValuesDTO { public void add(String namespace, String value, String prefix) { elementData.add(new IdentityValue(namespace, value, prefix)); } - + public void add(IdentityValue identityValue) { elementData.add(identityValue); } - + public List getValuesWithNamespaces() { return Collections.unmodifiableList(elementData); } - + @Override public String toString() { return elementData.toString(); } - + public String getOriginValue() { return originValue; } @@ -86,7 +86,7 @@ public final class IdentityValuesDTO { public void setPredicates(List predicates) { this.predicates = predicates; } - + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -110,22 +110,22 @@ public final class IdentityValuesDTO { } } - + public static final class Predicate { - + private final IdentityValue name; private final String value; - + public Predicate(IdentityValue name, String value) { super(); this.name = name; this.value = value; } - + public IdentityValue getName() { return name; } - + public String getValue() { return value; } @@ -141,10 +141,10 @@ public final class IdentityValuesDTO { } return sb.toString(); } - + public boolean isLeafList() { return name == null ? true : false; } - + } } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/NodeWrapper.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/NodeWrapper.java index f9bd7d7aaa..48fd1a3dfc 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/NodeWrapper.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/NodeWrapper.java @@ -15,16 +15,16 @@ import org.opendaylight.yangtools.yang.data.api.Node; public interface NodeWrapper> { void setQname(QName name); - + QName getQname(); - + T unwrap(); - + boolean isChangeAllowed(); - + URI getNamespace(); void setNamespace(URI namespace); - + String getLocalName(); } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestCodec.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestCodec.java index 42658d79f1..265cc5db45 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestCodec.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestCodec.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RestCodec { - + private static final Logger logger = LoggerFactory.getLogger(RestCodec.class); private RestCodec() { @@ -180,7 +180,7 @@ public class RestCodec { logger.info("Idenetityref will be translated as NULL for data - {}", String.valueOf(valueWithNamespace)); return null; } - + return QName.create(module.getNamespace(), module.getRevision(), valueWithNamespace.getValue()); } @@ -292,7 +292,7 @@ public class RestCodec { } } } - + return result.isEmpty() ? null : new InstanceIdentifier(result); } @@ -312,7 +312,7 @@ public class RestCodec { return null; } } - + private static Module getModuleByNamespace(String namespace, MountInstance mountPoint) { URI validNamespace = resolveValidNamespace(namespace, mountPoint); @@ -328,7 +328,7 @@ public class RestCodec { } return module; } - + private static URI resolveValidNamespace(String namespace, MountInstance mountPoint) { URI validNamespace; if (mountPoint != null) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java index 4d22bfa73a..3131668ed9 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java @@ -19,9 +19,9 @@ import org.opendaylight.yangtools.yang.data.impl.NodeFactory; import com.google.common.base.Preconditions; public final class SimpleNodeWrapper implements NodeWrapper>, SimpleNode { - + private SimpleNode simpleNode; - + private String localName; private Object value; private URI namespace; @@ -31,23 +31,23 @@ public final class SimpleNodeWrapper implements NodeWrapper>, Simp this.localName = Preconditions.checkNotNull(localName); this.value = value; } - + public SimpleNodeWrapper(URI namespace, String localName, Object value) { this(localName, value); this.namespace = namespace; } - + @Override public void setQname(QName name) { Preconditions.checkState(simpleNode == null, "Cannot change the object, due to data inconsistencies."); this.name = name; } - + @Override public QName getQname() { return name; } - + @Override public String getLocalName() { if (simpleNode != null) { @@ -55,7 +55,7 @@ public final class SimpleNodeWrapper implements NodeWrapper>, Simp } return localName; } - + @Override public URI getNamespace() { if (simpleNode != null) { @@ -83,7 +83,7 @@ public final class SimpleNodeWrapper implements NodeWrapper>, Simp name = new QName(namespace, localName); } simpleNode = NodeFactory.createImmutableSimpleNode(name, null, value); - + value = null; namespace = null; localName = null; @@ -126,7 +126,7 @@ public final class SimpleNodeWrapper implements NodeWrapper>, Simp public Object setValue(Object value) { return unwrap().setValue(value); } - + } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/ListenerAdapter.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/ListenerAdapter.java index f2a0d48e0a..15e4887ab8 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/ListenerAdapter.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/ListenerAdapter.java @@ -80,7 +80,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Creates new {@link ListenerAdapter} listener specified by path and stream * name. - * + * * @param path * Path to data in data store. * @param streamName @@ -157,7 +157,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Creates new event specified by {@link EventType} type. - * + * * @param type * EventType */ @@ -167,7 +167,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Gets the {@link Channel} subscriber. - * + * * @return Channel */ public Channel getSubscriber() { @@ -176,7 +176,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Sets subscriber for event. - * + * * @param subscriber * Channel */ @@ -186,7 +186,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Gets event data. - * + * * @return String representation of event data. */ public String getData() { @@ -195,7 +195,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Sets event data. - * + * * @param String * data. */ @@ -205,7 +205,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Gets event type. - * + * * @return The type of the event. */ public EventType getType() { @@ -222,7 +222,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Prepare data in printable form and transform it to String. - * + * * @param change * DataChangeEvent * @return Data in printable form. @@ -270,7 +270,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Formats data specified by RFC3339. - * + * * @param d * Date * @return Data specified by RFC3339. @@ -281,7 +281,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Creates {@link Document} document. - * + * * @return {@link Document} document. */ private Document createDocument() { @@ -298,7 +298,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Adds values to data changed notification event element. - * + * * @param doc * {@link Document} * @param dataChangedNotificationEventElement @@ -336,7 +336,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Adds values from data to element. - * + * * @param doc * {@link Document} * @param data @@ -363,7 +363,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Adds values from data to element. - * + * * @param doc * {@link Document} * @param data @@ -390,7 +390,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Creates changed event element from data. - * + * * @param doc * {@link Document} * @param path @@ -433,7 +433,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Translates {@link CompositeNode} data to XML format. - * + * * @param path * Path to data in data store. * @param data @@ -462,7 +462,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Adds path as value to element. - * + * * @param path * Path to data in data store. * @param element @@ -504,7 +504,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Writes identifier that consists of prefix and QName. - * + * * @param element * {@link Element} * @param textContent @@ -536,7 +536,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Generates new prefix which consists of four random characters . - * + * * @param prefixes * Collection of prefixes. * @return New prefix which consists of four random characters . @@ -557,7 +557,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Gets path pointed to data in data store. - * + * * @return Path pointed to data in data store. */ public InstanceIdentifier getPath() { @@ -566,7 +566,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Sets {@link ListenerRegistration} registration. - * + * * @param registration * ListenerRegistration */ @@ -577,7 +577,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Gets the name of the stream. - * + * * @return The name of the stream. */ public String getStreamName() { @@ -597,7 +597,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Checks if {@link ListenerRegistration} registration exist. - * + * * @return True if exist, false otherwise. */ public boolean isListening() { @@ -607,7 +607,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Creates event of type {@link EventType#REGISTER}, set {@link Channel} * subscriber to the event and post event into event bus. - * + * * @param subscriber * Channel */ @@ -624,7 +624,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Creates event of type {@link EventType#DEREGISTER}, sets {@link Channel} * subscriber to the event and posts event into event bus. - * + * * @param subscriber */ public void removeSubscriber(Channel subscriber) { @@ -636,7 +636,7 @@ public class ListenerAdapter implements DataChangeListener { /** * Checks if exists at least one {@link Channel} subscriber. - * + * * @return True if exist at least one {@link Channel} subscriber, false * otherwise. */ diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java index 6f154f8aff..75e22ed88e 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java @@ -37,7 +37,7 @@ public class Notificator { /** * Gets {@link ListenerAdapter} specified by stream name. - * + * * @param streamName * The name of the stream. * @return {@link ListenerAdapter} specified by stream name. @@ -49,7 +49,7 @@ public class Notificator { /** * Gets {@link ListenerAdapter} listener specified by * {@link InstanceIdentifier} path. - * + * * @param path * Path to data in data repository. * @return ListenerAdapter @@ -61,7 +61,7 @@ public class Notificator { /** * Checks if the listener specified by {@link InstanceIdentifier} path * exist. - * + * * @param path * Path to data in data repository. * @return True if the listener exist, false otherwise. @@ -73,7 +73,7 @@ public class Notificator { /** * Creates new {@link ListenerAdapter} listener from * {@link InstanceIdentifier} path and stream name. - * + * * @param path * Path to data in data repository. * @param streamName @@ -97,7 +97,7 @@ public class Notificator { /** * Looks for listener determined by {@link InstanceIdentifier} path and * removes it. - * + * * @param path * InstanceIdentifier */ @@ -109,7 +109,7 @@ public class Notificator { /** * Creates String representation of stream name from URI. Removes slash from * URI in start and end position. - * + * * @param uri * URI for creation stream name. * @return String representation of stream name. @@ -150,7 +150,7 @@ public class Notificator { /** * Checks if listener has at least one subscriber. In case it doesn't have any, delete * listener. - * + * * @param listener * ListenerAdapter */ @@ -163,7 +163,7 @@ public class Notificator { /** * Delete {@link ListenerAdapter} listener specified in parameter. - * + * * @param listener * ListenerAdapter */ diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServerHandler.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServerHandler.java index bf899a0b25..1918503c58 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServerHandler.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServerHandler.java @@ -58,7 +58,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler /** * Checks if HTTP request method is GET and if is possible to decode HTTP * result of request. - * + * * @param ctx * ChannelHandlerContext * @param req @@ -107,7 +107,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler /** * Checks response status, send response and close connection if necessary - * + * * @param ctx * ChannelHandlerContext * @param req @@ -135,7 +135,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler /** * Handles web socket frame. - * + * * @param ctx * {@link ChannelHandlerContext} * @param frame @@ -174,7 +174,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler /** * Get web socket location from HTTP request. - * + * * @param req * HTTP request from which the location will be returned * @return String representation of web socket location. diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnJsonChoiceCaseTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnJsonChoiceCaseTest.java index 8abf366bf7..21590ecb33 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnJsonChoiceCaseTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnJsonChoiceCaseTest.java @@ -32,7 +32,7 @@ public class CnSnJsonChoiceCaseTest extends YangAndXmlAndDataSchemaLoader { * Test when some data are in one case node and other in another. This isn't * correct. Next Json validator should return error because nodes has to be * from one case below concrete choice. - * + * */ @Test public void nodeSchemasOnVariousChoiceCasePathTest() { @@ -44,7 +44,7 @@ public class CnSnJsonChoiceCaseTest extends YangAndXmlAndDataSchemaLoader { * Additionally data are loadef from various choices. This isn't correct. * Next Json validator should return error because nodes has to be from one * case below concrete choice. - * + * */ @Test public void nodeSchemasOnVariousChoiceCasePathAndMultipleChoicesTest() { @@ -95,7 +95,7 @@ public class CnSnJsonChoiceCaseTest extends YangAndXmlAndDataSchemaLoader { } /** - * + * */ @Test public void nodeSchemasInMultipleChoicesTest() { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java index 12555bc9a2..21a46a6cc3 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonLeafrefType.java @@ -25,9 +25,9 @@ import org.opendaylight.controller.sal.restconf.impl.test.YangAndXmlAndDataSchem import org.opendaylight.yangtools.yang.data.api.CompositeNode; /** - * + * * All tests are commented now because leafref isn't supported now - * + * */ public class CnSnToJsonLeafrefType extends YangAndXmlAndDataSchemaLoader { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnInstanceIdentifierToXmlTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnInstanceIdentifierToXmlTest.java index 92de14bba4..086e648097 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnInstanceIdentifierToXmlTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnInstanceIdentifierToXmlTest.java @@ -25,14 +25,14 @@ import org.opendaylight.controller.sal.restconf.impl.test.YangAndXmlAndDataSchem import org.opendaylight.yangtools.yang.data.api.CompositeNode; /** - * + * * CnSn = Composite node and Simple node data structure Class contains test of * serializing simple nodes data values according data types from YANG schema to * XML file - * + * */ public class CnSnInstanceIdentifierToXmlTest extends YangAndXmlAndDataSchemaLoader { - + @BeforeClass public static void initialization() throws URISyntaxException { dataLoad("/instanceidentifier/yang", 4, "instance-identifier-module", "cont"); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java index b7a58886dc..402a3870a5 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java @@ -60,8 +60,8 @@ public class CnSnToXmlWithDataFromSeveralModulesTest extends YangAndXmlAndDataSc regex.append(".*"); - - + + regex.append(".*"); regex.append(".*xmlns=\"module:one\""); regex.append(".*>"); @@ -97,7 +97,7 @@ public class CnSnToXmlWithDataFromSeveralModulesTest extends YangAndXmlAndDataSc SimpleNodeWrapper lf1_m1 = new SimpleNodeWrapper(uriModule1, "lf1_m1", "lf1 m1 value"); cont_m1.addValue(lf1_m1); CompositeNodeWrapper contB_m1 = new CompositeNodeWrapper(uriModule1, "contB_m1"); - + data.addValue(contB_m1); data.addValue(cont_m1); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java index 67b5b8c93a..f6664ed34d 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java @@ -13,26 +13,26 @@ import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.yangtools.yang.common.RpcResult; public class DummyFuture implements Future> { - + private final boolean cancel; private final boolean isCancelled; private final boolean isDone; private final RpcResult result; - + public DummyFuture() { cancel = false; isCancelled = false; isDone = false; result = null; } - + private DummyFuture(Builder builder) { cancel = builder.cancel; isCancelled = builder.isCancelled; isDone = builder.isDone; result = builder.result; } - + public static Builder builder() { return new DummyFuture.Builder(); } @@ -62,9 +62,9 @@ public class DummyFuture implements Future> { ExecutionException, TimeoutException { return result; } - + public static class Builder { - + private boolean cancel; private boolean isCancelled; private boolean isDone; @@ -74,22 +74,22 @@ public class DummyFuture implements Future> { this.cancel = cancel; return this; } - + public Builder isCancelled(boolean isCancelled) { this.isCancelled = isCancelled; return this; } - + public Builder isDone(boolean isDone) { this.isDone = isDone; return this; } - + public Builder rpcResult(RpcResult result) { this.result = result; return this; } - + public Future> build() { return new DummyFuture(this); } diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java index 408b14acfe..56a58eeadd 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java @@ -76,13 +76,13 @@ public class RestDeleteOperationTest extends JerseyTest { when(brokerFacade.commitConfigurationDataDelete(any(InstanceIdentifier.class))).thenReturn(dummyFuture); Response response = target(uri).request(MediaType.APPLICATION_XML).delete(); assertEquals(200, response.getStatus()); - + dummyFuture = createFuture(TransactionStatus.FAILED); when(brokerFacade.commitConfigurationDataDelete(any(InstanceIdentifier.class))).thenReturn(dummyFuture); response = target(uri).request(MediaType.APPLICATION_XML).delete(); assertEquals(500, response.getStatus()); } - + private Future> createFuture(TransactionStatus statusName) { RpcResult rpcResult = new DummyRpcResult.Builder().result(statusName).build(); return DummyFuture.builder().rpcResult(rpcResult).build(); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java index eb623096de..853c19f935 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java @@ -147,7 +147,7 @@ public final class TestUtils { } /** - * + * * Fill missing data (namespaces) and build correct data type in * {@code compositeNode} according to {@code dataSchemaNode}. The method * {@link RestconfImpl#createConfigurationData createConfigurationData} is @@ -165,7 +165,7 @@ public final class TestUtils { * Searches module with name {@code searchedModuleName} in {@code modules}. * If module name isn't specified and module set has only one element then * this element is returned. - * + * */ public static Module resolveModule(String searchedModuleName, Set modules) { assertNotNull("Modules can't be null.", modules); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/structures/CompareLf.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/structures/CompareLf.java index e935a268a2..34036edc05 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/structures/CompareLf.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/structures/CompareLf.java @@ -19,7 +19,7 @@ public class CompareLf { Lf lf2 = new Lf("name", "value"); Lf lf3 = new Lf("name1", "value"); Lf lf4 = new Lf("name", "value1"); - + assertTrue(lf1.equals(lf2)); assertFalse(lf1.equals(lf3)); assertFalse(lf1.equals(lf4)); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java index ffddb00485..62159ccad6 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java @@ -24,7 +24,7 @@ public class XmlAugmentedElementToCnSnTest { loadAndNormalizeData("/common/augment/xml/dataa.xml", "/common/augment/yang", "main","cont"); loadAndNormalizeData("/common/augment/xml/datab.xml", "/common/augment/yang", "main","cont"); } - + private void loadAndNormalizeData(String xmlPath, String yangPath, String topLevelElementName, String moduleName) { CompositeNode compNode = TestUtils.readInputToCnSn(xmlPath, false, XmlToCompositeNodeProvider.INSTANCE); diff --git a/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGeneratorTest.java b/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGeneratorTest.java index 127529a3c6..264bc67004 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGeneratorTest.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/DocGeneratorTest.java @@ -69,4 +69,4 @@ public class DocGeneratorTest { } } -} +} diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java index 7d9cc7ecbd..db216237d0 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java @@ -103,7 +103,7 @@ public final class NodeStatisticsHandler implements AutoCloseable, FlowCapableCo final OpendaylightGroupStatisticsService groupStatsService, final OpendaylightMeterStatisticsService meterStatsService, final OpendaylightPortStatisticsService portStatsService, - final OpendaylightQueueStatisticsService queueStatsService, + final OpendaylightQueueStatisticsService queueStatsService, final StatisticsRequestScheduler srScheduler) { this.dps = Preconditions.checkNotNull(dps); this.targetNodeKey = Preconditions.checkNotNull(nodeKey); @@ -274,20 +274,20 @@ public final class NodeStatisticsHandler implements AutoCloseable, FlowCapableCo this.srScheduler.addRequestToSchedulerQueue(flowTableStats); this.srScheduler.addRequestToSchedulerQueue(flowStats); - + this.srScheduler.addRequestToSchedulerQueue(nodeConnectorStats); - + this.srScheduler.addRequestToSchedulerQueue(groupStats); - + this.srScheduler.addRequestToSchedulerQueue(groupDescStats); - + this.srScheduler.addRequestToSchedulerQueue(meterStats); - + this.srScheduler.addRequestToSchedulerQueue(meterConfigStats); - + this.srScheduler.addRequestToSchedulerQueue(queueStats); } - + public synchronized void start(final Timer timer) { flowStats.start(dps); groupDescStats.start(dps); @@ -313,7 +313,7 @@ public final class NodeStatisticsHandler implements AutoCloseable, FlowCapableCo meterStats.close(); queueStats.close(); - //Clean up queued statistics request from scheduler queue + //Clean up queued statistics request from scheduler queue srScheduler.removeRequestsFromSchedulerQueue(this.getNodeRef()); logger.debug("Statistics handler for {} shut down", targetNodeKey.getId()); diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java index d8bea7c63a..b96d2be47e 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java @@ -66,7 +66,7 @@ public class StatisticsProvider implements AutoCloseable { private OpendaylightFlowTableStatisticsService flowTableStatsService; private OpendaylightQueueStatisticsService queueStatsService; - + private final StatisticsRequestScheduler srScheduler; public StatisticsProvider(final DataProviderService dataService) { @@ -90,7 +90,7 @@ public class StatisticsProvider implements AutoCloseable { flowTableStatsService = rpcRegistry.getRpcService(OpendaylightFlowTableStatisticsService.class); queueStatsService = rpcRegistry.getRpcService(OpendaylightQueueStatisticsService.class); this.srScheduler.start(); - + // Start receiving notifications this.listenerRegistration = nps.registerNotificationListener(this.updateCommiter); diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsRequestScheduler.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsRequestScheduler.java index bea43ef68a..0ae33b8c71 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsRequestScheduler.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsRequestScheduler.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; /** * Main responsibility of the class is to check the MD-SAL data store read/write - * transaction accumulation level and send statistics request if number of pending + * transaction accumulation level and send statistics request if number of pending * read/write transactions are zero. * @author avishnoi@in.ibm.com * @@ -36,15 +36,15 @@ public class StatisticsRequestScheduler implements DataTransactionListener { private final Timer timer = new Timer("request-monitor", true); // We need ordered retrieval, and O(1) contains operation - private final Map requestQueue = + private final Map requestQueue = Collections.synchronizedMap(new LinkedHashMap()); - + private Long PendingTransactions; - + private long lastRequestTime = System.nanoTime(); - + private static final long REQUEST_MONITOR_INTERVAL = 1000; - + private final TimerTask task = new TimerTask() { @Override public void run() { @@ -58,11 +58,11 @@ public class StatisticsRequestScheduler implements DataTransactionListener { public StatisticsRequestScheduler(){ PendingTransactions = (long) 0; } - + public void addRequestToSchedulerQueue(AbstractStatsTracker statsRequest){ requestQueue.put(statsRequest, null); } - + public void removeRequestsFromSchedulerQueue(NodeRef node){ AbstractStatsTracker stats = null; synchronized(requestQueue){ @@ -97,7 +97,7 @@ public class StatisticsRequestScheduler implements DataTransactionListener { } @Override public void onStatusUpdated(DataModificationTransaction transaction, TransactionStatus status) { - + AbstractStatsTracker stats = null; synchronized(PendingTransactions){ switch(status){ @@ -119,7 +119,7 @@ public class StatisticsRequestScheduler implements DataTransactionListener { } sendStatsRequest(stats); } - + private void sendStatsRequest(AbstractStatsTracker stats){ if(stats != null){ try{ diff --git a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryListener.java b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryListener.java index ed96e3aa0c..c539ac81d4 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryListener.java +++ b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryListener.java @@ -24,7 +24,7 @@ class LLDPDiscoveryListener implements PacketProcessingListener { LLDPDiscoveryListener(LLDPDiscoveryProvider manager) { this.manager = manager; } - + public void onPacketReceived(PacketReceived lldp) { NodeConnectorRef src = LLDPDiscoveryUtils.lldpToNodeConnectorRef(lldp.getPayload()); if(src != null) { @@ -32,10 +32,10 @@ class LLDPDiscoveryListener implements PacketProcessingListener { ldb.setDestination(lldp.getIngress()); ldb.setSource(new NodeConnectorRef(src)); LinkDiscovered ld = ldb.build(); - + manager.getNotificationService().publish(ld); LLDPLinkAger.getInstance().put(ld); } } - + } diff --git a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPLinkAger.java b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPLinkAger.java index 7d2570551d..face5967c2 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPLinkAger.java +++ b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPLinkAger.java @@ -37,17 +37,17 @@ public class LLDPLinkAger { public static LLDPLinkAger getInstance() { return instance; } - + public void put(LinkDiscovered link) { Date expires = new Date(); expires.setTime(expires.getTime() + LLDPDiscoveryUtils.LLDP_EXPIRATION_TIME); linkToDate.put(link, expires); } - + public void close() { timer.cancel(); } - + private class LLDPAgingTask extends TimerTask { @Override @@ -64,9 +64,9 @@ public class LLDPLinkAger { } } } - + } - + } } diff --git a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java index ce42283ebe..82ab443246 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java +++ b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java @@ -27,10 +27,10 @@ import org.slf4j.LoggerFactory; public class LLDPDiscoveryUtils { static Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryUtils.class); - + public static final Long LLDP_INTERVAL = (long) (1000*5); // Send LLDP every five seconds public static final Long LLDP_EXPIRATION_TIME = LLDP_INTERVAL*3; // Let up to three intervals pass before we decide we are expired. - + public static String macToString(byte[] mac) { StringBuilder b = new StringBuilder(); for (int i = 0; i < mac.length; i++) { @@ -39,7 +39,7 @@ public class LLDPDiscoveryUtils { return b.toString(); } - + public static NodeConnectorRef lldpToNodeConnectorRef(byte[] payload) { Ethernet ethPkt = new Ethernet(); try { @@ -50,7 +50,7 @@ public class LLDPDiscoveryUtils { if (ethPkt.getPayload() instanceof LLDP) { LLDP lldp = (LLDP) ethPkt.getPayload(); - + try { NodeId srcNodeId = null; NodeConnectorId srcNodeConnectorId = null; -- 2.36.6