Skip to content

Commit

Permalink
Merge pull request #1279 from RumbleDB/fix-mvn-compile-warnings
Browse files Browse the repository at this point in the history
Fix mvn compile warnings
  • Loading branch information
ghislainfourny authored Oct 31, 2024
2 parents 2f042c6 + 8c86f5a commit 3e283a5
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 29 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ The documentation also contains an introduction specific to RumbleDB and how you

[The documentation of the current master (for the adventurous and curious) is available here.](http://sparksoniq.readthedocs.io/en/latest/)

RumbleDB is an effort involving many researchers and ETH Zurich students: code and support by Stefan Irimescu, Ghislain Fourny, Gustavo Alonso, Renato Marroquin, Rodrigo Bruno, Falko Noé, Ioana Stefan, Andrea Rinaldi, Stevan Mihajlovic, Mario Arduini, Can Berker Çıkış, Elwin Stephan, David Dao, Zirun Wang, Ingo Müller, Dan-Ovidiu Graur, Thomas Zhou, Olivier Goerens, Alexandru Meterez, Remo Röthlisberger, Dominik Bruggisser, David Loughlin, David Buzatu.
RumbleDB is an effort involving many researchers and ETH Zurich students: code and support by Stefan Irimescu, Ghislain Fourny, Gustavo Alonso, Renato Marroquin, Rodrigo Bruno, Falko Noé, Ioana Stefan, Andrea Rinaldi, Stevan Mihajlovic, Mario Arduini, Can Berker Çıkış, Elwin Stephan, David Dao, Zirun Wang, Ingo Müller, Dan-Ovidiu Graur, Thomas Zhou, Olivier Goerens, Alexandru Meterez, Remo Röthlisberger, Dominik Bruggisser, David Loughlin, David Buzatu, Marco Schöb.
16 changes: 13 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@
<compilerId>eclipse</compilerId>
<source>1.8</source>
<target>1.8</target>
<compilerArguments>
<properties>${project.basedir}/org.eclipse.jdt.core.prefs</properties>
</compilerArguments>
<compilerArgs>
<arg>-properties</arg>
<arg>${project.basedir}/org.eclipse.jdt.core.prefs</arg>
</compilerArgs>
</configuration>
<dependencies>
<dependency>
Expand All @@ -63,6 +64,14 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -150,6 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ public StaticContext visitProlog(Prolog prolog, StaticContext argument) {
public StaticContext visitProgram(Program program, StaticContext argument) {
visitDescendants(program, argument);
ExecutionMode mergedExecutionMode = program.getStatementsAndOptionalExpr().getHighestExecutionMode();
for (Statement statement : exitStatementChildren) {
for (Statement statement : this.exitStatementChildren) {
ExecutionMode statementExecMode = statement.getHighestExecutionMode(this.visitorConfig);
mergedExecutionMode = getHighestExecutionMode(mergedExecutionMode, statementExecMode);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class SequentialClassificationVisitor extends AbstractNodeVisitor<Descend
public SequentialClassificationVisitor(Prolog prolog) {
this.prolog = prolog;
this.blockLevel = 0;
variableBlockLevel = new HashMap<>();
this.variableBlockLevel = new HashMap<>();
}

protected DescendentSequentialProperties defaultAction(Node node, DescendentSequentialProperties argument) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/context/GlobalVariables.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class GlobalVariables implements Serializable, KryoSerializable {
private Set<Name> globalVariables;

public GlobalVariables() {
globalVariables = new HashSet<>();
this.globalVariables = new HashSet<>();
}

public void addGlobalVariable(Name globalVariable) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/rumbledb/context/InScopeVariable.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ public void read(Kryo kryo, Input input) {
}

public boolean isAssignable() {
return isAssignable;
return this.isAssignable;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {

@Nullable
public List<Annotation> getAnnotations() {
return annotations;
return this.annotations;
}


public boolean isAssignable() {
return isAssignable;
return this.isAssignable;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public Annotation(Name annotationName, List<Expression> literals) {
}

public Name getAnnotationName() {
return annotationName;
return this.annotationName;
}

public List<Expression> getLiterals() {
return literals;
return this.literals;
}

public static boolean checkAssignable(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ public <T> T accept(AbstractNodeVisitor<T> visitor, T argument) {

@Override
public List<Node> getChildren() {
return new ArrayList<>(variables);
return new ArrayList<>(this.variables);
}

@Override
public void serializeToJSONiq(StringBuffer sb, int indent) {
indentIt(sb, indent);
for (VariableDeclStatement variableDeclStatement : variables) {
for (VariableDeclStatement variableDeclStatement : this.variables) {
variableDeclStatement.serializeToJSONiq(sb, 0);
}
}

public List<VariableDeclStatement> getVariables() {
return variables;
return this.variables;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ public Expression getVariableExpression() {
}

public List<Annotation> getAnnotations() {
return annotations;
return this.annotations;
}

public boolean isAssignable() {
return isAssignable;
return this.isAssignable;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
}

public ReturnStatementClause getReturnStatementClause() {
return returnStatementClause;
return this.returnStatementClause;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
}

public Statement getReturnStatement() {
return returnStatement;
return this.returnStatement;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public <T> T accept(AbstractNodeVisitor<T> visitor, T argument) {
@Override
public List<Node> getChildren() {
List<Node> result = new ArrayList<>();
result.add(testCondition);
result.add(statement);
result.add(this.testCondition);
result.add(this.statement);
return result;
}

Expand All @@ -43,10 +43,10 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
}

public Expression getTestCondition() {
return testCondition;
return this.testCondition;
}

public Statement getStatement() {
return statement;
return this.statement;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected void closeLocal() {

public void setNextResult() {
this.nextResult = null;
if (!encounteredExitStatement) {
if (!this.encounteredExitStatement) {
try {
if (this.userDefinedFunctionCallIterator.hasNext()) {
this.nextResult = this.userDefinedFunctionCallIterator.next();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private void setPULFromExitStatement(ExitStatementException exitStatementExcepti

@Override
protected Item nextLocal() {
if (!encounteredExitStatement) {
if (!this.encounteredExitStatement) {
try {
return this.statementsAndExprIterator.next();
} catch (ExitStatementException exitStatementException) {
Expand Down Expand Up @@ -117,7 +117,7 @@ public boolean isUpdating() {

@Override
public PendingUpdateList getPendingUpdateList(DynamicContext context) {
if (!encounteredExitStatement) {
if (!this.encounteredExitStatement) {
return this.statementsAndExprIterator.getPendingUpdateList(context);
}
return this.pendingUpdateList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public StatementsWithExprIterator(
this.children.addAll(statements);
this.children.add(exprIterator);

for (RuntimeIterator child : children) {
for (RuntimeIterator child : this.children) {
if (child.isSequential()) {
this.isSequential = child.isSequential();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ protected Item nextLocal() {
this.result = this.childIterator.materialize(this.currentDynamicContextForLocalExecution);
this.pendingUpdateList = new PendingUpdateList();
if (this.childIterator.isUpdating()) {
pendingUpdateList = this.childIterator.getPendingUpdateList(this.currentDynamicContextForLocalExecution);
this.pendingUpdateList = this.childIterator.getPendingUpdateList(
this.currentDynamicContextForLocalExecution
);
}
throw new ExitStatementException(
this.pendingUpdateList,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public JSoundDataFrame getDataFrame(DynamicContext dynamicContext) {

@Override
public PendingUpdateList getPendingUpdateList(DynamicContext context) {
return iterator.getPendingUpdateList(context);
return this.iterator.getPendingUpdateList(context);
}

/**
Expand Down

0 comments on commit 3e283a5

Please sign in to comment.