removed un-needed import from statistics and naming of files for statistics generation

Author: synapticloop

src/main/java/synapticloop/h2zero/generator/JavaGenerator.java

@@ -68,7 +68,7 @@ private void generateTables(TemplarContext templarContext) throws ParseException
 
 		// The model
 		Parser javaCreateModelParser = getParser("/java-create-model.templar");
-		Parser javaCreateModelHitcountsParser = getParser("/java-create-model-hitcounts.templar");
+		Parser javaCreateModelStatisticsParser = getParser("/java-create-model-statistics.templar");
 
 		// The table actions
 		Parser javaCreateFinderParser = getParser("/java-create-finder.templar");
@@ -85,7 +85,7 @@ private void generateTables(TemplarContext templarContext) throws ParseException
 		renderToFile(templarContext, javaCreateConstantsParser, pathname);
 
 		pathname = outFile + options.getOutputCode() + database.getPackagePath() + "/model/util/Statistics.java";
-		renderToFile(templarContext, javaCreateModelHitcountsParser, pathname);
+		renderToFile(templarContext, javaCreateModelStatisticsParser, pathname);
 
 
 

src/main/java/synapticloop/h2zero/model/Constant.java

@@ -27,6 +27,13 @@
 import synapticloop.h2zero.exception.H2ZeroParseException;
 import synapticloop.h2zero.model.util.JSONKeyConstants;
 
+/**
+ * Used when the table is a constant - i.e. no need to go to the database to 
+ * determine what the values are.
+ * 
+ * @author synapticloop
+ *
+ */
 public class Constant {
 	private List<Object> values = new ArrayList<Object>();
 	private List<Object> sqlValues = new ArrayList<Object>();
@@ -61,7 +68,7 @@ public Constant(JSONObject constantsObject, Table table) throws H2ZeroParseExcep
 					}
 				} else {
 					sqlValues.add(object);
-					String stringified = "new " + table.getFields().get(i).getJavaType() + "(" + object + ")";
+					String stringified = table.getFields().get(i).getJavaType() + ".valueOf(" + object + ")";
 					values.add(stringified);
 					if(i == 0) {
 						this.primaryKeyValue = stringified;

…rces/java-create-model-hitcounts.templar …ces/java-create-model-statistics.templarsrc/main/resources/java-create-model-hitcounts.templar renamed to src/main/resources/java-create-model-statistics.templar src/main/resources/java-create-model-hitcounts.templar renamed to src/main/resources/java-create-model-statistics.templar

@@ -5,10 +5,12 @@
 package {database.package}.model.util;{\n}{\n}
 // - - - - thoughtfully generated by synapticloop h2zero - - - - {\n}
 //    with the use of synapticloop templar templating language{\n}
-//            (java-create-constants.templar){\n}{\n}
+//            (java-create-model-statistics.templar){\n}{\n}
 
 {loop database.tables as table}
-	import {database.package}.model.{table.javaClassName};{\n}
+	{if !table.isConstant}
+		import {database.package}.model.{table.javaClassName};{\n}
+	{endif}
 {endloop}
 {\n}
 import java.lang.StringBuilder;{\n}

src/main/resources/java-create-model.templar

@@ -80,7 +80,7 @@ public class {table.javaClassName} {if !table.isConstant}extends ModelBase {endi
 		And the static HashMap lookup
 	}
 
-	{\t}public static final Map<Long, {table.javaClassName}> ALL_LOOKUP = new HashMap<Long, {table.javaClassName}>();{\n}
+	{\t}public static final Map<Long, {table.javaClassName}> ALL_LOOKUP = new HashMap<>();{\n}
 	{\t}static{{{\n}
 		{loop table.constants as constant}
 			{\t}{\t}ALL_LOOKUP.put({constant.primaryKeyValue}, {table.javaClassName}.{constant.name});{\n}