Use java.util.Optional

Modernizer is point out use of Guava's Optional, migrate to Java
equivalents.

Change-Id: I732ea429505c730ef7ab38d45849662265267e0b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
index 88840f053d3f320fb7d4e549d0f217c8773671f6..33b8fce4813c5a999b955baf9b06f423a05761cc 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.netconf.mdsal.connector;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.util.concurrent.FluentFuture;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
@@ -53,11 +54,7 @@ public class TransactionProvider implements AutoCloseable {
     }
 
     public synchronized Optional<DOMDataTreeReadWriteTransaction> getCandidateTransaction() {
-        if (candidateTransaction == null) {
-            return Optional.absent();
-        }
-
-        return Optional.of(candidateTransaction);
+        return Optional.ofNullable(candidateTransaction);
     }
 
     public synchronized DOMDataTreeReadWriteTransaction getOrCreateTransaction() {
@@ -139,8 +136,7 @@ public class TransactionProvider implements AutoCloseable {
 
     public synchronized void abortRunningTransaction(final DOMDataTreeReadWriteTransaction tx) {
         LOG.debug("Aborting current running Transaction");
-        Preconditions.checkState(runningTransaction != null,
-                NO_TRANSACTION_FOUND_FOR_SESSION + netconfSessionIdForReporting);
+        checkState(runningTransaction != null, NO_TRANSACTION_FOUND_FOR_SESSION + netconfSessionIdForReporting);
         tx.cancel();
         allOpenReadWriteTransactions.remove(tx);
     }

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java
index ea025d8b26227ac4eee0f3195b24f3ef22478599..fe9b08078afc378faf0ae39e4d76b0e7358434c8 100644 (file)
--- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java
+++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java
@@ -5,18 +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.api.capability;
 
-import com.google.common.base.Optional;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Optional;
 
 /**
  * Capability representing a basic, one-line, string based capability.
  */
 public class BasicCapability implements Capability {
-
     private final String capability;
 
     public BasicCapability(final String capability) {
@@ -30,22 +28,22 @@ public class BasicCapability implements Capability {
 
     @Override
     public Optional<String> getModuleNamespace() {
-        return Optional.absent();
+        return Optional.empty();
     }
 
     @Override
     public Optional<String> getModuleName() {
-        return Optional.absent();
+        return Optional.empty();
     }
 
     @Override
     public Optional<String> getRevision() {
-        return Optional.absent();
+        return Optional.empty();
     }
 
     @Override
     public Optional<String> getCapabilitySchema() {
-        return Optional.absent();
+        return Optional.empty();
     }
 
     @Override

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java
index f17ce50707719b270100bc3b4857d73ff20afb8e..b40bb66b5eae7ea48e0f1ef37e3197b2de4048eb 100644 (file)
--- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java
+++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.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.capability;
 
-import com.google.common.base.Optional;
 import java.util.Collection;
+import java.util.Optional;
 
 /**
  * Contains capability URI announced by server hello message and optionally its

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
index 68b8ee35c7e7914c243754d48e60f41d89bb5611..03b94eb3b56fb1cf2de93edd2879a2fa4aa1b7df 100644 (file)
--- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
+++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
@@ -5,10 +5,9 @@
  * 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.capability;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Module;
 
@@ -58,6 +57,6 @@ public final class YangModuleCapability extends BasicCapability {
 
     @Override
     public Optional<String> getRevision() {
-        return Optional.fromNullable(revision);
+        return Optional.ofNullable(revision);
     }
 }

diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
index 4a3a38edf8882f4732189e42a468a68530529df3..7b4a0ccfac83b5a5f273d65ccc172e859de14748 100644 (file)
--- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java
+++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.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.client;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.collect.Sets;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.HashedWheelTimer;
@@ -20,6 +19,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -46,8 +46,8 @@ public class TestingNetconfClient implements Closeable {
     private final NetconfClientSessionListener sessionListener;
     private final long sessionId;
 
-    public TestingNetconfClient(String clientLabel,
-                                NetconfClientDispatcher netconfClientDispatcher,
+    public TestingNetconfClient(final String clientLabel,
+                                final NetconfClientDispatcher netconfClientDispatcher,
                                 final NetconfClientConfiguration config) throws InterruptedException {
         this.label = clientLabel;
         sessionListener = config.getSessionListener();
@@ -56,7 +56,8 @@ public class TestingNetconfClient implements Closeable {
         this.sessionId = clientSession.getSessionId();
     }
 
-    private static NetconfClientSession get(Future<NetconfClientSession> clientFuture) throws InterruptedException {
+    private static NetconfClientSession get(final Future<NetconfClientSession> clientFuture)
+            throws InterruptedException {
         try {
             return clientFuture.get();
         } catch (CancellationException e) {
@@ -66,16 +67,16 @@ public class TestingNetconfClient implements Closeable {
         }
     }
 
-    public Future<NetconfMessage> sendRequest(NetconfMessage message) {
+    public Future<NetconfMessage> sendRequest(final NetconfMessage message) {
         return ((SimpleNetconfClientSessionListener) sessionListener).sendRequest(message);
     }
 
-    public NetconfMessage sendMessage(NetconfMessage message, int attemptMsDelay) throws ExecutionException,
+    public NetconfMessage sendMessage(final NetconfMessage message, final int attemptMsDelay) throws ExecutionException,
             InterruptedException, TimeoutException {
         return sendRequest(message).get(attemptMsDelay, TimeUnit.MILLISECONDS);
     }
 
-    public NetconfMessage sendMessage(NetconfMessage message) throws ExecutionException,
+    public NetconfMessage sendMessage(final NetconfMessage message) throws ExecutionException,
             InterruptedException, TimeoutException {
         return sendMessage(message, DEFAULT_CONNECT_TIMEOUT);
     }
@@ -99,11 +100,11 @@ public class TestingNetconfClient implements Closeable {
     }
 
     public Set<String> getCapabilities() {
-        Preconditions.checkState(clientSession != null, "Client was not initialized successfully");
+        checkState(clientSession != null, "Client was not initialized successfully");
         return Sets.newHashSet(clientSession.getServerCapabilities());
     }
 
-    public static void main(String[] args) throws Exception {
+    public static void main(final String[] args) throws Exception {
         HashedWheelTimer hashedWheelTimer = new HashedWheelTimer();
         NioEventLoopGroup nettyGroup = new NioEventLoopGroup();
         NetconfClientDispatcherImpl netconfClientDispatcher = new NetconfClientDispatcherImpl(nettyGroup, nettyGroup,
@@ -114,8 +115,8 @@ public class TestingNetconfClient implements Closeable {
         System.console().writer().println(client.getCapabilities());
     }
 
-    private static NetconfClientConfiguration getClientConfig(String host, int port, boolean ssh, Optional<? extends
-            AuthenticationHandler> maybeAuthHandler) throws UnknownHostException {
+    private static NetconfClientConfiguration getClientConfig(final String host, final int port, final boolean ssh,
+            final Optional<? extends AuthenticationHandler> maybeAuthHandler) throws UnknownHostException {
         InetSocketAddress netconfAddress = new InetSocketAddress(InetAddress.getByName(host), port);
         final NetconfClientConfigurationBuilder b = NetconfClientConfigurationBuilder.create();
         b.withAddress(netconfAddress);

diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java b/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java
index 4d3e025ebecd80e506f148e4d44813e22cac2785..2f1f37f205596aca7edb82328011829c97280f14 100644 (file)
--- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java
+++ b/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java
@@ -5,13 +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.mapping.api;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import java.util.Objects;
+import java.util.Optional;
 
 public final class HandlingPriority implements Comparable<HandlingPriority> {
 
@@ -21,11 +22,11 @@ public final class HandlingPriority implements Comparable<HandlingPriority> {
 
     private Integer priority;
 
-    public static HandlingPriority getHandlingPriority(int priority) {
+    public static HandlingPriority getHandlingPriority(final int priority) {
         return new HandlingPriority(priority);
     }
 
-    private HandlingPriority(int priority) {
+    private HandlingPriority(final int priority) {
         this.priority = priority;
     }
 
@@ -38,13 +39,13 @@ public final class HandlingPriority implements Comparable<HandlingPriority> {
      * @return priority number or Optional.absent otherwise
      */
     public Optional<Integer> getPriority() {
-        return Optional.fromNullable(priority);
+        return Optional.ofNullable(priority);
     }
 
-    public HandlingPriority increasePriority(int priorityIncrease) {
-        Preconditions.checkState(priority != null, "Unable to increase priority for %s", this);
-        Preconditions.checkArgument(priorityIncrease > 0, "Negative increase");
-        Preconditions.checkArgument(Long.valueOf(priority) + priorityIncrease < Integer.MAX_VALUE,
+    public HandlingPriority increasePriority(final int priorityIncrease) {
+        checkState(priority != null, "Unable to increase priority for %s", this);
+        checkArgument(priorityIncrease > 0, "Negative increase");
+        checkArgument(Long.valueOf(priority) + priorityIncrease < Integer.MAX_VALUE,
                 "Resulting priority cannot be higher than %s", Integer.MAX_VALUE);
         return getHandlingPriority(priority + priorityIncrease);
     }
@@ -55,7 +56,7 @@ public final class HandlingPriority implements Comparable<HandlingPriority> {
 
     @Override
     @SuppressWarnings("checkstyle:parameterName")
-    public int compareTo(HandlingPriority o) {
+    public int compareTo(final HandlingPriority o) {
         if (this == o) {
             return 0;
         }
@@ -80,7 +81,7 @@ public final class HandlingPriority implements Comparable<HandlingPriority> {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }

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 9b457109bd5d47f3ff17a3a1dd01d73fb142fdff..12062b2d4068090376bf81fb19182507c1e98090 100644 (file)
--- 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
@@ -10,7 +10,6 @@ package org.opendaylight.netconf.nettyutil;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Optional;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
@@ -22,6 +21,7 @@ import io.netty.util.Timer;
 import io.netty.util.TimerTask;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.Promise;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.opendaylight.netconf.api.NetconfDocumentedException;
 import org.opendaylight.netconf.api.NetconfMessage;
@@ -100,8 +100,7 @@ public abstract class AbstractNetconfSessionNegotiator<P extends NetconfSessionP
     }
 
     private static Optional<SslHandler> getSslHandler(final Channel channel) {
-        final SslHandler sslHandler = channel.pipeline().get(SslHandler.class);
-        return sslHandler == null ? Optional.absent() : Optional.of(sslHandler);
+        return Optional.ofNullable(channel.pipeline().get(SslHandler.class));
     }
 
     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 c7ab89d8c71d81008cf352c217e7e7eea12217a6..81ee32c26d7242737f224a86cd33848c19cfa8e6 100644 (file)
--- 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
@@ -8,7 +8,6 @@
 package org.opendaylight.netconf.nettyutil.handler;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.channel.ChannelHandlerContext;
@@ -17,9 +16,11 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,14 +29,14 @@ import org.w3c.dom.Comment;
 public class NetconfMessageToXMLEncoder extends MessageToByteEncoder<NetconfMessage> {
     private static final Logger LOG = LoggerFactory.getLogger(NetconfMessageToXMLEncoder.class);
 
-    private final Optional<String> clientId;
+    private final @Nullable String clientId;
 
     public NetconfMessageToXMLEncoder() {
-        this(Optional.absent());
+        this(Optional.empty());
     }
 
     public NetconfMessageToXMLEncoder(final Optional<String> clientId) {
-        this.clientId = clientId;
+        this.clientId = clientId.orElse(null);
     }
 
     @Override
@@ -44,8 +45,8 @@ public class NetconfMessageToXMLEncoder extends MessageToByteEncoder<NetconfMess
             throws IOException, TransformerException {
         LOG.trace("Sent to encode : {}", msg);
 
-        if (clientId.isPresent()) {
-            Comment comment = msg.getDocument().createComment("clientId:" + clientId.get());
+        if (clientId != null) {
+            Comment comment = msg.getDocument().createComment("clientId:" + clientId);
             msg.getDocument().appendChild(comment);
         }
 

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 929232a8a29951250382148d5912f4983a987e76..7cac6407fecba69c82f470117cec438d1a5d8a7e 100644 (file)
--- 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
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.netconf.sal.connect.netconf.listener;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
@@ -16,6 +15,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
@@ -88,7 +88,7 @@ public class NetconfDeviceCommunicator
             final RemoteDeviceId id,
             final RemoteDevice<NetconfSessionPreferences, NetconfMessage, NetconfDeviceCommunicator> remoteDevice,
             final int rpcMessageLimit) {
-        this(id, remoteDevice, Optional.absent(), rpcMessageLimit);
+        this(id, remoteDevice, Optional.empty(), rpcMessageLimit);
     }
 
     private NetconfDeviceCommunicator(

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 b844af67e77710e9e0eef1e06bdaa105bbedcd8d..753637753c7196751a9313c69096159970ae583d 100644 (file)
--- 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
@@ -44,10 +44,10 @@ public class DummyMonitoringService implements NetconfMonitoringService {
             .setIdentifier(capability.getModuleName().get())
             .setNamespace(new Uri(capability.getModuleNamespace().get()))
             .setFormat(Yang.class)
-            .setVersion(capability.getRevision().or(""))
+            .setVersion(capability.getRevision().orElse(""))
             .setLocation(Collections.singletonList(new Location(Enumeration.NETCONF)))
             .withKey(new SchemaKey(Yang.class, capability.getModuleName().get(),
-                capability.getRevision().or("")))
+                capability.getRevision().orElse("")))
             .build();
 
     private final Capabilities capabilities;

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/FakeCapability.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/FakeCapability.java
index 921c09a9364a59793c30b6ad305529c27bf93947..e7c198eaac02e42c9b913e27eceb3c7bc7539ff7 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/FakeCapability.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/FakeCapability.java
@@ -5,10 +5,9 @@
  * 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.Optional;
+import java.util.Optional;
 import org.opendaylight.netconf.api.capability.BasicCapability;
 import org.opendaylight.netconf.api.capability.YangModuleCapability;
 
@@ -47,6 +46,6 @@ public class FakeCapability extends BasicCapability {
      */
     @Override
     public Optional<String> getCapabilitySchema() {
-        return Optional.absent();
+        return Optional.empty();
     }
 }

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
index a87dd0648cd690938e38a56e9100292bff207d94..b74f5f52b0e71b565cf43dab5006af311e395f43 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
@@ -9,7 +9,6 @@
 package org.opendaylight.netconf.test.tool;
 
 import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -30,6 +29,7 @@ import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.nio.channels.AsynchronousChannelGroup;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -145,8 +145,8 @@ public class NetconfDeviceSimulator implements Closeable {
         } else if (configuration.isXmlConfigurationProvided()) {
             LOG.info("using SimulatedOperationProvider.");
             operationProvider = new SimulatedOperationProvider(idProvider, transformedCapabilities,
-                    Optional.fromNullable(configuration.getNotificationFile()),
-                    Optional.fromNullable(configuration.getInitialConfigXMLFile()));
+                    Optional.ofNullable(configuration.getNotificationFile()),
+                    Optional.ofNullable(configuration.getInitialConfigXMLFile()));
         } else {
             LOG.info("using OperationsProvider.");
             operationProvider = new OperationsProvider(idProvider, transformedCapabilities,

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 f2828d1eeda304e03a6c5ad0b85a9cd8cccf600d..a84268625bd56e3dc17695a48b9f36099407079d 100644 (file)
--- 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
@@ -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.test.tool;
 
-import com.google.common.base.Optional;
 import com.google.common.collect.Sets;
 import java.io.File;
 import java.util.Collections;
+import java.util.Optional;
 import java.util.Set;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
index edfdf6ef7490f5a0c6eaa9a839a7df83c73f70c6..07f8727609fe67bae39d94ceabe4495d5f1ac8f4 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.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.test.tool.operations;
 
-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.capability.Capability;
 import org.opendaylight.netconf.impl.SessionIdProvider;
@@ -58,12 +57,12 @@ public final class DefaultOperationsCreator implements OperationsCreator {
             final SimulatedGet sGet = new SimulatedGet(String.valueOf(currentSessionId), storage);
             final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
             final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(
-                String.valueOf(currentSessionId), storage, Optional.absent());
+                String.valueOf(currentSessionId), storage, Optional.empty());
             final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(currentSessionId));
             final SimulatedLock sLock = new SimulatedLock(String.valueOf(currentSessionId));
             final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(currentSessionId));
             final SimulatedCreateSubscription sCreateSubs = new SimulatedCreateSubscription(
-                String.valueOf(currentSessionId), Optional.absent());
+                String.valueOf(currentSessionId), Optional.empty());
             final SimulatedDiscardChanges sDiscardChanges = new SimulatedDiscardChanges(
                 String.valueOf(currentSessionId));
             return Sets.newHashSet(

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 bf90d9479de66fa248cc4ffe5a3c251bef1fba44..bfa9ff4c0ffeb0f07f57f4c2e2139262257be5d7 100644 (file)
--- 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
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.netconf.test.tool.rpc;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import java.io.File;
@@ -18,6 +17,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -51,7 +51,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im
             notifs = Optional.of(loadNotifications(notificationsFile.get()));
             scheduledExecutorService = Executors.newScheduledThreadPool(1);
         } else {
-            notifs = Optional.absent();
+            notifs = Optional.empty();
         }
 
         if (notifs.isPresent()) {

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 d7b9f09cbde07a79a38c6d450c97f1aea7db6752..55e25c01ae66c5c0fdf2ac910429ba1a99bede63 100644 (file)
--- 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
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.netconf.test.tool.rpc;
 
-import com.google.common.base.Optional;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
@@ -24,8 +24,7 @@ import org.xml.sax.SAXException;
 public class SimulatedGetConfig extends AbstractLastNetconfOperation {
 
     private final DataList storage;
-    private static final Logger LOG = LoggerFactory
-            .getLogger(SimulatedGetConfig.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimulatedGetConfig.class);
 
     public SimulatedGetConfig(final String netconfSessionIdForReporting, final DataList storage,
                               final Optional<File> initialConfigXMLFile) {