From 9b8236dd7499510577c32f0d87dfd52d34f6b023 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sat, 2 Oct 2021 20:51:58 +0200 Subject: chore: fix Java 17 Sonar warnings Had to disable code coverage measurement in the Quality Gate, we should switch it on again once we have a complete test suite. --- .../viatra/solver/language/ProblemUtil.java | 4 ++-- .../language/resource/DerivedVariableComputer.java | 26 +++++++++------------- .../language/resource/NodeNameCollector.java | 8 +++---- .../resource/ProblemDerivedStateComputer.java | 17 ++++++-------- .../resource/ProblemLocationInFileProvider.java | 4 ++-- .../ProblemResourceDescriptionStrategy.java | 7 +++--- .../language/scoping/ProblemScopeProvider.java | 6 ++--- 7 files changed, 30 insertions(+), 42 deletions(-) (limited to 'language') diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java b/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java index 1581186c..a2938274 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java @@ -74,8 +74,8 @@ public final class ProblemUtil { if (!found.contains(current)) { found.add(current); for (Relation superType : current.getSuperTypes()) { - if (superType instanceof ClassDeclaration) { - queue.addLast((ClassDeclaration) superType); + if (superType instanceof ClassDeclaration superDeclaration) { + queue.addLast(superDeclaration); } } } diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java b/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java index 1b0146b6..2789f590 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java @@ -45,8 +45,7 @@ public class DerivedVariableComputer { public void installDerivedVariables(Problem problem, Set nodeNames) { for (Statement statement : problem.getStatements()) { - if (statement instanceof PredicateDefinition) { - PredicateDefinition definition = (PredicateDefinition) statement; + if (statement instanceof PredicateDefinition definition) { installDerivedPredicateDefinitionState(definition, nodeNames); } } @@ -69,16 +68,14 @@ public class DerivedVariableComputer { protected void installDeriveConjunctionState(Conjunction conjunction, Set knownVariables) { Set newVariables = new HashSet<>(); for (Literal literal : conjunction.getLiterals()) { - if (literal instanceof Atom) { - var atom = (Atom) literal; + if (literal instanceof Atom atom) { createSigletonVariablesAndCollectVariables(atom, knownVariables, newVariables); } } createVariables(conjunction, newVariables); newVariables.addAll(knownVariables); for (Literal literal : conjunction.getLiterals()) { - if (literal instanceof NegativeLiteral) { - var negativeLiteral = (NegativeLiteral) literal; + if (literal instanceof NegativeLiteral negativeLiteral) { installDeriveNegativeLiteralState(negativeLiteral, newVariables); } } @@ -93,8 +90,7 @@ public class DerivedVariableComputer { protected void createSigletonVariablesAndCollectVariables(Atom atom, Set knownVariables, Set newVariables) { for (Argument argument : atom.getArguments()) { - if (argument instanceof VariableOrNodeArgument) { - var variableOrNodeArgument = (VariableOrNodeArgument) argument; + if (argument instanceof VariableOrNodeArgument variableOrNodeArgument) { IScope scope = scopeProvider.getScope(variableOrNodeArgument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE); List nodes = NodeModelUtils.findNodesForFeature(variableOrNodeArgument, @@ -159,8 +155,8 @@ public class DerivedVariableComputer { public void discardDerivedVariables(Problem problem) { for (Statement statement : problem.getStatements()) { - if (statement instanceof PredicateDefinition) { - discardPredicateDefinitionState((PredicateDefinition) statement); + if (statement instanceof PredicateDefinition predicateDefinition) { + discardPredicateDefinitionState(predicateDefinition); } } } @@ -169,11 +165,10 @@ public class DerivedVariableComputer { for (Conjunction body : definition.getBodies()) { body.getImplicitVariables().clear(); for (Literal literal : body.getLiterals()) { - if (literal instanceof Atom) { - discardDerivedAtomState((Atom) literal); + if (literal instanceof Atom atom) { + discardDerivedAtomState(atom); } - if (literal instanceof NegativeLiteral) { - var negativeLiteral = (NegativeLiteral) literal; + if (literal instanceof NegativeLiteral negativeLiteral) { negativeLiteral.getImplicitVariables().clear(); discardDerivedAtomState(negativeLiteral.getAtom()); } @@ -186,8 +181,7 @@ public class DerivedVariableComputer { return; } for (Argument argument : atom.getArguments()) { - if (argument instanceof VariableOrNodeArgument) { - var variableOrNodeArgument = (VariableOrNodeArgument) argument; + if (argument instanceof VariableOrNodeArgument variableOrNodeArgument) { variableOrNodeArgument.setSingletonVariable(null); } } diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java b/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java index e9533c25..415db9a9 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java @@ -52,10 +52,10 @@ public class NodeNameCollector { } protected void collectStatementNodeNames(Statement statement) { - if (statement instanceof Assertion) { - collectAssertionNodeNames((Assertion) statement); - } else if (statement instanceof NodeValueAssertion) { - collectNodeValueAssertionNodeNames((NodeValueAssertion) statement); + if (statement instanceof Assertion assertion) { + collectAssertionNodeNames(assertion); + } else if (statement instanceof NodeValueAssertion nodeValueAssertion) { + collectNodeValueAssertionNodeNames(nodeValueAssertion); } } diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java index a2d0eef6..3c6c8273 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java @@ -62,8 +62,8 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer { return null; } EObject object = contents.get(0); - if (object instanceof Problem) { - return (Problem) object; + if (object instanceof Problem problem) { + return problem; } return null; } @@ -79,12 +79,10 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer { protected void installNewNodes(Problem problem, Adapter adapter) { for (Statement statement : problem.getStatements()) { - if (statement instanceof ClassDeclaration) { - var declaration = (ClassDeclaration) statement; - if (!declaration.isAbstract() && declaration.getNewNode() == null) { - var newNode = adapter.createNodeIfAbsent(declaration, key -> createNode(NEW_NODE)); - declaration.setNewNode(newNode); - } + if (statement instanceof ClassDeclaration declaration && !declaration.isAbstract() + && declaration.getNewNode() == null) { + var newNode = adapter.createNodeIfAbsent(declaration, key -> createNode(NEW_NODE)); + declaration.setNewNode(newNode); } } } @@ -120,8 +118,7 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer { Set classDeclarations = new HashSet<>(); problem.getNodes().clear(); for (Statement statement : problem.getStatements()) { - if (statement instanceof ClassDeclaration) { - var classDeclaration = (ClassDeclaration) statement; + if (statement instanceof ClassDeclaration classDeclaration) { classDeclaration.setNewNode(null); classDeclarations.add(classDeclaration); } diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java index 80bbdb0f..bd05e8cf 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java @@ -10,8 +10,8 @@ import org.eclipse.xtext.util.ITextRegion; public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider { @Override protected ITextRegion doGetTextRegion(EObject obj, RegionDescription query) { - if (obj instanceof Node) { - return getNodeTextRegion((Node) obj, query); + if (obj instanceof Node node) { + return getNodeTextRegion(node, query); } if (obj instanceof ImplicitVariable) { return ITextRegion.EMPTY_REGION; diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java index 012606d6..cd5020e7 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java @@ -80,8 +80,7 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti // Variables are always private to the containing predicate definition. return false; } - if (eObject instanceof Node) { - var node = (Node) eObject; + if (eObject instanceof Node node) { // Only enum literals and new nodes are visible across problem files. return ProblemUtil.isUniqueNode(node) || ProblemUtil.isNewNode(node); } @@ -89,8 +88,8 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti } protected boolean shouldExportSimpleName(EObject eObject) { - if (eObject instanceof Node) { - return !ProblemUtil.isNewNode((Node) eObject); + if (eObject instanceof Node node) { + return !ProblemUtil.isNewNode(node); } return true; } diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java b/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java index 33f8c50f..56de6b1b 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java @@ -57,16 +57,14 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider { protected IScope getVariableScope(EObject context, IScope delegateScope) { List variables = new ArrayList<>(); EObject currentContext = context; - if (context instanceof VariableOrNodeArgument) { - VariableOrNodeArgument argument = (VariableOrNodeArgument) context; + if (context instanceof VariableOrNodeArgument argument) { Variable singletonVariable = argument.getSingletonVariable(); if (singletonVariable != null) { variables.add(singletonVariable); } } while (currentContext != null && !(currentContext instanceof PredicateDefinition)) { - if (currentContext instanceof ExistentialQuantifier) { - ExistentialQuantifier quantifier = (ExistentialQuantifier) currentContext; + if (currentContext instanceof ExistentialQuantifier quantifier) { variables.addAll(quantifier.getImplicitVariables()); } currentContext = currentContext.eContainer(); -- cgit v1.2.3-54-g00ecf