Author: tv
Date: Sun Apr 21 13:22:54 2024
New Revision: 1917240
URL: http://svn.apache.org/viewvc?rev=1917240&view=rev
Log:
Eclipse cleanup
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaInheritance.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaJavaType.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/JavaType.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
db/torque/trunk/torque-templates/src/test/java/a/b/SomeEnum.java
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
Sun Apr 21 13:22:54 2024
@@ -258,14 +258,14 @@ public enum TemplateOptionName implement
/**
* The fully qualified name of the option.
*/
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the fully qualified name of the option, not null.
*/
- private TemplateOptionName(final String name)
+ TemplateOptionName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -98,14 +98,14 @@ public enum TorqueSchemaAttributeName im
PACKAGE("package");
/** The name of the attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the attribute, not null.
*/
- private TorqueSchemaAttributeName(final String name)
+ TorqueSchemaAttributeName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java
Sun Apr 21 13:22:54 2024
@@ -64,14 +64,14 @@ public enum TorqueSchemaElementName impl
/**
* The name of the element, not null.
*/
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the element, not null.
*/
- private TorqueSchemaElementName(final String name)
+ TorqueSchemaElementName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaIdMethod.java
Sun Apr 21 13:22:54 2024
@@ -41,14 +41,14 @@ public enum TorqueSchemaIdMethod
/**
* The name of the idMethod, not null.
*/
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the idMethod, not null.
*/
- private TorqueSchemaIdMethod(String name)
+ TorqueSchemaIdMethod(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaInheritance.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaInheritance.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaInheritance.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaInheritance.java
Sun Apr 21 13:22:54 2024
@@ -37,14 +37,14 @@ public enum TorqueSchemaInheritance
/**
* The value of the inheritance attribute, not null.
*/
- private String value;
+ private final String value;
/**
* Constructor.
*
* @param value the value of the inheritance attribute, not null.
*/
- private TorqueSchemaInheritance(String value)
+ TorqueSchemaInheritance(String value)
{
this.value = value;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaJavaType.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaJavaType.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaJavaType.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaJavaType.java
Sun Apr 21 13:22:54 2024
@@ -37,14 +37,14 @@ public enum TorqueSchemaJavaType
/**
* The value of the javaType attribute, not null.
*/
- private String value;
+ private final String value;
/**
* Constructor.
*
* @param value the value of the javaType attribute, not null.
*/
- private TorqueSchemaJavaType(String value)
+ TorqueSchemaJavaType(String value)
{
this.value = value;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/UniqueColumn.java
Sun Apr 21 13:22:54 2024
@@ -34,11 +34,11 @@ public class UniqueColumn
* unique constraint.
*/
public String name;
-
+
/**
* The optional size of the column to be included in the
* unique constraint.
*/
-
+
public String size;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
Sun Apr 21 13:22:54 2024
@@ -26,7 +26,7 @@ import org.apache.torque.templates.typem
/**
* Interface for RDBMS platform specific behaviour.
- *
+ *
* Which platform actually is used, is determined here: {@link
PlatformFactory#getPlatformFor(String)}.
*
* @author <a href="mailto:[email protected]";>Martin Poeschl</a>
@@ -140,7 +140,7 @@ public interface Platform
* @return true if separate schema creation is possible, false if not.
*/
boolean usesStandaloneSchema();
-
+
/**
* Returns whether the database has schema support unique constraint
* for columns with size
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java
Sun Apr 21 13:22:54 2024
@@ -95,12 +95,12 @@ public class PlatformDefaultImpl impleme
}
schemaTypeToSqlTypeMap.put(schemaType, sqlType);
}
-
+
/**
* Helper function to format date values to a platform-specific string.
- *
+ *
* set {@link ZoneId} to GMT timezone.
- *
+ *
* @param date the Date object
* @param format the format string
* @return the formatted string
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java
Sun Apr 21 13:22:54 2024
@@ -98,8 +98,8 @@ public class PlatformHsqldbImpl extends
{
return formatDateTimeString(date, DATE_FORMAT);
}
-
-
+
+
/**
* {@inheritDoc}
@@ -122,11 +122,11 @@ public class PlatformHsqldbImpl extends
{
return true;
}
-
+
/**
- * Caveat, read HSQLDB e.g.
- * Do not use BINARY(L) unless you are storing keys such as UUID.
- * This type pads short binary strings with zero bytes.
+ * Caveat, read HSQLDB e.g.
+ * Do not use BINARY(L) unless you are storing keys such as UUID.
+ * This type pads short binary strings with zero bytes.
* BINARY without the length L means a single byte.
*/
@Override
@@ -134,11 +134,11 @@ public class PlatformHsqldbImpl extends
return Arrays.asList("VARCHAR", "VARBINARY", "BINARY")
.contains(sqlType);
}
-
+
@Override
public boolean hasScale(String sqlType) {
return Arrays.asList("TIMESTAMP", "DATE", "TIME")
.contains(sqlType);
}
-
+
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java
Sun Apr 21 13:22:54 2024
@@ -127,6 +127,6 @@ public class PlatformMssqlImpl extends P
@Override
public boolean hasSize(String sqlType)
{
- return !("IMAGE".equals(sqlType) || "TEXT".equals(sqlType));
+ return (!"IMAGE".equals(sqlType) && !"TEXT".equals(sqlType));
}
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMysqlImpl.java
Sun Apr 21 13:22:54 2024
@@ -35,7 +35,7 @@ public class PlatformMysqlImpl extends P
{
/** The date format for formatting database dates. */
private static final String DATE_FORMAT = "''yyyy-MM-dd''";
-
+
/** The date format for formatting database dates. */
private static final String TIMESTAMP_FORMAT = "''yyyy-MM-dd
HH:mm:ss.SSS''";
@@ -97,11 +97,11 @@ public class PlatformMysqlImpl extends P
return !(Arrays.asList("MEDIUMTEXT", "LONGTEXT", "BLOB", "MEDIUMBLOB",
"LONGBLOB")
.contains(sqlType));
}
-
-
+
+
/**
* precison in time formats is more like a scale, which is the number of
digits to the right of the decimal point in a number.
- *
+ *
* @see Platform#hasScale(String)
*/
@Override
@@ -109,7 +109,7 @@ public class PlatformMysqlImpl extends P
{
return Arrays.asList("TIMESTAMP", "DATETIME", "DATE",
"TIME").contains(sqlType);
}
-
+
@Override
protected boolean escapeBackslashes()
@@ -125,7 +125,7 @@ public class PlatformMysqlImpl extends P
{
return formatDateTimeString(date, DATE_FORMAT);
}
-
+
/**
* {@inheritDoc}
*/
@@ -134,7 +134,7 @@ public class PlatformMysqlImpl extends P
{
return formatDateTimeString(date, TIMESTAMP_FORMAT);
}
-
+
/**
* {@inheritDoc}
*/
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java
Sun Apr 21 13:22:54 2024
@@ -175,7 +175,7 @@ public class PlatformOracleImpl extends
@Override
public boolean hasSize(String sqlType)
{
- return !("BLOB".equals(sqlType) || "CLOB".equals(sqlType));
+ return (!"BLOB".equals(sqlType) && !"CLOB".equals(sqlType));
}
/**
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformPostgresqlImpl.java
Sun Apr 21 13:22:54 2024
@@ -145,5 +145,5 @@ public class PlatformPostgresqlImpl exte
{
return true;
}
-
+
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java
Sun Apr 21 13:22:54 2024
@@ -37,19 +37,19 @@ public enum Jdbc2SchemaOptionName implem
/**
* The fully qualified name of the option.
*/
- private String name;
+ private final String name;
/**
* Whether this option must be set or not.
*/
- private boolean required;
+ private final boolean required;
/**
* Constructor for an option which is not required..
*
* @param name the fully qualified name of the option, not null.
*/
- private Jdbc2SchemaOptionName(String name)
+ Jdbc2SchemaOptionName(String name)
{
this(name, false);
}
@@ -60,7 +60,7 @@ public enum Jdbc2SchemaOptionName implem
* @param name the fully qualified name of the option, not null.
* @param required whether the option is required.
*/
- private Jdbc2SchemaOptionName(String name, boolean required)
+ Jdbc2SchemaOptionName(String name, boolean required)
{
this.name = name;
this.required = required;
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -70,14 +70,14 @@ public enum ColumnAttributeName implemen
IS_ENUM("isEnum");
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private ColumnAttributeName(final String name)
+ ColumnAttributeName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java
Sun Apr 21 13:22:54 2024
@@ -41,14 +41,14 @@ public enum ColumnChildElementName imple
REFERENCING_COLUMN("referencing-column");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private ColumnChildElementName(String name)
+ ColumnChildElementName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -38,14 +38,14 @@ public enum DatabaseAttributeName implem
BASE_DATABASE_MAP_INIT_CLASS_NAME("baseDatabaseMapInitClassName");
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private DatabaseAttributeName(String name)
+ DatabaseAttributeName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java
Sun Apr 21 13:22:54 2024
@@ -41,14 +41,14 @@ public enum DatabaseChildElementName imp
ALL_VIEWS("all-views");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private DatabaseChildElementName(String name)
+ DatabaseChildElementName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -31,14 +31,14 @@ public enum EnumValueAttributeName imple
JAVA_VALUE("javaValue");
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private EnumValueAttributeName(final String name)
+ EnumValueAttributeName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -41,14 +41,14 @@ public enum ForeignKeyAttributeName impl
REFERENCES_PRIMARY_KEY("referencesPrimaryKey");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private ForeignKeyAttributeName(String name)
+ ForeignKeyAttributeName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -62,14 +62,14 @@ public enum ForeignKeyChildAttributeName
BEAN_SETTER("beanSetter");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private ForeignKeyChildAttributeName(String name)
+ ForeignKeyChildAttributeName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java
Sun Apr 21 13:22:54 2024
@@ -53,14 +53,14 @@ public enum ForeignKeyChildElementName i
FOREIGN_FIELD_IN_BEAN("foreign-field-in-bean");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private ForeignKeyChildElementName(String name)
+ ForeignKeyChildElementName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -25,7 +25,7 @@ import org.apache.torque.templates.Torqu
/**
* Contains the attributes for a inheritance source element which are not
* defined in the Torque schema. Find them in {@link
TorqueSchemaAttributeName}.
- *
+ *
*/
public enum InheritanceAttributeName implements SourceAttributeName
{
@@ -62,14 +62,14 @@ public enum InheritanceAttributeName imp
BEAN_CLASS_NAME("beanClassName");
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private InheritanceAttributeName(String name)
+ InheritanceAttributeName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -144,14 +144,14 @@ public enum JavaFieldAttributeName imple
DESCRIPTION("description");
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private JavaFieldAttributeName(final String name)
+ JavaFieldAttributeName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java
Sun Apr 21 13:22:54 2024
@@ -48,7 +48,7 @@ import org.apache.torque.templates.typem
public class OMColumnJavaTransformer
{
private static Logger log =
LogManager.getLogger(OMColumnJavaTransformer.class);
-
+
/** The camelbacker to create the java name from the column name. */
private static Camelbacker javaNameCamelbacker = new Camelbacker();
@@ -412,7 +412,7 @@ public class OMColumnJavaTransformer
}
return fieldDefaultValue;
}
-
+
/**
* Returns the java type of the field representing a database column.
*
@@ -455,10 +455,10 @@ public class OMColumnJavaTransformer
// enumclassName is correct for Java class generation, but not for
column type mapping in peers -> JavaType.ENUM
columnElement.setAttribute(JavaFieldAttributeName.FIELD_TYPE,
enumClassName);
//columnElement.setAttribute(JavaFieldAttributeName.FIELD_TYPE,
JavaType.ENUM.getClassName());
-
- // this seems to be more correct
+
+ // this seems to be more correct
columnElement.setAttribute(TorqueSchemaAttributeName.JAVA_NAME,
enumClassName);
-
+
columnElement.setAttribute(ColumnAttributeName.ENUM_VALUE_CLASS_NAME,
result.getFullClassName());
}
else
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java
Sun Apr 21 13:22:54 2024
@@ -35,7 +35,7 @@ public class OMInheritanceTransformer
{
/** The logger. */
private static Logger logger =
LogManager.getLogger(OMInheritanceTransformer.class);
-
+
public void transform(
SourceElement inheritanceElement,
ControllerState controllerState)
@@ -72,10 +72,10 @@ public class OMInheritanceTransformer
}
inheritanceElement.setAttribute(
InheritanceAttributeName.CLASS_NAME, className);
-
+
String tablePackage = (String) tableElement.getAttribute(
TableAttributeName.DB_OBJECT_PACKAGE);
-
+
String thisElementPackage = (String) inheritanceElement.getAttribute(
TorqueSchemaAttributeName.PACKAGE);
@@ -83,7 +83,7 @@ public class OMInheritanceTransformer
logger.debug( "key: {}: package: {} from package: {}, table package:
{}",
key,
packageName,thisElementPackage, tablePackage );
-
+
inheritanceElement.setAttribute(
TorqueSchemaAttributeName.PACKAGE,
packageName);
@@ -93,25 +93,25 @@ public class OMInheritanceTransformer
String beanExtends = (String) inheritanceElement.getAttribute(
InheritanceAttributeName.BEAN_EXTENDS);
if (extendsAttribute == null)
- {
+ {
extendsAttribute = (String) tableElement.getAttribute(
TableAttributeName.DB_OBJECT_CLASS_NAME);
inheritanceElement.setAttribute(
- TorqueSchemaAttributeName.EXTENDS.getName(),
+ TorqueSchemaAttributeName.EXTENDS.getName(),
extendsAttribute);
-
+
String beanClassName = tableElement.getAttribute(
TableAttributeName.BEAN_CLASS_NAME).toString();
logger.debug( "key: {}: extends from default {} (not set in
element) and beanClassName:{}..",
key, extendsAttribute, beanClassName );
-
+
inheritanceElement.setAttribute(
InheritanceAttributeName.BEAN_EXTENDS,
beanClassName);
}
else if (beanExtends == null)
{
-
+
// we try to guess the extendsBean from extends
// and the bean package if the element has to set its own
package
int lastDot = extendsAttribute.lastIndexOf(".");
@@ -121,10 +121,10 @@ public class OMInheritanceTransformer
String tableBeanPackage = (String) tableElement.getAttribute(
TableAttributeName.BEAN_PACKAGE);
String extendPackage = extendsAttribute.substring(0, lastDot);
-
+
String beanClassNameSuffix = controllerState.getOption(
"torque.om.className.beanClassNameSuffix").toString();
-
+
if (extendPackage.equals( packageName ) && lastDot != -1 )
{
unqualifiedClassname
@@ -134,9 +134,9 @@ public class OMInheritanceTransformer
{
unqualifiedClassname = extendsAttribute;
} else {
-
+
unqualifiedClassname = extendsAttribute.substring(lastDot
+ 1);
-
+
int withBeanPackage = extendPackage.lastIndexOf(
tablePackage );
if (withBeanPackage != -1 && !extendPackage.equals(
tablePackage )) {
extendPackage =
extendPackage.substring(tablePackage.length());
@@ -144,28 +144,28 @@ public class OMInheritanceTransformer
key, extendPackage, tablePackage);
extendPackage = updatePackage( extendPackage,
tableBeanPackage ) ;
} else {
- extendPackage = tableBeanPackage ;
+ extendPackage = tableBeanPackage ;
}
- extendPackage += ".";
-
+ extendPackage += ".";
+
logger.debug( "key: {}: extendPackage: {} from table bean
package: {} ",
- key,
+ key,
extendPackage,
tableBeanPackage);
-
- String qualifiedClassname =
+
+ String qualifiedClassname =
extendPackage + unqualifiedClassname +
beanClassNameSuffix;
-
- logger.info("key: {}: override qualifiedClassname
(ignoring beanClassNamePrefix): {}",
+
+ logger.info("key: {}: override qualifiedClassname
(ignoring beanClassNamePrefix): {}",
key, qualifiedClassname);
beanExtends = qualifiedClassname;
}
-
- if (beanExtends == null)
+
+ if (beanExtends == null)
{
String beanClassNamePrefix = controllerState.getOption(
-
"torque.om.className.beanClassNamePrefix").toString();
-
+
"torque.om.className.beanClassNamePrefix").toString();
+
beanExtends = beanClassNamePrefix
+ unqualifiedClassname
+ beanClassNameSuffix;
@@ -199,20 +199,20 @@ public class OMInheritanceTransformer
beanClassName);
}
-
+
String tableBeanPackage = (String) tableElement.getAttribute(
TableAttributeName.BEAN_PACKAGE);
String beanPackage = updatePackage( thisElementPackage,
tableBeanPackage, ".bean" );
-
- logger.debug( "key: {}: beanPackage {} from {}, {}",
+
+ logger.debug( "key: {}: beanPackage {} from {}, {}",
key,beanPackage, thisElementPackage, tableBeanPackage );
-
+
inheritanceElement.setAttribute(
InheritanceAttributeName.BEAN_PACKAGE,
beanPackage);
}
-
+
private String updatePackage(String thisBeanPackageName, String
rootPackage)
{
return updatePackage(thisBeanPackageName, rootPackage, "");
@@ -221,11 +221,11 @@ public class OMInheritanceTransformer
private String updatePackage(String thisBeanPackageName, String
rootPackage, String suffix)
{
String beanPackage = rootPackage;
-
- if (thisBeanPackageName != null)
- {
+
+ if (thisBeanPackageName != null)
+ {
if (thisBeanPackageName.startsWith( "." ))
- { // relative
+ { // relative
beanPackage += thisBeanPackageName;
} else {
beanPackage = thisBeanPackageName + suffix;
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java
Sun Apr 21 13:22:54 2024
@@ -51,7 +51,7 @@ import org.apache.torque.templates.Torqu
* table
* ...
* </pre>
- *
+ *
* The structure after transformation is
* <pre>
* table
@@ -78,12 +78,12 @@ import org.apache.torque.templates.Torqu
*
* ...
* </pre>
- *
+ *
*/
public class OMJoinGetterTransformer
{
/**
- * @param tableElement the table
+ * @param tableElement the table
* @param controllerState the controller state
* @throws SourceTransformerException if the table cannot be joined
*/
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
Sun Apr 21 13:22:54 2024
@@ -54,14 +54,14 @@ import org.apache.torque.templates.trans
*/
public class OMTableAndViewTransformer extends AttributeTransformer
{
-
+
private static Logger log =
LogManager.getLogger(OMTableAndViewTransformer.class);
/** Constant for the dot. */
private static final String DOT = ".";
/** The transformer for the column child elements. */
private static OMColumnTransformer columnTransformer
- = new OMColumnTransformer();;
+ = new OMColumnTransformer();
/** The transformer for the foreign keys referencing this table. */
private static OMReferencingForeignKeyTableTransformer
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java
Sun Apr 21 13:22:54 2024
@@ -40,14 +40,14 @@ public enum ReferenceChildElementName im
FOREIGN_COLUMN("foreign-column");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private ReferenceChildElementName(String name)
+ ReferenceChildElementName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -118,14 +118,14 @@ public enum TableAttributeName implement
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private TableAttributeName(String name)
+ TableAttributeName(String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java
Sun Apr 21 13:22:54 2024
@@ -59,14 +59,14 @@ public enum TableChildElementName implem
FOREIGN("foreign");
/** The name of the source element, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element, not null.
*/
- private TableChildElementName(final String name)
+ TableChildElementName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
Sun Apr 21 13:22:54 2024
@@ -159,7 +159,7 @@ public class SQLModelTransformer impleme
Platform platform = getPlatform(controllerState);
boolean hasUniqueSize = platform.hasUniqueConstraintSize();
-
+
// unique
int uniqueIndex = 1;
for (final Unique unique : table.uniqueList)
@@ -169,9 +169,9 @@ public class SQLModelTransformer impleme
unique.name = table.name + "_UQ_" + uniqueIndex;
}
final StringBuilder uniqueColumnNames = new StringBuilder();
-
+
final StringBuilder uniqueColumnSizes = new StringBuilder();
-
+
for (final UniqueColumn uniqueColumn : unique.uniqueColumnList)
{
if (uniqueColumnNames.length() != 0)
@@ -179,7 +179,7 @@ public class SQLModelTransformer impleme
uniqueColumnNames.append(", ");
}
uniqueColumnNames.append(uniqueColumn.name);
-
+
if (hasUniqueSize) {
if (uniqueColumnSizes.length() != 0)
{
@@ -187,11 +187,11 @@ public class SQLModelTransformer impleme
}
if (uniqueColumn.size != null) {
uniqueColumnNames.append("(" + uniqueColumn.size +
")");
- }
+ }
}
}
unique.uniqueColumnNames = uniqueColumnNames.toString();
-
+
++uniqueIndex;
}
@@ -291,7 +291,7 @@ public class SQLModelTransformer impleme
sqlTypeName += sqlType.printSize(
platform.getSizeSuffix(sqlTypeName));
}
-
+
if (platform.hasScale(sqlTypeName))
{
sqlTypeName += sqlType.printScale();
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
Sun Apr 21 13:22:54 2024
@@ -337,7 +337,7 @@ public class SQLTransformer implements S
sqlTypeName += sqlType.printSize(
platform.getSizeSuffix(sqlTypeName));
}
-
+
if (platform.hasScale(sqlTypeName))
{
sqlTypeName += sqlType.printScale();
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java
Sun Apr 21 13:22:54 2024
@@ -42,12 +42,12 @@ public enum SqlAttributeName implements
* in a comma-separated String.
*/
UNIQUE_COLUMN_NAMES("uniqueColumnNames"),
-
+
/**
* The attribute contains all unique column sizes
* in a comma-separated String.
*/
-
+
UNIQUE_COLUMN_SIZES("uniqueColumnSizes"),
/**
@@ -96,14 +96,14 @@ public enum SqlAttributeName implements
SQL_VALUE("sqlValue");
/** The name of the source element attribute, not null. */
- private String name;
+ private final String name;
/**
* Constructor.
*
* @param name the name of the source element attribute, not null.
*/
- private SqlAttributeName(final String name)
+ SqlAttributeName(final String name)
{
this.name = name;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/JavaType.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/JavaType.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/JavaType.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/JavaType.java
Sun Apr 21 13:22:54 2024
@@ -70,16 +70,16 @@ public enum JavaType
ENUM("Enum", false, false, null);
/** The class name without package name. */
- private String className;
+ private final String className;
/** Whether the type is a primitive type. */
- private boolean primitive;
+ private final boolean primitive;
/** Whether the type is a number. */
- private boolean number;
+ private final boolean number;
/** The package prefix for object types, if different from java.lang. */
- private String packagePrefix;
+ private final String packagePrefix;
/**
* Constructor.
@@ -89,7 +89,7 @@ public enum JavaType
* @param number Whether the type is a number.
* @param packagePrefix The package prefix for object types, or null.
*/
- private JavaType(
+ JavaType(
final String className,
final boolean primitive,
final boolean number,
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java
Sun Apr 21 13:22:54 2024
@@ -74,14 +74,14 @@ public enum ResultSetGetter
URL("getURL");
/** The method name. */
- private String method;
+ private final String method;
/**
* Constructor.
*
* @param method the method name, not null.
*/
- private ResultSetGetter(String method)
+ ResultSetGetter(String method)
{
this.method = method;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SchemaType.java
Sun Apr 21 13:22:54 2024
@@ -94,9 +94,9 @@ public enum SchemaType
* The corresponding jdbc type,
* may be null if no corresponding type exists.
*/
- private Integer jdbcType;
+ private final Integer jdbcType;
- private SchemaType(Integer jdbcType)
+ SchemaType(Integer jdbcType)
{
this.jdbcType = jdbcType;
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
Sun Apr 21 13:22:54 2024
@@ -107,7 +107,7 @@ public class SizedForBitDataSqlType exte
/* (non-Javadoc)
* @see
org.apache.torque.templates.typemapping.SqlType#getNew(java.lang.String,
java.lang.String, java.lang.String)
- *
+ *
* Returns a new instance with the given sqlTypeName, size, scale
* and default value.
*
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
Sun Apr 21 13:22:54 2024
@@ -202,7 +202,7 @@ public class SqlType
/**
* Return the size and scale in brackets for use in an SQL script.
- *
+ *
* @return size and scale, size or an empty String if there are no values
* available.
*/
@@ -221,7 +221,7 @@ public class SqlType
return "";
}
}
-
+
/**
* Return the scale in brackets for use in an SQL script.
*
Modified: db/torque/trunk/torque-templates/src/test/java/a/b/SomeEnum.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/java/a/b/SomeEnum.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/test/java/a/b/SomeEnum.java (original)
+++ db/torque/trunk/torque-templates/src/test/java/a/b/SomeEnum.java Sun Apr 21
13:22:54 2024
@@ -24,33 +24,33 @@ package a.b;
*
*/
public enum SomeEnum {
-
+
/** Represents the database value x. */
A("a"),
/** Represents the database value y. */
B("b"),
/** Represents the database value z. */
C("c");
-
+
/** The database value represented by the enum value. */
- private String value;
-
+ private final String value;
+
/**
* Constructor.
*
* @param value The database value represented by the enum value.
*/
- private SomeEnum(String value)
+ SomeEnum(String value)
{
this.value = value;
}
-
+
public String getValue()
{
return value;
}
-
+
public static SomeEnum getByValue(String arg)
{
if (arg == null)
Modified:
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
(original)
+++
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
Sun Apr 21 13:22:54 2024
@@ -96,7 +96,7 @@ public class TestProcessing
final Map<String, String> overrideOptions = new HashMap<>();
overrideOptions.put(TemplateOptionName.OM_PACKAGE.getName(),
"org.apache.torque.test");
overrideOptions.put(TemplateOptionName.OM_GENERATE_MAP_INIT.getName(),
"true");
-
+
overrideOptions.put(TemplateOptionName.OM_GENERATE_BEANS.getName(),
"true");
//overrideOptions.put(TemplateOptionName.OM_USE_MANAGERS.getName(),
"true");
@@ -127,10 +127,10 @@ public class TestProcessing
unitDescriptor.setOverrideOptions(
new MapOptionsConfiguration(overrideOptions));
unitDescriptors.add(unitDescriptor);
-
+
// Options options = controllerState.getUnitConfiguration().getOptions();
// log.trace( "uc.options:"+ options );
-//
+//
// Option omGenerateBeans = new OptionImpl(
// new
QualifiedName(TemplateOptionName.OM_GENERATE_BEANS.getName()),
// true);
@@ -188,7 +188,7 @@ public class TestProcessing
"target/generated-sql/extext-schema-create.sql");
assertFalse(generationFolder2.exists());
}
-
+
@Test
public void testIdtableTemplates() throws Exception
@@ -309,7 +309,7 @@ public class TestProcessing
{
File generationFolder = new File("target/generated-xdocs");
File generationFolder2 = new File("target/generated-xdocs-2");
-
+
deleteDirectory(generationFolder);
deleteDirectory(generationFolder2);
@@ -345,13 +345,13 @@ public class TestProcessing
}
@ParameterizedTest // "mysql", "oracle", "postgresql", "hsqldb", "derby",
- //@ValueSource(strings = { "mysql" } )
+ //@ValueSource(strings = { "mysql" } )
@ValueSource(strings = { "mysql", "oracle", "postgresql", "hsqldb",
"derby", "mssql" } )
public void testSqlDdlTemplates(String dbType) throws Exception
{
File generationFolder = new File("target/generated-sql");
File generationFolder2 = new File("target/generated-sql-2");
-
+
deleteFilesInDirectory(generationFolder);
deleteFilesInDirectory(generationFolder2);
@@ -411,7 +411,7 @@ public class TestProcessing
// auto close file input stream
boolean isEqual = false; // delay assert
try (Reader actualReader = new InputStreamReader(new
FileInputStream(actualFilename), charset) ) {
- isEqual =
+ isEqual =
IOUtils.contentEqualsIgnoreEOL(new
InputStreamReader(IOUtils.toInputStream(expected, charset)),
actualReader) ;
}
@@ -426,10 +426,10 @@ public class TestProcessing
assertTrue(expected.contains(line), actualFilename +
"(line: "+ lineNr + "):\r\n'" + line + "'\r\nis not in expected file: "+
expectedFilename + " after:\r\n" + expected.substring(lastLineIndex));
lastLineIndex = expected.indexOf(line);// is found
}
- }
+ }
}
}
-
+
private void deleteDirectory(final File generatedDir) throws IOException {
try {
FileUtils.deleteDirectory(generatedDir);
@@ -441,12 +441,12 @@ public class TestProcessing
Files.delete(file);
} catch (IOException e1) {
throw new RuntimeException(e1);
- }
+ }
});
//Files.delete();
}
}
-
+
private void deleteFilesInDirectory(final File generatedDir) throws
IOException {
if (!generatedDir.exists()) {
return;
@@ -458,7 +458,7 @@ public class TestProcessing
Files.delete(file);
} catch (IOException e1) {
throw new RuntimeException(e1);
- }
+ }
});
}
}
Modified:
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java?rev=1917240&r1=1917239&r2=1917240&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
(original)
+++
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
Sun Apr 21 13:22:54 2024
@@ -79,7 +79,7 @@ public class Jdbc2SchemaTest /* implemen
}
@BeforeEach
- public void setUp()
+ public void setUp()
{
try {
BasicConfigurator.configure();
@@ -160,27 +160,25 @@ public class Jdbc2SchemaTest /* implemen
File referenceFile = new File(
"src/test/resources/org/apache/torque/templates/jdbc2schema/expected-schema.xml");
String reference = FileUtils.readFileToString(referenceFile,
StandardCharsets.UTF_8);
-
+
Diff myDiffSimilar =
DiffBuilder.compare(reference).ignoreComments().withTest(result)
.withNodeMatcher(new
DefaultNodeMatcher(ElementSelectors.byName))
.checkForSimilar()
.build();
assertFalse(myDiffSimilar.hasDifferences(), "XML similar " +
myDiffSimilar.toString());
-
+
Diff myDiffIdentical =
DiffBuilder.compare(reference).ignoreComments().withTest(result)
.withNodeMatcher(new
DefaultNodeMatcher(ElementSelectors.byName))
.checkForIdentical()
.build();
assertFalse(myDiffIdentical.hasDifferences(), "XML identical " +
myDiffIdentical.toString());
-
+
//XMLAssert.assertXMLEqual(reference, result);
- } catch (GeneratorException e) {
+ } catch (GeneratorException | IOException e) {
fail();
- } catch (IOException e) {
- fail();
- }
-
+ }
+
}
// @Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
