From 13002f4d3377d1097a23c46df11fc93c51ab83cc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 14 Oct 2018 02:07:07 +0200 Subject: [PATCH] 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 --- .../adapter/AbstractForwardedDataBroker.java | 14 +++---- .../codec/impl/DataObjectCodecContext.java | 6 +-- .../dom/codec/impl/LazyDataObject.java | 2 +- .../dom/codec/impl/LeafNodeCodecContext.java | 2 +- .../generator/util/BindingRuntimeContext.java | 12 +++--- .../context/base/LeafNodeCodecContext.java | 2 +- .../context/base/TreeNodeCodecContext.java | 4 +- .../impl/RpcActionGenHelperTest.java | 40 +++++++++---------- .../YangModuleInfoTemplateRenderer.java | 8 ++-- .../api/generator/util/TextTemplateUtil.java | 4 +- .../context/BindingRuntimeContext.java | 2 +- .../store/SnapshotBackedReadTransaction.java | 4 +- .../SnapshotBackedReadTransactionTest.java | 4 +- ...napshotBackedReadWriteTransactionTest.java | 2 +- 14 files changed, 52 insertions(+), 54 deletions(-) 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 1e93d19093..67c6b482c6 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 @@ -34,10 +34,10 @@ public abstract class AbstractForwardedDataBroker extends AbstractBindingAdapter final Map> normalized) { final Map, DataObject> newMap = new HashMap<>(); - for (final Map.Entry> entry : normalized.entrySet()) { + for (final Entry> entry : normalized.entrySet()) { try { - final Optional, DataObject>> potential - = getCodec().toBinding(entry); + final Optional, DataObject>> potential = getCodec() + .toBinding(entry); if (potential.isPresent()) { final Entry, 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 toBindingData(final InstanceIdentifier path, - final NormalizedNode data) { + protected Optional toBindingData(final InstanceIdentifier path, final NormalizedNode data) { if (path.isWildcarded()) { - return java.util.Optional.empty(); + return Optional.empty(); } - return (java.util.Optional) getCodec().getCodecRegistry().deserializeFunction(path) - .apply(java.util.Optional.of(data)); + return (Optional) 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 88731f31cd..74b77e67e7 100644 --- 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 choice = (ChoiceNodeCodecContext) context; choice.addYangPathArgument(arg, builder); - final java.util.Optional> caseType = arg.getCaseType(); + final Optional> caseType = arg.getCaseType(); final Class type = arg.getType(); final DataContainerCodecContext caze; if (caseType.isPresent()) { @@ -339,7 +339,7 @@ abstract class DataObjectCodecContext childContext = byMethod.get(method).get(); @SuppressWarnings("unchecked") - final java.util.Optional> domChild = domData.getChild(childContext.getDomPathArgument()); + final Optional> 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 value : byStreamAugmented.values()) { - final java.util.Optional> augData = data.getChild(value.getYangArg()); + final Optional> 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 a535eab2ee..4b3b791509 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 @@ -201,7 +201,7 @@ class LazyDataObject 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> augData = data.getChild(augCtx.getDomPathArgument()); + final Optional> 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 e681979d8b..9844149cc7 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 @@ -61,7 +61,7 @@ final class LeafNodeCodecContext extends NodeCodecContext< private static Object createDefaultObject(final DataSchemaNode schema, final Codec codec, final SchemaContext schemaContext) { if (schema instanceof LeafSchemaNode) { - java.util.Optional defaultValue = ((LeafSchemaNode) schema).getType().getDefaultValue(); + Optional 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 a2ca55bf24..4f32fbc0e8 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 @@ -92,7 +92,7 @@ public final class BindingRuntimeContext implements Immutable { new CacheLoader>() { @Override public Class load(final QName key) { - final java.util.Optional identityType = runtimeTypes.findIdentity(key); + final Optional 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 optType = runtimeTypes.findType(originalChoice); + final Optional 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 optSchema = runtimeTypes.findSchema(type); + final Optional optSchema = runtimeTypes.findSchema(type); if (!optSchema.isPresent()) { continue; } final WithStatus schema = optSchema.get(); - final java.util.Optional optDefinedType = runtimeTypes.findType(schema); + final Optional 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 clazzType = runtimeTypes.findType(origSchema); + final Optional 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 augType = runtimeTypes.findType(augOrig); + final Optional 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 ae4b7bc1ef..3676ffe9d0 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 @@ -62,7 +62,7 @@ public final class LeafNodeCodecContext extends NodeCodecCon final SchemaContext schemaContext) { if (schema instanceof LeafSchemaNode) { TypeDefinition type = ((LeafSchemaNode) schema).getType(); - java.util.Optional defaultValue = type.getDefaultValue(); + Optional 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 c5941d5cd5..427faa4ded 100755 --- 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 childContext = byMethod.get(method).get(); @SuppressWarnings("unchecked") - final java.util.Optional> domChild = domData.getChild(childContext.getDomPathArgument()); + final Optional> 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 value : byStreamAugmented.values()) { - final java.util.Optional> augData = data.getChild(value.getYangArg()); + final Optional> 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 88d9ab75c1..daf174db68 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 @@ -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 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 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> 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 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> 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 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 93cf8e4576..582f815652 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 @@ -45,10 +45,10 @@ public class YangModuleInfoTemplateRenderer { private final Map importMap = new HashMap<>(); private final String packageName; private final String modelBindingProviderName; - private final Function> moduleFilePathResolver; + private final Function> moduleFilePathResolver; - public YangModuleInfoTemplateRenderer(final Module module, final SchemaContext ctx, final Function> moduleFilePathResolver) { + public YangModuleInfoTemplateRenderer(final Module module, final SchemaContext ctx, + final Function> 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 modules, final String name) { - final TreeMap, Module> sorted = new TreeMap<>(Revision::compare); + final TreeMap, 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 99652f592a..f825bba659 100755 --- 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> moduleFilePathResolver) { - final java.util.Optional moduleFilePath = moduleFilePathResolver.apply(module); + final Optional 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("*/"), "&"); } -} \ 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 868a934121..e89f921d83 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 @@ -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 child = augment.getChildNodes().stream().findFirst(); + final Optional 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 ac754f56f2..dc98fbcf80 100644 --- 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 extends } @Override - public java.util.Optional getSnapshot() { - return java.util.Optional.ofNullable(stableSnapshot); + public Optional 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 596a7d8f02..68811fb677 100644 --- 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> 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 23cdbe285e..db25e5f39c 100644 --- 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> 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()); } -- 2.36.6