Skip to content
Snippets Groups Projects
Commit 2ad1ccc5 authored by Chrissi's avatar Chrissi
Browse files

remove builder errors after changing abstract join builder

parent 19ffd5b7
No related branches found
No related tags found
No related merge requests found
...@@ -85,12 +85,12 @@ public class JoinStatementVisitor extends ModelJoinBaseVisitor<JoinExpression> { ...@@ -85,12 +85,12 @@ public class JoinStatementVisitor extends ModelJoinBaseVisitor<JoinExpression> {
ClassResource left = ClassResource.fromQualifiedName(thetajoinContext.classres(0).getText()); ClassResource left = ClassResource.fromQualifiedName(thetajoinContext.classres(0).getText());
ClassResource right = ClassResource.fromQualifiedName(thetajoinContext.classres(1).getText()); ClassResource right = ClassResource.fromQualifiedName(thetajoinContext.classres(1).getText());
ThetaJoinBuilder joinBuilder = JoinFactory.createNew() ThetaJoinBuilder joinBuilder = (ThetaJoinBuilder)JoinFactory.createNew()
.theta() .theta()
.where(OCLConstraint.of(thetajoinContext.oclcond().getText()))
.join(left) .join(left)
.with(right) .with(right)
.as(ClassResource.fromQualifiedName(ctx.classres().getText())) .as(ClassResource.fromQualifiedName(ctx.classres().getText()));
.where(OCLConstraint.of(thetajoinContext.oclcond().getText()));
ctx.keepaggregatesexpr().stream() ctx.keepaggregatesexpr().stream()
.map(keepStatementVisitor::visitKeepaggregatesexpr) .map(keepStatementVisitor::visitKeepaggregatesexpr)
...@@ -118,7 +118,7 @@ public class JoinStatementVisitor extends ModelJoinBaseVisitor<JoinExpression> { ...@@ -118,7 +118,7 @@ public class JoinStatementVisitor extends ModelJoinBaseVisitor<JoinExpression> {
ClassResource left = ClassResource.fromQualifiedName(naturalJoinContext.classres(0).getText()); ClassResource left = ClassResource.fromQualifiedName(naturalJoinContext.classres(0).getText());
ClassResource right = ClassResource.fromQualifiedName(naturalJoinContext.classres(1).getText()); ClassResource right = ClassResource.fromQualifiedName(naturalJoinContext.classres(1).getText());
NaturalJoinBuilder joinBuilder = JoinFactory.createNew() NaturalJoinBuilder joinBuilder = (NaturalJoinBuilder)JoinFactory.createNew()
.natural() .natural()
.join(left) .join(left)
.with(right) .with(right)
...@@ -150,7 +150,7 @@ public class JoinStatementVisitor extends ModelJoinBaseVisitor<JoinExpression> { ...@@ -150,7 +150,7 @@ public class JoinStatementVisitor extends ModelJoinBaseVisitor<JoinExpression> {
ClassResource left = ClassResource.fromQualifiedName(outerJoinContext.classres(0).getText()); ClassResource left = ClassResource.fromQualifiedName(outerJoinContext.classres(0).getText());
ClassResource right = ClassResource.fromQualifiedName(outerJoinContext.classres(1).getText()); ClassResource right = ClassResource.fromQualifiedName(outerJoinContext.classres(1).getText());
OuterJoinBuilder joinBuilder = JoinFactory.createNew() OuterJoinBuilder joinBuilder = (OuterJoinBuilder)JoinFactory.createNew()
.outer() .outer()
.join(left) .join(left)
.with(right) .with(right)
......
...@@ -231,16 +231,16 @@ class JoinParser { ...@@ -231,16 +231,16 @@ class JoinParser {
keeps.forEach(outerJoinBuilder::keep); keeps.forEach(outerJoinBuilder::keep);
return outerJoinBuilder.done(); return outerJoinBuilder.done();
case "theta": case "theta":
ThetaJoinBuilder thetaJoinBuilder = joinFactory // ThetaJoinBuilder thetaJoinBuilder = (ThetaJoinBuilder)joinFactory
.theta() // .theta()
.join(ClassResource.fromQualifiedName(leftSource)) // .where(OCLConstraint.of(thetaPredicate))
.with(ClassResource.fromQualifiedName(rightSource)) // .join(ClassResource.fromQualifiedName(leftSource))
.as(ClassResource.fromQualifiedName(target)) // .with(ClassResource.fromQualifiedName(rightSource))
.where(OCLConstraint.of(thetaPredicate)); .as(ClassResource.fromQualifiedName(target));
keeps.forEach(thetaJoinBuilder::keep); keeps.forEach(thetaJoinBuilder::keep);
return thetaJoinBuilder.done(); return thetaJoinBuilder.done();
case "natural": case "natural":
NaturalJoinBuilder naturalJoinBuilder = joinFactory // NaturalJoinBuilder naturalJoinBuilder = (NaturalJoinBuilder)joinFactory //
.natural() // .natural() //
.join(ClassResource.fromQualifiedName(leftSource)) // .join(ClassResource.fromQualifiedName(leftSource)) //
.with(ClassResource.fromQualifiedName(rightSource)) // .with(ClassResource.fromQualifiedName(rightSource)) //
......
...@@ -39,6 +39,7 @@ public class ModelJoinCreation { ...@@ -39,6 +39,7 @@ public class ModelJoinCreation {
} }
}*/ }*/
ClassResource library = ClassResource.from("lib", "Library"); ClassResource library = ClassResource.from("lib", "Library");
ClassResource employee = ClassResource.from("lib", "Employee"); ClassResource employee = ClassResource.from("lib", "Employee");
ClassResource person = ClassResource.from("lib", "Person"); ClassResource person = ClassResource.from("lib", "Person");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment