added javaDoc and codeBeforeClass to Entity, freemarker:2.3.23

Author: greenrobot

DaoGenerator/build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'signing'
 
 group = 'de.greenrobot'
 archivesBaseName = 'greendao-generator'
-version = '2.0.0'
-sourceCompatibility = 1.6
+version = '2.1.0-SNAPSHOT'
+sourceCompatibility = 1.7
 
 def isSnapshot = version.endsWith('-SNAPSHOT')
 def sonatypeRepositoryUrl
@@ -27,7 +27,7 @@ configurations {
 }
 
 dependencies {
-    compile 'org.freemarker:freemarker:2.3.22'
+    compile 'org.freemarker:freemarker:2.3.23'
     testCompile 'junit:junit:4.12'
     // deployerJars 'org.apache.maven.wagon:wagon-webdav-jackrabbit:2.4'
     deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2'

DaoGenerator/src-template/entity.ftl

@@ -44,9 +44,16 @@ import ${additionalImport};
 <#else>
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. Enable "keep" sections if you want to edit. 
 </#if>
+<#if entity.javaDoc ??>
+${entity.javaDoc}
+<#else>
 /**
  * Entity mapped to table "${entity.tableName}".
  */
+</#if>
+<#if entity.codeBeforeClass ??>
+${entity.codeBeforeClass}
+</#if>
 public class ${entity.className}<#if
 entity.superclass?has_content> extends ${entity.superclass} </#if><#if
 entity.interfacesToImplement?has_content> implements <#list entity.interfacesToImplement

DaoGenerator/src/de/greenrobot/daogenerator/DaoGenerator.java

@@ -28,7 +28,6 @@
 import java.util.regex.Pattern;
 
 import freemarker.template.Configuration;
-import freemarker.template.DefaultObjectWrapper;
 import freemarker.template.Template;
 
 /**
@@ -58,9 +57,8 @@ public DaoGenerator() throws IOException {
         patternKeepFields = compilePattern("FIELDS");
         patternKeepMethods = compilePattern("METHODS");
 
-        Configuration config = new Configuration();
+        Configuration config = new Configuration(Configuration.VERSION_2_3_23);
         config.setClassForTemplateLoading(this.getClass(), "/");
-        config.setObjectWrapper(new DefaultObjectWrapper());
 
         templateDao = config.getTemplate("dao.ftl");
         templateDaoMaster = config.getTemplate("dao-master.ftl");

DaoGenerator/src/de/greenrobot/daogenerator/Entity.java

@@ -17,15 +17,15 @@
  */
 package de.greenrobot.daogenerator;
 
-import de.greenrobot.daogenerator.Property.PropertyBuilder;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
+import de.greenrobot.daogenerator.Property.PropertyBuilder;
+
 /**
  * Model class for an entity: a Java data object mapped to a data base table. A new entity is added to a {@link Schema}
  * by the method {@link Schema#addEntity(String)} (there is no public constructor for {@link Entity} itself). <br/>
@@ -64,6 +64,8 @@ public class Entity {
     private Property pkProperty;
     private String pkType;
     private String superclass;
+    private String javaDoc;
+    private String codeBeforeClass;
 
     private boolean protobuf;
     private boolean constructors;
@@ -463,7 +465,27 @@ public void setSuperclass(String classToExtend) {
         this.superclass = classToExtend;
     }
 
+    public String getJavaDoc() {
+        return javaDoc;
+    }
+
+    public void setJavaDoc(String javaDoc) {
+        this.javaDoc = javaDoc;
+    }
+
+    public String getCodeBeforeClass() {
+        return codeBeforeClass;
+    }
+
+    public void setCodeBeforeClass(String codeBeforeClass) {
+        this.codeBeforeClass = codeBeforeClass;
+    }
+
     void init2ndPass() {
+        if (javaDoc != null && !javaDoc.trim().startsWith("/**")) {
+            javaDoc = javaDoc.replace("\n", "\n * ");
+            javaDoc = "/**\n * " + javaDoc + "\n*/";
+        }
         init2ndPassNamesWithDefaults();
 
         for (int i = 0; i < properties.size(); i++) {

DaoTest/src-gen/de/greenrobot/daotest/TestEntity.java

@@ -2,8 +2,10 @@
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. Enable "keep" sections if you want to edit. 
 /**
- * Entity mapped to table "TEST_ENTITY".
- */
+ * This entity is used by internal tests of greenDAO.
+ * (This JavaDoc is defined in the generator project.)
+*/
+// This is another test comment, you could also apply annotations like this
 public class TestEntity {
 
     private Long id;

DaoTestGenerator/src/de/greenrobot/daogenerator/gentest/TestDaoGenerator.java

@@ -105,6 +105,9 @@ protected void createSimpleNotNull() {
 
     protected Entity createTest() {
         Entity testEntity = schema.addEntity("TestEntity");
+        testEntity.setJavaDoc("This entity is used by internal tests of greenDAO.\n" +
+                "(This JavaDoc is defined in the generator project.)");
+        testEntity.setCodeBeforeClass("// This is another test comment, you could also apply annotations like this");
         testEntity.addIdProperty();
         testEntity.addIntProperty("simpleInt").notNull();
         testEntity.addIntProperty("simpleInteger");