Fix CB issues

speedment · May 5, 2015 · bc885bb · bc885bb
1 parent 4e32fef
commit bc885bb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 31 deletions.
diff --git a/src/main/java/com/speedment/orm/core/manager/sql/generator/BinaryPredicateBuilderView.java b/src/main/java/com/speedment/orm/core/manager/sql/generator/BinaryPredicateBuilderView.java
@@ -19,14 +19,14 @@
 import com.speedment.codegen.base.Generator;
 import com.speedment.codegen.base.Transform;
 import com.speedment.orm.field.StandardBinaryOperator;
-import com.speedment.orm.field.reference.BinaryPredicateBuilder;
+import com.speedment.orm.field.reference.ReferenceBinaryPredicateBuilder;
 import java.util.Optional;
 
 /**
  *
  * @author Emil Forslund
  */
-public class BinaryPredicateBuilderView implements Transform<BinaryPredicateBuilder, String> {
+public class BinaryPredicateBuilderView implements Transform<ReferenceBinaryPredicateBuilder, String> {
 
 	private String render(StandardBinaryOperator op) {
 		switch (op) {
@@ -43,7 +43,7 @@ private String render(StandardBinaryOperator op) {
 	}
 
 	@Override
-	public Optional<String> transform(Generator gen, BinaryPredicateBuilder model) {
+	public Optional<String> transform(Generator gen, ReferenceBinaryPredicateBuilder model) {
 		return Optional.of(
 			model.getField().getColumn().getName() + 
 			render(model.getOperator()) + 

diff --git a/src/main/java/com/speedment/orm/core/manager/sql/generator/SQLTransformFactory.java b/src/main/java/com/speedment/orm/core/manager/sql/generator/SQLTransformFactory.java
@@ -17,18 +17,18 @@
 package com.speedment.orm.core.manager.sql.generator;
 
 import com.speedment.codegen.base.DefaultTransformFactory;
-import com.speedment.orm.field.reference.BinaryPredicateBuilder;
+import com.speedment.orm.field.reference.ReferenceBinaryPredicateBuilder;
-import com.speedment.orm.field.reference.UnaryPredicateBuilder;
+import com.speedment.orm.field.reference.ReferenceUnaryPredicateBuilder;
 
 /**
  *
  * @author Emil Forslund
  */
 public class SQLTransformFactory extends DefaultTransformFactory {
 
-	public SQLTransformFactory() {
+    public SQLTransformFactory() {
-		super (SQLTransformFactory.class.getSimpleName());
+        super(SQLTransformFactory.class.getSimpleName());
-		install(UnaryPredicateBuilder.class, UnaryPredicateBuilderView.class);
+        install(ReferenceUnaryPredicateBuilder.class, UnaryPredicateBuilderView.class);
-		install(BinaryPredicateBuilder.class, BinaryPredicateBuilderView.class);
+        install(ReferenceBinaryPredicateBuilder.class, BinaryPredicateBuilderView.class);
-	}
+    }
-}
+}
diff --git a/src/main/java/com/speedment/orm/core/manager/sql/generator/UnaryPredicateBuilderView.java b/src/main/java/com/speedment/orm/core/manager/sql/generator/UnaryPredicateBuilderView.java
@@ -21,30 +21,34 @@
 import com.speedment.orm.field.StandardUnaryOperator;
 import static com.speedment.orm.field.StandardUnaryOperator.IS_NOT_NULL;
 import static com.speedment.orm.field.StandardUnaryOperator.IS_NULL;
-import com.speedment.orm.field.reference.UnaryPredicateBuilder;
+import com.speedment.orm.field.reference.ReferenceUnaryPredicateBuilder;
+
 import java.util.Optional;
 
 /**
  *
  * @author Emil Forslund
  */
-public class UnaryPredicateBuilderView implements Transform<UnaryPredicateBuilder, String> {
+public class UnaryPredicateBuilderView implements Transform<ReferenceUnaryPredicateBuilder, String> {
+
+    private String render(StandardUnaryOperator op) {
+        switch (op) {
+            case IS_NOT_NULL:
+                return " <> NULL";
+            case IS_NULL:
+                return " == NULL";
+            default:
+                throw new UnsupportedOperationException(
+                    "Unknown enum constant " + op.name() + "."
+                );
+        }
+    }
 
-	private String render(StandardUnaryOperator op) {
+    @Override
-		switch (op) {
+    public Optional<String> transform(Generator gen, ReferenceUnaryPredicateBuilder model) {
-			case IS_NOT_NULL : return " <> NULL";
+        return Optional.of(
-			case IS_NULL : return " == NULL";
+            model.getField().getColumn().getName()
-			default : throw new UnsupportedOperationException(
+            + render(model.getOperator())
-				"Unknown enum constant " + op.name() + "."
+        );
-			);
+    }
-		}
+}
-	}
-
-	@Override
-	public Optional<String> transform(Generator gen, UnaryPredicateBuilder model) {
-		return Optional.of(
-			model.getField().getColumn().getName() + 
-			render(model.getOperator())
-		);
-	}
-}