From 3fc1c2c9bdb3f5a24b79eef9396c39caf874900e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 8 Aug 2018 22:44:26 +0200 Subject: [PATCH] Mass-migrate to java.util.Optional This patch migrates from Guava's Optional to Java Optional, no questions asked. Change-Id: If91efb662af08434c584549d86ced61d9a72870a Signed-off-by: Robert Varga --- .../mdsal/binding/api/MountPoint.java | 2 +- .../mdsal/binding/api/MountPointService.java | 2 +- .../mdsal/binding/api/ReadTransaction.java | 2 +- .../adapter/AbstractForwardedDataBroker.java | 2 +- .../adapter/AbstractForwardedTransaction.java | 2 +- .../dom/adapter/AbstractWriteTransaction.java | 4 ++-- .../binding/dom/adapter/AdapterLoader.java | 4 ++-- .../BindingDOMMountPointListenerAdapter.java | 2 +- .../BindingDOMMountPointServiceAdapter.java | 4 ++-- .../dom/adapter/BindingMountPointAdapter.java | 6 ++--- .../adapter/BindingToNormalizedNodeCodec.java | 15 ++++++------ .../dom/adapter/RpcServiceAdapter.java | 2 +- .../dom/adapter/invoke/RpcMethodInvoker.java | 2 +- ...indingDOMMountPointServiceAdapterTest.java | 4 ++-- .../dom/codec/api/BindingCodecTreeNode.java | 4 ++-- .../codec/impl/ChoiceNodeCodecContext.java | 4 ++-- .../codec/impl/DataContainerCodecContext.java | 6 ++--- .../codec/impl/DataObjectCodecContext.java | 4 ++-- .../dom/codec/impl/LazyDataObject.java | 2 +- .../dom/codec/impl/LeafNodeCodecContext.java | 4 ++-- .../codec/impl/SchemaRootCodecContext.java | 2 +- .../impl/BindingSchemaContextUtils.java | 18 +++++++------- .../impl/ModuleInfoBackedContext.java | 4 ++-- .../generator/util/BindingRuntimeContext.java | 4 ++-- .../spec/reflect/BindingReflections.java | 20 ++++++++-------- .../spec/util/DataObjectReadingUtil.java | 4 ++-- .../mdsal/binding/javav2/api/MountPoint.java | 2 +- .../binding/javav2/api/MountPointService.java | 2 +- .../BindingDOMMountPointListenerAdapter.java | 2 +- .../BindingDOMMountPointServiceAdapter.java | 6 ++--- .../mountpoint/BindingMountPointAdapter.java | 8 +++---- .../impl/operation/RpcServiceAdapter.java | 2 +- .../invoker/OperationMethodInvoker.java | 2 +- .../spi/AbstractForwardedDataBroker.java | 4 ++-- .../spi/AbstractForwardedTransaction.java | 5 ++-- .../dom/adapter/spi/loader/AdapterLoader.java | 6 ++--- ...indingDOMMountPointServiceAdapterTest.java | 4 ++-- .../dom/codec/api/BindingTreeNodeCodec.java | 4 ++-- .../BindingNormalizedNodeCodecRegistry.java | 4 ++-- .../impl/BindingToNormalizedNodeCodec.java | 12 +++++----- .../impl/context/ChoiceNodeCodecContext.java | 4 ++-- .../impl/context/SchemaRootCodecContext.java | 4 ++-- .../context/base/AnyxmlNodeCodecContext.java | 2 +- .../base/DataContainerCodecContext.java | 7 +++--- .../codec/impl/context/base/LazyTreeNode.java | 2 +- .../context/base/LeafNodeCodecContext.java | 5 ++-- .../context/base/TreeNodeCodecContext.java | 6 ++--- .../generator/impl/RpcActionGenHelper.java | 6 ++--- .../impl/RpcActionGenHelperTest.java | 2 +- .../YangModuleInfoTemplateRenderer.java | 4 ++-- .../context/BindingRuntimeContext.java | 4 ++-- .../context/ModuleInfoBackedContext.java | 4 ++-- .../util/BindingSchemaContextUtils.java | 24 +++++++++---------- .../reflection/BindingReflections.java | 20 ++++++++-------- .../javav2/spec/runtime/YangModuleInfo.java | 2 +- .../yang/binding/util/BindingReflections.java | 19 ++++++++------- .../binding/util/DataObjectReadingUtil.java | 5 ++-- .../yang/binding/util/RpcMethodInvoker.java | 2 +- .../mdsal/dom/api/DOMActionResult.java | 2 +- .../dom/api/DOMDataTreeReadTransaction.java | 2 +- .../mdsal/dom/api/DOMMountPoint.java | 2 +- .../mdsal/dom/api/DOMMountPointService.java | 2 +- .../dom/broker/DOMMountPointServiceImpl.java | 4 ++-- .../DataTreeModificationCursorAdaptor.java | 5 ++-- .../mdsal/dom/spi/RpcRoutingStrategy.java | 6 ++--- .../mdsal/dom/spi/SimpleDOMMountPoint.java | 5 ++-- .../DelegatingReadableCursorOperation.java | 6 ++--- .../spi/shard/ReadableCursorOperation.java | 2 +- .../spi/store/DOMStoreReadTransaction.java | 2 +- ...ndingDOMEntityOwnershipServiceAdapter.java | 2 +- ...gDOMEntityOwnershipServiceAdapterTest.java | 2 +- .../binding/api/EntityOwnershipService.java | 2 +- .../api/GenericEntityOwnershipService.java | 2 +- .../dom/api/DOMEntityOwnershipService.java | 2 +- .../SimpleDOMEntityOwnershipService.java | 4 ++-- .../SimpleDOMEntityOwnershipServiceTest.java | 2 +- 76 files changed, 182 insertions(+), 186 deletions(-) diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPoint.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPoint.java index 8e461ad620..f50a5e984b 100644 --- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPoint.java +++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPoint.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.api; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPointService.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPointService.java index 26150f8b56..7d7000e7c0 100644 --- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPointService.java +++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/MountPointService.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.api; -import com.google.common.base.Optional; import java.util.EventListener; +import java.util.Optional; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ReadTransaction.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ReadTransaction.java index c2567dff91..c7943519e6 100644 --- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ReadTransaction.java +++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ReadTransaction.java @@ -43,7 +43,7 @@ public interface ReadTransaction extends AsyncReadTransactionIf the data at the supplied path exists, the Future returns an Optional object * containing the data. *
  • If the data at the supplied path does not exist, the Future returns - * Optional#absent().
    • + * Optional.empty(). *
  • If the read of the data fails, the Future will fail with a * {@link ReadFailedException} or an exception derived from ReadFailedException.
    • * diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java index b7496c9df4..1e93d19093 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import com.google.common.base.Optional; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataBroker; diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java index 48f29c7ecb..cf2b24e233 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java @@ -60,6 +60,6 @@ abstract class AbstractForwardedTransaction getParent(final YangInstanceIdentifier child) { - return Optional.fromNullable(child.getParent()); + return Optional.ofNullable(child.getParent()); } /** diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java index 3e9d128360..ef126d7ff4 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import com.google.common.base.Optional; import com.google.common.cache.CacheLoader; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -23,7 +23,7 @@ public abstract class AdapterLoader extends CacheLoader if (deleg != null) { builder.addDelegate(reqDeleg, deleg); } else { - return Optional.absent(); + return Optional.empty(); } } return Optional.of(builder.build()); diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapter.java index 2a3ae308ef..7964e8eb52 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapter.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.mdsal.binding.api.MountPointService.MountPointListener; import org.opendaylight.mdsal.dom.api.DOMMountPointListener; import org.opendaylight.mdsal.dom.api.DOMMountPointService; diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java index 7a5bb2a310..1baadc37d6 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.binding.api.MountPointService; import org.opendaylight.mdsal.dom.api.DOMMountPoint; @@ -33,7 +33,7 @@ public class BindingDOMMountPointServiceAdapter public Optional getMountPoint(final InstanceIdentifier mountPoint) { YangInstanceIdentifier domPath = getCodec().toYangInstanceIdentifierBlocking(mountPoint); Optional domMount = getDelegate().getMountPoint(domPath); - return domMount.transform(this::getAdapter); + return domMount.map(this::getAdapter); } @Override diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java index ef8c9e3ea5..d7beecb191 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java @@ -7,9 +7,9 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.LoadingCache; +import java.util.Optional; import org.opendaylight.mdsal.binding.api.BindingService; import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.dom.api.DOMMountPoint; @@ -27,7 +27,7 @@ public class BindingMountPointAdapter implements MountPoint { @Override protected DOMService getDelegate(final Class reqDeleg) { - return domMountPoint.getService(reqDeleg).orNull(); + return domMountPoint.getService(reqDeleg).orElse(null); } }); } @@ -39,6 +39,6 @@ public class BindingMountPointAdapter implements MountPoint { @Override public Optional getService(final Class service) { - return services.getUnchecked(service).transform(service::cast); + return services.getUnchecked(service).map(service::cast); } } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java index 1e6c4f7d10..46fe9098a9 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java @@ -12,7 +12,6 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -24,6 +23,7 @@ import java.util.AbstractMap.SimpleEntry; import java.util.Collection; import java.util.HashSet; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -256,15 +256,15 @@ public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, * instance-identifier if it is possible to create representation. * *

    - * Returns Optional.absent for cases where target is mixin node except + * Returns Optional.empty for cases where target is mixin node except * augmentation. */ public final Optional> toBinding(final YangInstanceIdentifier normalized) throws DeserializationException { try { - return Optional.fromNullable(codecRegistry.fromYangInstanceIdentifier(normalized)); + return Optional.ofNullable(codecRegistry.fromYangInstanceIdentifier(normalized)); } catch (final IllegalArgumentException e) { - return Optional.absent(); + return Optional.empty(); } } @@ -289,9 +289,9 @@ public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, @SuppressWarnings("unchecked") final Entry, DataObject> binding = Entry.class.cast( codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue())); - return Optional.fromNullable(binding); + return Optional.ofNullable(binding); } catch (final IllegalArgumentException e) { - return Optional.absent(); + return Optional.empty(); } } @@ -310,8 +310,7 @@ public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, @Deprecated public final Function>, Optional> deserializeFunction( final InstanceIdentifier path) { - return input -> Optional.fromJavaUtil(codecRegistry.deserializeFunction(path).apply( - Optional.toJavaUtil(input))); + return codecRegistry.deserializeFunction(path)::apply; } public final BindingNormalizedNodeCodecRegistry getCodecRegistry() { diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java index 0c36a7f533..ef1379d132 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java @@ -7,7 +7,6 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Futures; @@ -17,6 +16,7 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Map.Entry; +import java.util.Optional; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.mdsal.dom.api.DOMRpcResult; diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvoker.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvoker.java index 973899638c..8ed16db910 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvoker.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvoker.java @@ -7,12 +7,12 @@ */ package org.opendaylight.mdsal.binding.dom.adapter.invoke; -import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; import java.lang.reflect.Method; +import java.util.Optional; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapterTest.java index 0573b0125e..1adf4e0a25 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapterTest.java @@ -14,7 +14,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import com.google.common.base.Optional; +import java.util.Optional; import org.junit.Test; import org.opendaylight.mdsal.binding.api.MountPointService.MountPointListener; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; @@ -38,7 +38,7 @@ public class BindingDOMMountPointServiceAdapterTest { final BindingDOMMountPointServiceAdapter adapter = new BindingDOMMountPointServiceAdapter(mountPointService, codec); - doReturn(Optional.absent()).when(mountPointService).getMountPoint(any()); + doReturn(Optional.empty()).when(mountPointService).getMountPoint(any()); assertFalse(adapter.getMountPoint(InstanceIdentifier.create(DataObject.class)).isPresent()); doReturn(Optional.of(mock(DOMMountPoint.class))).when(mountPointService).getMountPoint(any()); diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingCodecTreeNode.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingCodecTreeNode.java index d6108b6966..2106847849 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingCodecTreeNode.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingCodecTreeNode.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.dom.codec.api; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter; @@ -57,7 +57,7 @@ public interface BindingCodecTreeNode extends BindingNorma * same data was supplied and does not represent augmentation of this node. * * @param childClass - * @return Context of child or Optional absent is supplied class is not + * @return Context of child or Optional.empty is supplied class is not * applicable in context. */ Optional> possibleStreamChild( diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java index 912051e4ee..be96700de3 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java @@ -7,7 +7,6 @@ */ package org.opendaylight.mdsal.binding.dom.codec.impl; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; @@ -25,6 +24,7 @@ import java.util.HashSet; 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.ConcurrentHashMap; import javax.annotation.Nonnull; @@ -202,7 +202,7 @@ final class ChoiceNodeCodecContext extends DataContainerCo if (child != null) { return Optional.of((DataContainerCodecContext) child.get()); } - return Optional.absent(); + return Optional.empty(); } Iterable> getCaseChildrenClasses() { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java index 5d202d6c4d..df9ecabf60 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.dom.codec.impl; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec; @@ -125,7 +125,7 @@ abstract class DataContainerCodecContext Optional> possibleStreamChild( @@ -205,4 +205,4 @@ abstract class DataContainerCodecContext) childProto.get()); } - return Optional.absent(); + return Optional.empty(); } @Override diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyDataObject.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyDataObject.java index 587fb8d242..0c7a16586c 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyDataObject.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyDataObject.java @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.dom.codec.impl; 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 com.google.common.collect.ImmutableMap; import java.lang.reflect.InvocationHandler; @@ -19,6 +18,7 @@ import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import org.opendaylight.mdsal.binding.dom.codec.util.AugmentationReader; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java index 3df83dd09e..a72145217f 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java @@ -7,13 +7,13 @@ */ package org.opendaylight.mdsal.binding.dom.codec.impl; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeNode; @@ -236,4 +236,4 @@ final class LeafNodeCodecContext extends NodeCodecContext< @Nullable Object defaultObject() { return defaultObject; } -} \ No newline at end of file +} diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java index f29a111066..5eacddfe0c 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java @@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.dom.codec.impl; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; -import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.base.Verify; import com.google.common.cache.CacheBuilder; @@ -19,6 +18,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.UncheckedExecutionException; import java.lang.reflect.Type; import java.util.List; +import java.util.Optional; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.util.ClassLoaderUtils; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java index c7458cc3bf..ed840b0b63 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.HashSet; import java.util.Iterator; +import java.util.Optional; import java.util.Set; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; @@ -48,7 +48,7 @@ public final class BindingSchemaContextUtils { Preconditions.checkArgument(currentArg != null); QName currentQName = BindingReflections.findQName(currentArg.getType()); - Optional currentContainer = Optional.absent(); + Optional currentContainer = Optional.empty(); if (BindingReflections.isNotification(currentArg.getType())) { currentContainer = findNotification(ctx, currentQName); } else if (BindingReflections.isRpcType(currentArg.getType())) { @@ -79,7 +79,7 @@ public final class BindingSchemaContextUtils { if (potential.isPresent()) { currentContainer = potential; } else { - return Optional.absent(); + return Optional.empty(); } } return currentContainer; @@ -91,7 +91,7 @@ public final class BindingSchemaContextUtils { return Optional. of(notification); } } - return Optional.absent(); + return Optional.empty(); } private static Optional findDataNodeContainer(final DataNodeContainer ctx, @@ -112,7 +112,7 @@ public final class BindingSchemaContextUtils { } } - return Optional.absent(); + return Optional.empty(); } private static DataNodeContainer findInCases(final ChoiceSchemaNode choiceNode, final QName targetQName) { @@ -143,7 +143,7 @@ public final class BindingSchemaContextUtils { } } } - return Optional.absent(); + return Optional.empty(); } private static Optional findInputOutput(final RpcDefinition rpc, final String targetType) { @@ -156,7 +156,7 @@ public final class BindingSchemaContextUtils { if (targetType.equals(rpcOutputName)) { return Optional.of(rpc.getOutput()); } - return Optional.absent(); + return Optional.empty(); } public static Set collectAllAugmentationDefinitions(final SchemaContext currentSchema, @@ -184,7 +184,7 @@ public final class BindingSchemaContextUtils { return Optional.of((ChoiceSchemaNode) potential); } - return Optional.absent(); + return Optional.empty(); } public static Optional findInstantiatedCase(final ChoiceSchemaNode instantiatedChoice, @@ -214,7 +214,7 @@ public final class BindingSchemaContextUtils { return Optional.of(caze); } } - return Optional.absent(); + return Optional.empty(); } } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java index e6d07c038a..7e8bd2e6b2 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java @@ -7,10 +7,10 @@ */ package org.opendaylight.mdsal.binding.generator.impl; -import com.google.common.base.Optional; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.lang.ref.WeakReference; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; @@ -86,7 +86,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy // Implement remove ModuleInfo to update SchemaContext public Optional tryToCreateSchemaContext() { - return Optional.fromJavaUtil(ctxResolver.getSchemaContext()); + return ctxResolver.getSchemaContext(); } private boolean resolveModuleInfo(final Class cls) { diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java index 4fb2f39bd1..f40ff9cd69 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java @@ -11,7 +11,6 @@ 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 com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -29,6 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.generator.api.BindingRuntimeTypes; @@ -233,7 +233,7 @@ public final class BindingRuntimeContext implements Immutable { * * @param schema Resolved parent choice schema * @param childClass Class representing case. - * @return Optionally a resolved case schema, absent if the choice is not legal in + * @return Optionally a resolved case schema,.empty if the choice is not legal in * the given context. * @throws IllegalArgumentException If supplied class does not represent case. */ diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java index c4a0d34abf..76147092f9 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java @@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.spec.reflect; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -26,6 +25,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.ServiceLoader; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; @@ -119,7 +119,7 @@ public final class BindingReflections { * have name. May return null if QName is not present. */ public static QName findQName(final Class dataType) { - return CLASS_TO_QNAME.getUnchecked(dataType).orNull(); + return CLASS_TO_QNAME.getUnchecked(dataType).orElse(null); } /** @@ -144,7 +144,7 @@ public final class BindingReflections { * * @param targetMethod * method to scan - * @return Optional.absent() if result type could not be get, or return type is Void. + * @return Optional.empty() if result type could not be get, or return type is Void. */ @SuppressWarnings("rawtypes") public static Optional> resolveRpcOutputClass(final Method targetMethod) { @@ -155,7 +155,7 @@ public final class BindingReflections { if (rpcResultArgument instanceof Class && !Void.class.equals(rpcResultArgument)) { return Optional.of((Class) rpcResultArgument); } - return Optional.absent(); + return Optional.empty(); } /** @@ -163,7 +163,7 @@ public final class BindingReflections { * * @param targetMethod * method to scan - * @return Optional.absent() if RPC has no input, RPC input type otherwise. + * @return Optional.empty() if RPC has no input, RPC input type otherwise. */ @SuppressWarnings("rawtypes") public static Optional> resolveRpcInputClass(final Method targetMethod) { @@ -172,7 +172,7 @@ public final class BindingReflections { return Optional.of(clazz); } } - return Optional.absent(); + return Optional.empty(); } public static QName getQName(final Class context) { @@ -425,7 +425,7 @@ public final class BindingReflections { private static Optional> getYangModeledReturnType(final Method method) { if ("getClass".equals(method.getName()) || !method.getName().startsWith("get") || method.getParameterTypes().length > 0) { - return Optional.absent(); + return Optional.empty(); } Class returnType = method.getReturnType(); @@ -439,7 +439,7 @@ public final class BindingReflections { && DataContainer.class.isAssignableFrom((Class) listResult)) { return Optional.of((Class) listResult); } - return Optional.absent(); + return Optional.empty(); }); } catch (Exception e) { /* @@ -450,7 +450,7 @@ public final class BindingReflections { LOG.debug("Unable to find YANG modeled return type for {}", method, e); } } - return Optional.absent(); + return Optional.empty(); } private static class ClassToQNameLoader extends CacheLoader, Optional> { @@ -487,7 +487,7 @@ public final class BindingReflections { */ LOG.debug("Unexpected exception during extracting QName for {}", key, e); } - return Optional.absent(); + return Optional.empty(); } /** diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java index f960ea6520..e35ed7eb3a 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java @@ -11,7 +11,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import java.lang.reflect.InvocationTargetException; @@ -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 org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.DataContainer; @@ -93,7 +93,7 @@ public final class DataObjectReadingUtil { @SuppressWarnings("unchecked") T potential = (T) resolveReadStrategy(parentClass, child).read(source, child); - return Optional.fromNullable(potential); + return Optional.ofNullable(potential); } @SuppressWarnings("rawtypes") diff --git a/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPoint.java b/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPoint.java index 922bb57d5d..b79986b8c0 100644 --- a/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPoint.java +++ b/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPoint.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding.javav2.api; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.mdsal.binding.javav2.spec.base.InstanceIdentifier; import org.opendaylight.yangtools.concepts.Identifiable; diff --git a/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPointService.java b/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPointService.java index d2b06a2e67..9056a51d2e 100644 --- a/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPointService.java +++ b/binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/MountPointService.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding.javav2.api; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.mdsal.binding.javav2.spec.base.InstanceIdentifier; import org.opendaylight.yangtools.concepts.ListenerRegistration; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointListenerAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointListenerAdapter.java index c123ee09f6..f0f4963a67 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointListenerAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointListenerAdapter.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.mountpoint; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.javav2.api.MountPointListener; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.BindingToNormalizedNodeCodec; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapter.java index d0f98a8cf4..860c494a22 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapter.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.mountpoint; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.javav2.api.MountPoint; import org.opendaylight.mdsal.binding.javav2.api.MountPointListener; @@ -57,9 +57,9 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService { final YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(mountPoint); final Optional domMount = mountService.getMountPoint(domPath); if (domMount.isPresent()) { - return Optional.fromNullable(bindingMountpoints.getUnchecked(domMount.get())); + return Optional.ofNullable(bindingMountpoints.getUnchecked(domMount.get())); } - return Optional.absent(); + return Optional.empty(); } @Override diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingMountPointAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingMountPointAdapter.java index e6f8ff3413..9ea00710a0 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingMountPointAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingMountPointAdapter.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.mountpoint; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.LoadingCache; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.javav2.api.BindingService; @@ -37,7 +37,7 @@ public class BindingMountPointAdapter implements MountPoint { @Nullable @Override protected DOMService getDelegate(final Class reqDeleg) { - return domMountPoint.getService(reqDeleg).orNull(); + return domMountPoint.getService(reqDeleg).orElse(null); } }); } @@ -54,6 +54,6 @@ public class BindingMountPointAdapter implements MountPoint { if (potential.isPresent()) { return Optional.of(service.cast(potential.get())); } - return Optional.absent(); + return Optional.empty(); } -} \ No newline at end of file +} diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java index c60032b413..e80fa373d7 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.operation; import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Futures; @@ -21,6 +20,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Collection; import java.util.Map.Entry; +import java.util.Optional; import org.opendaylight.mdsal.binding.javav2.dom.adapter.extractor.ContextReferenceExtractor; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.BindingToNormalizedNodeCodec; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/invoker/OperationMethodInvoker.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/invoker/OperationMethodInvoker.java index 2c1bcad997..c883f9c559 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/invoker/OperationMethodInvoker.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/invoker/OperationMethodInvoker.java @@ -8,12 +8,12 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.operation.invoker; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Throwables; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; import java.lang.reflect.Method; +import java.util.Optional; import java.util.concurrent.Future; import org.opendaylight.mdsal.binding.javav2.runtime.reflection.BindingReflections; import org.opendaylight.mdsal.binding.javav2.spec.base.Instantiable; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedDataBroker.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedDataBroker.java index 38166cd0f3..df461cc36b 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedDataBroker.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedDataBroker.java @@ -8,11 +8,11 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.spi; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.BindingToNormalizedNodeCodec; import org.opendaylight.mdsal.binding.javav2.spec.base.InstanceIdentifier; @@ -96,7 +96,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator toBindingData(final InstanceIdentifier path, final NormalizedNode data) { if (path.isWildcarded()) { - return Optional.absent(); + return Optional.empty(); } return (Optional) getCodec().deserializeFunction(path) .apply(Optional.of(data)); diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedTransaction.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedTransaction.java index f35df4fbf2..7fbb2e94bf 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedTransaction.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/AbstractForwardedTransaction.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.spi; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.MoreExecutors; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.BindingToNormalizedNodeCodec; import org.opendaylight.mdsal.binding.javav2.spec.base.InstanceIdentifier; @@ -71,7 +71,6 @@ public abstract class AbstractForwardedTransaction< Preconditions.checkArgument(!path.isWildcarded(), "Invalid read of wildcarded path %s", path); return readTx.read(store, codec.toYangInstanceIdentifierBlocking(path)) - .transform(Optional::fromJavaUtil, MoreExecutors.directExecutor()) - .transform(codec.deserializeFunction(path), MoreExecutors.directExecutor()); + .transform(codec.deserializeFunction(path)::apply, MoreExecutors.directExecutor()); } } diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/AdapterLoader.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/AdapterLoader.java index fcf693f8f5..b50ebe45d1 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/AdapterLoader.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/loader/AdapterLoader.java @@ -8,8 +8,8 @@ package org.opendaylight.mdsal.binding.javav2.dom.adapter.spi.loader; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.cache.CacheLoader; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.javav2.dom.adapter.spi.builder.AdapterBuilder; @@ -41,9 +41,9 @@ public abstract class AdapterLoader extends CacheLoader if (deleg != null) { builder.addDelegate(reqDeleg, deleg); } else { - return Optional.absent(); + return Optional.empty(); } } return Optional.of(builder.build()); } -} \ No newline at end of file +} diff --git a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapterTest.java b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapterTest.java index 6e913e569d..6eda754753 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapterTest.java +++ b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/mountpoint/BindingDOMMountPointServiceAdapterTest.java @@ -15,7 +15,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import com.google.common.base.Optional; +import java.util.Optional; import org.junit.Test; import org.opendaylight.mdsal.binding.javav2.api.MountPointListener; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.BindingNormalizedNodeCodecRegistry; @@ -41,7 +41,7 @@ public class BindingDOMMountPointServiceAdapterTest { final BindingDOMMountPointServiceAdapter adapter = new BindingDOMMountPointServiceAdapter(mountPointService, codec); - doReturn(Optional.absent()).when(mountPointService).getMountPoint(any()); + doReturn(Optional.empty()).when(mountPointService).getMountPoint(any()); assertFalse(adapter.getMountPoint(InstanceIdentifier.create(TreeNode.class)).isPresent()); doReturn(Optional.of(mock(DOMMountPoint.class))).when(mountPointService).getMountPoint(any()); diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/BindingTreeNodeCodec.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/BindingTreeNodeCodec.java index e02c935314..19e88915de 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/BindingTreeNodeCodec.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/BindingTreeNodeCodec.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.api; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.javav2.spec.base.TreeArgument; @@ -66,7 +66,7 @@ public interface BindingTreeNodeCodec extends BindingNormali * @param childClass * - child class by Binding Stream navigation * @param data type - * @return context of child or Optional absent if supplied is not applicable + * @return context of child or Optional.empty if supplied is not applicable * in context */ Optional> possibleStreamChild(@Nonnull Class childClass); diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java index 7230ffac7c..496d4350cc 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.impl; import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -19,6 +18,7 @@ import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.javav2.dom.codec.api.BindingTreeCodec; @@ -327,7 +327,7 @@ public class BindingNormalizedNodeCodecRegistry implements TreeNodeSerializerReg if (input.isPresent()) { return Optional.of((T) ctx.deserialize(input.get())); } - return Optional.absent(); + return Optional.empty(); } } diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingToNormalizedNodeCodec.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingToNormalizedNodeCodec.java index 06a6b084bd..63216bb23d 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingToNormalizedNodeCodec.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingToNormalizedNodeCodec.java @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.impl; import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -21,6 +20,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; @@ -235,15 +235,15 @@ public final class BindingToNormalizedNodeCodec * create representation. * *

    - * Returns Optional.absent for cases where target is mixin node except augmentation. + * Returns Optional.empty for cases where target is mixin node except augmentation. * */ public Optional> toBinding(final YangInstanceIdentifier normalized) throws DeserializationException { try { - return Optional.fromNullable(codecRegistry.fromYangInstanceIdentifier(normalized)); + return Optional.ofNullable(codecRegistry.fromYangInstanceIdentifier(normalized)); } catch (final IllegalArgumentException e) { - return Optional.absent(); + return Optional.empty(); } } @@ -263,9 +263,9 @@ public final class BindingToNormalizedNodeCodec try { final Entry, TreeNode> binding = Entry.class.cast(codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue())); - return Optional.fromNullable(binding); + return Optional.ofNullable(binding); } catch (final IllegalArgumentException e) { - return Optional.absent(); + return Optional.empty(); } } diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/ChoiceNodeCodecContext.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/ChoiceNodeCodecContext.java index c8056f10d0..ba0c658845 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/ChoiceNodeCodecContext.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/ChoiceNodeCodecContext.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -16,6 +15,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base.DataContainerCodecContext; @@ -140,7 +140,7 @@ public class ChoiceNodeCodecContext extends DataContainerCod if (child != null) { return Optional.of((DataContainerCodecContext) child.get()); } - return Optional.absent(); + return Optional.empty(); } Iterable> getCaseChildrenClasses() { diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/SchemaRootCodecContext.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/SchemaRootCodecContext.java index dd6cb50aad..b985e3f150 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/SchemaRootCodecContext.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/SchemaRootCodecContext.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; @@ -16,6 +15,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.UncheckedExecutionException; import java.util.Iterator; +import java.util.Optional; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -368,4 +368,4 @@ public final class SchemaRootCodecContext extends DataContai throw e; } } -} \ No newline at end of file +} diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/AnyxmlNodeCodecContext.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/AnyxmlNodeCodecContext.java index 39c10efef9..fad47d78e2 100755 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/AnyxmlNodeCodecContext.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/AnyxmlNodeCodecContext.java @@ -9,11 +9,11 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import java.lang.reflect.Method; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.javav2.dom.codec.api.BindingNormalizedNodeCachingCodec; import org.opendaylight.mdsal.binding.javav2.dom.codec.api.BindingTreeNodeCodec; diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/DataContainerCodecContext.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/DataContainerCodecContext.java index 01d4edaf53..2b7f63f880 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/DataContainerCodecContext.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/DataContainerCodecContext.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.mdsal.binding.javav2.dom.codec.impl.context.base; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.javav2.dom.codec.api.BindingNormalizedNodeCachingCodec; @@ -137,7 +136,7 @@ public abstract class DataContainerCodecContext extends N * case, one must issue getChild(ChoiceClass).getChild(CaseClass). * * @param childClass input child class - * @return Context of child or Optional absent is supplied class is not applicable in context. + * @return Context of child or Optional.empty is supplied class is not applicable in context. */ @Override public abstract Optional> possibleStreamChild(@Nonnull @@ -219,4 +218,4 @@ public abstract class DataContainerCodecContext extends N } } -} \ No newline at end of file +} diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LazyTreeNode.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LazyTreeNode.java index 0e5f011716..98b9729a8b 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LazyTreeNode.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LazyTreeNode.java @@ -191,7 +191,7 @@ class LazyTreeNode implements InvocationHandler, Augmentatio Preconditions.checkNotNull(cls,"Supplied augmentation must not be null."); @SuppressWarnings({"unchecked","rawtypes"}) - final Optional> augCtx = context.possibleStreamChild((Class) cls).toJavaUtil(); + final Optional> augCtx = context.possibleStreamChild((Class) cls); if (augCtx.isPresent()) { final Optional> augData = data.getChild(augCtx.get().getDomPathArgument()); if (augData.isPresent()) { diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LeafNodeCodecContext.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LeafNodeCodecContext.java index bf9ad852de..ae4b7bc1ef 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LeafNodeCodecContext.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LeafNodeCodecContext.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.mdsal.binding.javav2.dom.codec.impl.context.base; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -245,4 +244,4 @@ public final class LeafNodeCodecContext extends NodeCodecCon Object defaultObject() { return defaultObject; } -} \ No newline at end of file +} diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/TreeNodeCodecContext.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/TreeNodeCodecContext.java index 0ad65c648e..f14cb3b2fb 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/TreeNodeCodecContext.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/TreeNodeCodecContext.java @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; @@ -26,6 +25,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.SortedMap; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; @@ -173,7 +173,7 @@ public abstract class TreeNodeCodecContext) childProto.get()); } - return Optional.absent(); + return Optional.empty(); } @Nonnull @@ -392,4 +392,4 @@ public abstract class TreeNodeCodecContext getRoutingContext(final DataSchemaNode schemaNode) { for (UnknownSchemaNode extension : schemaNode.getUnknownSchemaNodes()) { if (CONTEXT_REFERENCE.equals(extension.getNodeType())) { - return Optional.fromNullable(extension.getQName()); + return Optional.ofNullable(extension.getQName()); } } - return Optional.absent(); + return Optional.empty(); } private static void resolveActions(final DataNodeContainer parent, final Module module, diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/RpcActionGenHelperTest.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/RpcActionGenHelperTest.java index bf3a27aa7e..24cb75081a 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/RpcActionGenHelperTest.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/RpcActionGenHelperTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.common.base.Optional; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collection; @@ -21,6 +20,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.junit.Ignore; import org.junit.Test; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java index 3e172fb134..bf7c42fca4 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java @@ -12,7 +12,6 @@ import static org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifie import static org.opendaylight.mdsal.binding.javav2.util.BindingMapping.MODEL_BINDING_PROVIDER_CLASS_NAME; import static org.opendaylight.mdsal.binding.javav2.util.BindingMapping.getRootPackageName; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import java.io.IOException; @@ -22,6 +21,7 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.TreeMap; import java.util.function.Function; @@ -227,4 +227,4 @@ public class YangModuleInfoTemplateRenderer { public String getModelBindingProviderName() { return modelBindingProviderName; } -} \ No newline at end of file +} diff --git a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java index 6ed1f56444..3a05104cba 100755 --- a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java +++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.javav2.runtime.context; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -26,6 +25,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.javav2.generator.api.ClassLoadingStrategy; @@ -281,7 +281,7 @@ public class BindingRuntimeContext implements Immutable { * - resolved parent choice schema * @param childClass * - class representing case. - * @return Optionally a resolved case schema, absent if the choice is not + * @return Optionally a resolved case schema,.empty if the choice is not * legal in the given context. * @throws IllegalArgumentException * - if supplied class does not represent case diff --git a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/ModuleInfoBackedContext.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/ModuleInfoBackedContext.java index 6712295324..c6efd3e0e1 100644 --- a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/ModuleInfoBackedContext.java +++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/ModuleInfoBackedContext.java @@ -9,13 +9,13 @@ package org.opendaylight.mdsal.binding.javav2.runtime.context; import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Optional; import com.google.common.io.ByteSource; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.io.IOException; import java.io.InputStream; import java.lang.ref.WeakReference; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.opendaylight.mdsal.binding.javav2.generator.api.ClassLoadingStrategy; @@ -112,7 +112,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy * @return optional of schema context */ public Optional tryToCreateSchemaContext() { - return Optional.fromJavaUtil(ctxResolver.getSchemaContext()); + return ctxResolver.getSchemaContext(); } private boolean resolveModuleInfo(final Class cls) { diff --git a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java index d8362422da..64b09ab335 100644 --- a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java +++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java @@ -9,9 +9,9 @@ package org.opendaylight.mdsal.binding.javav2.runtime.context.util; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.Iterator; +import java.util.Optional; import java.util.Set; import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifier; import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer; @@ -51,7 +51,7 @@ public final class BindingSchemaContextUtils { * - schema context * @param path * - binding path - * @return node container by binding path if exists, absent otherwise + * @return node container by binding path if exists,.empty otherwise */ @SuppressWarnings({ "unchecked", "rawtypes" }) public static Optional findDataNodeContainer(final SchemaContext ctx, @@ -93,7 +93,7 @@ public final class BindingSchemaContextUtils { if (potential.isPresent()) { currentContainer = potential; } else { - return Optional.absent(); + return Optional.empty(); } } return currentContainer; @@ -105,7 +105,7 @@ public final class BindingSchemaContextUtils { return Optional.of(notification); } } - return Optional.absent(); + return Optional.empty(); } private static Optional findDataNodeContainer(final DataNodeContainer ctx, @@ -126,7 +126,7 @@ public final class BindingSchemaContextUtils { } } - return Optional.absent(); + return Optional.empty(); } private static DataNodeContainer findInCases(final ChoiceSchemaNode choiceNode, final QName targetQName) { @@ -170,7 +170,7 @@ public final class BindingSchemaContextUtils { } } } - return Optional.absent(); + return Optional.empty(); } private static Optional findInputOutput(final OperationDefinition operation, @@ -187,7 +187,7 @@ public final class BindingSchemaContextUtils { } else if (targetType.equals(actionOutputName)) { return Optional.of(operation.getOutput()); } - return Optional.absent(); + return Optional.empty(); } /** @@ -197,7 +197,7 @@ public final class BindingSchemaContextUtils { * - choice parent * @param choiceClass * - choice binding class - * @return choice schema node if exists, absent() otherwise + * @return choice schema node if exists,.empty() otherwise */ public static Optional findInstantiatedChoice(final DataNodeContainer parent, final Class choiceClass) { return findInstantiatedChoice(parent, BindingReflections.findQName(choiceClass)); @@ -210,7 +210,7 @@ public final class BindingSchemaContextUtils { * - parent node * @param choiceName * - qname of choice - * @return choice schema node if exists, absent() otherwise + * @return choice schema node if exists,.empty() otherwise */ public static Optional findInstantiatedChoice(final DataNodeContainer ctxNode, final QName choiceName) { final DataSchemaNode potential = ctxNode.getDataChildByName(choiceName); @@ -218,7 +218,7 @@ public final class BindingSchemaContextUtils { return Optional.of((ChoiceSchemaNode) potential); } - return Optional.absent(); + return Optional.empty(); } /** @@ -228,7 +228,7 @@ public final class BindingSchemaContextUtils { * - choice * @param originalDefinition * - choice case - * @return choice case node if exists, absent() otherwise + * @return choice case node if exists,.empty() otherwise */ public static Optional findInstantiatedCase(final ChoiceSchemaNode instantiatedChoice, final CaseSchemaNode originalDefinition) { final QName qname = originalDefinition.getQName(); @@ -255,6 +255,6 @@ public final class BindingSchemaContextUtils { return Optional.of(found); } } - return Optional.absent(); + return Optional.empty(); } } diff --git a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java index 2cff93c4e9..bc12722843 100644 --- a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java +++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java @@ -11,7 +11,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -27,6 +26,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.ServiceLoader; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -117,7 +117,7 @@ public final class BindingReflections { * May return null if QName is not present. */ public static QName findQName(final Class dataType) { - return CLASS_TO_QNAME.getUnchecked(dataType).orNull(); + return CLASS_TO_QNAME.getUnchecked(dataType).orElse(null); } /** @@ -143,7 +143,7 @@ public final class BindingReflections { * * @param targetMethod * method to scan - * @return Optional.absent() if result type could not be get, or return type + * @return Optional.empty() if result type could not be get, or return type * is Void. */ @SuppressWarnings("rawtypes") @@ -155,7 +155,7 @@ public final class BindingReflections { if (operationResultArgument instanceof Class && !Void.class.equals(operationResultArgument)) { return Optional.of((Class) operationResultArgument); } - return Optional.absent(); + return Optional.empty(); } /** @@ -163,7 +163,7 @@ public final class BindingReflections { * * @param targetMethod * - method to scan - * @return Optional.absent() if RPC or Action has no input, RPC input type + * @return Optional.empty() if RPC or Action has no input, RPC input type * otherwise. */ @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -173,7 +173,7 @@ public final class BindingReflections { return Optional.of(clazz); } } - return Optional.absent(); + return Optional.empty(); } /** @@ -456,7 +456,7 @@ public final class BindingReflections { private static Optional>> getYangModeledReturnType(final Method method) { if ("getClass".equals(method.getName()) || !method.getName().startsWith("get") || method.getParameterTypes().length > 0) { - return Optional.absent(); + return Optional.empty(); } final Class returnType = method.getReturnType(); @@ -471,7 +471,7 @@ public final class BindingReflections { && Instantiable.class.isAssignableFrom((Class) listResult)) { return Optional.of((Class) listResult); } - return Optional.absent(); + return Optional.empty(); }); } catch (final Exception e) { /* @@ -483,7 +483,7 @@ public final class BindingReflections { LOG.debug("Unable to find YANG modeled return type for {}", method, e); } } - return Optional.absent(); + return Optional.empty(); } private static class ClassToQNameLoader extends CacheLoader, Optional> { @@ -523,7 +523,7 @@ public final class BindingReflections { */ LOG.debug("Unexpected exception during extracting QName for {}", key, e); } - return Optional.absent(); + return Optional.empty(); } /** diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/YangModuleInfo.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/YangModuleInfo.java index 1e6706ac38..8342ef7ed9 100644 --- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/YangModuleInfo.java +++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/YangModuleInfo.java @@ -9,8 +9,8 @@ package org.opendaylight.mdsal.binding.javav2.spec.runtime; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import java.io.InputStream; +import java.util.Optional; import java.util.Set; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; diff --git a/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java b/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java index f390713840..1dc4706572 100644 --- a/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java +++ b/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.binding.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import com.google.common.base.Optional; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.ServiceLoader; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -150,7 +151,7 @@ public class BindingReflections { * * @param targetMethod * method to scan - * @return Optional.absent() if result type could not be get, or return type + * @return Optional.empty() if result type could not be get, or return type * is Void. */ @SuppressWarnings("rawtypes") @@ -162,7 +163,7 @@ public class BindingReflections { if (rpcResultArgument instanceof Class && !Void.class.equals(rpcResultArgument)) { return Optional.> of((Class) rpcResultArgument); } - return Optional.absent(); + return Optional.empty(); } /** @@ -171,14 +172,14 @@ public class BindingReflections { * * @param targetMethod * method to scan - * @return Optional.absent() if rpc has no input, Rpc input type otherwise. + * @return Optional.empty() if rpc has no input, Rpc input type otherwise. */ @SuppressWarnings("unchecked") public static Optional> resolveRpcInputClass(final Method targetMethod) { @SuppressWarnings("rawtypes") Class[] types = targetMethod.getParameterTypes(); if (types.length == 0) { - return Optional.absent(); + return Optional.empty(); } if (types.length == 1) { return Optional.> of(types[0]); @@ -450,7 +451,7 @@ public class BindingReflections { private static Optional> getYangModeledReturnType(final Method method) { if (method.getName().equals("getClass") || !method.getName().startsWith("get") || method.getParameterTypes().length > 0) { - return Optional.absent(); + return Optional.empty(); } @SuppressWarnings("rawtypes") @@ -470,7 +471,7 @@ public class BindingReflections { && InterfaceTyped.class.isAssignableFrom((Class) listResult)) { return Optional.> of((Class) listResult); } - return Optional.absent(); + return Optional.empty(); } }); @@ -484,7 +485,7 @@ public class BindingReflections { LOG.debug("Unable to find YANG modeled return type for {}", method, e); } } - return Optional.absent(); + return Optional.empty(); } private static class ClassToQNameLoader extends CacheLoader, Optional> { @@ -529,7 +530,7 @@ public class BindingReflections { */ LOG.debug("Unexpected exception during extracting QName for {}", key, e); } - return Optional.absent(); + return Optional.empty(); } /** diff --git a/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java b/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java index 6eb6293fea..48159a5e1e 100644 --- a/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java +++ b/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.binding.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import com.google.common.base.Optional; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import java.lang.reflect.InvocationTargetException; @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.InterfaceTyped; @@ -88,7 +89,7 @@ public class DataObjectReadingUtil { @SuppressWarnings("unchecked") T potential = (T) resolveReadStrategy(parentClass, child).read(source, child); - return Optional.fromNullable(potential); + return Optional.ofNullable(potential); } @SuppressWarnings("rawtypes") diff --git a/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/RpcMethodInvoker.java b/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/RpcMethodInvoker.java index 82d1647825..6a25542b00 100644 --- a/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/RpcMethodInvoker.java +++ b/binding2/prototype/yang-binding2/src/main/java/org/opendaylight/yangtools/yang/binding/util/RpcMethodInvoker.java @@ -9,11 +9,11 @@ package org.opendaylight.yangtools.yang.binding.util; import static com.sun.xml.internal.ws.policy.sourcemodel.wspolicy.XmlToken.Optional; -import com.google.common.base.Optional; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; import java.lang.reflect.Method; +import java.util.Optional; import java.util.concurrent.Future; import org.opendaylight.yangtools.yang.binding.InterfaceTyped; import org.opendaylight.yangtools.yang.binding.TreeNode; diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionResult.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionResult.java index 4273d786ff..2ed1a40cfa 100644 --- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionResult.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMActionResult.java @@ -33,7 +33,7 @@ public interface DOMActionResult { /** * Returns the value result of the call. * - * @return Invocation result, absent if the operation has not produced a result. This might be the case if the + * @return Invocation result,.empty if the operation has not produced a result. This might be the case if the * operation does not produce a result, or if it failed. */ Optional getOutput(); diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadTransaction.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadTransaction.java index 736a88d57d..e4bb89598f 100644 --- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadTransaction.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadTransaction.java @@ -41,7 +41,7 @@ public interface DOMDataTreeReadTransaction extends AsyncReadTransactionIf the data at the supplied path exists, the Future returns an Optional object * containing the data. *

  • If the data at the supplied path does not exist, the Future returns - * Optional#absent().
    • + * Optional.empty(). *
  • If the read of the data fails, the Future will fail with a * {@link ReadFailedException} or an exception derived from ReadFailedException.
    • * diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPoint.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPoint.java index d9af3d5758..e187607703 100644 --- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPoint.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPoint.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.dom.api; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPointService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPointService.java index 665ede0a7d..15c82393ae 100644 --- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPointService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMMountPointService.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.dom.api; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java index 501c32b234..4c5f6152c0 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java @@ -12,10 +12,10 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.collect.MutableClassToInstanceMap; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import org.opendaylight.mdsal.dom.api.DOMMountPoint; import org.opendaylight.mdsal.dom.api.DOMMountPointListener; import org.opendaylight.mdsal.dom.api.DOMMountPointService; @@ -39,7 +39,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService { @Override public Optional getMountPoint(final YangInstanceIdentifier path) { - return Optional.fromNullable(mountPoints.get(path)); + return Optional.ofNullable(mountPoints.get(path)); } @Override diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/DataTreeModificationCursorAdaptor.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/DataTreeModificationCursorAdaptor.java index d1af2383fb..dbd6cadacd 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/DataTreeModificationCursorAdaptor.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/DataTreeModificationCursorAdaptor.java @@ -5,12 +5,11 @@ * 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.mdsal.dom.store.inmemory; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ForwardingObject; +import java.util.Optional; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -74,7 +73,7 @@ final class DataTreeModificationCursorAdaptor extends ForwardingObject implement } public Optional> readNode(final PathArgument child) { - return Optional.fromJavaUtil(delegate.readNode(child)); + return delegate.readNode(child); } @Override diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RpcRoutingStrategy.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RpcRoutingStrategy.java index 6a60e0c222..518eb21146 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RpcRoutingStrategy.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RpcRoutingStrategy.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.dom.spi; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Optional; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -66,10 +66,10 @@ public abstract class RpcRoutingStrategy implements Identifiable { public static Optional getRoutingContext(final DataSchemaNode schemaNode) { for (UnknownSchemaNode extension : schemaNode.getUnknownSchemaNodes()) { if (CONTEXT_REFERENCE.equals(extension.getNodeType())) { - return Optional.fromNullable(extension.getQName()); + return Optional.ofNullable(extension.getQName()); } } - return Optional.absent(); + return Optional.empty(); } private static final class RoutedRpcStrategy extends RpcRoutingStrategy { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java index 32badc0a64..29f0848571 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java @@ -5,12 +5,11 @@ * 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.mdsal.dom.spi; -import com.google.common.base.Optional; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; +import java.util.Optional; import org.opendaylight.mdsal.dom.api.DOMMountPoint; import org.opendaylight.mdsal.dom.api.DOMService; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -46,6 +45,6 @@ public final class SimpleDOMMountPoint implements DOMMountPoint { @Override public Optional getService(final Class cls) { - return Optional.fromNullable(services.getInstance(cls)); + return Optional.ofNullable(services.getInstance(cls)); } } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DelegatingReadableCursorOperation.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DelegatingReadableCursorOperation.java index 887d453e51..3f9ce4b4e5 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DelegatingReadableCursorOperation.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DelegatingReadableCursorOperation.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.dom.spi.shard; -import com.google.common.base.Optional; import com.google.common.collect.ForwardingObject; +import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshotCursor; @@ -23,7 +23,7 @@ abstract class DelegatingReadableCursorOperation extends ForwardingObject implem @Override public Optional> readNode(final PathArgument arg) { - return Optional.fromJavaUtil(delegate().readNode(arg)); + return delegate().readNode(arg); } @Override @@ -36,4 +36,4 @@ abstract class DelegatingReadableCursorOperation extends ForwardingObject implem delegate().enter(arg); return this; } -} \ No newline at end of file +} diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/ReadableCursorOperation.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/ReadableCursorOperation.java index d7da0e179b..8626ff56bc 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/ReadableCursorOperation.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/ReadableCursorOperation.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.dom.spi.shard; -import com.google.common.base.Optional; +import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreReadTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreReadTransaction.java index 404ed1faa1..0b22cef46e 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreReadTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreReadTransaction.java @@ -27,7 +27,7 @@ public interface DOMStoreReadTransaction extends DOMStoreTransaction { *
  • If the data at the supplied path exists, the Future returns an Optional object * containing the data.
    • *
  • If the data at the supplied path does not exist, the Future returns - * Optional#absent().
    • + * Optional.empty(). *
  • If the read of the data fails, the Future will fail with a * {@link ReadFailedException} or an exception derived from ReadFailedException.
    • * diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java index 72edc809f0..6fd10707e9 100644 --- a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java +++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapter.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.eos.binding.dom.adapter; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.eos.binding.api.Entity; diff --git a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java index cac7445e2d..de29d0719c 100644 --- a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java +++ b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingDOMEntityOwnershipServiceAdapterTest.java @@ -17,7 +17,7 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import com.google.common.base.Optional; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/eos/binding/api/EntityOwnershipService.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/eos/binding/api/EntityOwnershipService.java index f699f9447a..f2532d230d 100644 --- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/eos/binding/api/EntityOwnershipService.java +++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/eos/binding/api/EntityOwnershipService.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.eos.binding.api; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java index 7b31df5984..e7be676721 100644 --- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java +++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.eos.common.api; -import com.google.common.base.Optional; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.yangtools.concepts.Path; diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipService.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipService.java index e7a497b8c5..3acf2659c3 100644 --- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipService.java +++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/eos/dom/api/DOMEntityOwnershipService.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.eos.dom.api; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; +import java.util.Optional; import javax.annotation.Nonnull; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; diff --git a/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java b/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java index f88d150832..8fc0334bb6 100644 --- a/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java +++ b/entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java @@ -13,7 +13,6 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState.L import com.google.common.annotations.VisibleForTesting; 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 com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashBasedTable; @@ -21,6 +20,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import com.google.common.collect.Table; import java.util.Collection; +import java.util.Optional; import java.util.UUID; import javax.annotation.concurrent.GuardedBy; import org.kohsuke.MetaInfServices; @@ -105,7 +105,7 @@ public final class SimpleDOMEntityOwnershipService implements DOMEntityOwnership @Override public Optional getOwnershipState(final DOMEntity forEntity) { - return isCandidateRegistered(forEntity) ? Optional.of(EntityOwnershipState.IS_OWNER) : Optional.absent(); + return isCandidateRegistered(forEntity) ? Optional.of(EntityOwnershipState.IS_OWNER) : Optional.empty(); } @Override diff --git a/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java b/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java index 63e0f01243..df252d42db 100644 --- a/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java +++ b/entityownership/mdsal-eos-dom-simple/src/test/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipServiceTest.java @@ -18,7 +18,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import com.google.common.base.Optional; +import java.util.Optional; import java.util.UUID; import org.junit.Before; import org.junit.Test; -- 2.36.6