From df283f75ef7de5ed90e47bf03c2f0c7183d11b0f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 3 Sep 2019 09:22:51 +0200 Subject: [PATCH] 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 --- .../mdsal/connector/TransactionProvider.java | 14 ++++------ .../api/capability/BasicCapability.java | 12 ++++----- .../netconf/api/capability/Capability.java | 3 +-- .../api/capability/YangModuleCapability.java | 5 ++-- .../netconf/client/TestingNetconfClient.java | 27 ++++++++++--------- .../netconf/mapping/api/HandlingPriority.java | 25 ++++++++--------- .../AbstractNetconfSessionNegotiator.java | 5 ++-- .../handler/NetconfMessageToXMLEncoder.java | 13 ++++----- .../listener/NetconfDeviceCommunicator.java | 4 +-- .../test/tool/DummyMonitoringService.java | 4 +-- .../netconf/test/tool/FakeCapability.java | 5 ++-- .../test/tool/NetconfDeviceSimulator.java | 6 ++--- .../test/tool/SimulatedOperationProvider.java | 3 +-- .../operations/DefaultOperationsCreator.java | 7 +++-- .../tool/rpc/SimulatedCreateSubscription.java | 4 +-- .../test/tool/rpc/SimulatedGetConfig.java | 5 ++-- 16 files changed, 66 insertions(+), 76 deletions(-) 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 88840f053d..33b8fce481 100644 --- 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 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 ea025d8b26..fe9b08078a 100644 --- 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 getModuleNamespace() { - return Optional.absent(); + return Optional.empty(); } @Override public Optional getModuleName() { - return Optional.absent(); + return Optional.empty(); } @Override public Optional getRevision() { - return Optional.absent(); + return Optional.empty(); } @Override public Optional 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 f17ce50707..b40bb66b5e 100644 --- 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 68b8ee35c7..03b94eb3b5 100644 --- 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 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 4a3a38edf8..7b4a0ccfac 100644 --- 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 clientFuture) throws InterruptedException { + private static NetconfClientSession get(final Future clientFuture) + throws InterruptedException { try { return clientFuture.get(); } catch (CancellationException e) { @@ -66,16 +67,16 @@ public class TestingNetconfClient implements Closeable { } } - public Future sendRequest(NetconfMessage message) { + public Future 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 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 maybeAuthHandler) throws UnknownHostException { + private static NetconfClientConfiguration getClientConfig(final String host, final int port, final boolean ssh, + final Optional 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 4d3e025ebe..2f1f37f205 100644 --- 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 { @@ -21,11 +22,11 @@ public final class HandlingPriority implements Comparable { 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 { * @return priority number or Optional.absent otherwise */ public Optional 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 { @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 { } @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 9b457109bd..12062b2d40 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -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

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 c7ab89d8c7..81ee32c26d 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java @@ -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 { private static final Logger LOG = LoggerFactory.getLogger(NetconfMessageToXMLEncoder.class); - private final Optional clientId; + private final @Nullable String clientId; public NetconfMessageToXMLEncoder() { - this(Optional.absent()); + this(Optional.empty()); } public NetconfMessageToXMLEncoder(final Optional clientId) { - this.clientId = clientId; + this.clientId = clientId.orElse(null); } @Override @@ -44,8 +45,8 @@ public class NetconfMessageToXMLEncoder extends MessageToByteEncoder 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 b844af67e7..753637753c 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 @@ -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 921c09a936..e7c198eaac 100644 --- 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 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 a87dd0648c..b74f5f52b0 100644 --- 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 f2828d1eed..a84268625b 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java @@ -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 edfdf6ef74..07f8727609 100644 --- 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 bf90d9479d..bfa9ff4c0f 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 @@ -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 d7b9f09cbd..55e25c01ae 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 @@ -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 initialConfigXMLFile) { -- 2.36.6