From 46f29107bbb71b037f474346d2eb34d6d446c27e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 11 Apr 2023 13:37:46 +0200 Subject: [PATCH] Migrate Optional.get() callers Use Optional.orElseThrow() instanced. Change-Id: I6ffee0b3e92ddca92a659d0f67d0fda128c02258 Signed-off-by: Robert Varga --- .../dom/adapter/BindingStructuralType.java | 2 +- ...BindingDOMTransactionChainAdapterTest.java | 2 +- .../dom/adapter/LeafDefaultValueTest.java | 30 ++++++------- .../impl/AugmentableCodecDataObject.java | 2 +- .../dom/codec/impl/BindingCodecContext.java | 12 +++--- .../codec/impl/ChoiceNodeCodecContext.java | 2 +- .../codec/impl/DataObjectCodecContext.java | 2 +- .../dom/codec/impl/LeafNodeCodecContext.java | 23 +++++----- .../codec/impl/SchemaRootCodecContext.java | 2 +- .../dom/codec/impl/CachingCodecTest.java | 2 +- ...UnionTypeWithMultipleIdentityrefsTest.java | 6 +-- .../reactor/AbstractTypeObjectGenerator.java | 2 +- .../generator/BindingGeneratorUtilTest.java | 2 +- .../generator/impl/AbstractOpaqueTest.java | 2 +- .../impl/BitAndUnionTOEnclosingTest.java | 10 ++--- .../generator/impl/GenEnumResolvingTest.java | 4 +- .../binding/generator/impl/Mdsal161Test.java | 2 +- .../binding/generator/impl/Mdsal269Test.java | 2 +- .../binding/generator/impl/Mdsal320Test.java | 4 +- .../impl/Mdsal406TypeObjectTest.java | 15 ++++--- .../java/api/generator/BaseTemplate.xtend | 4 +- .../api/generator/BuilderImplTemplate.xtend | 4 +- .../java/api/generator/ClassTemplate.xtend | 4 +- .../java/api/generator/JavaFileTemplate.java | 4 +- .../generator/NestedJavaGeneratedType.java | 2 +- .../generator/YangModuleInfoTemplate.xtend | 8 ++-- .../ManagedNewTransactionRunnerImplTest.java | 6 +-- ...tryingManagedNewTransactionRunnerTest.java | 5 ++- .../binding/util/TransactionAdapterTest.java | 2 +- .../yang/binding/InstanceIdentifier.java | 2 +- .../yang/binding/contract/Naming.java | 2 +- .../mdsal/dom/broker/DOMRpcRouter.java | 2 +- .../mdsal/dom/broker/DOMBrokerTest.java | 2 +- .../dom/broker/DOMDataTreeListenerTest.java | 12 +++--- .../broker/DOMMountPointServiceImplTest.java | 6 +-- .../InMemoryDOMStoreTreeChangePublisher.java | 2 +- .../store/inmemory/InMemoryDataStoreTest.java | 42 +++++++------------ .../SimpleDOMEntityOwnershipServiceTest.java | 2 +- 38 files changed, 114 insertions(+), 125 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java index 841574750c..168d815ba1 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java @@ -75,7 +75,7 @@ public enum BindingStructuralType { dataBased = domChildNode.getDataBefore(); } if (dataBased.isPresent()) { - return from(dataBased.get()); + return from(dataBased.orElseThrow()); } return from(domChildNode.getIdentifier()); } diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMTransactionChainAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMTransactionChainAdapterTest.java index 0a7fbe556a..c75801e437 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMTransactionChainAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMTransactionChainAdapterTest.java @@ -125,7 +125,7 @@ public class BindingDOMTransactionChainAdapterTest { }; BindingDOMDataBrokerAdapter bindingDOMDataBrokerAdapter = - (BindingDOMDataBrokerAdapter) bindingDOMAdapterLoader.load(DataBroker.class).get(); + (BindingDOMDataBrokerAdapter) bindingDOMAdapterLoader.load(DataBroker.class).orElseThrow(); bindingDOMTransactionChainAdapter = (BindingDOMTransactionChainAdapter) type.apply(bindingDOMDataBrokerAdapter, transactionChainListener); assertNotNull(bindingDOMTransactionChainAdapter.getDelegate()); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LeafDefaultValueTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LeafDefaultValueTest.java index 64631f3d6f..b0d87bc7a4 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LeafDefaultValueTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LeafDefaultValueTest.java @@ -109,7 +109,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(tinyIntContainerNode.isPresent()); - TinyIntContainer tinyIntContainer = tinyIntContainerNode.get(); + TinyIntContainer tinyIntContainer = tinyIntContainerNode.orElseThrow(); assertEquals(-18, tinyIntContainer.getTinyIntLeaf().getValue().byteValue()); assertEquals(-18, tinyIntContainer.getTinyIntLeaf2().getValue().byteValue()); assertEquals(-15, tinyIntContainer.getTinyIntLeaf3().getValue().byteValue()); @@ -130,7 +130,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(smallIntContainerNode.isPresent()); - SmallIntContainer smallIntContainer = smallIntContainerNode.get(); + SmallIntContainer smallIntContainer = smallIntContainerNode.orElseThrow(); assertEquals(-20000, smallIntContainer.getSmallIntLeaf().getValue().shortValue()); assertEquals(-20000, smallIntContainer.getSmallIntLeaf2().getValue().shortValue()); assertEquals(-15000, smallIntContainer.getSmallIntLeaf3().getValue().shortValue()); @@ -151,7 +151,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(normalIntContainerNode.isPresent()); - NormalIntContainer normalIntContainer = normalIntContainerNode.get(); + NormalIntContainer normalIntContainer = normalIntContainerNode.orElseThrow(); assertEquals(-200000, normalIntContainer.getNormalIntLeaf().getValue().intValue()); assertEquals(-200000, normalIntContainer.getNormalIntLeaf2().getValue().intValue()); assertEquals(-130000, normalIntContainer.getNormalIntLeaf3().getValue().intValue()); @@ -172,7 +172,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(bigIntContainerNode.isPresent()); - BigIntContainer bigIntContainer = bigIntContainerNode.get(); + BigIntContainer bigIntContainer = bigIntContainerNode.orElseThrow(); assertEquals(-3300000000L, bigIntContainer.getBigIntLeaf().getValue().longValue()); assertEquals(-3300000000L, bigIntContainer.getBigIntLeaf2().getValue().longValue()); assertEquals(-2800000000L, bigIntContainer.getBigIntLeaf3().getValue().longValue()); @@ -193,7 +193,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(tinyUintContainerNode.isPresent()); - TinyUintContainer tinyUintContainer = tinyUintContainerNode.get(); + TinyUintContainer tinyUintContainer = tinyUintContainerNode.orElseThrow(); assertEquals(150, tinyUintContainer.getTinyUintLeaf().getValue().shortValue()); assertEquals(150, tinyUintContainer.getTinyUintLeaf2().getValue().shortValue()); assertEquals(170, tinyUintContainer.getTinyUintLeaf3().getValue().shortValue()); @@ -214,7 +214,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(smallUintContainerNode.isPresent()); - SmallUintContainer smallUintContainer = smallUintContainerNode.get(); + SmallUintContainer smallUintContainer = smallUintContainerNode.orElseThrow(); assertEquals(35000, smallUintContainer.getSmallUintLeaf().getValue().intValue()); assertEquals(35000, smallUintContainer.getSmallUintLeaf2().getValue().intValue()); assertEquals(45000, smallUintContainer.getSmallUintLeaf3().getValue().intValue()); @@ -235,7 +235,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(normalUintContainerNode.isPresent()); - NormalUintContainer normalUintContainer = normalUintContainerNode.get(); + NormalUintContainer normalUintContainer = normalUintContainerNode.orElseThrow(); assertEquals(100000, normalUintContainer.getNormalUintLeaf().getValue().longValue()); assertEquals(100000, normalUintContainer.getNormalUintLeaf2().getValue().longValue()); assertEquals(250000, normalUintContainer.getNormalUintLeaf3().getValue().longValue()); @@ -256,7 +256,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(bigUintContainerNode.isPresent()); - BigUintContainer bigUintContainer = bigUintContainerNode.get(); + BigUintContainer bigUintContainer = bigUintContainerNode.orElseThrow(); assertEquals(5000000000L, bigUintContainer.getBigUintLeaf().getValue().longValue()); assertEquals(5000000000L, bigUintContainer.getBigUintLeaf2().getValue().longValue()); assertEquals(5800000000L, bigUintContainer.getBigUintLeaf3().getValue().longValue()); @@ -277,7 +277,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(decimalContainerNode.isPresent()); - DecimalContainer decimalCont = decimalContainerNode.get(); + DecimalContainer decimalCont = decimalContainerNode.orElseThrow(); assertEquals(66.66, decimalCont.getDecimalLeaf().getValue().doubleValue(), 0.001); assertEquals(66.66, decimalCont.getDecimalLeaf2().getValue().doubleValue(), 0.001); assertEquals(99.99, decimalCont.getDecimalLeaf3().getValue().doubleValue(), 0.001); @@ -298,7 +298,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(stringContainerNode.isPresent()); - StringContainer stringCont = stringContainerNode.get(); + StringContainer stringCont = stringContainerNode.orElseThrow(); assertEquals("unspecified string", stringCont.getStringLeaf().getValue()); assertEquals("unspecified string", stringCont.getStringLeaf2().getValue()); assertEquals("unknown", stringCont.getStringLeaf3().getValue()); @@ -319,7 +319,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(booleanContainerNode.isPresent()); - BooleanContainer boolCont = booleanContainerNode.get(); + BooleanContainer boolCont = booleanContainerNode.orElseThrow(); assertTrue(boolCont.getBooleanLeaf()); assertNull(boolCont.getBooleanLeaf2()); } @@ -336,7 +336,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(enumContainerNode.isPresent()); - EnumContainer enumCont = enumContainerNode.get(); + EnumContainer enumCont = enumContainerNode.orElseThrow(); assertEquals("Second", enumCont.getEnumLeaf().name()); assertEquals(2, enumCont.getEnumLeaf().getIntValue()); } @@ -353,7 +353,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(bitsContainerNode.isPresent()); - BitsContainer bitsCont = bitsContainerNode.get(); + BitsContainer bitsCont = bitsContainerNode.orElseThrow(); assertFalse(bitsCont.getBitsLeaf().getBitZero()); assertTrue(bitsCont.getBitsLeaf().getBitOne()); assertFalse(bitsCont.getBitsLeaf().getBitTwo()); @@ -372,7 +372,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(binaryContainerNode.isPresent()); - BinaryContainer binCont = binaryContainerNode.get(); + BinaryContainer binCont = binaryContainerNode.orElseThrow(); byte [] expectedBytes = {104, 101, 108, 108, 111}; byte [] actualBytes = binCont.getBinaryLeaf(); @@ -391,7 +391,7 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest { assertTrue(identityrefContainerNode.isPresent()); - IdentityrefContainer idrefCont = identityrefContainerNode.get(); + IdentityrefContainer idrefCont = identityrefContainerNode.orElseThrow(); assertNull(idrefCont.getIdentityrefLeaf()); assertSame(MyDerivedIdentity.VALUE, idrefCont.getIdentityrefLeaf2()); assertSame(MyDerivedIdentity.VALUE, idrefCont.getIdentityrefLeaf3()); diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentableCodecDataObject.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentableCodecDataObject.java index ac5e97c25d..dcee340dd5 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentableCodecDataObject.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentableCodecDataObject.java @@ -63,7 +63,7 @@ public abstract class AugmentableCodecDataObject> optAugCtx = codecContext().possibleStreamChild( (Class) augmentationType); if (optAugCtx.isPresent()) { - final DataContainerCodecContext augCtx = optAugCtx.get(); + final DataContainerCodecContext augCtx = optAugCtx.orElseThrow(); // Due to binding specification not representing grouping instantiations we can end up having the same // augmentation applied to a grouping multiple times. While these augmentations have the same shape, they // are still represented by distinct binding classes and therefore we need to make sure the result matches diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java index 307e6e1cd4..7d6dac79ee 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java @@ -387,11 +387,11 @@ public final class BindingCodecContext extends AbstractBindingNormalizedNodeSeri checkState(optType.isPresent(), "Failed to find return type for %s", method); final Class valueType; - final Type genericType = optType.get(); - if (genericType instanceof Class) { - valueType = (Class) genericType; - } else if (genericType instanceof ParameterizedType) { - valueType = (Class) ((ParameterizedType) genericType).getRawType(); + final Type genericType = optType.orElseThrow(); + if (genericType instanceof Class clazz) { + valueType = clazz; + } else if (genericType instanceof ParameterizedType parameterized) { + valueType = (Class) parameterized.getRawType(); } else if (genericType instanceof WildcardType) { // FIXME: MDSAL-670: this is not right as we need to find a concrete type valueType = Object.class; @@ -474,7 +474,7 @@ public final class BindingCodecContext extends AbstractBindingNormalizedNodeSeri Identifiable.class); checkState(optIdentifier.isPresent(), "Failed to find identifier for %s", listClz); - final Class> identifier = optIdentifier.get(); + final Class> identifier = optIdentifier.orElseThrow(); final Map valueCtx = new HashMap<>(); for (final ValueNodeCodecContext leaf : getLeafNodes(identifier, type.statement()).values()) { final QName name = leaf.getDomPathArgument().getNodeType(); 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 47d3c0cb40..46992c260f 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 @@ -328,7 +328,7 @@ final class ChoiceNodeCodecContext extends DataContainerCo for (Method method : type.getMethods()) { Optional> entity = getYangModeledReturnType(method, Naming.GETTER_PREFIX); if (entity.isPresent()) { - ret.add((Class) entity.get()); + ret.add((Class) entity.orElseThrow()); } } return ret; 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 b0bde73a71..780c5ac283 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 @@ -269,7 +269,7 @@ public abstract class DataObjectCodecContext caze; if (caseType.isPresent()) { // Non-ambiguous addressing this should not pose any problems - caze = choice.streamChild(caseType.get()); + caze = choice.streamChild(caseType.orElseThrow()); } else { caze = choice.getCaseByChildClass(type); } 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 cab325f426..d27c222002 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 @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.dom.codec.impl; import static java.util.Objects.requireNonNull; -import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.dom.codec.api.BindingTypeObjectCodecTreeNode; import org.opendaylight.yangtools.yang.binding.TypeObject; @@ -71,23 +70,25 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec { private static Object createDefaultObject(final LeafSchemaNode schema, final ValueCodec codec, final EffectiveModelContext schemaContext) { - Optional defaultValue = schema.getType().getDefaultValue(); + var optDefaultValue = schema.getType().getDefaultValue(); TypeDefinition type = schema.getType(); - if (defaultValue.isPresent()) { + if (optDefaultValue.isPresent()) { + final var defaultValue = optDefaultValue.orElseThrow(); if (type instanceof IdentityrefTypeDefinition) { - return qnameDomValueFromString(codec, schema, (String) defaultValue.get(), schemaContext); + return qnameDomValueFromString(codec, schema, (String) defaultValue, schemaContext); } - return domValueFromString(codec, type, defaultValue.get()); + return domValueFromString(codec, type, defaultValue); } - while (type.getBaseType() != null && !type.getDefaultValue().isPresent()) { + while (type.getBaseType() != null && type.getDefaultValue().isEmpty()) { type = type.getBaseType(); } - defaultValue = type.getDefaultValue(); - if (defaultValue.isPresent()) { + optDefaultValue = type.getDefaultValue(); + if (optDefaultValue.isPresent()) { + final var defaultValue = optDefaultValue.orElseThrow(); if (type instanceof IdentityrefTypeDefinition) { - return qnameDomValueFromString(codec, schema, (String) defaultValue.get(), schemaContext); + return qnameDomValueFromString(codec, schema, (String) defaultValue, schemaContext); } return domValueFromString(codec, type, defaultValue); } @@ -101,7 +102,7 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec { if (prefixEndIndex != -1) { String defaultValuePrefix = defaultValue.substring(0, prefixEndIndex); - Module module = schemaContext.findModule(schema.getQName().getModule()).get(); + Module module = schemaContext.findModule(schema.getQName().getModule()).orElseThrow(); if (module.getPrefix().equals(defaultValuePrefix)) { qname = QName.create(module.getQNameModule(), defaultValue.substring(prefixEndIndex + 1)); return codec.deserialize(qname); @@ -110,7 +111,7 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec { for (ModuleImport moduleImport : module.getImports()) { if (moduleImport.getPrefix().equals(defaultValuePrefix)) { Module importedModule = schemaContext.findModule(moduleImport.getModuleName().getLocalName(), - moduleImport.getRevision()).get(); + moduleImport.getRevision()).orElseThrow(); qname = QName.create(importedModule.getQNameModule(), defaultValue.substring(prefixEndIndex + 1)); return codec.deserialize(qname); } 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 19bc68b492..52c3efdfc9 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 @@ -289,7 +289,7 @@ final class SchemaRootCodecContext extends DataContainerCo final Optional optParamType = ClassLoaderUtils.findParameterizedType(action, actionType); checkState(optParamType.isPresent(), "%s does not specialize %s", action, actionType); - final ParameterizedType paramType = optParamType.get(); + final ParameterizedType paramType = optParamType.orElseThrow(); final Type[] args = paramType.getActualTypeArguments(); checkArgument(args.length == expectedArgsLength, "Unexpected (%s) Action generatic arguments", args.length); final ActionRuntimeType schema = factory().getRuntimeContext().getActionDefinition(action); diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingCodecTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingCodecTest.java index 6f2e584b4c..3cf587f867 100644 --- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingCodecTest.java +++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingCodecTest.java @@ -167,7 +167,7 @@ public class CachingCodecTest extends AbstractBindingCodecTest { } private static MapNode getListItems(final NormalizedNode top) { - return (MapNode) ((DataContainerNode) top).findChildByArg(TOP_LEVEL_LIST_ARG).get(); + return (MapNode) ((DataContainerNode) top).getChildByArg(TOP_LEVEL_LIST_ARG); } private static void verifyLeafItemSame(final NormalizedNode firstCont, final NormalizedNode secondCont) { diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeWithMultipleIdentityrefsTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeWithMultipleIdentityrefsTest.java index c5a00fa525..e2eef29f93 100644 --- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeWithMultipleIdentityrefsTest.java +++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeWithMultipleIdentityrefsTest.java @@ -89,10 +89,8 @@ public class UnionTypeWithMultipleIdentityrefsTest extends AbstractBindingCodecT final NormalizedNode translatedNN = translated.getValue(); assertNotNull(translatedNN); // verify the union leaf is present - Optional leafNodeOpt = NormalizedNodes.findNode(translatedNN, - NodeIdentifier.create(UNION_LEAF_QNAME)); - assertTrue(leafNodeOpt.isPresent()); // verify the leaf is the correct identity - assertEquals(identityQname, leafNodeOpt.get().body()); + assertEquals(Optional.of(identityQname), + NormalizedNodes.findNode(translatedNN, NodeIdentifier.create(UNION_LEAF_QNAME)).map(NormalizedNode::body)); } } diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java index ce9174c734..3afca47a8a 100644 --- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java +++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java @@ -882,7 +882,7 @@ abstract class AbstractTypeObjectGenerator, R // The pattern can be inverted final Optional optModifier = patternConstraint.getModifier(); if (optModifier.isPresent()) { - regEx = applyModifier(optModifier.get(), regEx); + regEx = applyModifier(optModifier.orElseThrow(), regEx); } regExps.put(regEx, patternConstraint.getRegularExpressionString()); diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java index 804feeb8fc..dc95e72595 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java @@ -52,7 +52,7 @@ public class BindingGeneratorUtilTest { assertNotNull(restrictions); assertEquals(Set.of(Range.closed(1, 2)), - restrictions.getLengthConstraint().get().getAllowedRanges().asRanges()); + restrictions.getLengthConstraint().orElseThrow().getAllowedRanges().asRanges()); assertFalse(restrictions.getRangeConstraint().isPresent()); assertEquals(1, restrictions.getPatternConstraints().size()); diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java index 5b4bb374b0..3a016223e0 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java @@ -29,7 +29,7 @@ abstract class AbstractOpaqueTest { final Optional optType = types.stream().filter(t -> typeName.equals(t.getIdentifier())) .findFirst(); assertTrue(optType.isPresent()); - final GeneratedType genType = optType.get(); + final GeneratedType genType = optType.orElseThrow(); final Iterator it = genType.getImplements().iterator(); final Type first = it.next(); assertTrue(first instanceof ParameterizedType); diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index fb0a93153d..87f32bb357 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -56,7 +56,7 @@ public class BitAndUnionTOEnclosingTest { GeneratedTransferObject lfLeaf = lfLeafs.get(0); assertEquals("Lf has incorrect package name.", "org.opendaylight.yang.gen.v1.urn.bit.union.in.leaf.rev130626.ParentContainer", - lfLeaf.getIdentifier().immediatelyEnclosingClass().get().toString()); + lfLeaf.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); assertEquals("Lf generated TO has incorrect number of properties", 2, lfLeaf.getProperties().size()); containsAttributes(lfLeaf, true, true, true, new NameTypePattern("string", "String")); @@ -70,7 +70,7 @@ public class BitAndUnionTOEnclosingTest { assertEquals("Lf$1", lf1Leaf.getName()); assertEquals("Lf$1 has incorrect package name.", "org.opendaylight.yang.gen.v1.urn.bit.union.in.leaf.rev130626.ParentContainer.Lf", - lf1Leaf.getIdentifier().immediatelyEnclosingClass().get().toString()); + lf1Leaf.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); assertThat(lf1Leaf, instanceOf(GeneratedTransferObject.class)); final GeneratedTransferObject lf1gto = (GeneratedTransferObject) lf1Leaf; @@ -88,7 +88,7 @@ public class BitAndUnionTOEnclosingTest { assertEquals("Lf$2", lf2Leaf.getName()); assertEquals("Lf$2 has incorrect package name.", "org.opendaylight.yang.gen.v1.urn.bit.union.in.leaf.rev130626.ParentContainer.Lf.Lf$1", - lf2Leaf.getIdentifier().immediatelyEnclosingClass().get().toString()); + lf2Leaf.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); assertThat(lf2Leaf, instanceOf(GeneratedTransferObject.class)); @@ -182,10 +182,10 @@ public class BitAndUnionTOEnclosingTest { assertEquals("BitLeaf has incorrect package name.", "org.opendaylight.yang.gen.v1.urn.bit.union.in.leaf.rev130626.ParentContainer", - bitLeaf.getIdentifier().immediatelyEnclosingClass().get().toString()); + bitLeaf.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); assertEquals("UnionLeaf has incorrect package name.", "org.opendaylight.yang.gen.v1.urn.bit.union.in.leaf.rev130626.ParentContainer", - unionLeaf.getIdentifier().immediatelyEnclosingClass().get().toString()); + unionLeaf.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); List propertiesBitLeaf = bitLeaf.getProperties(); GeneratedProperty firstBitProperty = null; diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java index bc0049ea17..990f02b58c 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java @@ -130,12 +130,12 @@ public class GenEnumResolvingTest { assertThat(linkUpDownTrapEnable, instanceOf(Enumeration.class)); assertEquals( "org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev121115.interfaces.Interface", - linkUpDownTrapEnable.getIdentifier().immediatelyEnclosingClass().get().toString()); + linkUpDownTrapEnable.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); assertNotNull("Expected Referenced Enum OperStatus, but was NULL!", operStatus); assertThat(operStatus, instanceOf(Enumeration.class)); assertEquals( "org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev121115.interfaces.Interface", - operStatus.getIdentifier().immediatelyEnclosingClass().get().toString()); + operStatus.getIdentifier().immediatelyEnclosingClass().orElseThrow().toString()); } } diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java index 2285b601b6..95112df81b 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java @@ -44,7 +44,7 @@ public class Mdsal161Test { .findFirst(); assertTrue("Type for " + className + " not found", optType.isPresent()); - final GeneratedType type = optType.get(); + final GeneratedType type = optType.orElseThrow(); assertThat(type, instanceOf(GeneratedTransferObject.class)); final GeneratedTransferObject gto = (GeneratedTransferObject) type; assertEquals(2, gto.getEqualsIdentifiers().size()); diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java index 151177406c..fd5ef3041e 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java @@ -26,7 +26,7 @@ public class Mdsal269Test { assertEquals(4, generateTypes.size()); final GeneratedType mplsLabelType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yang.gen.v1.mdsal269.rev180130.MplsLabel")).findFirst().get(); + .equals("org.opendaylight.yang.gen.v1.mdsal269.rev180130.MplsLabel")).findFirst().orElseThrow(); assertTrue(mplsLabelType instanceof GeneratedTransferObject); final GeneratedTransferObject gto = (GeneratedTransferObject) mplsLabelType; diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java index b36274a8a7..b743a19611 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java @@ -33,7 +33,7 @@ public class Mdsal320Test { assertEquals(2, generateTypes.size()); final GeneratedType foo = generateTypes.stream().filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yang.gen.v1.urn.odl.yt320.norev.Foo")).findFirst().get(); + .equals("org.opendaylight.yang.gen.v1.urn.odl.yt320.norev.Foo")).findFirst().orElseThrow(); final List fooTypes = foo.getEnclosedTypes(); assertEquals(1, fooTypes.size()); @@ -75,7 +75,7 @@ public class Mdsal320Test { assertFalse(it.hasNext()); final GeneratedProperty bar1Prop = bar.getProperties().stream().filter(prop -> "bar$1".equals(prop.getName())) - .findFirst().get(); + .findFirst().orElseThrow(); final Type bar1PropRet = bar1Prop.getReturnType(); assertEquals(bar1, bar1PropRet); } diff --git a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java index 683ce02f6e..366bc585dd 100644 --- a/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java +++ b/binding/mdsal-binding-generator/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java @@ -43,12 +43,13 @@ public class Mdsal406TypeObjectTest { assertNotNull(generateTypes); final GeneratedType typedefType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.MyBinary")).findFirst().get(); + .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.MyBinary")).findFirst() + .orElseThrow(); assertNotNull(typedefType.getImplements()); Type objectType = typedefType.getImplements().stream() .filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yangtools.yang.binding.ScalarTypeObject")).findAny().get(); + .equals("org.opendaylight.yangtools.yang.binding.ScalarTypeObject")).findAny().orElseThrow(); assertEquals(BindingTypes.scalarTypeObject(Types.BYTE_ARRAY), objectType); } @@ -58,12 +59,13 @@ public class Mdsal406TypeObjectTest { assertNotNull(generateTypes); final GeneratedType typedefType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.MyBits")).findFirst().get(); + .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.MyBits")).findFirst() + .orElseThrow(); assertNotNull(typedefType.getImplements()); Type objectType = typedefType.getImplements().stream() .filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yangtools.yang.binding.BitsTypeObject")).findAny().get(); + .equals("org.opendaylight.yangtools.yang.binding.BitsTypeObject")).findAny().orElseThrow(); assertEquals(BITS_TYPE_OBJECT, objectType); } @@ -73,12 +75,13 @@ public class Mdsal406TypeObjectTest { assertNotNull(generateTypes); final GeneratedType typedefType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.MyUnion")).findFirst().get(); + .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.MyUnion")).findFirst() + .orElseThrow(); assertNotNull(typedefType.getImplements()); Type objectType = typedefType.getImplements().stream() .filter(type -> type.getFullyQualifiedName() - .equals("org.opendaylight.yangtools.yang.binding.UnionTypeObject")).findAny().get(); + .equals("org.opendaylight.yangtools.yang.binding.UnionTypeObject")).findAny().orElseThrow(); assertEquals(UNION_TYPE_OBJECT, objectType); } } diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend index b0d26dce2d..ee717a9ac7 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend @@ -343,10 +343,10 @@ abstract class BaseTemplate extends JavaFileTemplate { def protected generateCheckers(GeneratedProperty field, Restrictions restrictions, Type actualType) ''' «IF restrictions.rangeConstraint.present» «AbstractRangeGenerator.forType(actualType).generateRangeChecker(field.name.toFirstUpper, - restrictions.rangeConstraint.get, this)» + restrictions.rangeConstraint.orElseThrow, this)» «ENDIF» «IF restrictions.lengthConstraint.present» - «LengthGenerator.generateLengthChecker(field.fieldName, actualType, restrictions.lengthConstraint.get, this)» + «LengthGenerator.generateLengthChecker(field.fieldName, actualType, restrictions.lengthConstraint.orElseThrow, this)» «ENDIF» ''' diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend index a4b43f3db8..25968ac9b1 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend @@ -137,13 +137,13 @@ class BuilderImplTemplate extends AbstractBuilderTemplate { package def findGetter(String getterName) { val ownGetter = getterByName(type.nonDefaultMethods, getterName); if (ownGetter.isPresent) { - return ownGetter.get; + return ownGetter.orElseThrow } for (ifc : type.implements) { if (ifc instanceof GeneratedType) { val getter = findGetter(ifc, getterName) if (getter.isPresent) { - return (getter.get) + return (getter.orElseThrow) } } } diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend index 38fb42811c..4450e5ee7a 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend @@ -173,10 +173,10 @@ class ClassTemplate extends BaseTemplate { «IF restrictions !== null» «IF restrictions.lengthConstraint.present» «LengthGenerator.generateLengthChecker("_value", TypeUtils.encapsulatedValueType(genTO), - restrictions.lengthConstraint.get, this)» + restrictions.lengthConstraint.orElseThrow, this)» «ENDIF» «IF restrictions.rangeConstraint.present» - «rangeGenerator.generateRangeChecker("_value", restrictions.rangeConstraint.get, this)» + «rangeGenerator.generateRangeChecker("_value", restrictions.rangeConstraint.orElseThrow, this)» «ENDIF» «ENDIF» diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java index d7ac386f8d..fd5540540d 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java @@ -250,8 +250,8 @@ class JavaFileTemplate { // Exposed for BuilderTemplate boolean isLocalInnerClass(final JavaTypeName name) { - final Optional optEnc = name.immediatelyEnclosingClass(); - return optEnc.isPresent() && type.getIdentifier().equals(optEnc.get()); + final var optEnc = name.immediatelyEnclosingClass(); + return optEnc.isPresent() && type.getIdentifier().equals(optEnc.orElseThrow()); } final CharSequence generateInnerClass(final GeneratedType innerClass) { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java index 5c1eb6e8cc..8f4b2ffa71 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java @@ -75,7 +75,7 @@ final class NestedJavaGeneratedType extends AbstractJavaGeneratedType { final Deque queue = new ArrayDeque<>(); queue.addFirst(type.simpleName()); while (optEnclosing.isPresent()) { - final JavaTypeName enclosing = optEnclosing.get(); + final JavaTypeName enclosing = optEnclosing.orElseThrow(); if (enclosing.equals(getName())) { return ImmutableList.copyOf(queue); } diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend index a83bf505e4..8b42d43d8a 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend @@ -97,7 +97,7 @@ final class YangModuleInfoTemplate { @«JavaFileTemplate.GENERATED»("mdsal-binding-generator") public final class «MODULE_INFO_CLASS_NAME» extends ResourceYangModuleInfo { «val rev = module.revision» - private static final @NonNull QName NAME = QName.create("«module.QNameModule.namespace.toString»", «IF rev.present»"«rev.get.toString»", «ENDIF»"«module.name»").intern(); + private static final @NonNull QName NAME = QName.create("«module.QNameModule.namespace.toString»", «IF rev.present»"«rev.orElseThrow.toString»", «ENDIF»"«module.name»").intern(); private static final @NonNull YangModuleInfo INSTANCE = new «MODULE_INFO_CLASS_NAME»(); private final @NonNull ImmutableSet importedModules; @@ -200,7 +200,7 @@ final class YangModuleInfoTemplate { «FOR imp : m.imports» «val name = imp.moduleName.localName» «val rev = imp.revision» - «IF !rev.present» + «IF rev.empty» «val TreeMap, Module> sorted = new TreeMap(REVISION_COMPARATOR)» «FOR module : ctx.modules» «IF name.equals(module.name)» @@ -247,7 +247,7 @@ final class YangModuleInfoTemplate { private def sourcePath(ModuleLike module) { val opt = moduleFilePathResolver.apply(module) Preconditions.checkState(opt.isPresent, "Module %s does not have a file path", module) - return opt.get + return opt.orElseThrow } private def generateSubInfo(Set submodules) ''' @@ -257,7 +257,7 @@ final class YangModuleInfoTemplate { private static final class «className»Info extends ResourceYangModuleInfo { «val rev = submodule.revision» private final @NonNull QName NAME = QName.create("«submodule.QNameModule.namespace.toString»", « - IF rev.present»"«rev.get.toString»", «ENDIF»"«submodule.name»").intern(); + IF rev.present»"«rev.orElseThrow.toString»", «ENDIF»"«submodule.name»").intern(); private static final @NonNull YangModuleInfo INSTANCE = new «className»Info(); private final @NonNull ImmutableSet importedModules; diff --git a/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java index 6b2df7c4b5..f880ea06cc 100644 --- a/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java +++ b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/ManagedNewTransactionRunnerImplTest.java @@ -124,8 +124,8 @@ public class ManagedNewTransactionRunnerImplTest extends AbstractConcurrentDataB TopLevelList data = newTestDataObject(); managedNewTransactionRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> tx.put(TEST_PATH, data)).get(); - assertEquals(data, managedNewTransactionRunner.applyWithNewReadOnlyTransactionAndClose(OPERATIONAL, - tx -> tx.read(TEST_PATH)).get().get()); + assertEquals(Optional.of(data), managedNewTransactionRunner.applyWithNewReadOnlyTransactionAndClose(OPERATIONAL, + tx -> tx.read(TEST_PATH)).get()); } TopLevelList newTestDataObject() { @@ -248,6 +248,6 @@ public class ManagedNewTransactionRunnerImplTest extends AbstractConcurrentDataB T syncRead(final LogicalDatastoreType datastoreType, final InstanceIdentifier path) throws ExecutionException, InterruptedException { - return syncReadOptional(datastoreType, path).get(); + return syncReadOptional(datastoreType, path).orElseThrow(); } } diff --git a/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java index c44f50da9e..496f9166a3 100644 --- a/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java +++ b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerTest.java @@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.util; import static org.junit.Assert.assertEquals; import static org.opendaylight.mdsal.binding.util.Datastore.OPERATIONAL; +import java.util.Optional; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -73,7 +74,7 @@ public class RetryingManagedNewTransactionRunnerTest extends ManagedNewTransacti managedNewTransactionRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> { tx.put(TEST_PATH, data); - assertEquals(data, tx.read(TEST_PATH).get().get()); + assertEquals(Optional.of(data), tx.read(TEST_PATH).get()); }).get(); assertEquals(data, syncRead(LogicalDatastoreType.OPERATIONAL, TEST_PATH)); } @@ -86,7 +87,7 @@ public class RetryingManagedNewTransactionRunnerTest extends ManagedNewTransacti OPERATIONAL, tx -> { tx.put(TEST_PATH, data); - return tx.read(TEST_PATH).get().get(); + return tx.read(TEST_PATH).get().orElseThrow(); }).get()); assertEquals(data, syncRead(LogicalDatastoreType.OPERATIONAL, TEST_PATH)); } diff --git a/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java index d1b155767c..a80c32bb71 100644 --- a/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java +++ b/binding/mdsal-binding-util/src/test/java/org/opendaylight/mdsal/binding/util/TransactionAdapterTest.java @@ -132,6 +132,6 @@ public class TransactionAdapterTest extends AbstractConcurrentDataBrokerTest { private T syncRead(final LogicalDatastoreType datastoreType, final InstanceIdentifier path) throws ExecutionException, InterruptedException { - return syncReadOptional(datastoreType, path).get(); + return syncReadOptional(datastoreType, path).orElseThrow(); } } diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java index 6ebbba710c..b0a6d908a6 100644 --- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java +++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java @@ -699,7 +699,7 @@ public class InstanceIdentifier return arg.getCaseType().isPresent() ? -1 : 1; } final Optional> argCaseType = getCaseType(); - return argCaseType.isPresent() ? compareClasses(caseType.get(), argCaseType.get()) : 1; + return argCaseType.isPresent() ? compareClasses(caseType.orElseThrow(), argCaseType.orElseThrow()) : 1; } private static int compareClasses(final Class first, final Class second) { diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java index 0afe783bd2..3b3b56f01b 100644 --- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java +++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java @@ -195,7 +195,7 @@ public final class Naming { if (optRev.isPresent()) { // Revision is in format 2017-10-26, we want the output to be 171026, which is a matter of picking the // right characters. - final String rev = optRev.get().toString(); + final String rev = optRev.orElseThrow().toString(); checkArgument(rev.length() == 10, "Unsupported revision %s", rev); packageNameBuilder.append("rev").append(rev, 2, 4).append(rev, 5, 7).append(rev.substring(8)); } else { diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java index a3524547c1..d5732066d7 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java @@ -593,7 +593,7 @@ public final class DOMRpcRouter extends AbstractRegistration // Routing key is present, attempt to deliver as a routed RPC if (maybeKey.isPresent()) { - final NormalizedNode key = maybeKey.get(); + final NormalizedNode key = maybeKey.orElseThrow(); final Object value = key.body(); if (value instanceof YangInstanceIdentifier iid) { // Find a DOMRpcImplementation for a specific iid diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMBrokerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMBrokerTest.java index 55f527e900..ab0b2ed54e 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMBrokerTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMBrokerTest.java @@ -204,7 +204,7 @@ public class DOMBrokerTest extends AbstractDatastoreTest { writeTx.commit().get(); assertEquals(Boolean.TRUE, domBroker.newReadOnlyTransaction().exists(OPERATIONAL, TestModel.TEST_PATH).get()); assertEquals(Boolean.TRUE, domBroker.newReadOnlyTransaction().read(OPERATIONAL, TestModel.TEST_PATH).get() - .get().toString().contains(testContainer.toString())); + .orElseThrow().toString().contains(testContainer.toString())); readRx.read(OPERATIONAL, TestModel.TEST_PATH).get(); // init backing tx before close readRx.close(); diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java index 39947d728b..6cc6775ad9 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java @@ -265,7 +265,7 @@ public class DOMDataTreeListenerTest extends AbstractDatastoreTest { candidateRoot = candidate.getRootNode(); checkChange(TEST_CONTAINER, TEST_CONTAINER_2, ModificationType.SUBTREE_MODIFIED, candidateRoot); final DataTreeCandidateNode modifiedChild = candidateRoot.getModifiedChild( - new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).get(); + new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME)).orElseThrow(); checkChange(OUTER_LIST, OUTER_LIST_2, ModificationType.WRITE, modifiedChild); listenerReg.close(); } @@ -369,11 +369,11 @@ public class DOMDataTreeListenerTest extends AbstractDatastoreTest { assertNotNull(candidate); candidateRoot = candidate.getRootNode(); checkChange(OUTER_LIST, listAfter, ModificationType.SUBTREE_MODIFIED, candidateRoot); - final DataTreeCandidateNode entry1Canditate = candidateRoot.getModifiedChild(outerListEntryId1).get(); + final DataTreeCandidateNode entry1Canditate = candidateRoot.getModifiedChild(outerListEntryId1).orElseThrow(); checkChange(outerListEntry1, null, ModificationType.DELETE, entry1Canditate); - final DataTreeCandidateNode entry2Canditate = candidateRoot.getModifiedChild(outerListEntryId2).get(); + final DataTreeCandidateNode entry2Canditate = candidateRoot.getModifiedChild(outerListEntryId2).orElseThrow(); checkChange(null, outerListEntry2, ModificationType.WRITE, entry2Canditate); - final DataTreeCandidateNode entry3Canditate = candidateRoot.getModifiedChild(outerListEntryId3).get(); + final DataTreeCandidateNode entry3Canditate = candidateRoot.getModifiedChild(outerListEntryId3).orElseThrow(); checkChange(null, outerListEntry3, ModificationType.WRITE, entry3Canditate); listenerReg.close(); } @@ -382,14 +382,14 @@ public class DOMDataTreeListenerTest extends AbstractDatastoreTest { final ModificationType expectedMod, final DataTreeCandidateNode candidateNode) { if (expectedBefore != null) { assertTrue(candidateNode.getDataBefore().isPresent()); - assertEquals(expectedBefore, candidateNode.getDataBefore().get()); + assertEquals(expectedBefore, candidateNode.getDataBefore().orElseThrow()); } else { assertFalse(candidateNode.getDataBefore().isPresent()); } if (expectedAfter != null) { assertTrue(candidateNode.getDataAfter().isPresent()); - assertEquals(expectedAfter, candidateNode.getDataAfter().get()); + assertEquals(expectedAfter, candidateNode.getDataAfter().orElseThrow()); } else { assertFalse(candidateNode.getDataAfter().isPresent()); } diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java index c3c34ce2fa..37c90472f2 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImplTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.dom.api.DOMMountPoint; @@ -58,9 +59,8 @@ public class DOMMountPointServiceImplTest { assertTrue(mountPointService.getMountPoint(PATH).isPresent()); // Verify mount point schema context and service - final DOMMountPoint mountPoint = mountPointService.getMountPoint(PATH).get(); - assertTrue(mountPoint.getService(DOMRpcService.class).isPresent()); - assertEquals(rpcService, mountPoint.getService(DOMRpcService.class).get()); + final DOMMountPoint mountPoint = mountPointService.getMountPoint(PATH).orElseThrow(); + assertEquals(Optional.of(rpcService), mountPoint.getService(DOMRpcService.class)); } @Test diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreTreeChangePublisher.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreTreeChangePublisher.java index d98697ecde..72ab65e634 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreTreeChangePublisher.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreTreeChangePublisher.java @@ -78,7 +78,7 @@ final class InMemoryDOMStoreTreeChangePublisher extends AbstractDOMStoreTreeChan return reg; } - final NormalizedNode data = preExistingData.get(); + final NormalizedNode data = preExistingData.orElseThrow(); if (treeId.isEmpty()) { checkState(data instanceof DataContainerNode, "Unexpected root node %s", data); if (((DataContainerNode) data).isEmpty()) { diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java index ac94386227..f46ee58c4b 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import java.util.Optional; @@ -85,15 +86,12 @@ public class InMemoryDataStoreTest { /** * Reads /test from writeTx Read should return container. */ - ListenableFuture> writeTxContainer = writeTx.read(TestModel.TEST_PATH); - assertEquals("read: isPresent", true, writeTxContainer.get().isPresent()); - assertEquals("read: data", testNode, writeTxContainer.get().get()); + assertEquals(Optional.of(testNode), Futures.getDone(writeTx.read(TestModel.TEST_PATH))); /** * Reads /test from readTx Read should return Absent. */ - ListenableFuture> readTxContainer = readTx.read(TestModel.TEST_PATH); - assertEquals("read: isPresent", false, readTxContainer.get().isPresent()); + assertEquals(Optional.empty(), Futures.getDone(readTx.read(TestModel.TEST_PATH))); } @Test @@ -111,17 +109,14 @@ public class InMemoryDataStoreTest { /** * Reads /test from writeTx Read should return container. */ - ListenableFuture> writeTxContainer = writeTx.read(TestModel.TEST_PATH); - assertEquals("read: isPresent", true, writeTxContainer.get().isPresent()); - assertEquals("read: data", testNode, writeTxContainer.get().get()); + assertEquals(Optional.of(testNode), Futures.getDone(writeTx.read(TestModel.TEST_PATH))); DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); assertThreePhaseCommit(cohort); - Optional afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); - assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent()); - assertEquals("After commit read: data", testNode, afterCommitRead.get()); + assertEquals(Optional.of(testNode), + Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH))); } @Test @@ -136,8 +131,7 @@ public class InMemoryDataStoreTest { assertThreePhaseCommit(writeTx.ready()); - Optional afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); - assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent()); + assertTrue(Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH)).isPresent()); // Delete /test and verify @@ -147,8 +141,7 @@ public class InMemoryDataStoreTest { assertThreePhaseCommit(writeTx.ready()); - afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); - assertEquals("After commit read: isPresent", false, afterCommitRead.isPresent()); + assertEquals(Optional.empty(), Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH))); } @Test @@ -167,10 +160,8 @@ public class InMemoryDataStoreTest { assertThreePhaseCommit(writeTx.ready()); - Optional afterCommitRead = - domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); - assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent()); - assertEquals("After commit read: data", containerNode, afterCommitRead.get()); + assertEquals(Optional.of(containerNode), + Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH))); // Merge a new list entry node @@ -189,9 +180,8 @@ public class InMemoryDataStoreTest { assertThreePhaseCommit(writeTx.ready()); - afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); - assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent()); - assertEquals("After commit read: data", containerNode, afterCommitRead.get()); + assertEquals(Optional.of(containerNode), + Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH))); } @Test @@ -208,9 +198,7 @@ public class InMemoryDataStoreTest { writeTx.merge(TestModel.TEST_PATH, containerNode); - ListenableFuture exists = writeTx.exists(TestModel.TEST_PATH); - - assertEquals(Boolean.TRUE, exists.get()); + assertEquals(Boolean.TRUE, Futures.getDone(writeTx.exists(TestModel.TEST_PATH))); DOMStoreThreePhaseCommitCohort ready = writeTx.ready(); @@ -221,9 +209,7 @@ public class InMemoryDataStoreTest { DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); assertNotNull(readTx); - exists = readTx.exists(TestModel.TEST_PATH); - - assertEquals(Boolean.TRUE, exists.get()); + assertEquals(Boolean.TRUE, Futures.getDone(readTx.exists(TestModel.TEST_PATH))); } @Test 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 c38ae6b95e..2476151516 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 @@ -62,7 +62,7 @@ public class SimpleDOMEntityOwnershipServiceTest { final Optional state = service.getOwnershipState(FOO_FOO_ENTITY); assertNotNull(state); assertTrue(state.isPresent()); - assertEquals(EntityOwnershipState.IS_OWNER, state.get()); + assertEquals(EntityOwnershipState.IS_OWNER, state.orElseThrow()); reg.close(); assertFalse(service.isCandidateRegistered(FOO_FOO_ENTITY)); -- 2.36.6