fixed imports for counters

Author: synapticloop

build.gradle

@@ -12,7 +12,7 @@ plugins {
 	id 'co.riiid.gradle' version '0.4.2'
 
 	id 'synapticloop.copyrightr' version '1.3.1'
-	id 'synapticloop.documentr' version '3.0.0'
+	id 'synapticloop.documentr' version '3.1.0'
 
 	id "org.sonarqube" version "2.7"
 
@@ -21,7 +21,7 @@ plugins {
 group = 'synapticloop'
 archivesBaseName = 'h2zero'
 description = """lightweight ORM generator for mysql/sqlite, java with extensions for taglibs and routemaster"""
-version = '4.2.0'
+version = '4.2.1'
 
 tasks.withType(Javadoc).all { enabled = false }
 
@@ -114,19 +114,6 @@ shadowJar {
 	configurations = [project.configurations.shadowRuntime]
 }
 
-dependencyUpdates.resolutionStrategy = {
-	componentSelection { rules ->
-		rules.all { ComponentSelection selection ->
-			boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'b', 'dmr'].any { qualifier ->
-				selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
-			}
-			if (rejected) {
-				selection.reject('Release candidate')
-			}
-		}
-	}
-}
-
 def javaApiUrl = 'http://docs.oracle.com/javase/1.7.0/docs/api/'
 def groovyApiUrl = 'http://groovy.codehaus.org/gapi/'
 
@@ -243,3 +230,15 @@ copyrightr {
 
 	failOnMissing = false
 }
+
+documentr {
+	// where to generate the README file
+	directory = '.'
+
+	// wnether to be verbose and output more
+	verbose = 'true'
+
+	// extension - can be either md or adoc
+	extension = 'md' // this is the default
+// 	extension = 'adoc' // perhaps you want asciidoc?
+}

src/main/java/synapticloop/h2zero/H2ZeroParser.java

@@ -96,6 +96,7 @@
 import synapticloop.h2zero.validator.updater.UpdaterQueryParameterNameValidator;
 import synapticloop.h2zero.validator.updater.UpdaterSetClauseValidator;
 import synapticloop.h2zero.validator.updater.UpdaterWhereClauseValidator;
+import synapticloop.h2zero.validator.view.ViewAsClauseValidator;
 
 /**
  * This is the parser for the h2zero generator
@@ -129,6 +130,8 @@ public class H2ZeroParser {
 		validators.add(new TablePrimaryKeyTypeValidator());
 		validators.add(new TableIgnoredKeysValidator());
 
+		// view validators
+		validators.add(new ViewAsClauseValidator());
 
 		// field validators
 		validators.add(new FieldDefaultValueValidator());

src/main/java/synapticloop/h2zero/validator/view/ViewAsClauseValidator.java

@@ -0,0 +1,22 @@
+package synapticloop.h2zero.validator.view;
+
+import java.util.List;
+
+import synapticloop.h2zero.model.Database;
+import synapticloop.h2zero.model.Options;
+import synapticloop.h2zero.model.View;
+import synapticloop.h2zero.validator.BaseValidator;
+
+public class ViewAsClauseValidator extends BaseValidator{
+
+	@Override
+	public void validate(Database database, Options options) {
+		List<View> views = database.getViews();
+		for (View view : views) {
+			if(view.getAsClause().endsWith(";")) {
+				addWarnMessage("The 'asClause' for " + view.getName() + " has a trailing ';' character, which will cause a warning when generating the SQL statement.");
+			}
+		}
+	}
+
+}

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

@@ -14,6 +14,7 @@ import java.sql.SQLException;{\n}
 import java.util.HashMap;{\n}
 import java.util.Map;{\n}
 import java.util.List;{\n}
+import java.sql.*;{\n}
 {\n}
 import synapticloop.h2zero.base.manager.{options.database}.ConnectionManager;{\n}
 {\n}