updated error messages, fixed behind-the-scenes hydration, added in quicker build files

synapticloop · synapticloop · commit acf1475b9a98 · 2020-04-03T15:26:11.000+11:00
diff --git a/build.gradle b/build.gradle
@@ -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.1.11'
+version = '4.2.0'
 
 tasks.withType(Javadoc).all { enabled = false }
 
diff --git a/build.h2zero.mysql.gradle b/build.h2zero.mysql.gradle
@@ -9,7 +9,7 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'synapticloop:h2zero:4.1.10'
+		classpath 'synapticloop:h2zero:4.2.0'
 //		classpath 'synapticloop:h2zero-extension-taglibs:1.0.0'
 	}
 }
diff --git a/build.mysql.sh b/build.mysql.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-./gradlew --no-daemon assemble pTML -b build.gradle 
-./gradlew --no-daemon -b build.h2zero.mysql.gradle h2zero
+./gradlew assemble pTML -b build.gradle 
+./gradlew -b build.h2zero.mysql.gradle h2zero
 
diff --git a/src/main/java/synapticloop/h2zero/H2ZeroParser.java b/src/main/java/synapticloop/h2zero/H2ZeroParser.java
@@ -62,6 +62,7 @@
 import synapticloop.h2zero.validator.field.FieldIgnoredKeysValidator;
 import synapticloop.h2zero.validator.field.FieldNameDuplicateValidator;
 import synapticloop.h2zero.validator.field.FieldNotNullLengthValidator;
+import synapticloop.h2zero.validator.field.FieldPopulateForeignKeyValidator;
 import synapticloop.h2zero.validator.field.FieldPopulatePrimaryKeyValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldBlobValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldClobValidator;
@@ -132,6 +133,7 @@ public class H2ZeroParser {
 		// field validators
 		validators.add(new FieldDefaultValueValidator());
 		validators.add(new FieldPopulatePrimaryKeyValidator());
+		validators.add(new FieldPopulateForeignKeyValidator());
 		validators.add(new FieldNameDuplicateValidator());
 		validators.add(new FieldIgnoredKeysValidator());
 		validators.add(new FieldNotNullLengthValidator());
@@ -219,14 +221,18 @@ public class H2ZeroParser {
 			}
 		}
 	}
+	
+	private static final List<String> FATAL_MESSAGES = new ArrayList<>();
+
+	public H2ZeroParser() {};
 
 	/**
 	 * Parse a .h2zero file
 	 * 
 	 * @param file The file to be parsed
 	 * @throws H2ZeroParseException if there was an error parsing the file
 	 */
