Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ static QueryAxisImpl convertQueryAxis(Optional<SelectSlicerAxisClause> selectSli

static List<QueryAxis> convertQueryAxisList(SelectQueryClause selectQueryClause) {
switch (selectQueryClause) {
case SelectQueryAsteriskClause _UNNAMED:
case SelectQueryAsteriskClause _:
return selectQueryAsteriskClauseToQueryAxisList();
case SelectQueryAxesClause selectQueryAxesClause:
return selectQueryAxesClauseToQueryAxisList(selectQueryAxesClause);
case SelectQueryEmptyClause _UNNAMES:
case SelectQueryEmptyClause _:
return selectQueryEmptyClauseToQueryAxisList();
}
}
Expand Down Expand Up @@ -316,7 +316,7 @@ static Expression getExpressionByLiteral(Literal literal) {
return NumericLiteralImpl.create(numericLiteral.value());
case StringLiteral stringLiteral:
return StringLiteralImpl.create(stringLiteral.value());
case NullLiteral _UNNAMED: // TODO: use Unnamed Pattern _
case NullLiteral _:
return NullLiteralImpl.nullValue;
case SymbolLiteral symbolLiteral:
return SymbolLiteralImpl.create(symbolLiteral.value());
Expand Down Expand Up @@ -369,7 +369,7 @@ static Expression getExpressionByCallExpression(CallExpression callExpression) {
case CaseOperationAtom coa:
list = getExpressionList(callExpression.expressions());
return new UnresolvedFunCallImpl(coa, list.stream().toArray(Expression[]::new));
case CastOperationAtom cast:
case CastOperationAtom _:
list = getExpressionList(callExpression.expressions());
return new UnresolvedFunCallImpl(new CastOperationAtom(), list.stream().toArray(Expression[]::new));
}
Expand Down Expand Up @@ -444,13 +444,11 @@ static String convertName(NameObjectIdentifier nameObjectIdentifier) {
}

static String quoted(String name) {
StringBuilder sb = new StringBuilder();
return sb.append("[").append(name).append("]").toString();
return "[" + name + "]";
}

static String key(String name) {
StringBuilder sb = new StringBuilder();
return sb.append("&").append(name).append("]").toString();
return "&" + name + "]";
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
//TODO: RM EXPORT
@org.osgi.annotation.bundle.Export
@org.osgi.annotation.versioning.Version("0.0.1")
package org.eclipse.daanse.olap.query.base;
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public Expression accept(Validator validator) {
}

@Override
public Calc accept(ExpressionCompiler compiler) {
public Calc<?> accept(ExpressionCompiler compiler) {
// This is a deliberate breach of the usual rules for interpreting
// acceptable result styles. Usually the caller gets to call the shots:
// the callee iterates over the acceptable styles and implements in the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public Expression accept(Validator validator) {
}

@Override
public Calc accept(ExpressionCompiler compiler) {
public Calc<?> accept(ExpressionCompiler compiler) {
return ((CompilableParameter) parameter).compile(compiler);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public Object accept(QueryComponentVisitor visitor) {
}

@Override
public Calc compile(ExpressionCompiler compiler, ResultStyle resultStyle) {
public Calc<?> compile(ExpressionCompiler compiler, ResultStyle resultStyle) {
Expression expInner = this.exp;
if (axisOrdinal.isFilter()) {
expInner = normalizeSlicerExpression(expInner);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ public class QueryImpl extends AbstractQueryPart implements Query {
private Subcube subcube;

private final Statement statement;
public Calc[] axisCalcs;
public Calc slicerCalc;
public Calc<?>[] axisCalcs;
public Calc<?> slicerCalc;

/**
* Set of FunDefs for which alerts about non-native evaluation
Expand Down Expand Up @@ -1029,7 +1029,7 @@ private static Object quickParse(
.append(parameterName).append("', type ").append(type).toString());
}
List<Member> expList = new ArrayList<>();
final List list = (List) value;
final List<?> list = (List<?>) value;
final SetType setType = (SetType) type;
final Type elementType = setType.getElementType();
for (Object o : list) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
//TODO: RM EXPORT
@org.osgi.annotation.bundle.Export
@org.osgi.annotation.versioning.Version("0.0.1")
package org.eclipse.daanse.olap.query.component.expression;
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
//TODO: RM EXPORT
@org.osgi.annotation.bundle.Export
@org.osgi.annotation.versioning.Version("0.0.1")
package org.eclipse.daanse.olap.query.component;
Loading