You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2018/09/09 15:10:24 UTC
svn commit: r1840416 [1/3] - in /db/torque/torque4/trunk:
torque-ant-tasks/src/main/java/org/apache/torque/ant/task/
torque-generator/src/main/java/org/apache/torque/generator/configuration/
torque-generator/src/main/java/org/apache/torque/generator/co...
Author: tv
Date: Sun Sep 9 15:10:22 2018
New Revision: 1840416
URL: http://svn.apache.org/viewvc?rev=1840416&view=rev
Log:
Fix indentation
Modified:
db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandler.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandlerFactory.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandler.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProcessConfiguration.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/OutletResultTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/JavadocOutletTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/UnixLinefeedProcessorTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/FileSourceProviderTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
db/torque/torque4/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/Query.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/AbstractWhereClausePsPartBuilder.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CurrentDateTimePsPartBuilder.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/DatabaseMapInitTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/GenerateOmClassesFromJavaTest.java
db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
Modified: db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java Sun Sep 9 15:10:22 2018
@@ -222,17 +222,17 @@ public class TorqueGeneratorTask extends
if (UnitDescriptor.Packaging.JAR == packaging)
{
defaultProjectPaths
- = new Maven2JarProjectPaths(projectRootDir, jarFile);
+ = new Maven2JarProjectPaths(projectRootDir, jarFile);
}
else if (UnitDescriptor.Packaging.DIRECTORY == packaging)
{
defaultProjectPaths
- = new Maven2DirectoryProjectPaths(projectRootDir);
+ = new Maven2DirectoryProjectPaths(projectRootDir);
}
else if (UnitDescriptor.Packaging.CLASSPATH == packaging)
{
defaultProjectPaths
- = new Maven2DirectoryProjectPaths(projectRootDir);
+ = new Maven2DirectoryProjectPaths(projectRootDir);
}
else
{
@@ -240,7 +240,7 @@ public class TorqueGeneratorTask extends
}
CustomProjectPaths projectPaths
- = new CustomProjectPaths(defaultProjectPaths);
+ = new CustomProjectPaths(defaultProjectPaths);
if (UnitDescriptor.Packaging.CLASSPATH == packaging)
{
@@ -273,7 +273,7 @@ public class TorqueGeneratorTask extends
if (sourceIncludes != null || sourceExcludes != null)
{
Fileset sourceFileset
- = new Fileset(
+ = new Fileset(
projectPaths.getDefaultSourcePath(),
sourceIncludes,
sourceExcludes);
@@ -346,7 +346,7 @@ public class TorqueGeneratorTask extends
if (overrideConfigDir != null)
{
CustomProjectPaths childProjectPaths
- = new CustomProjectPaths(projectPaths);
+ = new CustomProjectPaths(projectPaths);
childProjectPaths.setConfigurationDir(overrideConfigDir);
UnitDescriptor parentUnitDescriptor = new UnitDescriptor(
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java Sun Sep 9 15:10:22 2018
@@ -37,7 +37,7 @@ public class Configuration
* All known units of generation.
*/
private List<UnitDescriptor> unitDescriptors
- = new ArrayList<>();
+ = new ArrayList<>();
/**
* The configurations for all known units of generation.
@@ -48,7 +48,7 @@ public class Configuration
* The available configuration handlers.
*/
private ConfigurationHandlers configurationHandlers
- = new ConfigurationHandlers();
+ = new ConfigurationHandlers();
/**
* Whether the configuration has already been read.
@@ -125,7 +125,7 @@ public class Configuration
oldLoglevel.apply();
}
UnitConfigurationReader configurationReader
- = new UnitConfigurationReader();
+ = new UnitConfigurationReader();
UnitConfiguration unitConfiguration
= configurationReader.read(
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java Sun Sep 9 15:10:22 2018
@@ -53,31 +53,31 @@ public class ConfigurationHandlers
* The known types of outputs.
*/
private Map<String, OutputType> outputTypes
- = new HashMap<>();
+ = new HashMap<>();
/**
* The known (file) formats of stream sources (e.g. XML, properties).
*/
private Set<StreamSourceFormat> streamSourceFormats
- = new HashSet<>();
+ = new HashSet<>();
/**
* The known mergepoint action configuration handlers.
*/
private ActionSaxHandlerFactories actionSaxHandlerFactories
- = new ActionSaxHandlerFactories();
+ = new ActionSaxHandlerFactories();
/**
* The known option configuration handlers.
*/
private OptionsSaxHandlerFactories optionsSaxHandlerFactories
- = new OptionsSaxHandlerFactories();
+ = new OptionsSaxHandlerFactories();
/**
* The known source configuration handlers.
*/
private SourceSaxHandlerFactories sourceSaxHandlerFactories
- = new SourceSaxHandlerFactories();
+ = new SourceSaxHandlerFactories();
/**
* Standard constructor.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java Sun Sep 9 15:10:22 2018
@@ -44,14 +44,14 @@ public class OutletTypes
*/
private final Map<String, TypedOutletSaxHandlerFactory>
typedOutletHandlerFactories
- = new HashMap<>();
+ = new HashMap<>();
/**
* A List containing all untyped OutletSaxHandlerFactories.
*/
private final List<UntypedOutletSaxHandlerFactory>
untypedOutletHandlerFactories
- = new ArrayList<>();
+ = new ArrayList<>();
/**
* Constructor. Creates a new instance containing the mappings to the
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java Sun Sep 9 15:10:22 2018
@@ -129,7 +129,7 @@ class UnitConfigurationReader
log.debug("Start reading outlet configuration");
}
OutletConfiguration outletConfiguration
- = new OutletConfigurationXmlParser()
+ = new OutletConfigurationXmlParser()
.readOutletConfiguration(
configurationProvider,
configurationHandlers,
@@ -343,7 +343,7 @@ class UnitConfigurationReader
log.debug("Start reading control configuration");
}
ControlConfiguration controlConfiguration
- = new ControlConfigurationXmlParser()
+ = new ControlConfigurationXmlParser()
.readControllerConfiguration(
configurationProvider,
unitDescriptor,
@@ -362,7 +362,7 @@ class UnitConfigurationReader
log.debug("Start reading options");
}
List<OptionsConfiguration> optionConfigurations
- = new ArrayList<>();
+ = new ArrayList<>();
optionConfigurations.addAll(
controlConfiguration.getOptionsConfigurations());
if (unitDescriptor.getOverrideOptions() != null)
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java Sun Sep 9 15:10:22 2018
@@ -56,11 +56,11 @@ public class ControlConfiguration
/** The list of all options definitions within the generation unit. */
private List<OptionsConfiguration> optionsConfigurations
- = new ArrayList<>();
+ = new ArrayList<>();
/** The entity references within the generation unit. */
private EntityReferences entityReferences
- = new EntityReferences();
+ = new EntityReferences();
/** The loglevel during generation, not null. */
private Loglevel loglevel = Loglevel.INFO;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Sun Sep 9 15:10:22 2018
@@ -100,7 +100,7 @@ public class ControlConfigurationXmlPars
{
SAXParser parser = saxFactory.newSAXParser();
InputSource is
- = new InputSource(controlConfigurationInputStream);
+ = new InputSource(controlConfigurationInputStream);
parser.parse(
is,
new ControlConfigurationSaxHandler(
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java Sun Sep 9 15:10:22 2018
@@ -64,7 +64,7 @@ public class Output
* The information on how to post-process the sources after generation.
*/
private final List<PostprocessorDefinition> postprocessorDefinitions
- = new ArrayList<>();;
+ = new ArrayList<>();;
/**
* The outlet which generates the content.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java Sun Sep 9 15:10:22 2018
@@ -56,7 +56,7 @@ public class OutputSaxHandler extends De
{
/** The qualified name for the filename outlet. */
private static final QualifiedName FILENAME_OUTLET_NAME
- = new QualifiedName(
+ = new QualifiedName(
"org.apache.torque.generator.configuration.filenameOutlet");
/** The access object for the configuration files, not null. */
@@ -244,7 +244,7 @@ public class OutputSaxHandler extends De
else if (OUTLET_TAG.equals(rawName))
{
contentOutletSaxHandler
- = new OutletReferenceSaxHandler();
+ = new OutletReferenceSaxHandler();
contentOutletSaxHandler.startElement(
uri,
localName,
@@ -254,7 +254,7 @@ public class OutputSaxHandler extends De
else if (POSTPROCESSOR_TAG.equals(rawName))
{
postprocessorSaxHandler
- = new ConfigurableClassSaxHandler<>(
+ = new ConfigurableClassSaxHandler<>(
configurationProvider,
unitDescriptor,
POSTPROCESSOR_TAG);
@@ -264,7 +264,7 @@ public class OutputSaxHandler extends De
else if (FILENAME_GENERATOR_TAG.equals(rawName))
{
OutletConfigurationSaxHandler outletConfigurationSaxHandler
- = new OutletConfigurationSaxHandler(
+ = new OutletConfigurationSaxHandler(
configurationProvider,
unitDescriptor,
configurationHandlers);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java Sun Sep 9 15:10:22 2018
@@ -41,7 +41,7 @@ public class ActionSaxHandlerFactories
* keyed by the type of the action.
*/
private Map<String, ActionSaxHandlerFactory> actionSaxHandlerFactories
- = new HashMap<>();
+ = new HashMap<>();
/**
* Constructor. Registers the default Factories.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java Sun Sep 9 15:10:22 2018
@@ -45,7 +45,7 @@ public class OptionsSaxHandlerFactories
* keyed by the type of the action.
*/
private Map<String, OptionsSaxHandlerFactory> factories
- = new HashMap<>();
+ = new HashMap<>();
/**
* Constructor. Registers the default OptionsSaxHandlerFactories.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java Sun Sep 9 15:10:22 2018
@@ -87,7 +87,7 @@ public class SourceElementAttributeActio
attributes,
"the SourceElementAttributeAction " + element);
SourceElementAttributeAction action
- = new SourceElementAttributeAction(
+ = new SourceElementAttributeAction(
element,
attribute,
acceptNotSet);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandler.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandler.java Sun Sep 9 15:10:22 2018
@@ -116,7 +116,7 @@ class CopyOutletSaxHandler extends Outle
try
{
CopyOutlet result
- = new CopyOutlet(
+ = new CopyOutlet(
outletName,
getConfigurationProvider(),
path);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandlerFactory.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandlerFactory.java Sun Sep 9 15:10:22 2018
@@ -99,7 +99,7 @@ implements TypedOutletSaxHandlerFactory
throws ConfigurationException
{
GroovyScriptOutlet result
- = new GroovyScriptOutlet(
+ = new GroovyScriptOutlet(
OutletConfigurationXmlParser.getOutletNameForFilename(
templatePath),
configurationProvider,
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java Sun Sep 9 15:10:22 2018
@@ -38,12 +38,12 @@ public class OutletConfiguration
{
/** A map containing all outlets, keyed by their name. */
private final Map<QualifiedName, Outlet> outlets
- = new HashMap<>();
+ = new HashMap<>();
/** A map containing all isolated mergepoint mappings,
* keyed by their name. */
private final Map<String, MergepointMapping> mergepointMappings
- = new HashMap<>();
+ = new HashMap<>();
/**
* Whether the mergepoint mappings have been resolved and added to
@@ -107,7 +107,7 @@ public class OutletConfiguration
{
String name = entry.getKey();
QualifiedName qualifiedMergepointName
- = new QualifiedName(name);
+ = new QualifiedName(name);
if (qualifiedMergepointName.getNamespace().isRoot())
{
// outlet name is missing
@@ -131,7 +131,7 @@ public class OutletConfiguration
}
MergepointMapping originalMergepointMapping = entry.getValue();
MergepointMapping resolvedMergepointMapping
- = new MergepointMapping(
+ = new MergepointMapping(
qualifiedMergepointName.getName(),
originalMergepointMapping.getActions());
outlet.setMergepointMapping(resolvedMergepointMapping);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java Sun Sep 9 15:10:22 2018
@@ -67,7 +67,7 @@ public class OutletConfigurationSaxHandl
* which configuration was already parsed.
*/
private final List<MergepointMapping> mergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
/** The available configuration handlers. */
private final ConfigurationHandlers configurationHandlers;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java Sun Sep 9 15:10:22 2018
@@ -126,7 +126,7 @@ public class OutletConfigurationXmlParse
List<Outlet> allOutlets = new ArrayList<>();
List<MergepointMapping> allMergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
// Outlets from all files
Collection<String> outletConfigNames
@@ -213,7 +213,7 @@ public class OutletConfigurationXmlParse
{
SAXParser parser = saxFactory.newSAXParser();
OutletConfigurationSaxHandler saxHandler
- = new OutletConfigurationSaxHandler(
+ = new OutletConfigurationSaxHandler(
configurationProvider,
unitDescriptor,
configurationHandlers);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java Sun Sep 9 15:10:22 2018
@@ -131,7 +131,7 @@ class VelocityOutletSaxHandler extends O
try
{
VelocityOutlet result
- = new VelocityOutlet(
+ = new VelocityOutlet(
outletName,
getConfigurationProvider(),
path,
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java Sun Sep 9 15:10:22 2018
@@ -99,7 +99,7 @@ implements TypedOutletSaxHandlerFactory
throws ConfigurationException
{
VelocityOutlet result
- = new VelocityOutlet(
+ = new VelocityOutlet(
OutletConfigurationXmlParser.getOutletNameForFilename(
templatePath),
configurationProvider,
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java Sun Sep 9 15:10:22 2018
@@ -35,7 +35,7 @@ public class EntityReferences implements
{
/** All known entity references. */
private Map<String, byte[]> entityReferences
- = new HashMap<>();
+ = new HashMap<>();
/**
* Adds a new entity reference.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandler.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandler.java Sun Sep 9 15:10:22 2018
@@ -64,7 +64,7 @@ public abstract class SourceSaxHandler e
* The transformer definitions in the source element.
*/
private List<SourceTransformerDefinition> transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
/** The handler which handles transformer elements. */
private ConfigurableClassSaxHandler<SourceTransformer>
@@ -124,7 +124,7 @@ public abstract class SourceSaxHandler e
else if (TRANSFORMER_TAG.equals(rawName))
{
transformerSaxHandler
- = new ConfigurableClassSaxHandler<>(
+ = new ConfigurableClassSaxHandler<>(
configurationProvider,
unitDescriptor,
TRANSFORMER_TAG);
@@ -180,7 +180,7 @@ public abstract class SourceSaxHandler e
sourceProcessConfiguration.setSourceTransformerDefinitions(
transformerDefinitions);
transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
}
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java Sun Sep 9 15:10:22 2018
@@ -43,7 +43,7 @@ public class SourceSaxHandlerFactories
* keyed by the type of the sources.
*/
private Map<String, SourceSaxHandlerFactory> factories
- = new HashMap<>();
+ = new HashMap<>();
/**
* Constructor. Registers the default SourceSaxHandlerFactories.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java Sun Sep 9 15:10:22 2018
@@ -72,11 +72,11 @@ public class Checksums
/** The checksums, keyed by the name of the checked entity. */
private final Map<String, byte[]> checksums
- = new HashMap<>();
+ = new HashMap<>();
/** The modification dates, keyed by the name of the checked entity. */
private final Map<String, Date> modificationDates
- = new HashMap<>();
+ = new HashMap<>();
public byte[] getChecksum(final String name)
{
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Sun Sep 9 15:10:22 2018
@@ -94,7 +94,7 @@ public class Controller
static
{
final List<ExistingTargetStrategy> existingTargetStrategies
- = new ArrayList<>();
+ = new ArrayList<>();
existingTargetStrategies.add(new ReplaceTargetFileStrategy());
existingTargetStrategies.add(new SkipExistingTargetFileStrategy());
existingTargetStrategies.add(new MergeTargetFileStrategy());
@@ -113,7 +113,7 @@ public class Controller
* of the sourceModified check.
*/
private final Map<String, Boolean> sourceModifiedCache
- = new HashMap<>();
+ = new HashMap<>();
/**
* Executes the controller action.
@@ -424,7 +424,7 @@ public class Controller
final Outlet filenameOutlet = output.getFilenameOutlet();
final OutletReference contentOutletReference
- = new OutletReference(
+ = new OutletReference(
filenameOutlet.getName());
controllerState.setRootOutletReference(
contentOutletReference);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java Sun Sep 9 15:10:22 2018
@@ -113,14 +113,14 @@ public class ControllerState
* not null.
*/
private final Checksums lastGeneratedSourceChecksums
- = new Checksums();
+ = new Checksums();
/**
* The checksums of the source files for this generation run,
* not null.
*/
private final Checksums thisGenerationSourceChecksums
- = new Checksums();
+ = new Checksums();
/**
* Returns the source provider which is currently in use.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java Sun Sep 9 15:10:22 2018
@@ -106,18 +106,18 @@ public class MergeTargetFileStrategy imp
throws GeneratorException
{
File generationStorageDir
- = new File(unitConfiguration.getWorkDirectory(), WORK_SUBDIR);
+ = new File(unitConfiguration.getWorkDirectory(), WORK_SUBDIR);
File generationStorageFile;
if (outputDirKey == null)
{
generationStorageFile
- = new File(generationStorageDir,
+ = new File(generationStorageDir,
FilenameUtils.concat("default", outputPath));
}
else
{
generationStorageFile
- = new File(generationStorageDir,
+ = new File(generationStorageDir,
FilenameUtils.concat("other",
FilenameUtils.concat(outputDirKey, outputPath)));
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java Sun Sep 9 15:10:22 2018
@@ -90,7 +90,7 @@ public class ThreeWayMerger
try
{
String result
- = new String(outputStream.toByteArray(), charsetName);
+ = new String(outputStream.toByteArray(), charsetName);
return result;
}
catch (UnsupportedEncodingException e)
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java Sun Sep 9 15:10:22 2018
@@ -37,7 +37,7 @@ public class Options
{
/** The options with global scope. */
private QualifiedNameMap<Option> globalScope
- = new QualifiedNameMap<>();
+ = new QualifiedNameMap<>();
/**
* Sets an option with global scope.
@@ -130,7 +130,7 @@ public class Options
public Collection<Option> values()
{
Map<QualifiedName, Option> result
- = new HashMap<>();
+ = new HashMap<>();
for (Option globalOption : globalScope.values())
{
result.put(globalOption.getQualifiedName(), globalOption);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java Sun Sep 9 15:10:22 2018
@@ -51,7 +51,7 @@ public abstract class OutletImpl impleme
* The mergepoint mappings configured for this outlet.
*/
private final Map<String, MergepointMapping> mergepointMappings
- = new HashMap<>();
+ = new HashMap<>();
/**
* The name of the outlet. Is immutable.
@@ -297,7 +297,7 @@ public abstract class OutletImpl impleme
QualifiedName qualifiedName
= controllerState.getQualifiedName(key);
Variable variable
- = new Variable(
+ = new Variable(
qualifiedName,
value,
scope);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java Sun Sep 9 15:10:22 2018
@@ -49,7 +49,7 @@ public class CamelbackOutlet extends Str
* The processor which wraps reserved java words.
*/
private final WrapReservedJavaWords reservedWordsWrapper
- = new WrapReservedJavaWords();
+ = new WrapReservedJavaWords();
/** Whether reserved java words are wrapped. */
private boolean wrapReservedJavaWords = false;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java Sun Sep 9 15:10:22 2018
@@ -132,7 +132,7 @@ public class JavadocOutlet extends Outle
return "";
}
StringTokenizer tokenizer
- = new StringTokenizer(
+ = new StringTokenizer(
content.trim(),
removableWrapCharacters
+ wrapAfterCharacters
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java Sun Sep 9 15:10:22 2018
@@ -54,7 +54,7 @@ public final class Namespace
* The root namespace.
*/
public static final Namespace ROOT_NAMESPACE
- = new Namespace(StringUtils.EMPTY);
+ = new Namespace(StringUtils.EMPTY);
/**
* The String representation of the namespace. Is never null.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java Sun Sep 9 15:10:22 2018
@@ -60,7 +60,7 @@ public class SourceElement implements Se
* the source element's attributes.
*/
private final Map<String, Object> attributes
- = new LinkedHashMap<>();
+ = new LinkedHashMap<>();
/**
* Constructor.
@@ -500,7 +500,7 @@ public class SourceElement implements Se
public SourceElement copy()
{
Map<SourceElement, SourceElement> copied
- = new HashMap<>();
+ = new HashMap<>();
return copy(this, copied);
}
@@ -741,7 +741,7 @@ public class SourceElement implements Se
/** The children list, not null. */
private final List<SourceElement> children
- = new ArrayList<>();
+ = new ArrayList<>();
/**
* Constructor.
@@ -830,7 +830,7 @@ public class SourceElement implements Se
/** The parent list, not null. */
private final List<SourceElement> parents
- = new ArrayList<>();
+ = new ArrayList<>();
/**
* Constructor.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java Sun Sep 9 15:10:22 2018
@@ -423,7 +423,7 @@ public final class SourcePath
return result;
}
final StringTokenizer selectionPathTokenizer
- = new StringTokenizer(path, PATH_LEVEL_SEPARATOR);
+ = new StringTokenizer(path, PATH_LEVEL_SEPARATOR);
List<SourceElement> currentSelection = new ArrayList<>();
currentSelection.add(sourceElement);
while (selectionPathTokenizer.hasMoreTokens())
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProcessConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProcessConfiguration.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProcessConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProcessConfiguration.java Sun Sep 9 15:10:22 2018
@@ -43,7 +43,7 @@ public class SourceProcessConfiguration
/** The source transformers which are executed before transformation. */
private List<SourceTransformerDefinition> transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
/** The skip decider, or null if none exists. */
private SkipDecider skipDecider;
@@ -102,12 +102,12 @@ public class SourceProcessConfiguration
if (transformerDefinitions == null)
{
this.transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
}
else
{
this.transformerDefinitions
- = new ArrayList<>(
+ = new ArrayList<>(
transformerDefinitions);
}
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java Sun Sep 9 15:10:22 2018
@@ -418,7 +418,7 @@ public class JdbcMetadataSource extends
throws SQLException
{
Map<String, ForeignKeyMetadata> foreignKeys
- = new HashMap<>();
+ = new HashMap<>();
try (ResultSet resultSet = dbMeta.getImportedKeys(null, schemaName, tableName))
{
while (resultSet.next())
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java Sun Sep 9 15:10:22 2018
@@ -137,7 +137,7 @@ public class FileSource extends SourceIm
{
MessageDigest messageDigest = MessageDigest.getInstance("MD5");
DigestInputStream digestInputStream
- = new DigestInputStream(inputStream, messageDigest);
+ = new DigestInputStream(inputStream, messageDigest);
log.debug("Reading file "
+ path.getAbsolutePath()
+ " of type "
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java Sun Sep 9 15:10:22 2018
@@ -125,13 +125,13 @@ public final class PropertiesSourceForma
}
SourceElement result
- = new SourceElement(ROOT_ELEMENT_NAME);
+ = new SourceElement(ROOT_ELEMENT_NAME);
for (String key : properties.orderedKeySet())
{
String value = properties.getProperty(key);
SourceElement entryElement
- = new SourceElement(ENTRY_ELEMENT_NAME);
+ = new SourceElement(ENTRY_ELEMENT_NAME);
entryElement.setAttribute(KEY_ATTRIBUTE_NAME, key);
entryElement.setAttribute((String) null, value);
result.getChildren().add(entryElement);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java Sun Sep 9 15:10:22 2018
@@ -83,7 +83,7 @@ public class SourceToXml
throws SourceException
{
Map<SourceElement, Integer> knownElements
- = new HashMap<>();
+ = new HashMap<>();
StringBuilder result = new StringBuilder();
String currentIndent = "";
outputElement(
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java Sun Sep 9 15:10:22 2018
@@ -136,7 +136,7 @@ public class LoadAllSourceFilesTransform
List<SourceTransformerDefinition> transformerDefinitions
= sourceProcessConfiguration.getTransformerDefinitions();
transformerDefinitions
- = new ArrayList<>
+ = new ArrayList<>
(transformerDefinitions);
Iterator<SourceTransformerDefinition> transformerDefinitionIt
= transformerDefinitions.iterator();
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java Sun Sep 9 15:10:22 2018
@@ -54,7 +54,7 @@ public class SourceElementToModelTransfo
/** The processor which wraps reserved java words. */
private final WrapReservedJavaWords reservedWordsWrapper
- = new WrapReservedJavaWords();
+ = new WrapReservedJavaWords();
/** The class the model root must have. */
private String modelRootClass;
@@ -273,7 +273,7 @@ public class SourceElementToModelTransfo
propertyAccess.setProperty(childModelElement);
alreadyMapped.put(child, childModelElement);
PropertyAccess parentPropertyAccess
- = new PropertyAccess(childModelElement, "parent");
+ = new PropertyAccess(childModelElement, "parent");
if (!parentPropertyAccess.isPropertyAccessible())
{
final String modelClassName = model.getClass().getSimpleName();
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java Sun Sep 9 15:10:22 2018
@@ -43,7 +43,7 @@ public class GroovyScriptOutlet extends
/** The cached compiled scripts, keyed by the detokenized path. */
private static Map<String, Script> cachedScripts
- = new HashMap<>();
+ = new HashMap<>();
/**
* Constructs a new GroovyScriptOutlet.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java Sun Sep 9 15:10:22 2018
@@ -35,7 +35,7 @@ public class VariableStore
* <code>Variable.Scope.OUTLET<code>.
*/
private QualifiedNameMap<Variable> outletScope
- = new QualifiedNameMap<>();
+ = new QualifiedNameMap<>();
/**
* contains all variables with the scope
@@ -45,21 +45,21 @@ public class VariableStore
* to the respective calling outlets.
*/
private LinkedList<QualifiedNameMap<Variable>> childrenScopeList
- = new LinkedList<>();
+ = new LinkedList<>();
/**
* contains all variables with the scope
* <code>Variable.Scope.FILE<code>.
*/
private QualifiedNameMap<Variable> fileScope
- = new QualifiedNameMap<>();
+ = new QualifiedNameMap<>();
/**
* contains all variables with the scope
* <code>Variable.Scope.GLOBAL<code>.
*/
private QualifiedNameMap<Variable> globalScope
- = new QualifiedNameMap<>();
+ = new QualifiedNameMap<>();
/**
* Sets a variable.
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java Sun Sep 9 15:10:22 2018
@@ -101,9 +101,9 @@ public class ReadConfigurationTest exten
projectPaths,
new DefaultTorqueGeneratorPaths());
UnitConfigurationReader configurationReader
- = new UnitConfigurationReader();
+ = new UnitConfigurationReader();
ConfigurationHandlers configurationHandlers
- = new ConfigurationHandlers();
+ = new ConfigurationHandlers();
UnitConfiguration unitConfiguration
= configurationReader.read(
unitDescriptor,
@@ -301,11 +301,11 @@ public class ReadConfigurationTest exten
}
{
SourceProcessConfiguration sourceProcessConfiguration
- = new SourceProcessConfiguration();
+ = new SourceProcessConfiguration();
sourceProcessConfiguration.setStartElementsPath(
"properties/entry");
List<SourceTransformerDefinition> transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
transformerDefinitions.add(
new SourceTransformerDefinition(
@@ -358,7 +358,7 @@ public class ReadConfigurationTest exten
{
JdbcMetadataSourceProvider sourceProvider
- = new JdbcMetadataSourceProvider(
+ = new JdbcMetadataSourceProvider(
"jdbcUrl",
"jdbcDriver",
"jdbcUsername",
@@ -495,9 +495,9 @@ public class ReadConfigurationTest exten
projectPaths,
new DefaultTorqueGeneratorPaths());
ConfigurationHandlers configurationHandlers
- = new ConfigurationHandlers();
+ = new ConfigurationHandlers();
UnitConfigurationReader configurationReader
- = new UnitConfigurationReader();
+ = new UnitConfigurationReader();
UnitConfiguration unitConfiguration
= configurationReader.read(
unitDescriptor,
@@ -532,7 +532,7 @@ public class ReadConfigurationTest exten
overrideOptions.put("optionWithoutNamespace", "overriddenValue");
overrideOptions.put("newOption", "newValue");
OptionsConfiguration optionConfiguration
- = new MapOptionsConfiguration(overrideOptions);
+ = new MapOptionsConfiguration(overrideOptions);
UnitDescriptor unitDescriptor = new UnitDescriptor(
UnitDescriptor.Packaging.DIRECTORY,
@@ -540,9 +540,9 @@ public class ReadConfigurationTest exten
new DefaultTorqueGeneratorPaths());
unitDescriptor.setOverrideOptions(optionConfiguration);
ConfigurationHandlers configurationHandlers
- = new ConfigurationHandlers();
+ = new ConfigurationHandlers();
UnitConfigurationReader configurationReader
- = new UnitConfigurationReader();
+ = new UnitConfigurationReader();
UnitConfiguration unitConfiguration
= configurationReader.read(
unitDescriptor,
@@ -567,11 +567,11 @@ public class ReadConfigurationTest exten
CustomProjectPaths projectPaths;
UnitConfiguration unitConfiguration;
ConfigurationHandlers configurationHandlers
- = new ConfigurationHandlers();
+ = new ConfigurationHandlers();
UnitDescriptor unitDescriptor;
{
CustomProjectPaths parentProjectPaths
- = new CustomProjectPaths(
+ = new CustomProjectPaths(
new Maven2DirectoryProjectPaths(
new File("src/test/configuration")));
parentProjectPaths.setConfigurationDir(
@@ -602,7 +602,7 @@ public class ReadConfigurationTest exten
new DefaultTorqueGeneratorPaths());
unitDescriptor.setInheritsFrom(parentUnitDescriptor);
UnitConfigurationReader configurationReader
- = new UnitConfigurationReader();
+ = new UnitConfigurationReader();
unitConfiguration
= configurationReader.read(
unitDescriptor,
@@ -732,10 +732,10 @@ public class ReadConfigurationTest exten
}
{
SourceProcessConfiguration sourceProcessConfiguration
- = new SourceProcessConfiguration();
+ = new SourceProcessConfiguration();
sourceProcessConfiguration.setStartElementsPath("parentSourceElement");
List<SourceTransformerDefinition> transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
transformerDefinitions.add(
new SourceTransformerDefinition(
@@ -866,10 +866,10 @@ public class ReadConfigurationTest exten
}
{
SourceProcessConfiguration sourceProcessConfiguration
- = new SourceProcessConfiguration();
+ = new SourceProcessConfiguration();
sourceProcessConfiguration.setStartElementsPath("properties/entry");
List<SourceTransformerDefinition> transformerDefinitions
- = new ArrayList<>();
+ = new ArrayList<>();
transformerDefinitions.add(
new SourceTransformerDefinition(
new ConfigurationTestTransformer()));
@@ -911,7 +911,7 @@ public class ReadConfigurationTest exten
{
JdbcMetadataSourceProvider sourceProvider
- = new JdbcMetadataSourceProvider(
+ = new JdbcMetadataSourceProvider(
"jdbcUrl",
"jdbcDriver",
"jdbcUsername",
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java Sun Sep 9 15:10:22 2018
@@ -60,7 +60,7 @@ public class OutletConfigurationTest
outlets.add(new PackageToPathOutlet(
new QualifiedName("test.outlet.1")));
List<MergepointMapping> mergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
OutletConfiguration outletConfiguration = new OutletConfiguration(
outlets,
@@ -95,7 +95,7 @@ public class OutletConfigurationTest
outlets.add(new PackageToPathOutlet(
new QualifiedName("sameName")));
List<MergepointMapping> mergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
new OutletConfiguration(outlets, mergepointMappings, unitDescriptor);
}
@@ -113,7 +113,7 @@ public class OutletConfigurationTest
outlets.add(new PackageToPathOutlet(
new QualifiedName("test.outlet.2")));
List<MergepointMapping> mergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
mergepointMappings.add(
new MergepointMapping("test.outlet.testMergepoint"));
mergepointMappings.get(0).addAction(
@@ -146,7 +146,7 @@ public class OutletConfigurationTest
outlets.add(new JavaOutlet(
new QualifiedName("test.outlet")));
List<MergepointMapping> mergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
mergepointMappings.add(
new MergepointMapping("not.existing.outlet.testMergepoint"));
@@ -169,7 +169,7 @@ public class OutletConfigurationTest
outlets.add(new JavaOutlet(
new QualifiedName("test.outlet")));
List<MergepointMapping> mergepointMappings
- = new ArrayList<>();
+ = new ArrayList<>();
mergepointMappings.add(
new MergepointMapping("testMergepoint"));
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java Sun Sep 9 15:10:22 2018
@@ -41,10 +41,10 @@ import org.junit.Test;
public class ChecksumsTest extends BaseTest
{
private static final File CHECKSUM_DIR
- = new File("target/test/lastChangesContent");
+ = new File("target/test/lastChangesContent");
private static final File CHECKSUM_FILE
- = new File(CHECKSUM_DIR, "checksum");
+ = new File(CHECKSUM_DIR, "checksum");
@Before
public void cleanUp()
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java Sun Sep 9 15:10:22 2018
@@ -44,7 +44,7 @@ public class ExistingTargetStrategyTest
private final File targetDir1 = new File("target/test/existingTargetStrategy/target1");
private final File targetDir2 = new File("target/test/existingTargetStrategy/target2");
private final File workDir
- = new File("target/test/existingTargetStrategy/work");
+ = new File("target/test/existingTargetStrategy/work");
private final File targetFile1 = new File(targetDir1, "output1.txt");
private final File targetFile2 = new File(targetDir2, "output2.txt");
private final File workFile1 = new File(workDir, "raw-generated/default/output1.txt");
@@ -79,7 +79,7 @@ public class ExistingTargetStrategyTest
{
File configurationDirectory = new File(confRootDir, "mergeStrategy");
File initialSourceDir
- = new File(confRootDir, "/initial/src/main/torque-gen/src");
+ = new File(confRootDir, "/initial/src/main/torque-gen/src");
runGeneration(configurationDirectory, initialSourceDir);
File initialSourceDirectory = new File(confRootDir, "initial");
assertFile(new File(initialSourceDirectory, srcPath1), targetFile1);
@@ -104,7 +104,7 @@ public class ExistingTargetStrategyTest
{
File configurationDirectory = new File(confRootDir, "mergeStrategy");
File initialSourceDir
- = new File(confRootDir, "/initial/src/main/torque-gen/src");
+ = new File(confRootDir, "/initial/src/main/torque-gen/src");
runGeneration(configurationDirectory, initialSourceDir);
File initialSourceDirectory = new File(confRootDir, "initial");
assertFile(new File(initialSourceDirectory, srcPath1), targetFile1);
@@ -154,7 +154,7 @@ public class ExistingTargetStrategyTest
{
File configurationDirectory = new File(confRootDir, "mergeStrategy");
File initialSourceDir
- = new File(confRootDir, "/initial/src/main/torque-gen/src");
+ = new File(confRootDir, "/initial/src/main/torque-gen/src");
runGeneration(configurationDirectory, initialSourceDir);
File initialSourceDirectory = new File(confRootDir, "initial");
assertFile(new File(initialSourceDirectory, srcPath1), targetFile1);
@@ -201,7 +201,7 @@ public class ExistingTargetStrategyTest
{
File configurationDirectory = new File(confRootDir, "mergeStrategyNoNewlinesAtEndOfFile");
File initialSourceDir
- = new File(confRootDir, "/initial/src/main/torque-gen/src");
+ = new File(confRootDir, "/initial/src/main/torque-gen/src");
runGeneration(configurationDirectory, initialSourceDir);
assertFile(new File(configurationDirectory, "src/main/torque-gen/templates/simpleOutput.vm"), targetFile1);
assertFile(new File(configurationDirectory, "src/main/torque-gen/templates/simpleOutput.vm"), workFile1);
@@ -237,7 +237,7 @@ public class ExistingTargetStrategyTest
new File(configurationDirectoryInitial, srcPath2),
targetFile2);
File configurationDirectoryAppend
- = new File(confRootDir, "appendStrategy");
+ = new File(confRootDir, "appendStrategy");
runGeneration(configurationDirectoryAppend, null);
File expectedTargetFile1 = new File(targetDir1, "expectedOutput1.txt");
String initial1 = FileUtils.readFileToString(
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java?rev=1840416&r1=1840415&r2=1840416&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java Sun Sep 9 15:10:22 2018
@@ -82,10 +82,10 @@ public class PropertyToJavaGenerationTes
expectedContent,
FileUtils.readFileToByteArray(logoResultFile));
File propertiesResultFile
- = new File(targetDir, "Properties.properties");
+ = new File(targetDir, "Properties.properties");
assertTrue(propertiesResultFile.exists());
File propertiesExpectedFile
- = new File("src/test/propertyToJava/expectedProperties.properties");
+ = new File("src/test/propertyToJava/expectedProperties.properties");
assertEquals(FileUtils.readFileToString(propertiesExpectedFile),
FileUtils.readFileToString(propertiesResultFile));
}
@@ -128,10 +128,10 @@ public class PropertyToJavaGenerationTes
expectedContent,
FileUtils.readFileToByteArray(logoResultFile));
File propertiesResultFile
- = new File(targetDir, "Properties.properties");
+ = new File(targetDir, "Properties.properties");
assertTrue(propertiesResultFile.exists());
File propertiesExpectedFile
- = new File("src/test/propertyToJava/expectedPropertiesDebugOutput.properties");
+ = new File("src/test/propertyToJava/expectedPropertiesDebugOutput.properties");
assertEquals(FileUtils.readFileToString(propertiesExpectedFile),
FileUtils.readFileToString(propertiesResultFile));
}
@@ -174,7 +174,7 @@ public class PropertyToJavaGenerationTes
// run first time
controller.run(unitDescriptors);
File propertiesResultFile
- = new File(targetDir, "Properties.properties");
+ = new File(targetDir, "Properties.properties");
assertTrue(propertiesResultFile.exists());
// delete target so we can see if generation does not run again
@@ -225,7 +225,7 @@ public class PropertyToJavaGenerationTes
// run first time
controller.run(unitDescriptors);
File propertiesResultFile
- = new File(targetDir, "Properties.properties");
+ = new File(targetDir, "Properties.properties");
assertTrue(propertiesResultFile.exists());
// change checksum in checksums file
@@ -289,7 +289,7 @@ public class PropertyToJavaGenerationTes
// run first time
controller.run(unitDescriptors);
File propertiesResultFile
- = new File(targetDir, "Properties.properties");
+ = new File(targetDir, "Properties.properties");
assertTrue(propertiesResultFile.exists());
// change modification date of source file
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org