-	public H2ZeroParser(File file) throws H2ZeroParseException {
+	public void parse(File file) throws H2ZeroParseException {
 		JSONObject jsonObject = null;
 		try {
 			jsonObject = getJSONFileContents(file);
@@ -255,7 +261,7 @@ public H2ZeroParser(File file) throws H2ZeroParseException {
 		boolean isValid = checkAndLogValidators();
 
 		if(!isValid) {
-			throw new H2ZeroParseException("Validators found FATAL warnings, exiting...");
+			throw new H2ZeroParseException("Validators found the following FATAL warnings: (Exiting...)");
 		}
 	}
 
@@ -279,7 +285,9 @@ private boolean checkAndLogValidators() {
 				} else if(message.getType().equals(SimpleLogger.WARN)){
 					SimpleLogger.logWarn(LoggerType.VALIDATOR, String.format("[ %-" + maxValidatorClassNameLength + "s ] %s", validator.getClass().getSimpleName(), message.getContent()));
 				} else if(message.getType().equals(SimpleLogger.FATAL)){
-					SimpleLogger.logFatal(LoggerType.VALIDATOR, String.format("[ %-" + maxValidatorClassNameLength + "s ] %s", validator.getClass().getSimpleName(), message.getContent()));
+					String fatalMessage = String.format("[ %-" + maxValidatorClassNameLength + "s ] %s", validator.getClass().getSimpleName(), message.getContent());
+					FATAL_MESSAGES.add(fatalMessage);
+					SimpleLogger.logFatal(LoggerType.VALIDATOR, fatalMessage);
 				}
 			}
 		}
@@ -400,6 +408,8 @@ public JSONObject getJSONFileContents(File file) throws H2ZeroParseException {
 	 * @return the number of fatal messages in generation
 	 */
 	public int getNumFatal() { return(numFatal); }
+	
+	public List<String> getFatalMessages() { return(FATAL_MESSAGES); }
 
 	/**
 	 * Retrieve a validator by name from the lookup cache (or null if it can not be found)
diff --git a/src/main/java/synapticloop/h2zero/model/BaseSchemaObject.java b/src/main/java/synapticloop/h2zero/model/BaseSchemaObject.java
@@ -410,6 +410,7 @@ public boolean requiresImport(String fieldType) {
 	public List<BaseField> getPopulateFields() { return(populateFields); }
 	public List<BaseField> getNonPopulateFields() { return(nonPopulateFields); }
 
+	public boolean getShouldHydrate() { return(nonPopulateFields.size() != 0); }
 	/**
 	 * Return whether this schema object has any questions on it
 	 * 
diff --git a/src/main/java/synapticloop/h2zero/model/field/BaseField.java b/src/main/java/synapticloop/h2zero/model/field/BaseField.java
@@ -308,6 +308,8 @@ public String getLengthFormat() {
 	public int getFieldIndex() { return(this.fieldIndex); }
 	public void setFieldIndex(int fieldIndex) { this.fieldIndex = fieldIndex; }
 
+	public boolean getIsForeignKey() {return(getForeignKeyField() != null); }
+
 	public List<String> getFoundIgnoredKeys() { return foundIgnoredKeys; }
 	public String getReplacementForKey(String key) { return(replacementKeys.get(key)); }
 
diff --git a/src/main/java/synapticloop/h2zero/plugin/BaseH2ZeroGenerator.java b/src/main/java/synapticloop/h2zero/plugin/BaseH2ZeroGenerator.java
@@ -72,14 +72,14 @@ public BaseH2ZeroGenerator(File h2ZeroFile, File outFile, boolean verbose) {
 	 */
 	public void generateH2zero() {
 		// otherwise we are good to go
-		H2ZeroParser h2zeroParser = null;
+		H2ZeroParser h2zeroParser = new H2ZeroParser();
 		TemplarConfiguration templarConfiguration = null;
 		TemplarContext templarContext = null;
 		Database database = null;
 		Options options = null;
 
 		try {
-			h2zeroParser = new H2ZeroParser(h2ZeroFile);
+			h2zeroParser.parse(h2ZeroFile);
 
 			logDatabaseInfo(h2zeroParser);
 
@@ -114,6 +114,10 @@ public void generateH2zero() {
 			SimpleLogger.logFatal(SimpleLogger.LoggerType.PARSE, "H2ZeroParseException: There was an error parsing the '" + h2ZeroFile.getName() + "'.");
 			SimpleLogger.logFatal(SimpleLogger.LoggerType.PARSE, "The message was:");
 			SimpleLogger.logFatal(SimpleLogger.LoggerType.PARSE, "  " + h2zpex.getMessage());
+			List<String> fatalMessages = h2zeroParser.getFatalMessages();
+			for (String fatalMessage : fatalMessages) {
+				SimpleLogger.logFatal(SimpleLogger.LoggerType.PARSE, "  " + fatalMessage);
+			}
 			throw new BuildException(h2zpex);
 		} catch (ParseException pex) {
 			SimpleLogger.logFatal(SimpleLogger.LoggerType.TEMPLAR_PARSE, "ParseException: There was an error parsing the '" + h2ZeroFile.getName() + "'.");
diff --git a/src/main/java/synapticloop/h2zero/validator/field/FieldPopulateForeignKeyValidator.java b/src/main/java/synapticloop/h2zero/validator/field/FieldPopulateForeignKeyValidator.java
@@ -0,0 +1,44 @@
+package synapticloop.h2zero.validator.field;
+
+/*
+ * Copyright (c) 2012-2020 synapticloop.
+ * 
+ * All rights reserved.
+ *
+ * This source code and any derived binaries are covered by the terms and
+ * conditions of the Licence agreement ("the Licence").  You may not use this
+ * source code or any derived binaries except in compliance with the Licence.
+ * A copy of the Licence is available in the file named LICENCE shipped with
+ * this source code or binaries.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * Licence for the specific language governing permissions and limitations
+ * under the Licence.
+ */
+
+import java.util.List;
+
+import synapticloop.h2zero.model.Database;
+import synapticloop.h2zero.model.Options;
+import synapticloop.h2zero.model.Table;
+import synapticloop.h2zero.model.field.BaseField;
+import synapticloop.h2zero.validator.BaseValidator;
+
+public class FieldPopulateForeignKeyValidator extends BaseValidator {
+
+	@Override
+	public void validate(Database database, Options options) {
+		List<Table> tables = database.getTables();
+		for (Table table : tables) {
+			List<BaseField> fields = table.getFields();
+			for (BaseField baseField : fields) {
+				if(baseField.getIsForeignKey() && !baseField.getPopulate()) {
+					isValid = false;
+					addFatalMessage("The foreign key field '" + table.getName() + "." + baseField.getName() + "' has an attribute: \"populate\" with a value of 'false' . It __MUST_ALWAYS__ be 'true'");
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/resources/java-create-model.templar b/src/main/resources/java-create-model.templar
@@ -139,12 +139,14 @@ public class {table.javaClassName} {if !table.isConstant}extends ModelBase {endi
 	{endloop}";{\n}
 {\n}
 
-{\t}private static final String SQL_SELECT_HYDRATE = "select 
-{loop table.nonPopulateFields as field}
-	{field.name}
-	{if !fieldStatus.last}, {endif}
-{endloop}
- from {table.name} where " + PRIMARY_KEY_FIELD + " = ?";{\n}
+{if table.shouldHydrate}
+	{\t}private static final String SQL_SELECT_HYDRATE = "select 
+	{loop table.nonPopulateFields as field}
+		{field.name}
+		{if !fieldStatus.last}, {endif}
+	{endloop}
+	 from {table.name} where " + PRIMARY_KEY_FIELD + " = ?";{\n}
+{endif}{-- end of check whether we should hydrate some of the fields }
 
 {\n}// Static lookups for fields in the hit counter.{\n}
 	{\t}public static final int HIT_TOTAL = 0;{\n}
@@ -158,7 +160,11 @@ public class {table.javaClassName} {if !table.isConstant}extends ModelBase {endi
 	{\t}// the number of read-hits for a particular field{\n}
 	{\t}private static int[] HIT_COUNTS = {{ 0, {loop table.fields as field}0{if fieldStatus.last}{else}, {endif}{endloop} };{\n}
 	{set fn:length[table.nonPopulateFields] as nonPopulateFieldsLength}
-	{\t}private boolean isHydrated = {if fn:=[nonPopulateFieldsLength, '0']}true{else}false{endif};{\n}
+
+	{if table.shouldHydrate}
+		{\t}private boolean isHydrated = {if fn:=[nonPopulateFieldsLength, '0']}true{else}false{endif};{\n}
+	{endif}{-- end of check whether we should hydrate some of the fields }
+
 {endif}{-- end of !if.isConstant}
 {\n}
 	{-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -423,11 +429,11 @@ public class {table.javaClassName} {if !table.isConstant}extends ModelBase {endi
 		{\t}{\t}} catch (SQLException sqlex) {{{\n}
 		{\t}{\t}{\t}throw sqlex;{\n}
 		{\t}{\t}} finally {{{\n}
+		{\t}{\t}this.isHydrated = true;
 		{\t}{\t}{\t}ConnectionManager.closeAll(resultSet, preparedStatement);{\n}
 		{\t}{\t}}{\n}
-		{\n}
 		{\t}}{\n}
-
+		{\t}
 	{endif}
 
 
diff --git a/src/test/java/synapticloop/sample/h2zero/mysql/finder/UserFinder.java b/src/test/java/synapticloop/sample/h2zero/mysql/finder/UserFinder.java
@@ -35,7 +35,7 @@ public class UserFinder {
 	private static final String BINDER = Constants.USER_BINDER;
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(UserFinder.class);
-	private static final String SQL_SELECT_START = "select id_user, id_user_type, fl_is_alive, num_age, nm_username, txt_address_email, txt_password, dtm_signup from user";
+	private static final String SQL_SELECT_START = "select id_user, id_user_type, fl_is_alive, nm_username, txt_address_email, txt_password from user";
 	private static final String SQL_BUILTIN_FIND_BY_PRIMARY_KEY = SQL_SELECT_START + " where id_user = ?";
 
 	private static final String SQL_FIND_BY_NUM_AGE = SQL_SELECT_START + " where num_age = ?";
@@ -1158,11 +1158,11 @@ private static User uniqueResult(ResultSet resultSet) throws H2ZeroFinderExcepti
 			Long idUser = ConnectionManager.getNullableResultLong(resultSet, 1);
 			Long idUserType = ConnectionManager.getNullableResultLong(resultSet, 2);
 			Boolean flIsAlive = ConnectionManager.getNullableResultBoolean(resultSet, 3);
-			Integer numAge = ConnectionManager.getNullableResultInt(resultSet, 4);
-			String nmUsername = ConnectionManager.getNullableResultString(resultSet, 5);
-			String txtAddressEmail = ConnectionManager.getNullableResultString(resultSet, 6);
-			String txtPassword = ConnectionManager.getNullableResultString(resultSet, 7);
-			Timestamp dtmSignup = ConnectionManager.getNullableResultTimestamp(resultSet, 8);
+			String nmUsername = ConnectionManager.getNullableResultString(resultSet, 4);
+			String txtAddressEmail = ConnectionManager.getNullableResultString(resultSet, 5);
+			String txtPassword = ConnectionManager.getNullableResultString(resultSet, 6);
+			Integer numAge = null;
+			Timestamp dtmSignup = null;
 
 			User user = new User(idUser, idUserType, flIsAlive, numAge, nmUsername, txtAddressEmail, txtPassword, dtmSignup);
 
@@ -1190,15 +1190,24 @@ private static User uniqueResult(ResultSet resultSet) throws H2ZeroFinderExcepti
 	private static List<User> list(ResultSet resultSet) throws SQLException {
 		List<User> arrayList = new ArrayList<User>();
 		while(resultSet.next()) {
-			arrayList.add(new User(
-					ConnectionManager.getNullableResultLong(resultSet, 1),
-					ConnectionManager.getNullableResultLong(resultSet, 2),
-					ConnectionManager.getNullableResultBoolean(resultSet, 3),
-					ConnectionManager.getNullableResultInt(resultSet, 4),
-					ConnectionManager.getNullableResultString(resultSet, 5),
-					ConnectionManager.getNullableResultString(resultSet, 6),
-					ConnectionManager.getNullableResultString(resultSet, 7),
-					ConnectionManager.getNullableResultTimestamp(resultSet, 8)));
+			Long idUser = ConnectionManager.getNullableResultLong(resultSet, 1);
+			Long idUserType = ConnectionManager.getNullableResultLong(resultSet, 2);
+			Boolean flIsAlive = ConnectionManager.getNullableResultBoolean(resultSet, 3);
+			String nmUsername = ConnectionManager.getNullableResultString(resultSet, 4);
+			String txtAddressEmail = ConnectionManager.getNullableResultString(resultSet, 5);
+			String txtPassword = ConnectionManager.getNullableResultString(resultSet, 6);
+			Integer numAge = null;
+			Timestamp dtmSignup = null;
+					arrayList.add(new User(
+					idUser,
+					idUserType,
+					flIsAlive,
+					numAge,
+					nmUsername,
+					txtAddressEmail,
+					txtPassword,
+					dtmSignup
+					));
 		}
 		return(arrayList);
 	}
diff --git a/src/test/java/synapticloop/sample/h2zero/mysql/model/Pet.java b/src/test/java/synapticloop/sample/h2zero/mysql/model/Pet.java
@@ -35,7 +35,6 @@ public class Pet extends ModelBase {
 	private static final String SQL_DELETE = "delete from pet where " + PRIMARY_KEY_FIELD + " = ?";
 	private static final String SQL_ENSURE = "select " + PRIMARY_KEY_FIELD + " from pet where nm_pet = ? and num_age = ? and flt_weight = ? and dt_birthday = ? and img_photo = ?";
 
-	private static final String SQL_SELECT_HYDRATE = "select  from pet where " + PRIMARY_KEY_FIELD + " = ?";
 
 // Static lookups for fields in the hit counter.
 	public static final int HIT_TOTAL = 0;
@@ -52,7 +51,6 @@ public class Pet extends ModelBase {
 	private static final String[] HIT_FIELDS = { "TOTAL", "id_pet", "nm_pet", "num_age", "flt_weight", "dt_birthday", "img_photo" };
 	// the number of read-hits for a particular field
 	private static int[] HIT_COUNTS = { 0, 0, 0, 0, 0, 0, 0 };
-	private boolean isHydrated = true;
 
 
 	private Long idPet = null;
diff --git a/src/test/java/synapticloop/sample/h2zero/mysql/model/User.java b/src/test/java/synapticloop/sample/h2zero/mysql/model/User.java
@@ -34,7 +34,7 @@ public class User extends ModelBase {
 	private static final String SQL_DELETE = "delete from user where " + PRIMARY_KEY_FIELD + " = ?";
 	private static final String SQL_ENSURE = "select " + PRIMARY_KEY_FIELD + " from user where id_user_type = ? and fl_is_alive = ? and num_age = ? and nm_username = ? and txt_address_email = ? and txt_password = ? and dtm_signup = ?";
 
-	private static final String SQL_SELECT_HYDRATE = "select  from user where " + PRIMARY_KEY_FIELD + " = ?";
+	private static final String SQL_SELECT_HYDRATE = "select num_age, dtm_signup from user where " + PRIMARY_KEY_FIELD + " = ?";
 
 // Static lookups for fields in the hit counter.
 	public static final int HIT_TOTAL = 0;
@@ -53,7 +53,7 @@ public class User extends ModelBase {
 	private static final String[] HIT_FIELDS = { "TOTAL", "id_user", "id_user_type", "fl_is_alive", "num_age", "nm_username", "txt_address_email", "txt_password", "dtm_signup" };
 	// the number of read-hits for a particular field
 	private static int[] HIT_COUNTS = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-	private boolean isHydrated = true;
+	private boolean isHydrated = false;
 
 
 	private Long idUser = null;
@@ -188,7 +188,29 @@ public void refresh(Connection connection) throws H2ZeroPrimaryKeyException {
 		this.dtmSignup = user.getDtmSignup();
 	}
 
-	public static String[] getHitFields() { return(HIT_FIELDS); }
+	@Override
+	protected void hydrate(Connection connection) throws SQLException, H2ZeroPrimaryKeyException {
+		if(!primaryKeySet()) {
+			throw new H2ZeroPrimaryKeyException("Cannot hydrate bean when primary key is null.");
+		}
+		PreparedStatement preparedStatement = null;
+		ResultSet resultSet = null;
+		try {
+			preparedStatement = connection.prepareStatement(SQL_SELECT_HYDRATE);
+			preparedStatement.setLong(1, idUser);
+			resultSet = preparedStatement.executeQuery();
+			if(!resultSet.next()) {
+				throw new H2ZeroPrimaryKeyException("Could not find result with primary key of: " + getPrimaryKey());
+			}
+			this.numAge = ConnectionManager.getNullableResultInt(resultSet, 1);
+			this.dtmSignup = ConnectionManager.getNullableResultTimestamp(resultSet, 2);
+		} catch (SQLException sqlex) {
+			throw sqlex;
+		} finally {
+		this.isHydrated = true;			ConnectionManager.closeAll(resultSet, preparedStatement);
+		}
+	}
+		public static String[] getHitFields() { return(HIT_FIELDS); }
 	public static int[] getHitCounts() { return(HIT_COUNTS); }
 
 	public UserType getUserType() {
@@ -212,15 +234,15 @@ public static void updateHitCount(int offset) {
 	public void setIdUserType(Long idUserType) { if(isDifferent(this.idUserType, idUserType)) { this.idUserType = idUserType;this.isDirty = true; }}
 	public Boolean getFlIsAlive() { updateHitCount(3); return(this.flIsAlive); }
 	public void setFlIsAlive(Boolean flIsAlive) { if(isDifferent(this.flIsAlive, flIsAlive)) { this.flIsAlive = flIsAlive;this.isDirty = true; }}
-	public Integer getNumAge() { updateHitCount(4); return(this.numAge); }
+	public Integer getNumAge() { updateHitCount(4); if(!isHydrated) { hydrateSilent(); this.isHydrated = true; } return(this.numAge); }
 	public void setNumAge(Integer numAge) { if(isDifferent(this.numAge, numAge)) { this.numAge = numAge;this.isDirty = true; }}
 	public String getNmUsername() { updateHitCount(5); return(this.nmUsername); }
 	public void setNmUsername(String nmUsername) { if(isDifferent(this.nmUsername, nmUsername)) { this.nmUsername = nmUsername;this.isDirty = true; }}
 	public String getTxtAddressEmail() { updateHitCount(6); return(this.txtAddressEmail); }
 	public void setTxtAddressEmail(String txtAddressEmail) { if(isDifferent(this.txtAddressEmail, txtAddressEmail)) { this.txtAddressEmail = txtAddressEmail;this.isDirty = true; }}
 	public String getTxtPassword() { updateHitCount(7); return(this.txtPassword); }
 	public void setTxtPassword(String txtPassword) { if(isDifferent(this.txtPassword, txtPassword)) { this.txtPassword = txtPassword;this.isDirty = true; }}
-	public Timestamp getDtmSignup() { updateHitCount(8); return(this.dtmSignup); }
+	public Timestamp getDtmSignup() { updateHitCount(8); if(!isHydrated) { hydrateSilent(); this.isHydrated = true; } return(this.dtmSignup); }
 	public void setDtmSignup(Timestamp dtmSignup) { if(isDifferent(this.dtmSignup, dtmSignup)) { this.dtmSignup = dtmSignup;this.isDirty = true; }}
 
 	@Override
diff --git a/src/test/java/synapticloop/sample/h2zero/mysql/model/UserPet.java b/src/test/java/synapticloop/sample/h2zero/mysql/model/UserPet.java
@@ -35,7 +35,6 @@ public class UserPet extends ModelBase {
 	private static final String SQL_DELETE = "delete from user_pet where " + PRIMARY_KEY_FIELD + " = ?";
 	private static final String SQL_ENSURE = "select " + PRIMARY_KEY_FIELD + " from user_pet where id_user = ? and id_pet = ?";
 
-	private static final String SQL_SELECT_HYDRATE = "select  from user_pet where " + PRIMARY_KEY_FIELD + " = ?";
 
 // Static lookups for fields in the hit counter.
 	public static final int HIT_TOTAL = 0;
@@ -49,7 +48,6 @@ public class UserPet extends ModelBase {
 	private static final String[] HIT_FIELDS = { "TOTAL", "id_user_pet", "id_user", "id_pet" };
 	// the number of read-hits for a particular field
 	private static int[] HIT_COUNTS = { 0, 0, 0, 0 };
-	private boolean isHydrated = true;
 
 	private User User = null;
 	private Pet Pet = null;
diff --git a/src/test/resources/user.json b/src/test/resources/user.json

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'synapticloop:h2zero:4.1.10'`
	`12`	`+ classpath 'synapticloop:h2zero:4.2.0'`
`13`	`13`	`// classpath 'synapticloop:h2zero-extension-taglibs:1.0.0'`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ public boolean requiresImport(String fieldType) {`
`410`	`410`	`public List<BaseField> getPopulateFields() { return(populateFields); }`
`411`	`411`	`public List<BaseField> getNonPopulateFields() { return(nonPopulateFields); }`
`412`	`412`
	`413`	`+ public boolean getShouldHydrate() { return(nonPopulateFields.size() != 0); }`
`413`	`414`	`/**`
`414`	`415`	`* Return whether this schema object has any questions on it`
`415`	`416`	`*`