From e6d44937288210e0e3f8bbe7858fa60d2a570048 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Mon, 28 Oct 2024 16:27:16 +0100 Subject: [PATCH 1/4] Remove some warnings. --- .../expressions/primary/InlineFunctionExpression.java | 4 ++-- .../expressions/scripting/block/BlockStatement.java | 4 ++-- .../expressions/scripting/control/SwitchStatement.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java b/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java index 95f05b526..81a7019ad 100644 --- a/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java +++ b/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java @@ -138,7 +138,7 @@ public StatementsAndOptionalExpr getBody() { @Nullable public List getAnnotations() { - return annotations; + return thisannotations; } @Override @@ -252,7 +252,7 @@ public void serializeToJSONiq(StringBuffer sb, int indent) { } public boolean hasSequentialPropertyAnnotation() { - return hasSequentialPropertyAnnotation; + return this.hasSequentialPropertyAnnotation; } public void setHasExitStatement(boolean hasExitStatement) { diff --git a/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java b/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java index 075209262..281bc1989 100644 --- a/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java +++ b/src/main/java/org/rumbledb/expressions/scripting/block/BlockStatement.java @@ -27,7 +27,7 @@ public T accept(AbstractNodeVisitor visitor, T argument) { @Override public List getChildren() { List result = new ArrayList<>(); - blockStatements.forEach(statement -> { + this.blockStatements.forEach(statement -> { if (statement != null) { result.add(statement); } @@ -49,6 +49,6 @@ public void serializeToJSONiq(StringBuffer sb, int indent) { } public List getBlockStatements() { - return blockStatements; + return this.blockStatements; } } diff --git a/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java b/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java index a19182d91..f6bc43efc 100644 --- a/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java +++ b/src/main/java/org/rumbledb/expressions/scripting/control/SwitchStatement.java @@ -74,14 +74,14 @@ public void serializeToJSONiq(StringBuffer sb, int indent) { } public Expression getTestCondition() { - return testCondition; + return this.testCondition; } public List getCases() { - return cases; + return this.cases; } public Statement getDefaultStatement() { - return defaultStatement; + return this.defaultStatement; } } From 4599c8573f8a0bb716b2926dda2eb995735e49be Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Mon, 28 Oct 2024 16:32:37 +0100 Subject: [PATCH 2/4] Remove a warning. --- .../org/rumbledb/expressions/scripting/loops/ExitStatement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java b/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java index abe9f8a28..eec89443d 100644 --- a/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java +++ b/src/main/java/org/rumbledb/expressions/scripting/loops/ExitStatement.java @@ -34,7 +34,7 @@ public void serializeToJSONiq(StringBuffer sb, int indent) { } public Expression getExitExpression() { - return exitExpression; + return this.exitExpression; } } From 6e303dd013bf415a617c25b0f9a5be53b2a58d50 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Mon, 28 Oct 2024 16:38:41 +0100 Subject: [PATCH 3/4] Ignore only rumble jars. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4a4272142..45bb7f5d1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ target/ .ipynb_checkpoints/ *.iml /bin/ -*.jar +rumble*.jar *.*~ # for now ignore jsound package From 0fd4c3a7e5c3f68f352a91637e23b131616ffef0 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Mon, 28 Oct 2024 16:40:52 +0100 Subject: [PATCH 4/4] Fix typo. --- .../rumbledb/expressions/primary/InlineFunctionExpression.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java b/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java index 81a7019ad..399082c07 100644 --- a/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java +++ b/src/main/java/org/rumbledb/expressions/primary/InlineFunctionExpression.java @@ -138,7 +138,7 @@ public StatementsAndOptionalExpr getBody() { @Nullable public List getAnnotations() { - return thisannotations; + return this.annotations; } @Override