Shorten java.util.Optional reference

All of our codebase is using JDK Optionals, hence we need not use
a FQCN.

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

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 1e93d19093055f1e44c29589d5a4c91356727f13..67c6b482c61bf71231650dead18f52829faf57b4 100644 (file)
--- 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
@@ -34,10 +34,10 @@ public abstract class AbstractForwardedDataBroker extends AbstractBindingAdapter
             final Map<YangInstanceIdentifier, ? extends NormalizedNode<?, ?>> normalized) {
         final Map<InstanceIdentifier<?>, DataObject> newMap = new HashMap<>();
 
-        for (final Map.Entry<YangInstanceIdentifier, ? extends NormalizedNode<?, ?>> entry : normalized.entrySet()) {
+        for (final Entry<YangInstanceIdentifier, ? extends NormalizedNode<?, ?>> entry : normalized.entrySet()) {
             try {
-                final Optional<Entry<InstanceIdentifier<? extends DataObject>, DataObject>> potential
-                        = getCodec().toBinding(entry);
+                final Optional<Entry<InstanceIdentifier<? extends DataObject>, DataObject>> potential = getCodec()
+                        .toBinding(entry);
                 if (potential.isPresent()) {
                     final Entry<InstanceIdentifier<? extends DataObject>, DataObject> binding = potential.get();
                     newMap.put(binding.getKey(), binding.getValue());
@@ -71,12 +71,10 @@ public abstract class AbstractForwardedDataBroker extends AbstractBindingAdapter
     }
 
     @SuppressWarnings("unchecked")
-    protected java.util.Optional<DataObject> toBindingData(final InstanceIdentifier<?> path,
-            final NormalizedNode<?, ?> data) {
+    protected Optional<DataObject> toBindingData(final InstanceIdentifier<?> path, final NormalizedNode<?, ?> data) {
         if (path.isWildcarded()) {
-            return java.util.Optional.empty();
+            return Optional.empty();
         }
-        return (java.util.Optional<DataObject>) getCodec().getCodecRegistry().deserializeFunction(path)
-                .apply(java.util.Optional.of(data));
+        return (Optional<DataObject>) getCodec().getCodecRegistry().deserializeFunction(path).apply(Optional.of(data));
     }
 }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
index 88731f31cddc14ceeb1a9cb5ea4b7c5a92f60a47..74b77e67e7c3c4d9adf66795c4423551d54fa2df 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
@@ -187,7 +187,7 @@ abstract class DataObjectCodecContext<D extends DataObject, T extends DataNodeCo
             final ChoiceNodeCodecContext<?> choice = (ChoiceNodeCodecContext<?>) context;
             choice.addYangPathArgument(arg, builder);
 
-            final java.util.Optional<? extends Class<? extends DataObject>> caseType = arg.getCaseType();
+            final Optional<? extends Class<? extends DataObject>> caseType = arg.getCaseType();
             final Class<? extends DataObject> type = arg.getType();
             final DataContainerCodecContext<?, ?> caze;
             if (caseType.isPresent()) {
@@ -339,7 +339,7 @@ abstract class DataObjectCodecContext<D extends DataObject, T extends DataNodeCo
     Object getBindingChildValue(final Method method, final NormalizedNodeContainer domData) {
         final NodeCodecContext<?> childContext = byMethod.get(method).get();
         @SuppressWarnings("unchecked")
-        final java.util.Optional<NormalizedNode<?, ?>> domChild = domData.getChild(childContext.getDomPathArgument());
+        final Optional<NormalizedNode<?, ?>> domChild = domData.getChild(childContext.getDomPathArgument());
         if (domChild.isPresent()) {
             return childContext.deserializeObject(domChild.get());
         } else if (childContext instanceof LeafNodeCodecContext) {
@@ -377,7 +377,7 @@ abstract class DataObjectCodecContext<D extends DataObject, T extends DataNodeCo
             }
         }
         for (final DataContainerCodecPrototype<?> value : byStreamAugmented.values()) {
-            final java.util.Optional<NormalizedNode<?, ?>> augData = data.getChild(value.getYangArg());
+            final Optional<NormalizedNode<?, ?>> augData = data.getChild(value.getYangArg());
             if (augData.isPresent()) {
                 map.put(value.getBindingClass(), value.get().deserializeObject(augData.get()));
             }

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 a535eab2ee249d2c55db86eafa9d57c135a9c9ec..4b3b791509bc3e68befacd14fc34c666a86b46e0 100644 (file)
--- 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
@@ -201,7 +201,7 @@ class LazyDataObject<D extends DataObject> implements InvocationHandler, Augment
             // the augmentation the user is requesting -- otherwise a strict receiver would end up with a cryptic
             // ClassCastException.
             if (cls.isAssignableFrom(augCtx.getBindingClass())) {
-                final java.util.Optional<NormalizedNode<?, ?>> augData = data.getChild(augCtx.getDomPathArgument());
+                final Optional<NormalizedNode<?, ?>> augData = data.getChild(augCtx.getDomPathArgument());
                 if (augData.isPresent()) {
                     return augCtx.deserialize(augData.get());
                 }

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 e681979d8b539e1c9a3cb7b65a1b8f81c9202804..9844149cc7202d7ebf0f343d7c01234179a310f1 100644 (file)
--- 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
@@ -61,7 +61,7 @@ final class LeafNodeCodecContext<D extends DataObject> extends NodeCodecContext<
     private static Object createDefaultObject(final DataSchemaNode schema, final Codec<Object, Object> codec,
                                               final SchemaContext schemaContext) {
         if (schema instanceof LeafSchemaNode) {
-            java.util.Optional<? extends Object> defaultValue = ((LeafSchemaNode) schema).getType().getDefaultValue();
+            Optional<? extends Object> defaultValue = ((LeafSchemaNode) schema).getType().getDefaultValue();
             TypeDefinition<?> type = ((LeafSchemaNode) schema).getType();
             if (defaultValue.isPresent()) {
                 if (type instanceof IdentityrefTypeDefinition) {

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 a2ca55bf24628e0bfc8baf29491a8aca2bf4a80d..4f32fbc0e882e423225dee0b4589f4c155b9198d 100644 (file)
--- 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
@@ -92,7 +92,7 @@ public final class BindingRuntimeContext implements Immutable {
         new CacheLoader<QName, Class<?>>() {
             @Override
             public Class<?> load(final QName key) {
-                final java.util.Optional<Type> identityType = runtimeTypes.findIdentity(key);
+                final Optional<Type> identityType = runtimeTypes.findIdentity(key);
                 checkArgument(identityType.isPresent(), "Supplied QName %s is not a valid identity", key);
                 try {
                     return strategy.loadClass(identityType.get());
@@ -285,7 +285,7 @@ public final class BindingRuntimeContext implements Immutable {
 
         for (final ChoiceSchemaNode choice :  Iterables.filter(schema.getChildNodes(), ChoiceSchemaNode.class)) {
             final ChoiceSchemaNode originalChoice = getOriginalSchema(choice);
-            final java.util.Optional<Type> optType = runtimeTypes.findType(originalChoice);
+            final Optional<Type> optType = runtimeTypes.findType(originalChoice);
             checkState(optType.isPresent(), "Failed to find generated type for choice %s", originalChoice);
             final Type choiceType = optType.get();
 
@@ -365,13 +365,13 @@ public final class BindingRuntimeContext implements Immutable {
             }
 
             final Type type = new ReferencedTypeImpl(name);
-            final java.util.Optional<WithStatus> optSchema = runtimeTypes.findSchema(type);
+            final Optional<WithStatus> optSchema = runtimeTypes.findSchema(type);
             if (!optSchema.isPresent()) {
                 continue;
             }
 
             final WithStatus schema = optSchema.get();
-            final java.util.Optional<Type> optDefinedType =  runtimeTypes.findType(schema);
+            final Optional<Type> optDefinedType =  runtimeTypes.findType(schema);
             if (!optDefinedType.isPresent()) {
                 continue;
             }
@@ -403,7 +403,7 @@ public final class BindingRuntimeContext implements Immutable {
 
     public Class<?> getClassForSchema(final SchemaNode childSchema) {
         final SchemaNode origSchema = getOriginalSchema(childSchema);
-        final java.util.Optional<Type> clazzType = runtimeTypes.findType(origSchema);
+        final Optional<Type> clazzType = runtimeTypes.findType(origSchema);
         checkArgument(clazzType.isPresent(), "Failed to find binding type for %s (original %s)",
             childSchema, origSchema);
 
@@ -426,7 +426,7 @@ public final class BindingRuntimeContext implements Immutable {
                 }
 
                 if (!augment.getChildNodes().isEmpty()) {
-                    final java.util.Optional<Type> augType = runtimeTypes.findType(augOrig);
+                    final Optional<Type> augType = runtimeTypes.findType(augOrig);
                     if (augType.isPresent()) {
                         identifierToType.put(getAugmentationIdentifier(augment), augType.get());
                     }

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 ae4b7bc1ef743bec2f380c809ef44db7f7477336..3676ffe9d07a84c85f1fc2a11072502c0045e108 100644 (file)
--- 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
@@ -62,7 +62,7 @@ public final class LeafNodeCodecContext<D extends TreeNode> extends NodeCodecCon
             final SchemaContext schemaContext) {
         if (schema instanceof LeafSchemaNode) {
             TypeDefinition<?> type = ((LeafSchemaNode) schema).getType();
-            java.util.Optional<? extends Object> defaultValue = type.getDefaultValue();
+            Optional<? extends Object> defaultValue = type.getDefaultValue();
             if (defaultValue.isPresent()) {
                 if (type instanceof IdentityrefTypeDefinition) {
                     return qnameDomValueFromString(codec, schema, (String) defaultValue.get(), schemaContext);

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 c5941d5cd57348b13e3b2bb2df43165f27e27269..427faa4dedc04fe85d3bb4bc6ca535ca71e1c983 100755 (executable)
--- 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
@@ -357,7 +357,7 @@ public abstract class TreeNodeCodecContext<D extends TreeNode, T extends DataNod
     public Object getBindingChildValue(final Method method, final NormalizedNodeContainer domData) {
         final NodeCodecContext<?> childContext = byMethod.get(method).get();
         @SuppressWarnings("unchecked")
-        final java.util.Optional<NormalizedNode<?, ?>> domChild = domData.getChild(childContext.getDomPathArgument());
+        final Optional<NormalizedNode<?, ?>> domChild = domData.getChild(childContext.getDomPathArgument());
         if (domChild.isPresent()) {
             return childContext.deserializeObject(domChild.get());
         } else if (childContext instanceof LeafNodeCodecContext) {
@@ -394,7 +394,7 @@ public abstract class TreeNodeCodecContext<D extends TreeNode, T extends DataNod
             }
         }
         for (final DataContainerCodecPrototype<?> value : byStreamAugmented.values()) {
-            final java.util.Optional<NormalizedNode<?, ?>> augData = data.getChild(value.getYangArg());
+            final Optional<NormalizedNode<?, ?>> augData = data.getChild(value.getYangArg());
             if (augData.isPresent()) {
                 map.put(value.getBindingClass(), value.get().deserializeObject(augData.get()));
             }

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 88d9ab75c16c17d0ffedd85f630f0ad017226942..daf174db68c3ea6d4dfdf53e33ce2c577da3c041 100644 (file)
--- 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
@@ -160,12 +160,12 @@ public class RpcActionGenHelperTest {
         when(module.getName()).thenReturn("module-name");
         when(module.getRevision()).thenReturn(rpcQName.getRevision());
         when(module.getNamespace()).thenReturn(rpcQName.getNamespace());
-        when(module.getDescription()).thenReturn(java.util.Optional.empty());
-        when(module.getReference()).thenReturn(java.util.Optional.empty());
+        when(module.getDescription()).thenReturn(Optional.empty());
+        when(module.getReference()).thenReturn(Optional.empty());
         final Set<RpcDefinition> rpcs = new HashSet<>();
         final RpcDefinition rpcDefinition = mock(RpcDefinition.class);
-        when(rpcDefinition.getDescription()).thenReturn(java.util.Optional.empty());
-        when(rpcDefinition.getReference()).thenReturn(java.util.Optional.empty());
+        when(rpcDefinition.getDescription()).thenReturn(Optional.empty());
+        when(rpcDefinition.getReference()).thenReturn(Optional.empty());
         final SchemaPath rpcPath = SchemaPath.create(true, rpcParentQName, rpcQName);
         when(rpcDefinition.getPath()).thenReturn(rpcPath);
         when(rpcDefinition.getQName()).thenReturn(rpcQName);
@@ -179,8 +179,8 @@ public class RpcActionGenHelperTest {
         final SchemaPath inputSchemaPath = SchemaPath.create(true, rpcQName, qnameInput);
         when(input.getQName()).thenReturn(qnameInput);
         when(input.getPath()).thenReturn(inputSchemaPath);
-        when(input.getDescription()).thenReturn(java.util.Optional.empty());
-        when(input.getReference()).thenReturn(java.util.Optional.empty());
+        when(input.getDescription()).thenReturn(Optional.empty());
+        when(input.getReference()).thenReturn(Optional.empty());
 
         when(rpcDefinition.getInput()).thenReturn(input);
 
@@ -189,8 +189,8 @@ public class RpcActionGenHelperTest {
         final SchemaPath outputSchemaPath = SchemaPath.create(true, rpcQName, qnameOutput);
         when(output.getQName()).thenReturn(qnameOutput);
         when(output.getPath()).thenReturn(outputSchemaPath);
-        when(output.getDescription()).thenReturn(java.util.Optional.empty());
-        when(output.getReference()).thenReturn(java.util.Optional.empty());
+        when(output.getDescription()).thenReturn(Optional.empty());
+        when(output.getReference()).thenReturn(Optional.empty());
         when(rpcDefinition.getOutput()).thenReturn(output);
 
         final Map<Module, ModuleContext> genCtx = new HashMap<>();
@@ -198,7 +198,7 @@ public class RpcActionGenHelperTest {
         genCtx.put(module, moduleContext);
 
         final SchemaContext schemaContext = mock(SchemaContext.class);
-        when(schemaContext.findModule(rpcQName.getModule())).thenReturn(java.util.Optional.of(module));
+        when(schemaContext.findModule(rpcQName.getModule())).thenReturn(Optional.of(module));
 
         final boolean verboseClassComments = false;
         final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders = new HashMap<>();
@@ -224,8 +224,8 @@ public class RpcActionGenHelperTest {
         when(module.getName()).thenReturn("module-name");
         when(module.getRevision()).thenReturn(actionQName.getRevision());
         when(module.getNamespace()).thenReturn(actionQName.getNamespace());
-        when(module.getDescription()).thenReturn(java.util.Optional.empty());
-        when(module.getReference()).thenReturn(java.util.Optional.empty());
+        when(module.getDescription()).thenReturn(Optional.empty());
+        when(module.getReference()).thenReturn(Optional.empty());
 
         final Collection<DataSchemaNode> childNodes = new ArrayList<>();
         final T actionNodeContainer = mock(clazz);
@@ -245,16 +245,16 @@ public class RpcActionGenHelperTest {
         when(actionDefinition.getQName()).thenReturn(actionQName);
         final SchemaPath actionPath = SchemaPath.create(true, actionQName);
         when(actionDefinition.getPath()).thenReturn(actionPath);
-        when(actionDefinition.getDescription()).thenReturn(java.util.Optional.empty());
-        when(actionDefinition.getReference()).thenReturn(java.util.Optional.empty());
+        when(actionDefinition.getDescription()).thenReturn(Optional.empty());
+        when(actionDefinition.getReference()).thenReturn(Optional.empty());
 
         final ContainerSchemaNode input = mock(ContainerSchemaNode.class);
         final QName qnameInput = QName.create(actionQName, "action-input");
         final SchemaPath inputSchemaPath = SchemaPath.create(true, actionQName, qnameInput);
         when(input.getQName()).thenReturn(qnameInput);
         when(input.getPath()).thenReturn(inputSchemaPath);
-        when(input.getDescription()).thenReturn(java.util.Optional.empty());
-        when(input.getReference()).thenReturn(java.util.Optional.empty());
+        when(input.getDescription()).thenReturn(Optional.empty());
+        when(input.getReference()).thenReturn(Optional.empty());
         when(actionDefinition.getInput()).thenReturn(input);
 
         final ContainerSchemaNode output = mock(ContainerSchemaNode.class);
@@ -262,8 +262,8 @@ public class RpcActionGenHelperTest {
         final SchemaPath outputSchemaPath = SchemaPath.create(true, actionQName, qnameOutput);
         when(output.getQName()).thenReturn(qnameOutput);
         when(output.getPath()).thenReturn(outputSchemaPath);
-        when(output.getDescription()).thenReturn(java.util.Optional.empty());
-        when(output.getReference()).thenReturn(java.util.Optional.empty());
+        when(output.getDescription()).thenReturn(Optional.empty());
+        when(output.getReference()).thenReturn(Optional.empty());
         when(actionDefinition.getOutput()).thenReturn(output);
 
         actions.add(actionDefinition);
@@ -276,7 +276,7 @@ public class RpcActionGenHelperTest {
         genCtx.put(module, moduleContext);
 
         final SchemaContext schemaContext = mock(SchemaContext.class);
-        when(schemaContext.findModule(actionQName.getModule())).thenReturn(java.util.Optional.of(module));
+        when(schemaContext.findModule(actionQName.getModule())).thenReturn(Optional.of(module));
 
         final boolean verboseClassComments = false;
         final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders = new HashMap<>();
@@ -287,8 +287,8 @@ public class RpcActionGenHelperTest {
             final RpcDefinition rpcDef = mock(RpcDefinition.class);
             when(rpcDef.getPath()).thenReturn(outputSchemaPath);
             when(rpcDef.getQName()).thenReturn(qnameOutput);
-            when(rpcDef.getDescription()).thenReturn(java.util.Optional.empty());
-            when(rpcDef.getReference()).thenReturn(java.util.Optional.empty());
+            when(rpcDef.getDescription()).thenReturn(Optional.empty());
+            when(rpcDef.getReference()).thenReturn(Optional.empty());
 
             when(module.getDataChildByName(actionQName)).thenReturn((ContainerSchemaNode) actionNodeContainer);
             final List<UnknownSchemaNode> unknownSchemaNodes = new ArrayList<>();

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 93cf8e4576f65f8713532efd6828004043f5a661..582f815652623c021bf05355b37fe9addd7de463 100644 (file)
--- 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
@@ -45,10 +45,10 @@ public class YangModuleInfoTemplateRenderer {
     private final Map<String, String> importMap = new HashMap<>();
     private final String packageName;
     private final String modelBindingProviderName;
-    private final Function<Module, java.util.Optional<String>> moduleFilePathResolver;
+    private final Function<Module, Optional<String>> moduleFilePathResolver;
 
-    public YangModuleInfoTemplateRenderer(final Module module, final SchemaContext ctx, final Function<Module,
-            java.util.Optional<String>> moduleFilePathResolver) {
+    public YangModuleInfoTemplateRenderer(final Module module, final SchemaContext ctx,
+            final Function<Module, Optional<String>> moduleFilePathResolver) {
 
         Preconditions.checkArgument(module != null, "Module must not be null.");
         this.module = module;
@@ -214,7 +214,7 @@ public class YangModuleInfoTemplateRenderer {
     }
 
     public static Module getSortedQName(final Set<Module> modules, final String name) {
-        final TreeMap<java.util.Optional<Revision>, Module> sorted = new TreeMap<>(Revision::compare);
+        final TreeMap<Optional<Revision>, Module> sorted = new TreeMap<>(Revision::compare);
         for (Module module : modules) {
             if (name.equals(module.getName())) {
                 sorted.put(module.getRevision(), module);

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
index 99652f592a6849d2fee4a47a3f2817ee49d1f8f1..f825bba6593fbbc80c4bb68166440b9aa4d96a3e 100755 (executable)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
@@ -509,7 +509,7 @@ public final class TextTemplateUtil {
      */
     public static String getSourcePath(final Module module, final Function<Module, Optional<String>>
             moduleFilePathResolver) {
-        final java.util.Optional<String> moduleFilePath = moduleFilePathResolver.apply(module);
+        final Optional<String> moduleFilePath = moduleFilePathResolver.apply(module);
         Preconditions.checkArgument(moduleFilePath.isPresent(), "Module file path for %s is not present", module);
 
         return moduleFilePath.get();
@@ -588,4 +588,4 @@ public final class TextTemplateUtil {
         return Strings.isNullOrEmpty(description) ? description
                 : AMP_MATCHER.replaceFrom(TAIL_COMMENT_PATTERN.matcher(description).replaceAll("&#42;&#47;"), "&amp;");
     }
-}
\ 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 868a93412198e43d5a6c3789c4a230af4e6e056c..e89f921d83252e8607110b9e557c9261369eacd9 100755 (executable)
--- 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
@@ -446,7 +446,7 @@ public class BindingRuntimeContext implements Immutable {
         final QName root = ((SchemaNode) container).getPath().getPathFromRoot().iterator().next();
         // findFirst makes no sense but just pick up one child to judge whether the target node is
         // in the same module.
-        final java.util.Optional<DataSchemaNode> child = augment.getChildNodes().stream().findFirst();
+        final Optional<DataSchemaNode> child = augment.getChildNodes().stream().findFirst();
         if (child.isPresent()) {
             return root.getModule().equals(child.get().getQName().getModule());
         }

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransaction.java
index ac754f56f277a193f97ceee228c6f5cb593945ae..dc98fbcf8038ab508a731055d8b698e17ea52fcf 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransaction.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransaction.java
@@ -81,7 +81,7 @@ public final class SnapshotBackedReadTransaction<T> extends
     }
 
     @Override
-    public java.util.Optional<DataTreeSnapshot> getSnapshot() {
-        return java.util.Optional.ofNullable(stableSnapshot);
+    public Optional<DataTreeSnapshot> getSnapshot() {
+        return Optional.ofNullable(stableSnapshot);
     }
 }

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
index 596a7d8f02314a5c53774c62fc93959ccda4415b..68811fb6778545679624803ee6274323009dedc1 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
@@ -37,7 +37,7 @@ public class SnapshotBackedReadTransactionTest {
         final NormalizedNode<?, ?> testNode = mock(NormalizedNode.class);
         final Optional<NormalizedNode<?, ?>> optional = Optional.of(testNode);
         doReturn("testNode").when(testNode).toString();
-        doReturn(java.util.Optional.of(testNode)).when(DATA_TREE_SNAPSHOT).readNode(YangInstanceIdentifier.EMPTY);
+        doReturn(Optional.of(testNode)).when(DATA_TREE_SNAPSHOT).readNode(YangInstanceIdentifier.EMPTY);
         assertTrue(snapshotBackedReadTransaction.exists(YangInstanceIdentifier.EMPTY).get());
 
         assertEquals(optional, snapshotBackedReadTransaction.read(YangInstanceIdentifier.EMPTY).get());
@@ -88,4 +88,4 @@ public class SnapshotBackedReadTransactionTest {
             throw e.getCause();
         }
     }
-}
\ No newline at end of file
+}

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
index 23cdbe285e407b6d0d053491cbc025edd7fbf982..db25e5f39c8baa4adb5024aed63654a89107550c 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
@@ -46,7 +46,7 @@ public class SnapshotBackedReadWriteTransactionTest {
         final NormalizedNode<?, ?> testNode = mock(NormalizedNode.class);
         final Optional<NormalizedNode<?, ?>> optional = Optional.of(testNode);
         doReturn("testNode").when(testNode).toString();
-        doReturn(java.util.Optional.of(testNode)).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.EMPTY);
+        doReturn(Optional.of(testNode)).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.EMPTY);
         assertTrue(snapshotBackedReadWriteTransaction.exists(YangInstanceIdentifier.EMPTY).get());
         assertEquals(optional, snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get());
     }