From b5d6f23d8ac3d4bedb139fdaecc2e9dc621f385a Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 3 Aug 2013 15:06:46 +0200
Subject: wip

---
 .../src/main/java/io/trygvis/persistence/EntityMirror.java     |  9 ++++++---
 .../src/main/java/io/trygvis/persistence/FieldMirror.java      | 10 ++++++----
 .../src/main/java/io/trygvis/persistence/GeneratorSupport.java |  1 -
 .../src/main/java/io/trygvis/persistence/SqlEntitySet.java     |  4 ++++
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 container-compiler-plugin/src/main/java/io/trygvis/persistence/SqlEntitySet.java

(limited to 'container-compiler-plugin/src/main/java/io/trygvis/persistence')

diff --git a/container-compiler-plugin/src/main/java/io/trygvis/persistence/EntityMirror.java b/container-compiler-plugin/src/main/java/io/trygvis/persistence/EntityMirror.java
index fe50e17..7b45145 100644
--- a/container-compiler-plugin/src/main/java/io/trygvis/persistence/EntityMirror.java
+++ b/container-compiler-plugin/src/main/java/io/trygvis/persistence/EntityMirror.java
@@ -4,7 +4,7 @@ import io.trygvis.container.compiler.model.ClassG;
 import io.trygvis.container.compiler.model.ParameterRef;
 import io.trygvis.container.compiler.model.TypeRef;
 
-import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.DeclaredType;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -16,13 +16,16 @@ import static org.apache.commons.lang.StringUtils.join;
 public class EntityMirror {
     public final GeneratorSupport generatorSupport;
     public final List<FieldMirror> fields = new ArrayList<>();
-    public final TypeMirror javaName;
+    public final DeclaredType javaName;
     public final String tableName;
+    public final String daoName;
 
-    public EntityMirror(GeneratorSupport generatorSupport, TypeMirror javaName, String tableName) {
+    public EntityMirror(GeneratorSupport generatorSupport, DeclaredType javaName, String tableName) {
         this.generatorSupport = generatorSupport;
         this.javaName = javaName;
         this.tableName = tableName;
+
+        this.daoName = javaName.asElement().getSimpleName() + "Dao";
     }
 
     public void add(FieldMirror field) {
diff --git a/container-compiler-plugin/src/main/java/io/trygvis/persistence/FieldMirror.java b/container-compiler-plugin/src/main/java/io/trygvis/persistence/FieldMirror.java
index e14fb9f..c2e5f35 100644
--- a/container-compiler-plugin/src/main/java/io/trygvis/persistence/FieldMirror.java
+++ b/container-compiler-plugin/src/main/java/io/trygvis/persistence/FieldMirror.java
@@ -13,6 +13,7 @@ public abstract class FieldMirror {
     public final VariableElement element;
     public final String javaName;
     public final String sqlName;
+    public final boolean id;
     public final boolean notNull;
 
     public enum FieldType {
@@ -20,17 +21,18 @@ public abstract class FieldMirror {
         REFERENCE,
     }
 
-    protected FieldMirror(FieldType fieldType, VariableElement element, String javaName, String sqlName, boolean notNull) {
+    protected FieldMirror(FieldType fieldType, VariableElement element, String javaName, String sqlName, boolean id, boolean notNull) {
         this.fieldType = fieldType;
         this.element = element;
         this.javaName = javaName;
         this.sqlName = sqlName;
+        this.id = id;
         this.notNull = notNull;
     }
 
     public static class PrimitiveFieldMirror extends FieldMirror {
-        public PrimitiveFieldMirror(VariableElement element, String javaName, String sqlName, boolean notNull) {
-            super(PRIMITIVE, element, javaName, sqlName, notNull);
+        public PrimitiveFieldMirror(VariableElement element, String javaName, String sqlName, boolean id, boolean notNull) {
+            super(PRIMITIVE, element, javaName, sqlName, id, notNull);
         }
 
         @Override
@@ -45,7 +47,7 @@ public abstract class FieldMirror {
 
     public static class  ReferenceFieldMirror extends FieldMirror {
         public ReferenceFieldMirror(VariableElement element, String javaName, String sqlName, boolean notNull) {
-            super(REFERENCE, element, javaName, sqlName, notNull);
+            super(REFERENCE, element, javaName, sqlName, false, notNull);
         }
 
         @Override
diff --git a/container-compiler-plugin/src/main/java/io/trygvis/persistence/GeneratorSupport.java b/container-compiler-plugin/src/main/java/io/trygvis/persistence/GeneratorSupport.java
index 7ac30d9..d3293c3 100644
--- a/container-compiler-plugin/src/main/java/io/trygvis/persistence/GeneratorSupport.java
+++ b/container-compiler-plugin/src/main/java/io/trygvis/persistence/GeneratorSupport.java
@@ -1,7 +1,6 @@
 package io.trygvis.persistence;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/container-compiler-plugin/src/main/java/io/trygvis/persistence/SqlEntitySet.java b/container-compiler-plugin/src/main/java/io/trygvis/persistence/SqlEntitySet.java
new file mode 100644
index 0000000..69176f8
--- /dev/null
+++ b/container-compiler-plugin/src/main/java/io/trygvis/persistence/SqlEntitySet.java
@@ -0,0 +1,4 @@
+package io.trygvis.persistence;
+
+public @interface SqlEntitySet {
+}
-- 
cgit v1.2.3