Modified: db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java Mon Aug 27 09:48:33 2018 @@ -63,7 +63,7 @@ public class AbstractFunctionTest extend */ public void testGetSetArgumentList() { - ArrayList<Object> arguments = new ArrayList<Object>(); + ArrayList<Object> arguments = new ArrayList<>(); arguments.add(false); arguments.add(new ColumnImpl("fooColumn")); abstractFunction.setArgumentList(arguments); @@ -103,9 +103,9 @@ public class AbstractFunctionTest extend public void testGetColumnName() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertNull(abstractFunction.getColumnName()); } @@ -115,10 +115,10 @@ public class AbstractFunctionTest extend public void testGetTableName() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl("schema", "table", "column", "sqlExpression"), - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl("schema", "table", "column", "sqlExpression"), + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertEquals("table", abstractFunction.getTableName()); } @@ -129,10 +129,10 @@ public class AbstractFunctionTest extend public void testGetTableNameDifferentTables() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl(null, null, null, "sqlExpression"), - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl(null, null, null, "sqlExpression"), + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertNull(abstractFunction.getTableName()); } @@ -143,10 +143,10 @@ public class AbstractFunctionTest extend public void testGetFullTableName() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl("schema", "table", "column", "sqlExpression"), - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl("schema", "table", "column", "sqlExpression"), + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertEquals("schema.table", abstractFunction.getFullTableName()); } @@ -157,10 +157,10 @@ public class AbstractFunctionTest extend public void testGetFullTableNameDifferentTables() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl(null, null, null, "sqlExpression"), - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl(null, null, null, "sqlExpression"), + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertNull(abstractFunction.getFullTableName()); } @@ -171,10 +171,10 @@ public class AbstractFunctionTest extend public void testGetSchemaName() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl("schema", "table", "column", "sqlExpression"), - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl("schema", "table", "column", "sqlExpression"), + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertEquals("schema", abstractFunction.getSchemaName()); } @@ -185,10 +185,10 @@ public class AbstractFunctionTest extend public void testGetSchemaNameDifferentTables() { abstractFunction.setArguments( - new Object[] { - new ColumnImpl(null, null, null, "sqlExpression"), - new ColumnImpl("schema", "table", "column", "sqlExpression"), - true}); + new Object[] { + new ColumnImpl(null, null, null, "sqlExpression"), + new ColumnImpl("schema", "table", "column", "sqlExpression"), + true}); assertNull(abstractFunction.getSchemaName()); }
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java Mon Aug 27 09:48:33 2018 @@ -182,7 +182,7 @@ public enum TemplateOptionName implement * as used in the foreign field name. */ OM_FOREIGN_FIELD_NAME_RELATED_BY( - "torque.om.complexObjectModel.foreignFieldNameRelatedBy"), + "torque.om.complexObjectModel.foreignFieldNameRelatedBy"), /** * The name of the option for the java type for the foreign field @@ -275,6 +275,7 @@ public enum TemplateOptionName implement * * @return the fully qualified name of the option, not null. */ + @Override public String getName() { return name; @@ -296,17 +297,17 @@ public enum TemplateOptionName implement */ public static void checkRequiredOptions(final ControllerState controllerState, final TemplateOptionName... requiredOptions) - throws SourceTransformerException + throws SourceTransformerException { for (TemplateOptionName templateOption : requiredOptions) { Object optionValue - = controllerState.getOption(templateOption.getName()); + = controllerState.getOption(templateOption.getName()); if (optionValue == null) { throw new SourceTransformerException( "Option " + templateOption.getName() - + " must be set"); + + " must be set"); } } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java Mon Aug 27 09:48:33 2018 @@ -113,6 +113,7 @@ public enum TorqueSchemaAttributeName im * * @return the name of the attribute, not null. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java Mon Aug 27 09:48:33 2018 @@ -81,6 +81,7 @@ public enum TorqueSchemaElementName impl * * @return the name of the element, not null. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java Mon Aug 27 09:48:33 2018 @@ -35,13 +35,13 @@ public class Column public Table parent; /** The list of options for this column. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The list of inheritances for this column. */ - public List<Inheritance> inheritanceList = new ArrayList<Inheritance>(); + public List<Inheritance> inheritanceList = new ArrayList<>(); /** The list of enum values for this column. */ - public List<EnumValue> enumValueList = new ArrayList<EnumValue>(); + public List<EnumValue> enumValueList = new ArrayList<>(); /** The column's name. */ public String name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java Mon Aug 27 09:48:33 2018 @@ -31,18 +31,18 @@ public class Database { // properties from schema /** The list of options for this database. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The list of included schemas for this database. */ public List<IncludeSchema> includeSchemaList - = new ArrayList<IncludeSchema>(); + = new ArrayList<>(); /** The list of external schemas for this database. */ public List<ExternalSchema> externalSchemaList - = new ArrayList<ExternalSchema>(); + = new ArrayList<>(); /** The List of domains for this database. */ - public List<Domain> domainList = new ArrayList<Domain>(); + public List<Domain> domainList = new ArrayList<>(); /** * The list of tables for this database. @@ -50,7 +50,7 @@ public class Database * depending on whether included schemas were already resolved, * but never includes the tables from external schemas. */ - public List<Table> tableList = new ArrayList<Table>(); + public List<Table> tableList = new ArrayList<>(); /** * The list of views for this database. @@ -58,7 +58,7 @@ public class Database * depending on whether included schemas were already resolved, * but never includes the views from external schemas. */ - public List<View> viewList = new ArrayList<View>(); + public List<View> viewList = new ArrayList<>(); /** The name of the database. */ public String name; @@ -87,18 +87,18 @@ public class Database * List of all tables, including the tables from loaded * external-schema definitions. */ - public List<Table> allTables = new ArrayList<Table>(); + public List<Table> allTables = new ArrayList<>(); /** * List of all views, including the views from loaded * external-schema definitions. */ - public List<View> allViews = new ArrayList<View>(); + public List<View> allViews = new ArrayList<>(); /** * List of all schema names in the tables of the database. */ - public List<String> schemaNameList = new ArrayList<String>(); + public List<String> schemaNameList = new ArrayList<>(); @Override public String toString() Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java Mon Aug 27 09:48:33 2018 @@ -33,10 +33,10 @@ public class ForeignKey public Table parent; /** The list of options for this foreign key. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The list of column references for this foreign key. */ - public List<Reference> referenceList = new ArrayList<Reference>(); + public List<Reference> referenceList = new ArrayList<>(); /** The name of the foreign key. */ public String name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java Mon Aug 27 09:48:33 2018 @@ -35,10 +35,10 @@ public class Index public Table parent; /** The list of otions for the index. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The list of indexColumns for the index. */ - public List<IndexColumn> indexColumnList = new ArrayList<IndexColumn>(); + public List<IndexColumn> indexColumnList = new ArrayList<>(); /** The name of the index. */ public String name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java Mon Aug 27 09:48:33 2018 @@ -35,23 +35,23 @@ public class Table public Database parent; /** The options for this table. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The columns of this table. */ - public List<Column> columnList = new ArrayList<Column>(); + public List<Column> columnList = new ArrayList<>(); /** The foreign keys of this table. */ - public List<ForeignKey> foreignKeyList = new ArrayList<ForeignKey>(); + public List<ForeignKey> foreignKeyList = new ArrayList<>(); /** The index list for this table. */ - public List<Index> indexList = new ArrayList<Index>(); + public List<Index> indexList = new ArrayList<>(); /** The list of unique indices for this table. */ - public List<Unique> uniqueList = new ArrayList<Unique>(); + public List<Unique> uniqueList = new ArrayList<>(); /** The id method parameters for this table. */ public List<IdMethodParameter> idMethodParameterList - = new ArrayList<IdMethodParameter>(); + = new ArrayList<>(); /** The table's name. */ public String name; @@ -97,7 +97,7 @@ public class Table // general generation properties /** Contains all primary key columns of the table. */ - public List<Column> primaryKeyList = new ArrayList<Column>(); + public List<Column> primaryKeyList = new ArrayList<>(); // properties for generation of ORM classes Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java Mon Aug 27 09:48:33 2018 @@ -35,10 +35,10 @@ public class Unique public Table parent; /** The options for this unique constraint. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The columns in this unique constraint. */ - public List<UniqueColumn> uniqueColumnList = new ArrayList<UniqueColumn>(); + public List<UniqueColumn> uniqueColumnList = new ArrayList<>(); /** The name of the constraint. */ public String name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java Mon Aug 27 09:48:33 2018 @@ -33,7 +33,7 @@ public class View public Database parent; /** The options for this view. */ - public List<Option> optionList = new ArrayList<Option>(); + public List<Option> optionList = new ArrayList<>(); /** The columns of this view. */ public List<ViewColumn> columnList; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ViewColumn.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ViewColumn.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ViewColumn.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ViewColumn.java Mon Aug 27 09:48:33 2018 @@ -33,10 +33,10 @@ public class ViewColumn public View parent; /** The list of options for this view column. */ - public List<Option> options = new ArrayList<Option>(); + public List<Option> options = new ArrayList<>(); /** The list of inheritances for this view column. */ - public List<Inheritance> inheritances = new ArrayList<Inheritance>(); + public List<Inheritance> inheritances = new ArrayList<>(); /** The view column's name. */ public String name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java Mon Aug 27 09:48:33 2018 @@ -58,8 +58,8 @@ public class PlatformDefaultImpl impleme private void initialize() { schemaTypeToSqlTypeMap - = Collections.synchronizedMap( - new HashMap<SchemaType, SqlType>()); + = Collections.synchronizedMap( + new HashMap<SchemaType, SqlType>()); for (SchemaType schemaType : SchemaType.values()) { setSchemaTypeToSqlTypeMapping( @@ -99,6 +99,7 @@ public class PlatformDefaultImpl impleme /** * @see Platform#getSqlTypeForSchemaType(SchemaType) */ + @Override public SqlType getSqlTypeForSchemaType(SchemaType schemaType) { return schemaTypeToSqlTypeMap.get(schemaType); @@ -109,6 +110,7 @@ public class PlatformDefaultImpl impleme * disallowed. * @see Platform#getNullString(boolean) */ + @Override public String getNullString(boolean notNull) { return (notNull ? "NOT NULL" : ""); @@ -117,6 +119,7 @@ public class PlatformDefaultImpl impleme /** * @see Platform#getAutoIncrement() */ + @Override public String getAutoIncrement() { return "IDENTITY"; @@ -126,6 +129,7 @@ public class PlatformDefaultImpl impleme * @see Platform#hasScale(String) * TODO collect info for all platforms */ + @Override public boolean hasScale(String sqlType) { return true; @@ -135,6 +139,7 @@ public class PlatformDefaultImpl impleme * @see Platform#hasSize(String) * TODO collect info for all platforms */ + @Override public boolean hasSize(String sqlType) { return true; @@ -150,14 +155,16 @@ public class PlatformDefaultImpl impleme * @return The size suffix, not null. * This implementation always returns the empty string. */ + @Override public String getSizeSuffix(String sqlType) { return StringUtils.EMPTY; } - /** + /** * @see Platform#createNotNullBeforeAutoincrement() */ + @Override public boolean createNotNullBeforeAutoincrement() { return true; @@ -166,6 +173,7 @@ public class PlatformDefaultImpl impleme /** * @see Platform#quoteAndEscape(String) */ + @Override public String quoteAndEscape(String text) { String result = text.replace("'", "''"); @@ -189,6 +197,7 @@ public class PlatformDefaultImpl impleme /** * {@inheritDoc} */ + @Override public String getDateString(Date date) { return getTimestampString(date); @@ -197,6 +206,7 @@ public class PlatformDefaultImpl impleme /** * {@inheritDoc} */ + @Override public String getTimeString(Date date) { return getTimestampString(date); @@ -205,6 +215,7 @@ public class PlatformDefaultImpl impleme /** * {@inheritDoc} */ + @Override public String getTimestampString(Date date) { SimpleDateFormat dateFormat = new SimpleDateFormat(TIMESTAMP_FORMAT); @@ -219,6 +230,7 @@ public class PlatformDefaultImpl impleme * * @return this implementation returns false. */ + @Override public boolean usesStandaloneSchema() { return false; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java Mon Aug 27 09:48:33 2018 @@ -92,9 +92,9 @@ public class PlatformDerbyImpl extends P public boolean hasSize(String sqlType) { return "NUMERIC".equals(sqlType) || "DECIMAL".equals(sqlType) - || "VARCHAR".equals(sqlType) || "CHAR".equals(sqlType) - || "BINARY".equals(sqlType) || "VARBINARY".equals(sqlType) - || "BLOB".equals(sqlType) || "CLOB".equals(sqlType); + || "VARCHAR".equals(sqlType) || "CHAR".equals(sqlType) + || "BINARY".equals(sqlType) || "VARBINARY".equals(sqlType) + || "BLOB".equals(sqlType) || "CLOB".equals(sqlType); } @Override Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java Mon Aug 27 09:48:33 2018 @@ -36,7 +36,7 @@ public final class PlatformFactory { /** All known platforms. */ private static HashMap<String, Platform> platforms - = new HashMap<String, Platform>(); + = new HashMap<>(); /** The class log. */ private static Log log = LogFactory.getLog(PlatformFactory.class); @@ -60,7 +60,7 @@ public final class PlatformFactory Platform result = null; String platformName = null; - result = (Platform) getPlatforms().get(dbms); + result = getPlatforms().get(dbms); if (result == null) { try @@ -97,7 +97,7 @@ public final class PlatformFactory } String myClassname = PlatformFactory.class.getName(); String myPackage - = myClassname.substring(0, myClassname.lastIndexOf(".")); + = myClassname.substring(0, myClassname.lastIndexOf(".")); return myPackage + ".Platform" + pf.substring(0, 1).toUpperCase() Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java Mon Aug 27 09:48:33 2018 @@ -120,6 +120,7 @@ public class PlatformHsqldbImpl extends * * @return this implementation returns true. */ + @Override public boolean usesStandaloneSchema() { return true; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java Mon Aug 27 09:48:33 2018 @@ -104,6 +104,7 @@ public class PlatformMssqlImpl extends P /** * {@inheritDoc} */ + @Override public String getTimestampString(Date date) { SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); @@ -118,6 +119,7 @@ public class PlatformMssqlImpl extends P * * @return this implementation returns true. */ + @Override public boolean usesStandaloneSchema() { return true; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java Mon Aug 27 09:48:33 2018 @@ -37,15 +37,15 @@ public class PlatformOracleImpl extends { /** The date format for formatting database dates. */ private static final String DATE_FORMAT - = "'to_date('''yyyy-MM-dd''',''yyyy-mm-dd'')'"; + = "'to_date('''yyyy-MM-dd''',''yyyy-mm-dd'')'"; /** The date format for formatting database dates. */ private static final String TIME_FORMAT - = "'to_date('''1970-01-01 HH:mm:ss''',''yyyy-mm-dd hh24:mi:ss'')'"; + = "'to_date('''1970-01-01 HH:mm:ss''',''yyyy-mm-dd hh24:mi:ss'')'"; /** The date format for formatting database dates. */ private static final String TIMESTAMP_FORMAT - = "'to_timestamp('''yyyy-MM-dd HH:mm:ss''',''yyyy-mm-dd hh24:mi:ss'')'"; + = "'to_timestamp('''yyyy-MM-dd HH:mm:ss''',''yyyy-mm-dd hh24:mi:ss'')'"; /** * Default constructor. Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -31,6 +31,7 @@ import org.apache.torque.templates.Templ */ public class BeanSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { return controllerState.getBooleanOption( Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/EnumSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/EnumSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/EnumSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/EnumSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -32,13 +32,14 @@ import org.apache.torque.templates.trans */ public class EnumSkipDecider implements SkipDecider { + @Override public boolean proceed(final ControllerState controllerState) { SourceElement sourceElement - = (SourceElement) controllerState.getModel(); + = (SourceElement) controllerState.getModel(); String generateEnum - = (String) sourceElement.getAttribute( - ColumnAttributeName.GENERATE_ENUM); + = (String) sourceElement.getAttribute( + ColumnAttributeName.GENERATE_ENUM); return Boolean.parseBoolean(generateEnum); } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -33,13 +33,14 @@ import org.apache.torque.templates.Torqu */ public class InterfaceSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { SourceElement sourceElement - = (SourceElement) controllerState.getModel(); + = (SourceElement) controllerState.getModel(); String interfaceName - = (String) sourceElement.getAttribute( - TorqueSchemaAttributeName.INTERFACE.getName()); + = (String) sourceElement.getAttribute( + TorqueSchemaAttributeName.INTERFACE.getName()); if (interfaceName == null) { return false; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -36,6 +36,7 @@ import org.apache.torque.templates.trans */ public class ManagerSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { if (!controllerState.getBooleanOption( @@ -44,14 +45,14 @@ public class ManagerSkipDecider implemen return false; } SourceElement sourceElement - = (SourceElement) controllerState.getModel(); + = (SourceElement) controllerState.getModel(); if ("false".equals(sourceElement.getAttribute("useManagers"))) { return false; } List<SourceElement> primaryKeyColumns - = sourceElement.getChild(TableChildElementName.PRIMARY_KEYS) - .getChildren(TorqueSchemaElementName.COLUMN); + = sourceElement.getChild(TableChildElementName.PRIMARY_KEYS) + .getChildren(TorqueSchemaElementName.COLUMN); return !primaryKeyColumns.isEmpty(); } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -31,6 +31,7 @@ import org.apache.torque.templates.Templ */ public class MapInitSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { return controllerState.getBooleanOption( Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/PeerInterfaceSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/PeerInterfaceSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/PeerInterfaceSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/PeerInterfaceSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -33,13 +33,14 @@ import org.apache.torque.templates.Torqu */ public class PeerInterfaceSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { SourceElement sourceElement - = (SourceElement) controllerState.getModel(); + = (SourceElement) controllerState.getModel(); String interfaceName - = (String) sourceElement.getAttribute( - TorqueSchemaAttributeName.PEER_INTERFACE.getName()); + = (String) sourceElement.getAttribute( + TorqueSchemaAttributeName.PEER_INTERFACE.getName()); if (interfaceName == null) { return false; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java Mon Aug 27 09:48:33 2018 @@ -73,12 +73,12 @@ public class CollectAttributeSetTrueTran SourceElementName targetElementName) { List<SourceElement> hits - = new ArrayList<SourceElement>(); + = new ArrayList<>(); for (SourceElement column : rootElement.getChildren( childrenToProcessName)) { String attributeToCheck - = (String) column.getAttribute(attributeToCheckName); + = (String) column.getAttribute(attributeToCheckName); if (Boolean.parseBoolean(attributeToCheck)) { hits.add(column); @@ -86,7 +86,7 @@ public class CollectAttributeSetTrueTran } SourceElement targetElement - = new SourceElement(targetElementName); + = new SourceElement(targetElementName); rootElement.getChildren().add(targetElement); for (SourceElement hit : hits) Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java Mon Aug 27 09:48:33 2018 @@ -47,7 +47,7 @@ public class IncludeSchemaTransformer im { /** The class log. */ private static Log log - = LogFactory.getLog(IncludeSchemaTransformer.class); + = LogFactory.getLog(IncludeSchemaTransformer.class); /** * The base dir for the external schema, @@ -59,7 +59,7 @@ public class IncludeSchemaTransformer im * The transformer creating the typed model from the source graph. */ private final SourceElementToModelTransformer toModelTransformer - = new SourceElementToModelTransformer(Database.class); + = new SourceElementToModelTransformer(Database.class); /** * Standard constructor. @@ -86,14 +86,15 @@ public class IncludeSchemaTransformer im * * @throws SourceTransformerException if the transformation fails. */ + @Override public SourceElement transform( final Object modelRoot, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { final SourceElement root = (SourceElement) modelRoot; final List<SourceElement> includeSchemaList - = root.getChildren(TorqueSchemaElementName.INCLUDE_SCHEMA); + = root.getChildren(TorqueSchemaElementName.INCLUDE_SCHEMA); final List<SourceElement> childrenList = root.getChildren(); for (final SourceElement includeSchemaElement : includeSchemaList) @@ -110,9 +111,9 @@ public class IncludeSchemaTransformer im } final String relativePath = includeSchemaElement.getAttribute( TorqueSchemaAttributeName.FILENAME) - .toString(); + .toString(); final File includeSchemaPath - = new File(includeSchemaBaseDir, relativePath); + = new File(includeSchemaBaseDir, relativePath); log.trace("Trying to read included file " + includeSchemaPath); try { @@ -121,7 +122,7 @@ public class IncludeSchemaTransformer im includeSchemaPath, controllerState); final SourceElement includeSchemaRootElement - = fileSource.getRootElement(); + = fileSource.getRootElement(); log.trace("successfully read included file " + includeSchemaPath); @@ -130,8 +131,8 @@ public class IncludeSchemaTransformer im // disattach children from their current parent // so that the new parent is the primary parent final List<SourceElement> toIncludeList - = new ArrayList<SourceElement>( - includeSchemaRootElement.getChildren()); + = new ArrayList<>( + includeSchemaRootElement.getChildren()); for (final SourceElement childToInclude : toIncludeList) { childToInclude.getParents().clear(); @@ -146,7 +147,7 @@ public class IncludeSchemaTransformer im { log.error("Could not construct source from schema file " + includeSchemaPath, - e); + e); throw new SourceTransformerException(e); } } @@ -164,12 +165,12 @@ public class IncludeSchemaTransformer im public Database transform( final Database database, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { // copy original list to iterate so we can modify the model list // during iteration final List<IncludeSchema> originalIncludeSchemaList - = new ArrayList<IncludeSchema>(database.includeSchemaList); + = new ArrayList<>(database.includeSchemaList); for (final IncludeSchema includeSchema : originalIncludeSchemaList) { File includeSchemaBaseDir; @@ -183,7 +184,7 @@ public class IncludeSchemaTransformer im includeSchemaBaseDir = baseDir; } final File includeSchemaPath - = new File(includeSchemaBaseDir, includeSchema.filename); + = new File(includeSchemaBaseDir, includeSchema.filename); log.trace("Trying to read included file " + includeSchemaPath); try { @@ -192,11 +193,11 @@ public class IncludeSchemaTransformer im includeSchemaPath, controllerState); final SourceElement includeSchemaRootElement - = fileSource.getRootElement(); + = fileSource.getRootElement(); log.trace("successfully read included file " + includeSchemaPath); final Database includedDatabase - = (Database) toModelTransformer.transform( + = (Database) toModelTransformer.transform( includeSchemaRootElement, controllerState); @@ -219,7 +220,7 @@ public class IncludeSchemaTransformer im { log.error("Could not construct source from schema file " + includeSchemaPath, - e); + e); throw new SourceTransformerException(e); } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java Mon Aug 27 09:48:33 2018 @@ -50,7 +50,7 @@ public class LoadExternalSchemaTransform { /** The class log. */ private static Log log - = LogFactory.getLog(LoadExternalSchemaTransformer.class); + = LogFactory.getLog(LoadExternalSchemaTransformer.class); /** * The base dir for the external schema, @@ -62,7 +62,7 @@ public class LoadExternalSchemaTransform * The transformer creating the typed model from the source graph. */ private final SourceElementToModelTransformer toModelTransformer - = new SourceElementToModelTransformer(Database.class); + = new SourceElementToModelTransformer(Database.class); /** * Standard constructor. @@ -94,14 +94,15 @@ public class LoadExternalSchemaTransform * * @throws SourceTransformerException if the transformation fails. */ + @Override public SourceElement transform( final Object modelRoot, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { final SourceElement root = (SourceElement) modelRoot; final List<SourceElement> externalSchemaElementList - = root.getChildren(TorqueSchemaElementName.EXTERNAL_SCHEMA); + = root.getChildren(TorqueSchemaElementName.EXTERNAL_SCHEMA); SourceElement allTables = root.getChild( DatabaseChildElementName.ALL_TABLES); if (allTables == null) @@ -133,9 +134,9 @@ public class LoadExternalSchemaTransform } final String relativePath = externalSchemaElement.getAttribute( TorqueSchemaAttributeName.FILENAME) - .toString(); + .toString(); final File externalSchemaPath - = new File(externalSchemaBaseDir, relativePath); + = new File(externalSchemaBaseDir, relativePath); try { final FileSource fileSource = new FileSource( @@ -143,7 +144,7 @@ public class LoadExternalSchemaTransform externalSchemaPath, controllerState); final SourceElement externalSchemaRootElement - = fileSource.getRootElement(); + = fileSource.getRootElement(); externalSchemaRootElement.setAttribute( DatabaseAttributeName.ROOT_DATABASE_NAME, rootDatabaseName); @@ -158,20 +159,20 @@ public class LoadExternalSchemaTransform externalSchemaRootElement); final SourceElement externalAllTables - = externalSchemaRootElement.getChild( - DatabaseChildElementName.ALL_TABLES); + = externalSchemaRootElement.getChild( + DatabaseChildElementName.ALL_TABLES); // fill root's all-tables with all external tables for (final SourceElement externalTable : externalAllTables.getChildren( - TorqueSchemaElementName.TABLE)) + TorqueSchemaElementName.TABLE)) { allTables.getChildren().add(externalTable); } // fill root's all-views with all external views for (final SourceElement externalView : externalAllTables.getChildren( - TorqueSchemaElementName.VIEW)) + TorqueSchemaElementName.VIEW)) { allViews.getChildren().add(externalView); } @@ -180,7 +181,7 @@ public class LoadExternalSchemaTransform { log.error("Could not construct source from schema file " + externalSchemaPath, - e); + e); throw new SourceTransformerException(e); } } @@ -215,7 +216,7 @@ public class LoadExternalSchemaTransform public Database transform( final Database database, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { for (final ExternalSchema externalSchema : database.externalSchemaList) { @@ -230,7 +231,7 @@ public class LoadExternalSchemaTransform externalSchemaBaseDir = baseDir; } final File externalSchemaPath - = new File(externalSchemaBaseDir, externalSchema.filename); + = new File(externalSchemaBaseDir, externalSchema.filename); try { final FileSource fileSource = new FileSource( @@ -238,9 +239,9 @@ public class LoadExternalSchemaTransform externalSchemaPath, controllerState); final SourceElement externalSchemaRootElement - = fileSource.getRootElement(); + = fileSource.getRootElement(); final Database externalDatabase - = (Database) toModelTransformer.transform( + = (Database) toModelTransformer.transform( externalSchemaRootElement, controllerState); externalDatabase.rootDatabaseName = database.rootDatabaseName; @@ -262,7 +263,7 @@ public class LoadExternalSchemaTransform { log.error("Could not construct source from schema file " + externalSchemaPath, - e); + e); throw new SourceTransformerException(e); } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java Mon Aug 27 09:48:33 2018 @@ -64,11 +64,11 @@ public final class SchemaTypeHelper public static SchemaType getSchemaType( final SourceElement columnElement, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { final String columnNameFromSchema - = (String) columnElement.getAttribute( - TorqueSchemaAttributeName.NAME); + = (String) columnElement.getAttribute( + TorqueSchemaAttributeName.NAME); if (columnNameFromSchema == null) { throw new SourceTransformerException("The attribute " @@ -133,7 +133,7 @@ public final class SchemaTypeHelper public static SchemaType getSchemaType( final Column column, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { if (column.name == null) { @@ -237,13 +237,13 @@ public final class SchemaTypeHelper } public static SqlType getDomain( - final SourceElement columnElement, - final ControllerState controllerState) - throws SourceTransformerException + final SourceElement columnElement, + final ControllerState controllerState) + throws SourceTransformerException { final String domainNameFromSchema - = (String) columnElement.getAttribute( - TorqueSchemaAttributeName.DOMAIN); + = (String) columnElement.getAttribute( + TorqueSchemaAttributeName.DOMAIN); if (domainNameFromSchema == null) { // no domain specified @@ -252,10 +252,10 @@ public final class SchemaTypeHelper SourceElement domainElement = null; { final SourceElement databaseElement - = columnElement.getParent().getParent(); + = columnElement.getParent().getParent(); final List<SourceElement> domainElementList - = databaseElement.getChildren( - TorqueSchemaElementName.DOMAIN); + = databaseElement.getChildren( + TorqueSchemaElementName.DOMAIN); for (final SourceElement candidate : domainElementList) { if (domainNameFromSchema.equals(candidate.getAttribute( @@ -295,7 +295,7 @@ public final class SchemaTypeHelper public static SqlType getDomain( final Column column, final ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { if (column.domain == null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java Mon Aug 27 09:48:33 2018 @@ -71,6 +71,7 @@ public enum Jdbc2SchemaOptionName implem * * @return the fully qualified name of the option, not null. */ + @Override public String getName() { return name; @@ -100,19 +101,19 @@ public enum Jdbc2SchemaOptionName implem * @throws SourceTransformerException if a required option is not set. */ public static void checkRequiredOptions(ControllerState controllerState) - throws SourceTransformerException + throws SourceTransformerException { for (Jdbc2SchemaOptionName templateOption : values()) { if (templateOption.isRequired()) { Object optionValue - = controllerState.getOption(templateOption.getName()); + = controllerState.getOption(templateOption.getName()); if (optionValue == null) { throw new SourceTransformerException( "Option " + templateOption.getName() - + " must be set"); + + " must be set"); } } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaTransformer.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaTransformer.java Mon Aug 27 09:48:33 2018 @@ -50,10 +50,11 @@ public class Jdbc2SchemaTransformer impl * * @throws SourceTransformerException if the transformation fails. */ + @Override public SourceElement transform( - Object modelRoot, - ControllerState controllerState) - throws SourceTransformerException + Object modelRoot, + ControllerState controllerState) + throws SourceTransformerException { SourceElement root = (SourceElement) modelRoot; if (root.getAttribute(TorqueSchemaAttributeName.NAME) == null) Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java Mon Aug 27 09:48:33 2018 @@ -87,6 +87,7 @@ public enum ColumnAttributeName implemen * * @return the name of the referenced source element attribute. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java Mon Aug 27 09:48:33 2018 @@ -58,6 +58,7 @@ public enum ColumnChildElementName imple * * @return the name of the referenced source element. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java Mon Aug 27 09:48:33 2018 @@ -55,6 +55,7 @@ public enum DatabaseAttributeName implem * * @return the name of the referenced source element attribute. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java Mon Aug 27 09:48:33 2018 @@ -58,6 +58,7 @@ public enum DatabaseChildElementName imp * * @return the name of the referenced source element. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java Mon Aug 27 09:48:33 2018 @@ -48,6 +48,7 @@ public enum EnumValueAttributeName imple * * @return the name of the referenced source element attribute. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java Mon Aug 27 09:48:33 2018 @@ -65,7 +65,7 @@ final class FieldHelper String getterName; if (controllerState.getBooleanOption( TemplateOptionName.OM_USE_IS_FOR_BOOLEAN_GETTERS) - && JavaType.BOOLEAN_PRIMITIVE.getClassName().equals(fieldType)) + && JavaType.BOOLEAN_PRIMITIVE.getClassName().equals(fieldType)) { getterName = IS + StringUtils.capitalize(fieldName); } @@ -118,11 +118,11 @@ final class FieldHelper final ControllerState controllerState) { String adderName - = controllerState.getOption( - TemplateOptionName.OM_ADDER_PREFIX) - + StringUtils.capitalize(fieldName) - + controllerState.getOption( - TemplateOptionName.OM_ADDER_SUFFIX); + = controllerState.getOption( + TemplateOptionName.OM_ADDER_PREFIX) + + StringUtils.capitalize(fieldName) + + controllerState.getOption( + TemplateOptionName.OM_ADDER_SUFFIX); return adderName; } @@ -139,11 +139,11 @@ final class FieldHelper final ControllerState controllerState) { String adderName - = controllerState.getOption( - TemplateOptionName.OM_RESETTER_PREFIX) - + StringUtils.capitalize(fieldName) - + controllerState.getOption( - TemplateOptionName.OM_RESETTER_SUFFIX); + = controllerState.getOption( + TemplateOptionName.OM_RESETTER_PREFIX) + + StringUtils.capitalize(fieldName) + + controllerState.getOption( + TemplateOptionName.OM_RESETTER_SUFFIX); return adderName; } @@ -160,11 +160,11 @@ final class FieldHelper final ControllerState controllerState) { String initializerName - = controllerState.getOption( - TemplateOptionName.OM_INITIALIZER_PREFIX) - + StringUtils.capitalize(fieldName) - + controllerState.getOption( - TemplateOptionName.OM_INITIALIZER_SUFFIX); + = controllerState.getOption( + TemplateOptionName.OM_INITIALIZER_PREFIX) + + StringUtils.capitalize(fieldName) + + controllerState.getOption( + TemplateOptionName.OM_INITIALIZER_SUFFIX); return initializerName; } @@ -181,11 +181,11 @@ final class FieldHelper final ControllerState controllerState) { String initializerName - = controllerState.getOption( - TemplateOptionName.OM_IS_INITIALIZED_PREFIX) - + StringUtils.capitalize(fieldName) - + controllerState.getOption( - TemplateOptionName.OM_IS_INITIALIZED_SUFFIX); + = controllerState.getOption( + TemplateOptionName.OM_IS_INITIALIZED_PREFIX) + + StringUtils.capitalize(fieldName) + + controllerState.getOption( + TemplateOptionName.OM_IS_INITIALIZED_SUFFIX); return initializerName; } @@ -205,12 +205,12 @@ final class FieldHelper final ControllerState controllerState) { String fillerName - = controllerState.getOption( - TemplateOptionName.OM_FILLER_PREFIX) - + distinctionPart - + StringUtils.capitalize(fieldName) - + controllerState.getOption( - TemplateOptionName.OM_FILLER_SUFFIX); + = controllerState.getOption( + TemplateOptionName.OM_FILLER_PREFIX) + + distinctionPart + + StringUtils.capitalize(fieldName) + + controllerState.getOption( + TemplateOptionName.OM_FILLER_SUFFIX); return fillerName; } @@ -230,12 +230,12 @@ final class FieldHelper final ControllerState controllerState) { String fillerName - = controllerState.getOption( - TemplateOptionName.OM_SET_AND_SAVE_PREFIX) - + distinctionPart - + StringUtils.capitalize(fieldName) - + controllerState.getOption( - TemplateOptionName.OM_SET_AND_SAVE_SUFFIX); + = controllerState.getOption( + TemplateOptionName.OM_SET_AND_SAVE_PREFIX) + + distinctionPart + + StringUtils.capitalize(fieldName) + + controllerState.getOption( + TemplateOptionName.OM_SET_AND_SAVE_SUFFIX); return fillerName; } } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java Mon Aug 27 09:48:33 2018 @@ -79,7 +79,7 @@ final class FindHelper TorqueSchemaElementName.EXTERNAL_SCHEMA)) { SourceElement databaseElement - = externalSchema.getChild(TorqueSchemaElementName.DATABASE); + = externalSchema.getChild(TorqueSchemaElementName.DATABASE); SourceElement result = findTable( databaseElement, tableName, @@ -136,7 +136,7 @@ final class FindHelper SourceElement table, String tableName) { - List<SourceElement> result = new ArrayList<SourceElement>(); + List<SourceElement> result = new ArrayList<>(); if (!TorqueSchemaElementName.TABLE.getName().equals( table.getName())) { @@ -147,7 +147,7 @@ final class FindHelper TorqueSchemaElementName.FOREIGN_KEY)) { if (foreignKey.getAttribute( - TorqueSchemaAttributeName.FOREIGN_TABLE) + TorqueSchemaAttributeName.FOREIGN_TABLE) .equals(tableName)) { result.add(foreignKey); Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java Mon Aug 27 09:48:33 2018 @@ -58,6 +58,7 @@ public enum ForeignKeyAttributeName impl * * @return the name of the referenced source element. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java Mon Aug 27 09:48:33 2018 @@ -79,6 +79,7 @@ public enum ForeignKeyChildAttributeName * * @return the name of the referenced source element. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java Mon Aug 27 09:48:33 2018 @@ -70,6 +70,7 @@ public enum ForeignKeyChildElementName i * * @return the name of the referenced source element. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java Mon Aug 27 09:48:33 2018 @@ -75,6 +75,7 @@ public enum InheritanceAttributeName imp * * @return the name of the referenced source element attribute. */ + @Override public String getName() { return name; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java Mon Aug 27 09:48:33 2018 @@ -161,6 +161,7 @@ public enum JavaFieldAttributeName imple * * @return the name of the referenced source element attribute. */ + @Override public String getName() { return name; --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org