From bb0a5647411830d544b19fb79c35b7e563d12079 Mon Sep 17 00:00:00 2001 From: Jakub Morvay Date: Wed, 11 Jul 2018 12:36:00 +0200 Subject: [PATCH] Remove redundant code constructs - Remove redundant type arguments - Remove redundant type casts Change-Id: I943060df1f465ff019b62abd5e72bc9ff7bc8ef9 Signed-off-by: Jakub Morvay --- .../callhome/protocol/CallHomeAuthorization.java | 2 +- .../netconf/mdsal/connector/ops/Lock.java | 2 +- .../netconf/mdsal/connector/ops/Unlock.java | 2 +- .../mdsal/connector/ops/get/AbstractGet.java | 2 +- .../netconf/mdsal/connector/ops/get/Get.java | 4 ++-- .../mdsal/connector/ops/get/GetConfig.java | 4 ++-- .../CapabilityChangeNotificationProducer.java | 2 +- ...CapabilityChangeNotificationProducerTest.java | 4 ++-- .../netconf/api/DocumentedException.java | 4 ++-- .../api/xml/MissingNameSpaceException.java | 2 +- .../api/xml/UnexpectedElementException.java | 2 +- .../api/xml/UnexpectedNamespaceException.java | 2 +- .../opendaylight/netconf/api/xml/XmlElement.java | 2 +- .../opendaylight/netconf/api/xml/XmlUtil.java | 2 +- .../SimpleNetconfClientSessionListener.java | 2 +- ...etconfClientSessionNegotiatorFactoryTest.java | 3 +-- .../client/TlsClientChannelInitializerTest.java | 1 - .../mapping/operations/DefaultCloseSession.java | 2 +- .../osgi/NetconfCapabilityMonitoringService.java | 2 +- .../netconf/impl/ConcurrentClientsTest.java | 3 +-- .../netconf/impl/MessageParserTest.java | 6 +++--- .../impl/NetconfServerSessionListenerTest.java | 4 ++-- .../osgi/NetconfMonitoringOperationService.java | 2 +- .../opendaylight/netconf/monitoring/GetTest.java | 6 ++---- .../AbstractNetconfSessionNegotiator.java | 2 +- .../handler/NetconfMessageToXMLEncoder.java | 2 +- .../handler/ssh/client/AsyncSshHandlerTest.java | 10 +++++----- .../impl/ops/CreateSubscription.java | 2 +- .../impl/ops/NotificationsTransformUtil.java | 2 +- .../notifications/impl/osgi/Activator.java | 8 ++++---- .../connect/netconf/LibraryModulesSchemas.java | 16 ++++++++-------- .../sal/connect/netconf/NetconfStateSchemas.java | 2 +- .../listener/NetconfDeviceCommunicator.java | 2 +- .../connect/netconf/sal/tx/AbstractWriteTx.java | 14 +++++++------- .../sal/connect/netconf/util/NetconfBaseOps.java | 4 ++-- .../connect/netconf/util/NodeContainerProxy.java | 3 +-- .../sal/connect/netconf/NetconfDeviceTest.java | 3 +-- ...etconfRemoteSchemaYangSourceProviderTest.java | 3 +-- .../mapping/NetconfMessageTransformerTest.java | 7 ++----- .../test/tool/MdsalOperationProvider.java | 4 ++-- .../test/tool/SimulatedOperationProvider.java | 2 +- .../test/tool/operations/OperationsProvider.java | 2 +- .../netconf/test/tool/rpc/SimulatedCommit.java | 2 +- .../tool/rpc/SimulatedCreateSubscription.java | 2 +- .../test/tool/rpc/SimulatedEditConfig.java | 2 +- .../netconf/test/tool/rpc/SimulatedUnLock.java | 2 +- .../yanglib/impl/YangLibRestApp.java | 2 +- .../netconf/sal/restconf/impl/BrokerFacade.java | 14 +++++++------- .../sal/restconf/impl/ControllerContext.java | 4 ++-- .../netconf/sal/streams/listeners/EventType.java | 2 +- .../restconf/impl/test/InvokeRpcMethodTest.java | 10 +++++----- .../impl/test/JSONRestconfServiceImplTest.java | 6 +++--- .../impl/test/RestPostOperationTest.java | 3 +-- .../restconf/impl/test/RestPutConfigTest.java | 2 +- .../rests/utils/PutDataTransactionUtil.java | 3 +-- .../rests/utils/ReadDataTransactionUtil.java | 4 ++-- .../nb/rfc8040/streams/listeners/EventType.java | 2 +- .../impl/JSONRestconfServiceRfc8040ImplTest.java | 6 +++--- .../mapping/RestconfMappingNodeUtilTest.java | 10 +++++----- .../rest/doc/impl/BaseYangSwaggerGenerator.java | 2 +- 60 files changed, 110 insertions(+), 123 deletions(-) diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java index 886021ed3c..81d6c6fa75 100644 --- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java +++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java @@ -165,7 +165,7 @@ public abstract class CallHomeAuthorization { @Override protected void applyTo(final ClientSession session) { Preconditions.checkArgument(session instanceof ClientSessionImpl); - ((ClientSessionImpl) session).setUsername(username); + session.setUsername(username); // First try authentication using server host keys, else try password. for (KeyPair keyPair : clientKeyPair) { diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java index c39c61891e..e1a6ff10c0 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java @@ -40,7 +40,7 @@ public class Lock extends AbstractSingletonNetconfOperation { final Datastore targetDatastore = extractTargetParameter(operationElement); if (targetDatastore == Datastore.candidate) { LOG.debug("Locking candidate datastore on session: {}", getNetconfSessionIdForReporting()); - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } throw new DocumentedException("Unable to lock " + targetDatastore + " datastore", diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java index 3b5eb3c7d5..ed3e0b1ebc 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java @@ -39,7 +39,7 @@ public class Unlock extends AbstractSingletonNetconfOperation { final Datastore targetDatastore = Lock.extractTargetParameter(operationElement); if (targetDatastore == Datastore.candidate) { LOG.debug("Unlocking candidate datastore on session: {}", getNetconfSessionIdForReporting()); - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } throw new DocumentedException("Unable to unlock " + targetDatastore + " datastore", diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java index 7624d14236..6ce25640ea 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java @@ -180,7 +180,7 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation { return sourceElement.isPresent() ? Optional.of(Datastore.valueOf(sourceElement.get().getOnlyChildElement().getName())) - : Optional.absent(); + : Optional.absent(); } private static void validateInputRpc(final XmlElement xml, final String operationName) throws diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java index 603e6d4d03..2bdfcb0694 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java @@ -48,7 +48,7 @@ public class Get extends AbstractGet { final Optional dataRootOptional = getDataRootFromFilter(operationElement); if (!dataRootOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); } final YangInstanceIdentifier dataRoot = dataRootOptional.get(); @@ -60,7 +60,7 @@ public class Get extends AbstractGet { transactionProvider.abortRunningTransaction(rwTx); if (!normalizedNodeOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); } return serializeNodeWithParentStructure(document, dataRoot, normalizedNodeOptional.get()); diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java index 30b5079925..ec3da5934a 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java @@ -57,7 +57,7 @@ public class GetConfig extends AbstractGet { final Optional dataRootOptional = getDataRootFromFilter(operationElement); if (!dataRootOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); } final YangInstanceIdentifier dataRoot = dataRootOptional.get(); @@ -74,7 +74,7 @@ public class GetConfig extends AbstractGet { } if (!normalizedNodeOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); } return serializeNodeWithParentStructure(document, dataRoot, normalizedNodeOptional.get()); diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducer.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducer.java index 8fab4c84fe..b3c6c97ea7 100644 --- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducer.java +++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducer.java @@ -93,7 +93,7 @@ public final class CapabilityChangeNotificationProducer extends OperationalDatas netconfCapabilityChangeBuilder.setAddedCapability(ImmutableList.copyOf(added)); netconfCapabilityChangeBuilder.setDeletedCapability(ImmutableList.copyOf(removed)); // TODO modified should be computed ... but why ? - netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList()); + netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList()); baseNotificationPublisherRegistration.onCapabilityChanged(netconfCapabilityChangeBuilder.build()); } diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java index 5652af80ce..b387c89e2e 100644 --- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java +++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java @@ -82,7 +82,7 @@ public class CapabilityChangeNotificationProducerTest { Map, DataObject> createdData = Maps.newHashMap(); createdData.put(capabilitiesIdentifier, newCapabilities); verifyDataTreeChange(DataObjectModification.ModificationType.WRITE, null, newCapabilities, - changedCapabilitesFrom(newCapabilitiesList, Collections.emptyList())); + changedCapabilitesFrom(newCapabilitiesList, Collections.emptyList())); } @Test @@ -128,7 +128,7 @@ public class CapabilityChangeNotificationProducerTest { netconfCapabilityChangeBuilder.setChangedBy(new ChangedByBuilder().setServerOrUser( new ServerBuilder().setServer(true).build()).build()); - netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList()); + netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList()); netconfCapabilityChangeBuilder.setAddedCapability(added); netconfCapabilityChangeBuilder.setDeletedCapability(deleted); diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java index ec6b0606e9..15d4dfe443 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java @@ -169,7 +169,7 @@ public class DocumentedException extends Exception { public DocumentedException(final String message, final ErrorType errorType, final ErrorTag errorTag, final ErrorSeverity errorSeverity) { - this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); + this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); } public DocumentedException(final String message, final ErrorType errorType, final ErrorTag errorTag, @@ -183,7 +183,7 @@ public class DocumentedException extends Exception { public DocumentedException(final String message, final Exception cause, final ErrorType errorType, final ErrorTag errorTag, final ErrorSeverity errorSeverity) { - this(message, cause, errorType, errorTag, errorSeverity, Collections.emptyMap()); + this(message, cause, errorType, errorTag, errorSeverity, Collections.emptyMap()); } public DocumentedException(final String message, final Exception cause, final ErrorType errorType, diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java index d5ab5d0648..2f30154b93 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java @@ -16,7 +16,7 @@ public class MissingNameSpaceException extends DocumentedException { public MissingNameSpaceException(final String message, final DocumentedException.ErrorType errorType, final DocumentedException.ErrorTag errorTag, final DocumentedException.ErrorSeverity errorSeverity) { - this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); + this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); } public MissingNameSpaceException(final String message, final DocumentedException.ErrorType errorType, diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java index ec31b9e615..f6eda4930a 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java @@ -16,7 +16,7 @@ public class UnexpectedElementException extends DocumentedException { public UnexpectedElementException(final String message, final DocumentedException.ErrorType errorType, final DocumentedException.ErrorTag errorTag, final DocumentedException.ErrorSeverity errorSeverity) { - this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); + this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); } public UnexpectedElementException(final String message, final DocumentedException.ErrorType errorType, diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java index 4152e261b3..95e09a768a 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java @@ -16,7 +16,7 @@ public class UnexpectedNamespaceException extends DocumentedException { public UnexpectedNamespaceException(final String message, final DocumentedException.ErrorType errorType, final DocumentedException.ErrorTag errorTag, final DocumentedException.ErrorSeverity errorSeverity) { - this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); + this(message, errorType, errorTag, errorSeverity, Collections.emptyMap()); } public UnexpectedNamespaceException(final String message, final DocumentedException.ErrorType errorType, diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java index ad90fb3cb2..9b0f5e3af7 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java @@ -470,7 +470,7 @@ public final class XmlElement { } public void checkUnrecognisedElements(final XmlElement... additionalRecognisedElements) throws DocumentedException { - checkUnrecognisedElements(Collections.emptyList(), additionalRecognisedElements); + checkUnrecognisedElements(Collections.emptyList(), additionalRecognisedElements); } @Override diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java index a080889aee..d6d9f82f8a 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java @@ -145,7 +145,7 @@ public final class XmlUtil { final String prefix, final String namespace, final String contentWithoutPrefix) { return createTextElementWithNamespacedContent(document, qname, prefix, namespace, contentWithoutPrefix, - Optional.absent()); + Optional.absent()); } public static Element createTextElementWithNamespacedContent(final Document document, final String qname, diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java index 26f33152da..ce1e5ef0a0 100644 --- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java +++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java @@ -103,7 +103,7 @@ public class SimpleNetconfClientSessionListener implements NetconfClientSessionL } public final synchronized Future sendRequest(NetconfMessage message) { - final RequestEntry req = new RequestEntry(GlobalEventExecutor.INSTANCE.newPromise(), message); + final RequestEntry req = new RequestEntry(GlobalEventExecutor.INSTANCE.newPromise(), message); requests.add(req); if (clientSession != null) { diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java index 718c67b798..ca9eb2cefe 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java @@ -18,7 +18,6 @@ import io.netty.util.HashedWheelTimer; import io.netty.util.Timer; import io.netty.util.concurrent.Promise; import org.junit.Test; -import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.protocol.framework.SessionListenerFactory; import org.opendaylight.protocol.framework.SessionNegotiator; @@ -33,7 +32,7 @@ public class NetconfClientSessionNegotiatorFactoryTest { Channel channel = mock(Channel.class); Promise promise = mock(Promise.class); NetconfClientSessionNegotiatorFactory negotiatorFactory = new NetconfClientSessionNegotiatorFactory(timer, - Optional.absent(), 200L); + Optional.absent(), 200L); SessionNegotiator sessionNegotiator = negotiatorFactory.getSessionNegotiator(listenerFactory, channel, promise); diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java index 0edc9550aa..03ef147e7b 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java @@ -18,7 +18,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; import io.netty.util.concurrent.Promise; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java index 1a018363e5..194411f2d6 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java @@ -60,7 +60,7 @@ public class DefaultCloseSession extends AbstractSingletonNetconfOperation imple DocumentedException.ErrorSeverity.ERROR, Collections.singletonMap( DocumentedException.ErrorSeverity.ERROR.toString(), e.getMessage())); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java index c8dc4c3003..5739488ff5 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java @@ -241,7 +241,7 @@ class NetconfCapabilityMonitoringService implements CapabilityListener, AutoClos netconfCapabilityChangeBuilder.setAddedCapability(Lists.newArrayList(Collections2 .transform(added, CAPABILITY_TO_URI))); // TODO modified should be computed ... but why ? - netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList()); + netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList()); return netconfCapabilityChangeBuilder.build(); } diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java index cfa1915e3e..4b8f8591df 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java @@ -73,7 +73,6 @@ import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage; import org.opendaylight.netconf.util.messages.NetconfMessageUtil; import org.opendaylight.netconf.util.test.XmlFileLoader; import org.opendaylight.protocol.framework.NeverReconnectStrategy; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.CapabilitiesBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -128,7 +127,7 @@ public class ConcurrentClientsTest { }).when(monitoring).registerCapabilitiesListener(any(NetconfMonitoringService.CapabilitiesListener.class)); doReturn(sessionListener).when(monitoring).getSessionListener(); - doReturn(new CapabilitiesBuilder().setCapability(Collections.emptyList()).build()).when(monitoring) + doReturn(new CapabilitiesBuilder().setCapability(Collections.emptyList()).build()).when(monitoring) .getCapabilities(); return monitoring; } diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java index 0b07c774f2..a8e05a900a 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java @@ -86,7 +86,7 @@ public class MessageParserTest { } assertTrue(messages.isEmpty()); - NetconfMessage receivedMessage = (NetconfMessage) testChunkChannel.readInbound(); + NetconfMessage receivedMessage = testChunkChannel.readInbound(); assertNotNull(receivedMessage); assertXMLEqual(this.msg.getDocument(), receivedMessage.getDocument()); } @@ -98,7 +98,7 @@ public class MessageParserTest { new NetconfMessageToXMLEncoder(), new NetconfEOMAggregator(), new NetconfXMLToMessageDecoder()); testChunkChannel.writeOutbound(this.msg); - ByteBuf recievedOutbound = (ByteBuf) testChunkChannel.readOutbound(); + ByteBuf recievedOutbound = testChunkChannel.readOutbound(); byte[] endOfMsgBytes = NetconfMessageConstants.END_OF_MESSAGE.getBytes(StandardCharsets.UTF_8); byte[] eom = new byte[endOfMsgBytes.length]; @@ -106,7 +106,7 @@ public class MessageParserTest { assertArrayEquals(endOfMsgBytes, eom); testChunkChannel.writeInbound(recievedOutbound); - NetconfMessage receivedMessage = (NetconfMessage) testChunkChannel.readInbound(); + NetconfMessage receivedMessage = testChunkChannel.readInbound(); assertNotNull(receivedMessage); assertXMLEqual(this.msg.getDocument(), receivedMessage.getDocument()); } diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java index 493326281f..e7d5bb3e2d 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java @@ -99,7 +99,7 @@ public class NetconfServerSessionListenerTest { listener.onMessage(session, msg); verify(monitoringListener).onSessionEvent(argThat(sessionEventIs(SessionEvent.Type.IN_RPC_SUCCESS))); channel.runPendingTasks(); - final NetconfMessage sentMsg = (NetconfMessage) channel.readOutbound(); + final NetconfMessage sentMsg = channel.readOutbound(); final Diff diff = XMLUnit.compareXML(reply, sentMsg.getDocument()); Assert.assertTrue(diff.toString(), diff.similar()); } @@ -141,7 +141,7 @@ public class NetconfServerSessionListenerTest { verify(monitoringListener).onSessionEvent(argThat(sessionEventIs(SessionEvent.Type.IN_RPC_FAIL))); verify(monitoringListener).onSessionEvent(argThat(sessionEventIs(SessionEvent.Type.OUT_RPC_ERROR))); channel.runPendingTasks(); - final NetconfMessage sentMsg = (NetconfMessage) channel.readOutbound(); + final NetconfMessage sentMsg = channel.readOutbound(); System.out.println(XmlUtil.toString(sentMsg.getDocument())); System.out.println(XmlUtil.toString(reply)); final Diff diff = XMLUnit.compareXML(reply, sentMsg.getDocument()); diff --git a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java b/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java index 6141babe16..7bdeac6af5 100644 --- a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java +++ b/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java @@ -26,7 +26,7 @@ public class NetconfMonitoringOperationService implements NetconfOperationServic @Override public Set getNetconfOperations() { - return Sets.newHashSet(new Get(monitor), new GetSchema(monitor)); + return Sets.newHashSet(new Get(monitor), new GetSchema(monitor)); } @Override diff --git a/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetTest.java b/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetTest.java index 012d729198..f295353ec6 100644 --- a/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetTest.java +++ b/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetTest.java @@ -28,8 +28,6 @@ import org.opendaylight.netconf.mapping.api.HandlingPriority; import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.SchemasBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.SessionsBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.Schema; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; import org.w3c.dom.Document; public class GetTest { @@ -54,9 +52,9 @@ public class GetTest { correctSubsequentResult = XmlUtil.readXmlToDocument(""); - doReturn(new SessionsBuilder().setSession(Collections.emptyList()).build()).when(monitor) + doReturn(new SessionsBuilder().setSession(Collections.emptyList()).build()).when(monitor) .getSessions(); - doReturn(new SchemasBuilder().setSchema(Collections.emptyList()).build()).when(monitor).getSchemas(); + doReturn(new SchemasBuilder().setSchema(Collections.emptyList()).build()).when(monitor).getSchemas(); doReturn(false).when(subsequentOperation).isExecutionTermination(); get = new Get(monitor); diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java index 4135896b34..b6a26804fd 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -106,7 +106,7 @@ public abstract class AbstractNetconfSessionNegotiator

getSslHandler(final Channel channel) { final SslHandler sslHandler = channel.pipeline().get(SslHandler.class); - return sslHandler == null ? Optional.absent() : Optional.of(sslHandler); + return sslHandler == null ? Optional.absent() : Optional.of(sslHandler); } public P getSessionPreferences() { diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java index f033e0efe3..c7ab89d8c7 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java @@ -31,7 +31,7 @@ public class NetconfMessageToXMLEncoder extends MessageToByteEncoder clientId; public NetconfMessageToXMLEncoder() { - this(Optional.absent()); + this(Optional.absent()); } public NetconfMessageToXMLEncoder(final Optional clientId) { diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerTest.java index bc57f3c7a1..4023ece6db 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerTest.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerTest.java @@ -219,7 +219,7 @@ public class AsyncSshHandlerTest { public void onSuccess(final SshFutureListener result) { doReturn(new IllegalStateException()).when(mockedReadFuture).getException(); doReturn(mockedReadFuture).when(mockedReadFuture) - .removeListener(Matchers.>any()); + .removeListener(Matchers.any()); doReturn(true).when(asyncOut).isClosing(); doReturn(true).when(asyncOut).isClosed(); result.operationComplete(mockedReadFuture); @@ -250,7 +250,7 @@ public class AsyncSshHandlerTest { public void onSuccess(final SshFutureListener result) { doReturn(new IllegalStateException()).when(mockedReadFuture).getException(); doReturn(mockedReadFuture).when(mockedReadFuture) - .removeListener(Matchers.>any()); + .removeListener(Matchers.any()); result.operationComplete(mockedReadFuture); } }, MoreExecutors.directExecutor()); @@ -493,7 +493,7 @@ public class AsyncSshHandlerTest { private static IoOutputStream getMockedIoOutputStream() { final IoOutputStream mock = mock(IoOutputStream.class); final IoWriteFuture ioWriteFuture = mock(IoWriteFuture.class); - doReturn(ioWriteFuture).when(ioWriteFuture).addListener(Matchers.>any()); + doReturn(ioWriteFuture).when(ioWriteFuture).addListener(Matchers.any()); doReturn(true).when(ioWriteFuture).isWritten(); Futures.addCallback(stubAddListener(ioWriteFuture), new SuccessFutureListener() { @@ -513,10 +513,10 @@ public class AsyncSshHandlerTest { final IoInputStream mock = mock(IoInputStream.class); final IoReadFuture ioReadFuture = mock(IoReadFuture.class); doReturn(null).when(ioReadFuture).getException(); - doReturn(ioReadFuture).when(ioReadFuture).removeListener(Matchers.>any()); + doReturn(ioReadFuture).when(ioReadFuture).removeListener(Matchers.any()); doReturn(5).when(ioReadFuture).getRead(); doReturn(new ByteArrayBuffer(new byte[]{0, 1, 2, 3, 4})).when(ioReadFuture).getBuffer(); - doReturn(ioReadFuture).when(ioReadFuture).addListener(Matchers.>any()); + doReturn(ioReadFuture).when(ioReadFuture).addListener(Matchers.any()); // Always success for read Futures.addCallback(stubAddListener(ioReadFuture), new SuccessFutureListener() { diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java index 9860de76bb..b0d9cf75ba 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java @@ -89,7 +89,7 @@ public class CreateSubscription extends AbstractSingletonNetconfOperation .registerNotificationListener(streamNameType, new NotificationSubscription(netconfSession, filter)); subscriptions.add(notificationListenerRegistration); - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } private static StreamNameType parseStreamIfPresent(final XmlElement operationElement) throws DocumentedException { diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java index d2fdaaddb7..ade7a35648 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/NotificationsTransformUtil.java @@ -77,7 +77,7 @@ public final class NotificationsTransformUtil { * Transform base notification for capabilities into NetconfNotification. */ public static NetconfNotification transform(final Notification notification, SchemaPath path) { - return transform(notification, Optional.absent(), path); + return transform(notification, Optional.absent(), path); } public static NetconfNotification transform(final Notification notification, diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java index 21b7d0d83d..6724d10f14 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java @@ -52,7 +52,7 @@ public class Activator implements BundleActivator { final NetconfOperationServiceFactory netconfOperationServiceFactory = new NetconfOperationServiceFactory() { private final Set capabilities = - Collections.singleton(new BasicCapability(NetconfNotification.NOTIFICATION_NAMESPACE)); + Collections.singleton(new BasicCapability(NetconfNotification.NOTIFICATION_NAMESPACE)); @Override public Set getCapabilities() { @@ -61,8 +61,8 @@ public class Activator implements BundleActivator { @Override public AutoCloseable registerCapabilityListener(final CapabilityListener listener) { - listener.onCapabilitiesChanged(capabilities, Collections.emptySet()); - return () -> listener.onCapabilitiesChanged(Collections.emptySet(), capabilities); + listener.onCapabilitiesChanged(capabilities, Collections.emptySet()); + return () -> listener.onCapabilitiesChanged(Collections.emptySet(), capabilities); } @Override @@ -74,7 +74,7 @@ public class Activator implements BundleActivator { @Override public Set getNetconfOperations() { - return Sets.newHashSet( + return Sets.newHashSet( new Get(netconfSessionIdForReporting, netconfNotificationManager), createSubscription); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java index 590996ea19..261ba28d29 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java @@ -146,7 +146,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { } catch (final IOException e) { LOG.warn("Unable to download yang library from {}", url, e); - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } } @@ -163,13 +163,13 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { } catch (final ExecutionException e) { LOG.warn("{}: Unable to detect available schemas, get to {} failed", deviceId, MODULES_STATE_MODULE_LIST, e); - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } if (moduleListNodeResult.getErrors().isEmpty() == false) { LOG.warn("{}: Unable to detect available schemas, get to {} failed, {}", deviceId, MODULES_STATE_MODULE_LIST, moduleListNodeResult.getErrors()); - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } @@ -182,7 +182,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { } LOG.warn("{}: Unable to detect available schemas, get to {} was empty", deviceId, toId(ModulesState.QNAME)); - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } private static LibraryModulesSchemas create(final ContainerNode modulesStateNode) { @@ -226,7 +226,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { } catch (final IOException e) { LOG.warn("Unable to download yang library from {}", url, e); - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } } @@ -260,7 +260,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { contentType.equals("application/json") ? readJson(in) : readXml(in); if (!optionalModulesStateNode.isPresent()) { - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } final NormalizedNode modulesStateNode = optionalModulesStateNode.get(); @@ -290,7 +290,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { return new LibraryModulesSchemas(schemasMapping.build()); } catch (final IOException e) { LOG.warn("Unable to download yang library from {}", connection.getURL(), e); - return new LibraryModulesSchemas(Collections.emptyMap()); + return new LibraryModulesSchemas(Collections.emptyMap()); } } @@ -382,7 +382,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { : QName.create(URI.create(moduleNameSpace), moduleName); try { - return Optional.>of(new AbstractMap.SimpleImmutableEntry<>( + return Optional.of(new AbstractMap.SimpleImmutableEntry<>( moduleQName, new URL(schemaUriAsString.get()))); } catch (final MalformedURLException e) { LOG.warn("Skipping library schema for {}. URL {} representing yang schema resource is not valid", diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java index 822a43a22a..5083b2edc0 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java @@ -55,7 +55,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { private static final Logger LOG = LoggerFactory.getLogger(NetconfStateSchemas.class); - public static final NetconfStateSchemas EMPTY = new NetconfStateSchemas(Collections.emptySet()); + public static final NetconfStateSchemas EMPTY = new NetconfStateSchemas(Collections.emptySet()); private static final YangInstanceIdentifier STATE_SCHEMAS_IDENTIFIER = YangInstanceIdentifier.builder().node(NetconfState.QNAME).node(Schemas.QNAME).build(); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java index 0e240dde64..7968fcda97 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java @@ -86,7 +86,7 @@ public class NetconfDeviceCommunicator final RemoteDeviceId id, final RemoteDevice remoteDevice, final int rpcMessageLimit) { - this(id, remoteDevice, Optional.absent(), rpcMessageLimit); + this(id, remoteDevice, Optional.absent(), rpcMessageLimit); } private NetconfDeviceCommunicator( diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java index 6e3b0554c6..eb48fdbd96 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java @@ -107,9 +107,9 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { } final DataContainerChild editStructure = - netOps.createEditConfigStrcture(Optional.>fromNullable(data), + netOps.createEditConfigStrcture(Optional.fromNullable(data), Optional.of(ModifyAction.REPLACE), path); - editConfig(path, Optional.fromNullable(data), editStructure, Optional.absent(), "put"); + editConfig(path, Optional.fromNullable(data), editStructure, Optional.absent(), "put"); } @Override @@ -125,9 +125,9 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { } final DataContainerChild editStructure = - netOps.createEditConfigStrcture(Optional.>fromNullable(data), - Optional.absent(), path); - editConfig(path, Optional.fromNullable(data), editStructure, Optional.absent(), "merge"); + netOps.createEditConfigStrcture(Optional.fromNullable(data), + Optional.absent(), path); + editConfig(path, Optional.fromNullable(data), editStructure, Optional.absent(), "merge"); } /** @@ -144,9 +144,9 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { public synchronized void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) { checkEditable(store); final DataContainerChild editStructure = - netOps.createEditConfigStrcture(Optional.>absent(), + netOps.createEditConfigStrcture(Optional.absent(), Optional.of(ModifyAction.DELETE), path); - editConfig(path, Optional.>absent(), + editConfig(path, Optional.absent(), editStructure, Optional.of(ModifyAction.NONE), "delete"); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java index 2c055b9cf1..6218f59cb8 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java @@ -257,7 +257,7 @@ public final class NetconfBaseOps { public ListenableFuture editConfigCandidate(final FutureCallback callback, final DataContainerChild editStructure, final boolean rollback) { - return editConfig(callback, NETCONF_CANDIDATE_QNAME, editStructure, Optional.absent(), rollback); + return editConfig(callback, NETCONF_CANDIDATE_QNAME, editStructure, Optional.absent(), rollback); } public ListenableFuture editConfigRunning(final FutureCallback callback, @@ -269,7 +269,7 @@ public final class NetconfBaseOps { public ListenableFuture editConfigRunning(final FutureCallback callback, final DataContainerChild editStructure, final boolean rollback) { - return editConfig(callback, NETCONF_RUNNING_QNAME, editStructure, Optional.absent(), rollback); + return editConfig(callback, NETCONF_RUNNING_QNAME, editStructure, Optional.absent(), rollback); } public ListenableFuture editConfig( diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NodeContainerProxy.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NodeContainerProxy.java index 2a0830658d..da65e55959 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NodeContainerProxy.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NodeContainerProxy.java @@ -7,7 +7,6 @@ */ package org.opendaylight.netconf.sal.connect.netconf.util; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -58,7 +57,7 @@ public final class NodeContainerProxy implements ContainerSchemaNode { } private static Map asMap(final Collection childNodes) { - return Maps.uniqueIndex(childNodes, (Function) DataSchemaNode::getQName); + return Maps.uniqueIndex(childNodes, DataSchemaNode::getQName); } @Override diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java index 3cc5c74a9f..3618bf67d3 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java @@ -61,7 +61,6 @@ import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; @@ -178,7 +177,7 @@ public class NetconfDeviceTest { // Make fallback attempt to fail due to empty resolved sources final SchemaResolutionException schemaResolutionException = new SchemaResolutionException("fail first", - Collections.emptyList(), HashMultimap.create()); + Collections.emptyList(), HashMultimap.create()); doReturn(Futures.immediateFailedFuture(schemaResolutionException)) .when(schemaFactory).createSchemaContext(anyCollectionOf(SourceIdentifier.class)); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java index edf7b96f30..6b85cd1fc8 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java @@ -32,7 +32,6 @@ import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -56,7 +55,7 @@ public class NetconfRemoteSchemaYangSourceProviderTest { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - final DOMRpcResult value = new DefaultDOMRpcResult(getNode(), Collections.emptySet()); + final DOMRpcResult value = new DefaultDOMRpcResult(getNode(), Collections.emptySet()); CheckedFuture response = Futures.immediateCheckedFuture(value); doReturn(response).when(service).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java index 5ddbfa5c2a..a884a887f2 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java @@ -58,17 +58,14 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.Schema; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.ModifyAction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.w3c.dom.Element; import org.xml.sax.SAXException; public class NetconfMessageTransformerTest { @@ -165,7 +162,7 @@ public class NetconfMessageTransformerTest { assertNotNull(compositeNodeRpcResult.getResult()); final DOMSource schemaContent = ((AnyXmlNode) ((ContainerNode) compositeNodeRpcResult.getResult()).getValue().iterator().next()).getValue(); - assertThat(((Element) schemaContent.getNode()).getTextContent(), + assertThat(schemaContent.getNode().getTextContent(), CoreMatchers.containsString("Random YANG SCHEMA")); } @@ -261,7 +258,7 @@ public class NetconfMessageTransformerTest { .nodeWithKey(Schema.QNAME, keys).build(); final DataContainerChild editConfigStructure = createEditConfigStructure(BaseSchema.BASE_NETCONF_CTX_WITH_NOTIFICATIONS.getSchemaContext(), id, - Optional.absent(), Optional.>fromNullable(schemaNode)); + Optional.absent(), Optional.fromNullable(schemaNode)); final DataContainerChild target = NetconfBaseOps.getTargetNode(NETCONF_CANDIDATE_QNAME); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java index afece1b190..660f67fe80 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java @@ -88,7 +88,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory { @Override public AutoCloseable registerCapabilityListener( final CapabilityListener listener) { - listener.onCapabilitiesChanged(caps, Collections.emptySet()); + listener.onCapabilitiesChanged(caps, Collections.emptySet()); return () -> { }; } @@ -153,7 +153,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory { final DiscardChanges discardChanges = new DiscardChanges( String.valueOf(currentSessionId), transactionProvider); - return Sets.newHashSet(get, getConfig, + return Sets.newHashSet(get, getConfig, editConfig, commit, lock, unLock, discardChanges); } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java index b49f39998b..f2828d1eed 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java @@ -50,7 +50,7 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory { @Override public AutoCloseable registerCapabilityListener( final CapabilityListener listener) { - listener.onCapabilitiesChanged(caps, Collections.emptySet()); + listener.onCapabilitiesChanged(caps, Collections.emptySet()); return () -> { }; } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java index b93f59a41f..15ae253007 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java @@ -44,7 +44,7 @@ public class OperationsProvider implements NetconfOperationServiceFactory { @Override public AutoCloseable registerCapabilityListener( final CapabilityListener listener) { - listener.onCapabilitiesChanged(caps, Collections.emptySet()); + listener.onCapabilitiesChanged(caps, Collections.emptySet()); return () -> { }; } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java index 4276e5fb2f..ad647f667f 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java @@ -26,7 +26,7 @@ public class SimulatedCommit extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) throws DocumentedException { - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java index c6f7fac0db..eab9f2c820 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java @@ -105,7 +105,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im }, delayAggregator, TimeUnit.SECONDS); } } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } private static NetconfMessage parseNetconfNotification(String content) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java index 2e902c054c..509d9416de 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java @@ -41,7 +41,7 @@ public class SimulatedEditConfig extends AbstractLastNetconfOperation { storage.setConfigList(configElementData.getChildElements()); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java index ce06534a9c..6002bea60a 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java @@ -26,7 +26,7 @@ public class SimulatedUnLock extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) throws DocumentedException { - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override diff --git a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibRestApp.java b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibRestApp.java index ff3541bbe2..946f8d1a59 100644 --- a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibRestApp.java +++ b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibRestApp.java @@ -22,6 +22,6 @@ public class YangLibRestApp extends Application { @Override public Set getSingletons() { - return Collections.singleton(this.yangLibService); + return Collections.singleton(this.yangLibService); } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java index 1b53c7544e..49427f1a74 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java @@ -594,21 +594,21 @@ public class BrokerFacade implements Closeable { builder.withChild(childBuilder.build()); } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); - final Object nodeVal = ((LeafNode) child).getValue(); + final Object nodeVal = child.getValue(); final NormalizedNodeAttrBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (keys.contains(child.getNodeType())) { - leafBuilder.withValue(((LeafNode) child).getValue()); + leafBuilder.withValue(child.getValue()); builder.withChild(leafBuilder.build()); } else { if (trim) { if (defaultVal == null || !defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).getValue()); + leafBuilder.withValue(child.getValue()); builder.withChild(leafBuilder.build()); } } else { if (defaultVal != null && defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).getValue()); + leafBuilder.withValue(child.getValue()); builder.withChild(leafBuilder.build()); } } @@ -649,17 +649,17 @@ public class BrokerFacade implements Closeable { builder.withChild(childBuilder.build()); } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); - final Object nodeVal = ((LeafNode) child).getValue(); + final Object nodeVal = child.getValue(); final NormalizedNodeAttrBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (trim) { if (defaultVal == null || !defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).getValue()); + leafBuilder.withValue(child.getValue()); builder.withChild(leafBuilder.build()); } } else { if (defaultVal != null && defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).getValue()); + leafBuilder.withValue(child.getValue()); builder.withChild(leafBuilder.build()); } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java index bbc34cbcb5..80dabef6a7 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java @@ -507,7 +507,7 @@ public final class ControllerContext implements SchemaContextListener, Closeable return childByQName((Module) container, name); } else { throw new IllegalArgumentException("Unhandled parameter types: " - + Arrays.asList(container, name).toString()); + + Arrays.asList(container, name).toString()); } } @@ -538,7 +538,7 @@ public final class ControllerContext implements SchemaContextListener, Closeable private InstanceIdentifierContext collectPathArguments(final InstanceIdentifierBuilder builder, final List strings, final DataNodeContainer parentNode, final DOMMountPoint mountPoint, final boolean returnJustMountPoint) { - Preconditions.>checkNotNull(strings); + Preconditions.checkNotNull(strings); if (parentNode == null) { return null; diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java index 2a4d8bccbb..ba7c2a3531 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java @@ -11,5 +11,5 @@ package org.opendaylight.netconf.sal.streams.listeners; * Type of the event. */ enum EventType { - REGISTER, DEREGISTER, NOTIFY; + REGISTER, DEREGISTER, NOTIFY } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java index 664a00cbb0..8bbfae9342 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java @@ -171,7 +171,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception to be thrown."); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED, - Optional.absent(), Optional.absent()); + Optional.absent(), Optional.absent()); } } @@ -218,7 +218,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception to be thrown."); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED, Optional.of("foo"), - Optional.absent()); + Optional.absent()); verifyRestconfDocumentedException(e, 1, ErrorType.RPC, ErrorTag.IN_USE, Optional.of("bar"), Optional.of("app-tag")); } @@ -249,7 +249,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception"); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, - Optional.absent(), Optional.absent()); + Optional.absent(), Optional.absent()); } } @@ -260,7 +260,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception"); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT, - Optional.absent(), Optional.absent()); + Optional.absent(), Optional.absent()); } } @@ -314,7 +314,7 @@ public class InvokeRpcMethodTest { fail("Expected an exception."); } catch (final RestconfDocumentedException e) { verifyRestconfDocumentedException(e, 0, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, - Optional.absent(), Optional.absent()); + Optional.absent(), Optional.absent()); } } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java index 5ac8070072..5f45287441 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java @@ -449,7 +449,7 @@ public class JSONRestconfServiceImplTest { final String uriPath = "toaster:cancel-toast"; - final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); + final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); assertEquals("Output present", false, output.isPresent()); @@ -469,7 +469,7 @@ public class JSONRestconfServiceImplTest { final String uriPath = "toaster:testOutput"; - final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); + final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); assertEquals("Output present", true, output.isPresent()); assertNotNull("Returned null response", output.get()); @@ -486,7 +486,7 @@ public class JSONRestconfServiceImplTest { final String uriPath = "toaster:cancel-toast"; - this.service.invokeRpc(uriPath, Optional.absent()); + this.service.invokeRpc(uriPath, Optional.absent()); } void testGet(final LogicalDatastoreType datastoreType) throws OperationFailedException { diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java index d9c9f55299..0701636fff 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java @@ -32,7 +32,6 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils; import org.opendaylight.netconf.sal.rest.api.Draft02; @@ -153,7 +152,7 @@ public class RestPostOperationTest extends JerseyTest { public void createConfigurationDataNullTest() throws UnsupportedEncodingException { when(brokerFacade.commitConfigurationDataPost(any(SchemaContext.class), any(YangInstanceIdentifier.class), any(NormalizedNode.class), Mockito.anyString(), Mockito.anyString())) - .thenReturn(Futures.immediateCheckedFuture(null)); + .thenReturn(Futures.immediateCheckedFuture(null)); //FIXME : find who is set schemaContext // final String URI_1 = "/config"; diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java index 94a8284d82..81117609f8 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java @@ -135,7 +135,7 @@ public class RestPutConfigTest { final PutResult result = Mockito.mock(PutResult.class); final CheckedFuture checkedFuture = Futures.immediateCheckedFuture(null); - Mockito.when(this.brokerFacade.commitConfigurationDataPut(this.schemaContext, yii, data, null, null)) + Mockito.when(this.brokerFacade.commitConfigurationDataPut(schemaContext, yii, data, null, null)) .thenReturn(result); Mockito.when(result.getFutureOfPutData()).thenReturn(checkedFuture); Mockito.when(result.getStatus()).thenReturn(Status.OK); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java index a237f037cf..200605da4b 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java @@ -36,7 +36,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.OrderedLeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.OrderedMapNode; @@ -383,7 +382,7 @@ public final class PutDataTransactionUtil { final NormalizedNode emptySubtree = ImmutableNodes.fromInstanceId(schemaContext, path); writeTx.merge(datastore, YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree); TransactionUtil.ensureParentsByMerge(path, schemaContext, writeTx); - for (final MapEntryNode child : ((MapNode) payload).getValue()) { + for (final MapEntryNode child : payload.getValue()) { final YangInstanceIdentifier childPath = path.node(child.getIdentifier()); writeTx.put(datastore, childPath, child); } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java index aca94271bd..b54afbac50 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java @@ -355,7 +355,7 @@ public final class ReadDataTransactionUtil { builder.withChild(childBuilder.build()); } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); - final Object nodeVal = ((LeafNode) child).getValue(); + final Object nodeVal = child.getValue(); final NormalizedNodeAttrBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (keys.contains(child.getNodeType())) { @@ -410,7 +410,7 @@ public final class ReadDataTransactionUtil { builder.withChild(childBuilder.build()); } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); - final Object nodeVal = ((LeafNode) child).getValue(); + final Object nodeVal = child.getValue(); final NormalizedNodeAttrBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (trim) { diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventType.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventType.java index fd971523c9..70b866186b 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventType.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventType.java @@ -11,5 +11,5 @@ package org.opendaylight.restconf.nb.rfc8040.streams.listeners; * Type of the event. */ enum EventType { - REGISTER, DEREGISTER, NOTIFY; + REGISTER, DEREGISTER, NOTIFY } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java index bad0decc33..49f69d50d2 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java @@ -496,7 +496,7 @@ public class JSONRestconfServiceRfc8040ImplTest { final String uriPath = "toaster:cancel-toast"; - final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); + final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); assertEquals("Output present", false, output.isPresent()); @@ -516,7 +516,7 @@ public class JSONRestconfServiceRfc8040ImplTest { final String uriPath = "toaster:testOutput"; - final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); + final Optional output = this.service.invokeRpc(uriPath, Optional.absent()); assertEquals("Output present", true, output.isPresent()); assertNotNull("Returned null response", output.get()); @@ -533,7 +533,7 @@ public class JSONRestconfServiceRfc8040ImplTest { final String uriPath = "toaster:cancel-toast"; - this.service.invokeRpc(uriPath, Optional.absent()); + this.service.invokeRpc(uriPath, Optional.absent()); } void testGet(final LogicalDatastoreType datastoreType) throws OperationFailedException { diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java index c16ebd5396..116139dc3d 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java @@ -126,7 +126,7 @@ public class RestconfMappingNodeUtilTest { assertNotNull(normNode); final List listOfValues = new ArrayList<>(); - for (final DataContainerChild child : ((ContainerNode) normNode).getValue()) { + for (final DataContainerChild child : normNode.getValue()) { if (child.getNodeType().equals(MonitoringModule.CONT_CAPABILITES_QNAME)) { for (final DataContainerChild dataContainerChild : ((ContainerNode) child) .getValue()) { @@ -216,10 +216,10 @@ public class RestconfMappingNodeUtilTest { for (final DataContainerChild child : containerNode.getValue()) { if (child instanceof LeafNode) { - assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, ((LeafNode) child).getNodeType()); + assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.getNodeType()); } if (child instanceof MapNode) { - assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, ((MapNode) child).getNodeType()); + assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.getNodeType()); for (final MapEntryNode mapEntryNode : ((MapNode) child).getValue()) { String name = ""; String revision = ""; @@ -227,10 +227,10 @@ public class RestconfMappingNodeUtilTest { .getValue()) { switch (dataContainerChild.getNodeType().getLocalName()) { case IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF: - name = String.valueOf(((LeafNode) dataContainerChild).getValue()); + name = String.valueOf(dataContainerChild.getValue()); break; case IetfYangLibrary.SPECIFIC_MODULE_REVISION_LEAF: - revision = String.valueOf(((LeafNode) dataContainerChild).getValue()); + revision = String.valueOf(dataContainerChild.getValue()); break; default : LOG.info("Unknown local name '{}' of node.", diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java index 1fd9ada432..b9f5290eff 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java @@ -285,7 +285,7 @@ public abstract class BaseYangSwaggerGenerator { LOG.debug("Adding path: [{}]", resourcePath); api.setPath(resourcePath.concat(getContent(dataStore))); - Iterable childSchemaNodes = Collections.emptySet(); + Iterable childSchemaNodes = Collections.emptySet(); if (node instanceof ListSchemaNode || node instanceof ContainerSchemaNode) { final DataNodeContainer dataNodeContainer = (DataNodeContainer) node; childSchemaNodes = dataNodeContainer.getChildNodes(); -- 2.36.6