diff options
| -rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java | 3 | ||||
| -rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java index d3a0a79c737..b08e41846e4 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -795,8 +795,7 @@ public class CppClassBuilder implements ClassBuilder { } else { w.write("ConfigParser::parseStruct<" + childType + ">(\"" + child.getName() + "\", __lines"); } - if (child instanceof LeafCNode && ((LeafCNode) child).getDefaultValue() != null) { - LeafCNode leaf = (LeafCNode) child; + if (child instanceof LeafCNode leaf && leaf.getDefaultValue() != null) { if (leaf.getDefaultValue().getValue() != null) { String defaultVal = getDefaultValue(leaf); if (leaf instanceof LeafCNode.EnumLeaf) { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java index b48303ae98b..c64f0eaa211 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java @@ -32,8 +32,8 @@ public class Simplifier extends ExpressionTransformer<TransformContext> { node = transformChildren((CompositeNode) node, context); // depth first if (node instanceof IfNode) node = transformIf((IfNode) node); - if (node instanceof EmbracedNode && hasSingleUndividableChild((EmbracedNode)node)) - node = ((EmbracedNode)node).children().get(0); + if (node instanceof EmbracedNode e && hasSingleUndividableChild(e)) + node = e.children().get(0); if (node instanceof ArithmeticNode) node = transformArithmetic((ArithmeticNode) node); if (node instanceof NegativeNode) |