From: Robert Varga Date: Fri, 4 Jan 2019 16:14:52 +0000 (+0100) Subject: Migrate NetconfHelloMessage's use of Optional X-Git-Tag: release/neon~61^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F79240%2F8;p=netconf.git Migrate NetconfHelloMessage's use of Optional Use java.util.Optional, cascading that to all users. Change-Id: I3ba97d060c8ea564bec378285bf6d8dbdb6a59d6 Signed-off-by: Robert Varga Signed-off-by: Jakub Morvay --- diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java index 73d4c5b473..c915ade8a3 100644 --- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java +++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java @@ -7,11 +7,11 @@ */ package org.opendaylight.netconf.callhome.protocol; -import com.google.common.base.Optional; import io.netty.channel.DefaultEventLoopGroup; import io.netty.channel.EventLoopGroup; import io.netty.util.HashedWheelTimer; import java.net.InetSocketAddress; +import java.util.Optional; import java.util.concurrent.TimeUnit; import org.apache.sshd.client.SshClient; import org.opendaylight.netconf.callhome.protocol.CallHomeSessionContext.Factory; @@ -112,7 +112,7 @@ public class NetconfCallHomeServerBuilder implements Builder configElement = parent.getOnlyChildElementOptionally(CONFIG_KEY); if (configElement.isPresent()) { return configElement.get(); - } else { - final Optional urlElement = parent.getOnlyChildElementOptionally(URL_KEY); - if (!urlElement.isPresent()) { - throw new DocumentedException("Invalid RPC, neither not element is present", - DocumentedException.ErrorType.PROTOCOL, - DocumentedException.ErrorTag.MISSING_ELEMENT, - DocumentedException.ErrorSeverity.ERROR); - } + } - final Document document = getDocumentFromUrl(urlElement.get().getTextContent()); - return XmlElement.fromDomElementWithExpected(document.getDocumentElement(), CONFIG_KEY, - XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0); + final Optional urlElement = parent.getOnlyChildElementOptionally(URL_KEY); + if (!urlElement.isPresent()) { + throw new DocumentedException("Invalid RPC, neither not element is present", + DocumentedException.ErrorType.PROTOCOL, + DocumentedException.ErrorTag.MISSING_ELEMENT, + DocumentedException.ErrorSeverity.ERROR); } + + final Document document = getDocumentFromUrl(urlElement.get().getTextContent()); + return XmlElement.fromDomElementWithExpected(document.getDocumentElement(), CONFIG_KEY, + XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0); } /** diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java index 38a24ae79e..4f71ac89c0 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; @@ -42,12 +40,11 @@ public class Commit extends AbstractSingletonNetconfOperation { boolean commitStatus = transactionProvider.commitTransaction(); LOG.trace("Commit completed successfully {}", commitStatus); - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @Override protected String getOperationName() { return OPERATION_NAME; } - } diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java index c249a44391..a06dbf82a2 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.mdsal.connector.ops; import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0; -import com.google.common.base.Optional; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -18,6 +17,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; +import java.util.Optional; import java.util.concurrent.ExecutionException; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; @@ -93,7 +93,7 @@ public final class CopyConfig extends AbstractEdit { ErrorTag.BAD_ELEMENT, ErrorSeverity.ERROR); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } private void copyToCandidate(final XmlElement operationElement) diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java index 3e90745d33..3ec15d473d 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import java.util.HashMap; import java.util.Map; import org.opendaylight.netconf.api.DocumentedException; @@ -53,7 +51,7 @@ public class DiscardChanges extends AbstractSingletonNetconfOperation { throw new DocumentedException(e.getMessage(), e, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED, ErrorSeverity.ERROR, errorInfo); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @Override diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java index 7fcb151105..dc107b8f65 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java @@ -7,7 +7,6 @@ */ package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.List; import java.util.ListIterator; @@ -82,7 +81,7 @@ public final class EditConfig extends AbstractEdit { executeOperations(changeTracker); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } private void executeOperations(final DataTreeChangeTracker changeTracker) throws DocumentedException { 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 e1a6ff10c0..4c0554a358 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; @@ -40,7 +38,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); } throw new DocumentedException("Unable to lock " + targetDatastore + " datastore", diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java index 52449dfcc1..5f304d24d4 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java @@ -7,12 +7,12 @@ */ package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import java.io.IOException; import java.net.URI; import java.util.Collection; import java.util.Collections; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; import javax.xml.stream.XMLOutputFactory; @@ -103,7 +103,7 @@ public class RuntimeRpc extends AbstractSingletonNetconfOperation { //this returns module with the newest revision if more then 1 module with same namespace is found private Optional getModule(final URI namespaceURI) { - return Optional.fromJavaUtil(schemaContext.getCurrentContext().findModules(namespaceURI).stream().findFirst()); + return schemaContext.getCurrentContext().findModules(namespaceURI).stream().findFirst(); } private static Optional getRpcDefinitionFromModule(final Module module, final URI namespaceURI, @@ -114,7 +114,7 @@ public class RuntimeRpc extends AbstractSingletonNetconfOperation { return Optional.of(rpcDef); } } - return Optional.absent(); + return Optional.empty(); } @Override 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 ed3e0b1ebc..00e7506bc5 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; @@ -39,7 +37,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); } throw new DocumentedException("Unable to unlock " + targetDatastore + " datastore", diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java index 4792dd7b31..df1657b5bf 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.mdsal.connector.ops; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import java.util.Map; import org.opendaylight.netconf.api.DocumentedException; @@ -50,7 +48,7 @@ public final class Validate extends AbstractConfigOperation { transactionProvider.validateTransaction(); LOG.trace(" request completed successfully on session {}", getNetconfSessionIdForReporting()); - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } protected static Datastore extractSourceParameter(final XmlElement operationElement, final String operationName) 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 6ce25640ea..8eaef55451 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 @@ -8,9 +8,9 @@ package org.opendaylight.netconf.mdsal.connector.ops.get; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.collect.Iterables; import java.io.IOException; +import java.util.Optional; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -127,7 +127,7 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation { final Optional filterElement = operationElement.getOnlyChildElementOptionally(FILTER); if (filterElement.isPresent()) { if (filterElement.get().getChildElements().size() == 0) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(getInstanceIdentifierFromFilter(filterElement.get())); } @@ -177,10 +177,9 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation { private static Optional parseSource(final XmlElement xml) throws DocumentedException { final Optional sourceElement = xml.getOnlyChildElementOptionally(XmlNetconfConstants.SOURCE_KEY, XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0); - return sourceElement.isPresent() ? Optional.of(Datastore.valueOf(sourceElement.get().getOnlyChildElement().getName())) - : Optional.absent(); + : Optional.empty(); } 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/FilterContentValidator.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java index 1c88362cee..dd1c41ebc9 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.mdsal.connector.ops.get; import static org.opendaylight.yangtools.yang.data.util.ParserStreamUtils.findSchemaNodeByNameAndNamespace; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.net.URI; import java.net.URISyntaxException; @@ -20,6 +19,7 @@ import java.util.Deque; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamWriter; import org.opendaylight.netconf.api.DocumentedException; 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 b7f0b2bf00..8dadc6bec1 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 @@ -7,7 +7,7 @@ */ package org.opendaylight.netconf.mdsal.connector.ops.get; -import com.google.common.base.Optional; +import java.util.Optional; import java.util.concurrent.ExecutionException; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; @@ -47,7 +47,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); } final YangInstanceIdentifier dataRoot = dataRootOptional.get(); @@ -59,7 +59,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); } 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 4cce7ac2c0..b23473da54 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 @@ -7,8 +7,8 @@ */ package org.opendaylight.netconf.mdsal.connector.ops.get; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Optional; import java.util.concurrent.ExecutionException; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; @@ -56,7 +56,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); } final YangInstanceIdentifier dataRoot = dataRootOptional.get(); @@ -73,7 +73,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); } return serializeNodeWithParentStructure(document, dataRoot, normalizedNodeOptional.get()); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java index 849c0de8d8..c4f8d406d7 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java @@ -5,12 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.messagebus.eventsources.netconf; import static com.google.common.util.concurrent.Futures.immediateFuture; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Maps; @@ -25,6 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.regex.Pattern; diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java index 349a57a64d..d46336a962 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.api.messages; -import com.google.common.base.Optional; import com.google.common.collect.Sets; +import java.util.Optional; import java.util.Set; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; @@ -41,7 +40,7 @@ public final class NetconfHelloMessage extends NetconfMessage { } public Optional getAdditionalHeader() { - return Optional.fromNullable(additionalHeader); + return Optional.ofNullable(additionalHeader); } private static void checkHelloMessage(final Document doc) { @@ -54,7 +53,7 @@ public final class NetconfHelloMessage extends NetconfMessage { public static NetconfHelloMessage createClientHello(final Iterable capabilities, final Optional additionalHeaderOptional) { - return new NetconfHelloMessage(createHelloMessageDoc(capabilities), additionalHeaderOptional.orNull()); + return new NetconfHelloMessage(createHelloMessageDoc(capabilities), additionalHeaderOptional.orElse(null)); } private static Document createHelloMessageDoc(final Iterable capabilities) { diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java index 03d1d36e1b..493052bb50 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java @@ -7,8 +7,8 @@ */ package org.opendaylight.netconf.api.monitoring; -import com.google.common.base.Optional; import java.util.Collection; +import java.util.Optional; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities; 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.Sessions; 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 c04fda11ac..039a45ed61 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 @@ -7,7 +7,6 @@ */ package org.opendaylight.netconf.api.xml; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; @@ -18,6 +17,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -234,7 +234,7 @@ public final class XmlElement { public Optional getOnlyChildElementOptionally(final String childName) { List nameElements = getChildElements(childName); if (nameElements.size() != 1) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(nameElements.get(0)); } @@ -244,7 +244,7 @@ public final class XmlElement { children = Lists.newArrayList(Collections2.filter(children, xmlElement -> xmlElement.getName().equals(childName))); if (children.size() != 1) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(children.get(0)); } @@ -252,7 +252,7 @@ public final class XmlElement { public Optional getOnlyChildElementOptionally() { List children = getChildElements(); if (children.size() != 1) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(children.get(0)); } @@ -274,11 +274,11 @@ public final class XmlElement { children = Lists.newArrayList(Collections2.filter(children, xmlElement -> xmlElement.getName().equals(childName))); if (children.size() != 1) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(children.get(0)); } - return Optional.absent(); + return Optional.empty(); } public Optional getOnlyChildElementWithSameNamespaceOptionally() { @@ -289,7 +289,7 @@ public final class XmlElement { && getNamespaceOptionally().get().equals(child.get().getNamespaceOptionally().get())) { return child; } - return Optional.absent(); + return Optional.empty(); } public XmlElement getOnlyChildElement(final String childName, final String namespace) throws DocumentedException { @@ -357,7 +357,7 @@ public final class XmlElement { return Optional.of(((Text) item).getWholeText()); } } - return Optional.absent(); + return Optional.empty(); } public String getNamespaceAttribute() throws MissingNameSpaceException { @@ -375,7 +375,7 @@ public final class XmlElement { public Optional getNamespaceAttributeOptionally() { String attribute = element.getAttribute(XmlUtil.XMLNS_ATTRIBUTE_KEY); if (attribute.isEmpty() || attribute.equals(DEFAULT_NAMESPACE_PREFIX)) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(attribute); } @@ -383,7 +383,7 @@ public final class XmlElement { public Optional getNamespaceOptionally() { String namespaceURI = element.getNamespaceURI(); if (Strings.isNullOrEmpty(namespaceURI)) { - return Optional.absent(); + return Optional.empty(); } else { return Optional.of(namespaceURI); } 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 d6d9f82f8a..458d4e4965 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.api.xml; -import com.google.common.base.Optional; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -16,6 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; import java.nio.charset.StandardCharsets; +import java.util.Optional; import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; @@ -120,10 +119,14 @@ public final class XmlUtil { return DEFAULT_DOM_BUILDER.get().newDocument(); } - public static Element createElement(final Document document, final String qmame, + public static Element createElement(final Document document, final String qname) { + return createElement(document, qname, Optional.empty()); + } + + public static Element createElement(final Document document, final String qname, final Optional namespaceURI) { if (namespaceURI.isPresent()) { - final Element element = document.createElementNS(namespaceURI.get(), qmame); + final Element element = document.createElementNS(namespaceURI.get(), qname); String name = XMLNS_ATTRIBUTE_KEY; if (element.getPrefix() != null) { name += ":" + element.getPrefix(); @@ -131,7 +134,7 @@ public final class XmlUtil { element.setAttributeNS(XMLNS_URI, name, namespaceURI.get()); return element; } - return document.createElement(qmame); + return document.createElement(qname); } public static Element createTextElement(final Document document, final String qname, final String content, @@ -145,7 +148,7 @@ public final class XmlUtil { final String prefix, final String namespace, final String contentWithoutPrefix) { return createTextElementWithNamespacedContent(document, qname, prefix, namespace, contentWithoutPrefix, - Optional.absent()); + Optional.empty()); } public static Element createTextElementWithNamespacedContent(final Document document, final String qname, diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java index 8d5107dc5f..df0e4bc738 100644 --- a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java +++ b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java @@ -5,13 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.api.messages; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.common.base.Optional; +import java.util.Optional; import java.util.Set; import org.junit.Before; import org.junit.Test; diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java index fac88d679b..f529ed5492 100644 --- a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java +++ b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.api.xml; import static org.hamcrest.CoreMatchers.both; @@ -17,8 +16,8 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.base.Optional; import java.util.Map; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; @@ -114,7 +113,7 @@ public class XmlElementTest { final XmlElement inner = xmlElement.getOnlyChildElement("inner"); final XmlElement deepInner = inner.getOnlyChildElementWithSameNamespaceOptionally().get(); assertEquals(deepInner, inner.getOnlyChildElementWithSameNamespace()); - assertEquals(Optional.absent(), xmlElement.getOnlyChildElementOptionally("unknown")); + assertEquals(Optional.empty(), xmlElement.getOnlyChildElementOptionally("unknown")); assertEquals("deepValue", deepInner.getTextContent()); assertEquals("deepValue", deepInner.getOnlyTextContentOptionally().get()); assertEquals("deepValue", deepInner.getOnlyTextContentOptionally().get()); diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java index c45d7f4f69..20ad4e37b1 100644 --- a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java +++ b/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java @@ -5,15 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.api.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.base.Optional; import java.io.ByteArrayInputStream; +import java.util.Optional; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Test; diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java index 2e8a90719f..413ee30742 100644 --- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java +++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.client; import static java.util.Objects.requireNonNull; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.siemens.ct.exi.core.CodingMode; import com.siemens.ct.exi.core.FidelityOptions; @@ -17,6 +16,7 @@ import com.siemens.ct.exi.core.exceptions.UnsupportedOption; import io.netty.channel.Channel; import io.netty.util.Timer; import io.netty.util.concurrent.Promise; +import java.util.Optional; import java.util.Set; import org.opendaylight.netconf.api.NetconfClientSessionPreferences; import org.opendaylight.netconf.api.NetconfMessage; diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java index 756789a8e0..9ad03b915d 100644 --- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java +++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java @@ -9,10 +9,10 @@ package org.opendaylight.netconf.client.conf; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.net.InetSocketAddress; import java.util.List; +import java.util.Optional; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.netconf.client.NetconfClientSessionListener; import org.opendaylight.netconf.client.SslHandlerFactory; @@ -68,7 +68,7 @@ public class NetconfClientConfiguration { } public final Optional getAdditionalHeader() { - return Optional.fromNullable(additionalHeader); + return Optional.ofNullable(additionalHeader); } public final NetconfClientSessionListener getSessionListener() { diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java index 2e2f7203cb..46b2bfd38c 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java @@ -8,8 +8,8 @@ package org.opendaylight.netconf.client; -import com.google.common.base.Optional; import java.net.InetSocketAddress; +import java.util.Optional; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; @@ -39,7 +39,7 @@ public class NetconfClientConfigurationTest { .withAuthHandler(handler).build(); Assert.assertEquals(timeout, cfg.getConnectionTimeoutMillis()); - Assert.assertEquals(Optional.fromNullable(header), cfg.getAdditionalHeader()); + Assert.assertEquals(Optional.of(header), cfg.getAdditionalHeader()); Assert.assertEquals(listener, cfg.getSessionListener()); Assert.assertEquals(handler, cfg.getAuthHandler()); Assert.assertEquals(strategy, cfg.getReconnectStrategy()); @@ -57,7 +57,7 @@ public class NetconfClientConfigurationTest { .withSslHandlerFactory(sslHandlerFactory).build(); Assert.assertEquals(timeout, cfg2.getConnectionTimeoutMillis()); - Assert.assertEquals(Optional.fromNullable(header), cfg2.getAdditionalHeader()); + Assert.assertEquals(Optional.of(header), cfg2.getAdditionalHeader()); Assert.assertEquals(listener, cfg2.getSessionListener()); Assert.assertEquals(sslHandlerFactory, cfg2.getSslHandlerFactory()); Assert.assertEquals(strategy, cfg2.getReconnectStrategy()); 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 a033ea5c4b..34fa1f3256 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 @@ -5,18 +5,17 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.client; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import com.google.common.base.Optional; import io.netty.channel.Channel; import io.netty.util.HashedWheelTimer; import io.netty.util.Timer; import io.netty.util.concurrent.Promise; +import java.util.Optional; import org.junit.Test; import org.opendaylight.netconf.api.NetconfSessionListenerFactory; @@ -32,7 +31,7 @@ public class NetconfClientSessionNegotiatorFactoryTest { Channel channel = mock(Channel.class); Promise promise = mock(Promise.class); NetconfClientSessionNegotiatorFactory negotiatorFactory = new NetconfClientSessionNegotiatorFactory(timer, - Optional.absent(), 200L); + Optional.empty(), 200L); NetconfClientSessionNegotiator sessionNegotiator = negotiatorFactory.getSessionNegotiator(listenerFactory, channel, promise); diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java index b25de514c7..db9e80ed42 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.client; import static org.junit.Assert.assertEquals; @@ -19,7 +18,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; @@ -36,6 +34,7 @@ import io.netty.util.Timer; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.Promise; import java.io.InputStream; +import java.util.Optional; import java.util.Set; import org.junit.Before; import org.junit.Test; @@ -65,7 +64,7 @@ public class NetconfClientSessionNegotiatorTest { @Before public void setUp() throws Exception { - helloMessage = NetconfHelloMessage.createClientHello(Sets.newSet("exi:1.0"), Optional.absent()); + helloMessage = NetconfHelloMessage.createClientHello(Sets.newSet("exi:1.0"), Optional.empty()); pipeline = mockChannelPipeline(); future = mockChannelFuture(); channel = mockChannel(); diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java index be654a340c..ec09f88efa 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java @@ -8,8 +8,8 @@ package org.opendaylight.netconf.client; -import com.google.common.base.Optional; import java.net.InetSocketAddress; +import java.util.Optional; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; @@ -44,7 +44,7 @@ public class NetconfReconnectingClientConfigurationTest { .withAuthHandler(handler).build(); Assert.assertEquals(timeout, cfg.getConnectionTimeoutMillis()); - Assert.assertEquals(Optional.fromNullable(header), cfg.getAdditionalHeader()); + Assert.assertEquals(Optional.of(header), cfg.getAdditionalHeader()); Assert.assertEquals(listener, cfg.getSessionListener()); Assert.assertEquals(handler, cfg.getAuthHandler()); Assert.assertEquals(strategy, cfg.getConnectStrategyFactory()); @@ -64,7 +64,7 @@ public class NetconfReconnectingClientConfigurationTest { .withSslHandlerFactory(sslHandlerFactory).build(); Assert.assertEquals(timeout, cfg2.getConnectionTimeoutMillis()); - Assert.assertEquals(Optional.fromNullable(header), cfg2.getAdditionalHeader()); + Assert.assertEquals(Optional.of(header), cfg2.getAdditionalHeader()); Assert.assertEquals(listener, cfg2.getSessionListener()); Assert.assertEquals(sslHandlerFactory, cfg2.getSslHandlerFactory()); Assert.assertEquals(strategy, cfg2.getConnectStrategyFactory()); diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java index e32d5c7e45..1a975fc79f 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.impl; -import com.google.common.base.Optional; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.channel.Channel; import io.netty.channel.local.LocalAddress; @@ -18,6 +16,7 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.AbstractMap; import java.util.Map; +import java.util.Optional; import org.opendaylight.netconf.api.NetconfDocumentedException; import org.opendaylight.netconf.api.NetconfServerSessionPreferences; import org.opendaylight.netconf.api.messages.NetconfHelloMessage; 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 194411f2d6..1338ccdefd 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.impl.mapping.operations; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.Collections; import org.opendaylight.netconf.api.DocumentedException; @@ -60,7 +58,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); } @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 5e039cf67f..f9c931a1dc 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 @@ -11,7 +11,6 @@ import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARA import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_URL_1_0; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; @@ -25,6 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java index ff0bc5ce39..90bcfe3bd5 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java @@ -7,7 +7,7 @@ */ package org.opendaylight.netconf.impl.osgi; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.monitoring.SessionListener; @@ -23,13 +23,13 @@ public class NetconfMonitoringServiceImpl implements NetconfMonitoringService, A private final NetconfSessionMonitoringService sessionMonitoring; public NetconfMonitoringServiceImpl(NetconfOperationServiceFactory opProvider) { - this(opProvider, Optional.absent(), 0); + this(opProvider, Optional.empty(), 0); } public NetconfMonitoringServiceImpl(NetconfOperationServiceFactory opProvider, ScheduledThreadPool threadPool, long updateInterval) { - this(opProvider, Optional.fromNullable(threadPool), updateInterval); + this(opProvider, Optional.ofNullable(threadPool), updateInterval); } public NetconfMonitoringServiceImpl(NetconfOperationServiceFactory opProvider, diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java index 103dc1bcf8..a3fecbdeef 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java @@ -7,13 +7,13 @@ */ package org.opendaylight.netconf.impl.osgi; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java index 7799c16628..ebadafefa3 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java @@ -15,12 +15,12 @@ import static org.mockito.Mockito.verify; import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_CANDIDATE_1_0; import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_URL_1_0; -import com.google.common.base.Optional; import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import org.junit.Assert; import org.junit.Before; @@ -156,7 +156,7 @@ public class NetconfCapabilityMonitoringServiceTest { //remove one revision monitoringService.onCapabilitiesChanged(Collections.emptySet(), Collections.singleton(moduleCapability1)); //only one revision present - final String schema3 = monitoringService.getSchemaForModuleRevision(TEST_MODULE_NAME, Optional.absent()); + final String schema3 = monitoringService.getSchemaForModuleRevision(TEST_MODULE_NAME, Optional.empty()); Assert.assertEquals(TEST_MODULE_CONTENT2, schema3); } diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java index ef6a5dc61a..cd7096cb7a 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java @@ -14,9 +14,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; -import com.google.common.base.Optional; import java.util.Collection; import java.util.HashSet; +import java.util.Optional; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import org.junit.Assert; @@ -73,7 +73,7 @@ public class NetconfSessionMonitoringServiceTest { doNothing().when(notificationPublisher).onSessionStarted(any()); doNothing().when(notificationPublisher).onSessionEnded(any()); - monitoringService = new NetconfSessionMonitoringService(Optional.absent(), 0); + monitoringService = new NetconfSessionMonitoringService(Optional.empty(), 0); monitoringService.registerListener(listener); } diff --git a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/GetSchema.java b/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/GetSchema.java index 4f8374c974..4a041d46a4 100644 --- a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/GetSchema.java +++ b/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/GetSchema.java @@ -7,9 +7,9 @@ */ package org.opendaylight.netconf.monitoring; -import com.google.common.base.Optional; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.xml.XmlElement; @@ -92,7 +92,7 @@ public class GetSchema extends AbstractSingletonNetconfOperation { if (versionElement.isPresent()) { version = Optional.of(versionElement.get().getTextContent()); } else { - version = Optional.absent(); + version = Optional.empty(); } } } diff --git a/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetSchemaTest.java b/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetSchemaTest.java index 178f6fac0d..ab1081ae8b 100644 --- a/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetSchemaTest.java +++ b/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/GetSchemaTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.monitoring; import static org.junit.Assert.assertNotNull; @@ -15,7 +14,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; -import com.google.common.base.Optional; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java index fac1b2ba4d..ee24cc679e 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java @@ -8,12 +8,12 @@ package org.opendaylight.netconf.nettyutil.handler; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.util.Optional; import javax.xml.transform.TransformerException; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessage; diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java index e2fe0c67fd..68decb5ac5 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiatorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.nettyutil; import static org.mockito.ArgumentMatchers.any; @@ -19,7 +18,6 @@ import static org.mockito.Mockito.verify; import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETCONF_MESSAGE_AGGREGATOR; import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETCONF_MESSAGE_FRAME_ENCODER; -import com.google.common.base.Optional; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -33,6 +31,7 @@ import io.netty.util.concurrent.Promise; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Optional; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -78,9 +77,9 @@ public class AbstractNetconfSessionNegotiatorTest { channel.pipeline().addLast(NETCONF_MESSAGE_FRAME_ENCODER, FramingMechanismHandlerFactory.createHandler(FramingMechanism.EOM)); channel.pipeline().addLast(NETCONF_MESSAGE_AGGREGATOR, new NetconfEOMAggregator()); - hello = NetconfHelloMessage.createClientHello(Collections.emptySet(), Optional.absent()); + hello = NetconfHelloMessage.createClientHello(Collections.emptySet(), Optional.empty()); helloBase11 = NetconfHelloMessage.createClientHello(Collections - .singleton(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1), Optional.absent()); + .singleton(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1), Optional.empty()); prefs = new NetconfSessionPreferences(helloBase11); doReturn(promise).when(promise).setFailure(any()); doReturn(promise).when(promise).setSuccess(any()); diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java index e978850545..e3d152c265 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.nettyutil; import static org.junit.Assert.assertEquals; @@ -21,7 +20,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; -import com.google.common.base.Optional; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; @@ -32,6 +30,7 @@ import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; import io.netty.util.concurrent.GenericFutureListener; import java.util.Collections; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -84,7 +83,7 @@ public class AbstractNetconfSessionTest { return null; }).when(eventLoop).execute(any(Runnable.class)); - clientHello = NetconfHelloMessage.createClientHello(Collections.emptySet(), Optional.absent()); + clientHello = NetconfHelloMessage.createClientHello(Collections.emptySet(), Optional.empty()); } @Test @@ -154,7 +153,7 @@ public class AbstractNetconfSessionTest { public void testSendMessage() throws Exception { final TestingNetconfSession testingNetconfSession = new TestingNetconfSession(listener, channel, 1L); final NetconfHelloMessage hello = NetconfHelloMessage.createClientHello(Collections.emptySet(), - Optional.absent()); + Optional.empty()); testingNetconfSession.sendMessage(hello); verify(channel).writeAndFlush(hello, writeFuture); } diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java index 4bea19a2ad..8e8edebb6c 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.nettyutil; import static org.mockito.ArgumentMatchers.any; @@ -13,12 +12,12 @@ import static org.mockito.Mockito.doReturn; import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETCONF_MESSAGE_AGGREGATOR; import static org.opendaylight.netconf.nettyutil.AbstractChannelInitializer.NETCONF_MESSAGE_FRAME_ENCODER; -import com.google.common.base.Optional; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.HashedWheelTimer; import io.netty.util.concurrent.Promise; import java.util.Collections; +import java.util.Optional; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -59,7 +58,7 @@ public class Netconf539Test { FramingMechanismHandlerFactory.createHandler(FramingMechanism.EOM)); channel.pipeline().addLast(NETCONF_MESSAGE_AGGREGATOR, new NetconfEOMAggregator()); final NetconfHelloMessage serverHello = NetconfHelloMessage.createClientHello(Collections - .singleton(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1), Optional.absent()); + .singleton(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1), Optional.empty()); doReturn(promise).when(promise).setFailure(any()); doReturn(promise).when(promise).setSuccess(any()); negotiator = new TestSessionNegotiator(new NetconfSessionPreferences(serverHello), promise, channel, 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 99435ea15a..81c6af23e7 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 @@ -7,11 +7,11 @@ */ package org.opendaylight.netconf.notifications.impl.ops; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfSession; import org.opendaylight.netconf.api.xml.XmlElement; @@ -88,7 +88,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); } private static StreamNameType parseStreamIfPresent(final XmlElement operationElement) throws DocumentedException { diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java index a9ab6994d7..b584b5661b 100644 --- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java +++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.util.mapping; -import com.google.common.base.Optional; import java.util.Map; +import java.util.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java index 6e16741be2..a0c2db36c4 100644 --- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java +++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java @@ -5,13 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.util.messages; -import com.google.common.base.Optional; import com.google.common.collect.Collections2; import java.util.Collection; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfDocumentedException; @@ -70,9 +69,10 @@ public final class NetconfMessageUtil { XmlElement responseElement = XmlElement.fromDomDocument(doc); // Extract child element from with or without(fallback) the same namespace Optional capabilitiesElement = responseElement - .getOnlyChildElementWithSameNamespaceOptionally(XmlNetconfConstants.CAPABILITIES) - .or(responseElement - .getOnlyChildElementOptionally(XmlNetconfConstants.CAPABILITIES)); + .getOnlyChildElementWithSameNamespaceOptionally(XmlNetconfConstants.CAPABILITIES); + if (!capabilitiesElement.isPresent()) { + capabilitiesElement = responseElement.getOnlyChildElementOptionally(XmlNetconfConstants.CAPABILITIES); + } List caps = capabilitiesElement.get().getChildElements(XmlNetconfConstants.CAPABILITY); return Collections2.transform(caps, (@Nonnull final XmlElement input) -> { diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java index 3b803b6a43..fdc3831c32 100644 --- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java +++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.util.messages; -import com.google.common.base.Optional; import java.util.Map; +import java.util.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; @@ -69,7 +68,7 @@ public final class SubtreeFilter { Document notification) throws DocumentedException { removeEventTimeNode(notification); if (isSupported(filter)) { - return Optional.fromNullable(filteredNotification(filter, notification)); + return Optional.ofNullable(filteredNotification(filter, notification)); } return Optional.of(extractNotificationContent(notification)); } diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java index 341c1c46e8..9e7ed2bb27 100644 --- a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java +++ b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java @@ -5,17 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.util.messages; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.common.base.Optional; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Before; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java index ef4c254bdc..2454b5eedc 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -7,7 +7,6 @@ */ package org.opendaylight.netconf.sal.connect.netconf.util; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -22,6 +21,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMResult; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java index a3aa411bea..d6109639eb 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java @@ -5,16 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import java.util.Collections; +import java.util.Optional; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; 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 c985f45f9f..93ea6eaff8 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -17,14 +15,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; public class SimulatedCommit extends AbstractLastNetconfOperation { - public SimulatedCommit(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); } @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @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 8d62d3ada1..cf6fd1d74a 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 @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; import com.google.common.base.Optional; @@ -103,7 +102,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im }, delayAggregator, TimeUnit.SECONDS); } } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } private static NetconfMessage parseNetconfNotification(String content) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java index fe54d84f9f..924024c2ba 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -24,7 +22,7 @@ public class SimulatedDiscardChanges extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @Override 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 509d9416de..b2231f2f33 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; @@ -41,7 +39,7 @@ public class SimulatedEditConfig extends AbstractLastNetconfOperation { storage.setConfigList(configElementData.getChildElements()); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java index e5b197d3c3..e7cc098d96 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -27,7 +25,7 @@ public class SimulatedGet extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); + final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); for (final XmlElement e : storage.getConfigList()) { final Element domElement = e.getDomElement(); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java index 4c2a8592a9..ca09bb310c 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; import com.google.common.base.Optional; @@ -60,7 +59,7 @@ public class SimulatedGetConfig extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent()); + final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); for (final XmlElement e : storage.getConfigList()) { final Element domElement = e.getDomElement(); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java index 1dfbd1f428..beda99d066 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -24,7 +22,7 @@ public class SimulatedLock extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @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 bfd0026c37..22d27f5c04 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 @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.rpc; -import com.google.common.base.Optional; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -24,7 +22,7 @@ public class SimulatedUnLock extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK); } @Override