Author: tv
Date: Sun Apr 21 13:29:41 2024
New Revision: 1917241
URL: http://svn.apache.org/viewvc?rev=1917241&view=rev
Log:
Eclipse cleanup, use Charset where appropriate
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4j2LoggingAdapter.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/AppendToTargetFileStrategy.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ExistingTargetStrategy.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ReplaceTargetFileStrategy.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/SkipExistingTargetFileStrategy.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/jdbc/SchemaType.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/DebuggingOutletWrapper.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Mergepoint.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletResult.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/ConstantNameCreator.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelPropertyPointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/PostprocessorDefinition.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributeIterator.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributePointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePathPointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceTransformerDefinition.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ColumnMetadata.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/CombinedFileSource.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceFormat.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestTransformer.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestTransformer.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/OutletResultTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/XmlParserTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java
db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
Sun Apr 21 13:29:41 2024
@@ -36,7 +36,7 @@ public class Configuration
/**
* All known units of generation.
*/
- private List<UnitDescriptor> unitDescriptors
+ private final List<UnitDescriptor> unitDescriptors
= new ArrayList<>();
/**
@@ -101,7 +101,7 @@ public class Configuration
/**
* Reads the configuration.
- *
+ *
* If a {@link UnitDescriptor} does not provide a loglevel,
* {@link Loglevel#getCurrentLoglevel()} will be applied (which is the
root log level of the provided adapter).
*
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
Sun Apr 21 13:29:41 2024
@@ -47,36 +47,36 @@ public class ConfigurationHandlers
/**
* The known types of outlets and how to read their configuration.
*/
- private OutletTypes outletTypes = new OutletTypes();
+ private final OutletTypes outletTypes = new OutletTypes();
/**
* The known types of outputs.
*/
- private Map<String, OutputType> outputTypes
+ private final Map<String, OutputType> outputTypes
= new HashMap<>();
/**
* The known (file) formats of stream sources (e.g. XML, properties).
*/
- private Set<StreamSourceFormat> streamSourceFormats
+ private final Set<StreamSourceFormat> streamSourceFormats
= new HashSet<>();
/**
* The known mergepoint action configuration handlers.
*/
- private ActionSaxHandlerFactories actionSaxHandlerFactories
+ private final ActionSaxHandlerFactories actionSaxHandlerFactories
= new ActionSaxHandlerFactories();
/**
* The known option configuration handlers.
*/
- private OptionsSaxHandlerFactories optionsSaxHandlerFactories
+ private final OptionsSaxHandlerFactories optionsSaxHandlerFactories
= new OptionsSaxHandlerFactories();
/**
* The known source configuration handlers.
*/
- private SourceSaxHandlerFactories sourceSaxHandlerFactories
+ private final SourceSaxHandlerFactories sourceSaxHandlerFactories
= new SourceSaxHandlerFactories();
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java
Sun Apr 21 13:29:41 2024
@@ -330,13 +330,8 @@ public class PackageResources
continue;
}
String name = rawName.substring(directory.length() + 1);
- if (suffix != null && !name.endsWith(suffix))
- {
- continue;
- }
-
- if (name.indexOf("/") != -1
- && !searchSubdirectories)
+ if ((suffix != null && !name.endsWith(suffix)) ||
(name.indexOf("/") != -1
+ && !searchSubdirectories))
{
continue;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java
Sun Apr 21 13:29:41 2024
@@ -20,6 +20,7 @@ package org.apache.torque.generator.conf
*/
import java.io.File;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -90,7 +91,7 @@ public class UnitConfiguration
* The output encoding if no specific encoding has been set in the output;
* null for the default platform encoding.
*/
- private String defaultOutputEncoding = null;
+ private Charset defaultOutputCharset = null;
/**
* The class loader to use by the generator when accessing the templates
@@ -513,27 +514,27 @@ public class UnitConfiguration
}
/**
- * Returns the output encoding if no specific encoding has been set
+ * Returns the output CharSet if no specific encoding has been set
* in the output.
*
* @return the default output encoding, null for the default
* platform encoding.
*/
- public String getDefaultOutputEncoding()
+ public Charset getDefaultOutputEncoding()
{
- return defaultOutputEncoding;
+ return defaultOutputCharset;
}
/**
- * Sets the output encoding if no specific encoding has been set
+ * Sets the output encoding if no specificdefaultOutputCharsetg has been
set
* in the output.
*
- * @param defaultOutputEncoding the default output encoding,
+ * @param defaultOutputCharset the default output encoding,
* null for the default platform encoding.
*/
- public void setDefaultOutputEncoding(final String defaultOutputEncoding)
+ public void setDefaultOutputEncoding(final Charset defaultOutputCharset)
{
- this.defaultOutputEncoding = defaultOutputEncoding;
+ this.defaultOutputCharset = defaultOutputCharset;
}
/**
@@ -634,7 +635,7 @@ public class UnitConfiguration
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(outputFiles=")
.append(outputList.toString())
.append(", options=")
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java
Sun Apr 21 13:29:41 2024
@@ -1,5 +1,7 @@
package org.apache.torque.generator.configuration;
+import java.nio.charset.Charset;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -82,7 +84,7 @@ public class UnitDescriptor
* The output encoding if no specific encoding has been set in the output;
* null for the default platform encoding.
*/
- private String defaultOutputEncoding = null;
+ private Charset defaultOutputCharset = null;
/**
* The class loader to use by the generator when accessing the templates
@@ -283,21 +285,21 @@ public class UnitDescriptor
* @return the default output encoding, null for the default
* platform encoding.
*/
- public String getDefaultOutputEncoding()
+ public Charset getDefaultOutputEncoding()
{
- return defaultOutputEncoding;
+ return defaultOutputCharset;
}
/**
* Sets the output encoding which is used if no specific encoding
* has been set in the output.
*
- * @param defaultOutputEncoding the default output encoding,
+ * @param defaultOutputCharset the default output encoding,
* null for the default platform encoding.
*/
- public void setDefaultOutputEncoding(final String defaultOutputEncoding)
+ public void setDefaultOutputEncoding(final Charset defaultOutputCharset)
{
- this.defaultOutputEncoding = defaultOutputEncoding;
+ this.defaultOutputCharset = defaultOutputCharset;
}
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
Sun Apr 21 13:29:41 2024
@@ -52,14 +52,14 @@ import org.apache.torque.generator.confi
public class ControlConfiguration
{
/** The list of all activities of the generation unit. */
- private List<Output> outputList = new ArrayList<>();
+ private final List<Output> outputList = new ArrayList<>();
/** The list of all options definitions within the generation unit. */
- private List<OptionsConfiguration> optionsConfigurations
+ private final List<OptionsConfiguration> optionsConfigurations
= new ArrayList<>();
/** The entity references within the generation unit. */
- private EntityReferences entityReferences
+ private final EntityReferences entityReferences
= new EntityReferences();
/** The loglevel during generation, not null. */
@@ -141,7 +141,7 @@ public class ControlConfiguration
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(outputFiles=")
.append(outputList.toString())
.append(", optionsConfigurations=")
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -51,10 +51,10 @@ import org.xml.sax.helpers.DefaultHandle
public class ControlConfigurationSaxHandler extends DefaultHandler
{
/** The Controller configuration which is configured by this Handler. */
- private ControlConfiguration controllerConfiguration;
+ private final ControlConfiguration controllerConfiguration;
/** The known configuration handlers. */
- private ConfigurationHandlers configurationHandlers;
+ private final ConfigurationHandlers configurationHandlers;
/**
* The SAX handler which handles the output declarations, or null
@@ -77,12 +77,12 @@ public class ControlConfigurationSaxHand
/**
* Object for accessing the configuration.
*/
- private ConfigurationProvider configurationProvider;
+ private final ConfigurationProvider configurationProvider;
/**
* The description of the generation unit, not null.
*/
- private UnitDescriptor unitDescriptor;
+ private final UnitDescriptor unitDescriptor;
/**
* Constructor.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4j2LoggingAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4j2LoggingAdapter.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4j2LoggingAdapter.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4j2LoggingAdapter.java
Sun Apr 21 13:29:41 2024
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.core.con
/**
* Allows reading and setting the current loglevel using log4j2.
- *
+ *
* @version $Id$
*
*/
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
Sun Apr 21 13:29:41 2024
@@ -41,7 +41,7 @@ public enum Loglevel
ERROR("error");
/** The key of the loglevel. */
- private String key;
+ private final String key;
/** The default logging adapter to use. */
private static LoggingAdapter loggingAdapter = new Log4j2LoggingAdapter();
@@ -51,7 +51,7 @@ public enum Loglevel
*
* @param key the key, not null.
*/
- private Loglevel(String key)
+ Loglevel(String key)
{
this.key = key;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java
Sun Apr 21 13:29:41 2024
@@ -30,13 +30,13 @@ import org.apache.torque.generator.qname
public class OutletReference
{
/** The name of the referenced outlet. */
- private QualifiedName name;
+ private final QualifiedName name;
/**
* The namespace under which the outlet should execute.
* Defaults to the namespace in the outlet's name.
*/
- private Namespace namespace;
+ private final Namespace namespace;
/**
* Constructor.
@@ -94,7 +94,7 @@ public class OutletReference
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(name=").append(name).append(")");
return result.toString();
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
Sun Apr 21 13:29:41 2024
@@ -1,5 +1,7 @@
package org.apache.torque.generator.configuration.controller;
+import java.nio.charset.Charset;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -64,7 +66,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.
@@ -113,7 +115,7 @@ public class Output
* The character encoding of the generated file, or null for the platform
* default encoding.
*/
- private String encoding;
+ private Charset charSet;
/**
* Constructor.
@@ -312,20 +314,20 @@ public class Output
* @return The character encoding of the generated file,
* or null for the platform default encoding.
*/
- public String getEncoding()
+ public Charset getEncoding()
{
- return encoding;
+ return charSet;
}
/**
* Sets the character encoding of the generated file(s).
*
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
*/
- public void setEncoding(final String encoding)
+ public void setEncoding(final Charset charSet)
{
- this.encoding = encoding;
+ this.charSet = charSet;
}
/**
@@ -356,16 +358,16 @@ public class Output
/**
* Returns the line break character(s) for this Output.
- *
+ *
* <p>
* If the line break was already determined, the already determined
* line break character(s) are returned, and content is ignored.
- *
+ *
* <p>
* If the line break character was not already determined,
* the occurrence of the different line break characters is counted
* and the largest is returned ("\r\n" for equal count)
- *
+ *
* <p>
* If one of them is > 0, the result is cached and stored;
* if all occurrences are 0, the result is not cached and will be
determined
@@ -413,12 +415,12 @@ public class Output
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(OutputFile: sourceProvider=").append(sourceProvider)
.append(",existingTargetStrategy=")
.append(existingTargetStrategy)
- .append(",encoding=")
- .append(encoding)
+ .append(",charSet=")
+ .append(charSet)
.append(",filenameOutlet=")
.append(filenameOutlet)
.append(",contentOutlet=")
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -31,6 +31,8 @@ import static org.apache.torque.generato
import static
org.apache.torque.generator.configuration.source.SourceConfigurationTags.POSTPROCESSOR_TAG;
import static
org.apache.torque.generator.configuration.source.SourceConfigurationTags.SOURCE_TAG;
+import java.nio.charset.Charset;
+
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
import org.apache.torque.generator.configuration.UnitDescriptor;
@@ -208,7 +210,8 @@ public class OutputSaxHandler extends De
}
if (attributes.getValue(ENCODING_ATTRIBUTE) != null)
{
- output.setEncoding(attributes.getValue(ENCODING_ATTRIBUTE));
+ Charset charSet =
Charset.forName(attributes.getValue(ENCODING_ATTRIBUTE));
+ output.setEncoding(charSet);
}
if (attributes.getValue(TYPE_ATTRIBUTE) != null)
{
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -38,13 +38,13 @@ public abstract class ActionSaxHandler e
private static Log log = LogFactory.getLog(ActionSaxHandler.class);
/** The action which configured by this handler, not null. */
- private MergepointAction action;
+ private final MergepointAction action;
/** The description of the generation unit, not null. */
- private UnitDescriptor unitDescriptor;
+ private final UnitDescriptor unitDescriptor;
/** The configuration provider for accessing the configuration, not null.
*/
- private ConfigurationProvider configurationProvider;
+ private final ConfigurationProvider configurationProvider;
/**
* Constructor.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
Sun Apr 21 13:29:41 2024
@@ -40,7 +40,7 @@ public class ActionSaxHandlerFactories
* A map containing all known ActionSaxHandlerFactories,
* keyed by the type of the action.
*/
- private Map<String, ActionSaxHandlerFactory> actionSaxHandlerFactories
+ private final Map<String, ActionSaxHandlerFactory>
actionSaxHandlerFactories
= new HashMap<>();
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java
Sun Apr 21 13:29:41 2024
@@ -33,7 +33,7 @@ import org.xml.sax.SAXException;
* ActionSaxHandlers. The first matching handler will then be used to parse
* the action configuration.
*/
-public abstract interface ActionSaxHandlerFactory
+public interface ActionSaxHandlerFactory
{
/**
* Returns the action type handled by the ActionSaxHandlers which are
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java
Sun Apr 21 13:29:41 2024
@@ -21,6 +21,7 @@ package org.apache.torque.generator.conf
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import org.apache.torque.generator.control.action.MergepointAction;
@@ -33,12 +34,12 @@ public class MergepointMapping
/**
* The name of the mergepoint.
*/
- private String name;
+ private final String name;
/**
* The list of actions whichare executed at the mergepoint.
*/
- private List<MergepointAction> actions = new ArrayList<>();
+ private final List<MergepointAction> actions = new ArrayList<>();
/**
* Constructor.
@@ -109,7 +110,7 @@ public class MergepointMapping
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(name=").append(name)
.append(",actions=").append(actions)
.append(")");
@@ -119,11 +120,7 @@ public class MergepointMapping
@Override
public int hashCode()
{
- final int prime = 31;
- int result = 1;
- result = prime * result + ((actions == null) ? 0 : actions.hashCode());
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- return result;
+ return Objects.hash(actions, name);
}
@Override
@@ -133,34 +130,16 @@ public class MergepointMapping
{
return true;
}
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
+ if ((obj == null) || (getClass() != obj.getClass()))
{
return false;
}
final MergepointMapping other = (MergepointMapping) obj;
- if (actions == null)
- {
- if (other.actions != null)
- {
- return false;
- }
- }
- else if (!actions.equals(other.actions))
+ if (!Objects.equals(actions, other.actions))
{
return false;
}
- if (name == null)
- {
- if (other.name != null)
- {
- return false;
- }
- }
- else if (!name.equals(other.name))
+ if (!Objects.equals(name, other.name))
{
return false;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -44,17 +44,17 @@ public class MergepointSaxHandler
/**
* The access object for the configuration files, not null.
*/
- private ConfigurationProvider configurationProvider;
+ private final ConfigurationProvider configurationProvider;
/**
* The description of the generation unit, not null.
*/
- private UnitDescriptor unitDescriptor;
+ private final UnitDescriptor unitDescriptor;
/**
* The available configuration handlers.
*/
- private ConfigurationHandlers configurationHandlers;
+ private final ConfigurationHandlers configurationHandlers;
/**
* A SAX handler which parses nested elements. Null if no nested element
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
Sun Apr 21 13:29:41 2024
@@ -44,7 +44,7 @@ public class OptionsSaxHandlerFactories
* A map containing all known ActionSaxHandlerFactories,
* keyed by the type of the action.
*/
- private Map<String, OptionsSaxHandlerFactory> factories
+ private final Map<String, OptionsSaxHandlerFactory> factories
= new HashMap<>();
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java
Sun Apr 21 13:29:41 2024
@@ -60,7 +60,7 @@ public abstract class FileOptionsConfigu
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(path=")
.append(path);
result.append(")");
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
public class FileOptionsSaxHandler extends OptionsSaxHandler
{
/** The option configuration which is currently filled. */
- private FileOptionsConfiguration optionsConfiguration;
+ private final FileOptionsConfiguration optionsConfiguration;
public FileOptionsSaxHandler(FileOptionsConfiguration optionsConfiguration)
{
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java
Sun Apr 21 13:29:41 2024
@@ -35,7 +35,7 @@ import org.apache.torque.generator.optio
public class MapOptionsConfiguration extends OptionsConfigurationBase
{
/** The map containing the options. */
- private Map<String, String> optionMap;
+ private final Map<String, String> optionMap;
/**
* Constructor.
@@ -78,7 +78,7 @@ public class MapOptionsConfiguration ext
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("(optionMap=")
.append(optionMap);
result.append(")");
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -29,7 +29,7 @@ import org.xml.sax.helpers.DefaultHandle
public class OptionsSaxHandler extends DefaultHandler
{
/** The OptionsConfiguration to be filled by this SAX handler. */
- private OptionsConfiguration optionsConfiguration;
+ private final OptionsConfiguration optionsConfiguration;
/**
* Whether the SAX handler has finished reading the options configuration.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
Sun Apr 21 13:29:41 2024
@@ -30,7 +30,7 @@ import org.xml.sax.SAXException;
* OptionsSaxHandlers. The first matching handler will then be used to parse
* the action configuration.
*/
-public abstract interface OptionsSaxHandlerFactory
+public interface OptionsSaxHandlerFactory
{
/**
* Returns the action type handled by the ActionSaxHandlers which are
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -52,7 +52,7 @@ class JavaOutletSaxHandler extends Outle
private String propertyName;
/** The value of the property which is currently processed. */
- private StringBuffer propertyValue;
+ private StringBuilder propertyValue;
/** The current nesting level inside the processed element. */
private int level = 0;
@@ -273,7 +273,7 @@ class JavaOutletSaxHandler extends Outle
else if (level > 1)
{
propertyName = rawName;
- propertyValue = new StringBuffer();
+ propertyValue = new StringBuilder();
}
else
{
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
Sun Apr 21 13:29:41 2024
@@ -98,7 +98,7 @@ public class OutletConfiguration
/**
* Resolves the isolated merge point mappings and adds them to
* the relevant outlets.
- *
+ *
* @throws ConfigurationException if configuration not found
*/
public void resolveMergepointMappings() throws ConfigurationException
@@ -232,7 +232,7 @@ public class OutletConfiguration
@Override
public String toString()
{
- StringBuffer result = new StringBuffer("(outlets=[")
+ StringBuilder result = new StringBuilder("(outlets=[")
.append(outlets)
.append(")");
return result.toString();
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
Sun Apr 21 13:29:41 2024
@@ -73,15 +73,7 @@ public class OutletConfigurationXmlParse
saxFactory.setFeature(
"http://apache.org/xml/features/validation/schema";, true);
}
- catch (SAXNotSupportedException e)
- {
- throw new RuntimeException(e);
- }
- catch (SAXNotRecognizedException e)
- {
- throw new RuntimeException(e);
- }
- catch (ParserConfigurationException e)
+ catch (SAXNotSupportedException | SAXNotRecognizedException |
ParserConfigurationException e)
{
throw new RuntimeException(e);
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -51,19 +51,19 @@ public abstract class OutletSaxHandler e
* by the generated SaxHandlerFactory, or null if the name
* of the outlet should be determined from the parsed XML.
*/
- private QualifiedName outletName;
+ private final QualifiedName outletName;
/** the outlet to be configured. */
private Outlet outlet;
/** The access object for the configuration files, not null. */
- private ConfigurationProvider configurationProvider;
+ private final ConfigurationProvider configurationProvider;
/** The description of the generation unit, not null. */
- private UnitDescriptor unitDescriptor;
+ private final UnitDescriptor unitDescriptor;
/** The available configuration handlers. */
- private ConfigurationHandlers configurationHandlers;
+ private final ConfigurationHandlers configurationHandlers;
/**
* The SAX handler for processing mergepoint declarations.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java
Sun Apr 21 13:29:41 2024
@@ -29,7 +29,7 @@ import org.xml.sax.SAXException;
* Classes implementing this interface can create creating
* <code>OutletSaxHandler</code>s for more than one outlet type.
*/
-public abstract interface UntypedOutletSaxHandlerFactory
+public interface UntypedOutletSaxHandlerFactory
{
/**
* Returns whether the handler can create OutletSaxHandlers for the given
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
Sun Apr 21 13:29:41 2024
@@ -21,7 +21,7 @@ package org.apache.torque.generator.conf
/**
* The default organization of the torque-generator directory.
- *
+ *
* <p>
* This is:
* <pre>
@@ -32,7 +32,7 @@ package org.apache.torque.generator.conf
* - - templates
* - - resources
* </pre>
- *
+ *
*/
public class DefaultTorqueGeneratorPaths implements TorqueGeneratorPaths
{
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java
Sun Apr 21 13:29:41 2024
@@ -30,7 +30,7 @@ public class Maven2JarProjectPaths exten
/**
* The path to the jar file, relative to the configuration root directory.
*/
- private String jarFileName;
+ private final String jarFileName;
/**
* Constructor.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -46,7 +46,7 @@ public class EntityReferenceSaxHandler e
private String resource;
/** The configurationProvider. */
- private ConfigurationProvider configurationProvider;
+ private final ConfigurationProvider configurationProvider;
/**
* Constructor.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
Sun Apr 21 13:29:41 2024
@@ -34,7 +34,7 @@ import org.xml.sax.SAXException;
public class EntityReferences implements EntityResolver
{
/** All known entity references. */
- private Map<String, byte[]> entityReferences
+ private final Map<String, byte[]> entityReferences
= new HashMap<>();
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java
Sun Apr 21 13:29:41 2024
@@ -49,10 +49,10 @@ public class FileSourceSaxHandler extend
private String format;
/** The source file names which should be included in generation. */
- private Set<String> includes = new HashSet<>();
+ private final Set<String> includes = new HashSet<>();
/** The source file names which should be excluded from generation. */
- private Set<String> excludes = new HashSet<>();
+ private final Set<String> excludes = new HashSet<>();
/** Whether to combine all source files. */
private Boolean combineFiles;
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
Sun Apr 21 13:29:41 2024
@@ -42,7 +42,7 @@ public class SourceSaxHandlerFactories
* A map containing all known SourceSaxHandlerFactories,
* keyed by the type of the sources.
*/
- private Map<String, SourceSaxHandlerFactory> factories
+ private final Map<String, SourceSaxHandlerFactory> factories
= new HashMap<>();
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java
Sun Apr 21 13:29:41 2024
@@ -28,7 +28,7 @@ import org.xml.sax.SAXException;
* Classes implementing this interface are responsible for creating
* <code>SourceSaxHandler</code>s for a specific source type.
*/
-public abstract interface SourceSaxHandlerFactory
+public interface SourceSaxHandlerFactory
{
/**
* Returns the source type handled by the SourceSaxHandlers which are
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
Sun Apr 21 13:29:41 2024
@@ -149,7 +149,7 @@ public class Controller
/**
* Initializes the Logging.
- *
+ *
*/
protected void checkLogging()
{
@@ -667,7 +667,7 @@ public class Controller
*
* @return the encoding, not null.
*/
- private String getOutputEncoding(
+ private Charset getOutputEncoding(
final Output output,
final UnitConfiguration unitConfiguration)
{
@@ -679,7 +679,7 @@ public class Controller
{
return unitConfiguration.getDefaultOutputEncoding();
}
- return Charset.defaultCharset().displayName();
+ return Charset.defaultCharset();
}
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
Sun Apr 21 13:29:41 2024
@@ -40,18 +40,18 @@ import org.apache.torque.generator.varia
/**
* The state of the controller. Contains all stuff the controller needs to
* track.
- *
+ *
* Initialization steps in {@link Controller#run(List)}:
- * <ol>
- * <li>First {@link #unitConfiguration} {@link UnitConfiguration} is set
+ * <ol>
+ * <li>First {@link #unitConfiguration} {@link UnitConfiguration} is set
* in {@link Controller#processGenerationUnit(ControllerState,
UnitConfiguration)}
- * <li>Second {@link #output} {@link Output} and {@link #sourceProvider}
{@link SourceProvider} is set and reset
+ * <li>Second {@link #output} {@link Output} and {@link #sourceProvider}
{@link SourceProvider} is set and reset
* in private method processOutput of {@link Controller}.
- * <li>Third {@link #sourceFile}, {@link #modelRoot} and {@link #model} is set
- * in private method processSourceInOutput of {@link Controller}.
- * <li>Fourth {@link #outputFile}, {@link #outletNamespace}, {@link
#rootOutletReference} is set
+ * <li>Third {@link #sourceFile}, {@link #modelRoot} and {@link #model} is set
+ * in private method processSourceInOutput of {@link Controller}.
+ * <li>Fourth {@link #outputFile}, {@link #outletNamespace}, {@link
#rootOutletReference} is set
* in private method processModel of {@link Controller} .
- *
+ *
*/
public class ControllerState
{
@@ -405,11 +405,11 @@ public class ControllerState
/**
* Convenience method to return the value of an option as boolean.
* The option is evaluated in the current outlet's context, see
- * getOption(String).
- *
+ * getOption(String).
+ *
* <p>
* Uses Boolean.paseBoolean() for String -> Boolean conversion.
- *
+ *
* @param name the name of the option, can contain a namespace.
*
* @return The value of the option as boolean, or false if no option
@@ -429,7 +429,7 @@ public class ControllerState
* Convenience method to return the value of an option as boolean.
* The option is evaluated in the current outlet's context, see
* getOption(String).
- *
+ *
* <p>
* Uses Boolean.paseBoolean() for String -> Boolean conversion.
*
@@ -616,7 +616,7 @@ public class ControllerState
@Override
public String toString()
{
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append("sourceProvider=").append(sourceProvider)
.append("output=").append(output)
.append("outputFilePath=").append(outputFile)
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java
Sun Apr 21 13:29:41 2024
@@ -50,7 +50,7 @@ public class TokenReplacer implements St
/**
* The controller state for resolving options.
*/
- private ControllerState controllerState;
+ private final ControllerState controllerState;
/**
* @param controllerState to init the token replacer
@@ -166,7 +166,7 @@ public class TokenReplacer implements St
return result.toString();
}
-
+
/**
* @param tokenName the token name to resolve
* @return resolved token
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java
Sun Apr 21 13:29:41 2024
@@ -183,11 +183,7 @@ public class ApplyAction implements Merg
{
return true;
}
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
+ if ((obj == null) || (getClass() != obj.getClass()))
{
return false;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java
Sun Apr 21 13:29:41 2024
@@ -196,11 +196,7 @@ public class TraverseAllAction implement
{
return true;
}
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
+ if ((obj == null) || (getClass() != obj.getClass()))
{
return false;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/AppendToTargetFileStrategy.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/AppendToTargetFileStrategy.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/AppendToTargetFileStrategy.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/AppendToTargetFileStrategy.java
Sun Apr 21 13:29:41 2024
@@ -21,6 +21,7 @@ package org.apache.torque.generator.cont
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
import org.apache.torque.generator.GeneratorException;
@@ -49,7 +50,7 @@ public class AppendToTargetFileStrategy
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param unitConfiguration the configuration of the current configuration
* unit, not null.
@@ -60,7 +61,7 @@ public class AppendToTargetFileStrategy
public boolean beforeGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
UnitConfiguration unitConfiguration)
{
return true;
@@ -74,7 +75,7 @@ public class AppendToTargetFileStrategy
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param generationResult the result of the generation, not null.
* @param unitConfiguration the configuration of the current configuration
@@ -85,7 +86,7 @@ public class AppendToTargetFileStrategy
public void afterGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
OutletResult generationResult,
UnitConfiguration unitConfiguration)
throws GeneratorException
@@ -103,16 +104,16 @@ public class AppendToTargetFileStrategy
{
originalContent = FileUtils.readFileToString(
outputFile,
- encoding);
+ charSet);
}
FileUtils.writeStringToFile(
outputFile,
originalContent + generationResult.getStringResult(),
- encoding);
+ charSet);
}
else
{
- byte[] originalContent = new byte[] {};
+ byte[] originalContent = {};
if (outputFile.exists())
{
originalContent = FileUtils.readFileToByteArray(
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ExistingTargetStrategy.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ExistingTargetStrategy.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ExistingTargetStrategy.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ExistingTargetStrategy.java
Sun Apr 21 13:29:41 2024
@@ -1,5 +1,7 @@
package org.apache.torque.generator.control.existingtargetstrategy;
+import java.nio.charset.Charset;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -39,7 +41,7 @@ public interface ExistingTargetStrategy
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param unitConfiguration the configuration of the current configuration
* unit, not null.
@@ -52,7 +54,7 @@ public interface ExistingTargetStrategy
boolean beforeGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
UnitConfiguration unitConfiguration)
throws GeneratorException;
@@ -64,7 +66,7 @@ public interface ExistingTargetStrategy
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param generationResult the result of the generation, not null.
* @param unitConfiguration the configuration of the current configuration
@@ -75,7 +77,7 @@ public interface ExistingTargetStrategy
void afterGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
OutletResult generationResult,
UnitConfiguration unitConfiguration)
throws GeneratorException;
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
Sun Apr 21 13:29:41 2024
@@ -21,6 +21,7 @@ package org.apache.torque.generator.cont
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
@@ -64,7 +65,7 @@ public class MergeTargetFileStrategy imp
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param unitConfiguration the configuration of the current configuration
* unit, not null.
@@ -75,7 +76,7 @@ public class MergeTargetFileStrategy imp
public boolean beforeGeneration(
final String outputDirKey,
final String outputPath,
- final String encoding,
+ final Charset charSet,
final UnitConfiguration unitConfiguration)
{
return true;
@@ -88,7 +89,7 @@ public class MergeTargetFileStrategy imp
* into which the generated file should be written,
* null for the default output directory.
* @param outputPath the location to which the output should be written.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param generationResult the result of the generation, not null.
* @param unitConfiguration the configuration of the current configuration
@@ -100,7 +101,7 @@ public class MergeTargetFileStrategy imp
public void afterGeneration(
final String outputDirKey,
final String outputPath,
- final String encoding,
+ final Charset charSet,
final OutletResult generationResult,
final UnitConfiguration unitConfiguration)
throws GeneratorException
@@ -123,7 +124,7 @@ public class MergeTargetFileStrategy imp
}
String oldGenerationContent = readFileToString(
generationStorageFile,
- encoding);
+ charSet);
File targetFile = ControllerHelper.getOutputFile(
outputDirKey,
@@ -131,7 +132,7 @@ public class MergeTargetFileStrategy imp
unitConfiguration);
String oldTargetContent = readFileToString(
targetFile,
- encoding);
+ charSet);
if (!generationResult.isStringResult())
{
@@ -162,13 +163,13 @@ public class MergeTargetFileStrategy imp
oldGenerationContent,
generationResult.getStringResult(),
oldTargetContent,
- encoding);
+ charSet);
}
- writeStringToFile(targetFile, newTargetContent, encoding);
+ writeStringToFile(targetFile, newTargetContent, charSet);
writeStringToFile(
generationStorageFile,
generationResult.getStringResult(),
- encoding);
+ charSet);
}
/**
@@ -194,7 +195,7 @@ public class MergeTargetFileStrategy imp
*/
private String readFileToString(
final File file,
- final String charset)
+ final Charset charset)
throws ControllerException
{
String result = null;
@@ -231,7 +232,7 @@ public class MergeTargetFileStrategy imp
private void writeStringToFile(
final File file,
final String content,
- final String charset)
+ final Charset charset)
throws ControllerException
{
try
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ReplaceTargetFileStrategy.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ReplaceTargetFileStrategy.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ReplaceTargetFileStrategy.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ReplaceTargetFileStrategy.java
Sun Apr 21 13:29:41 2024
@@ -21,6 +21,7 @@ package org.apache.torque.generator.cont
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
import org.apache.torque.generator.GeneratorException;
@@ -48,7 +49,7 @@ public class ReplaceTargetFileStrategy i
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param unitConfiguration the configuration of the current configuration
* unit, not null.
@@ -59,7 +60,7 @@ public class ReplaceTargetFileStrategy i
public boolean beforeGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
UnitConfiguration unitConfiguration)
{
return true;
@@ -73,7 +74,7 @@ public class ReplaceTargetFileStrategy i
* null for the default output directory.
* @param outputPath the path to which the output should be written,
* relative to the output base directory.
- * @param encoding The character encoding of the generated file,
+ * @param charSet The character encoding of the generated file,
* or null for the platform default encoding.
* @param generationResult the result of the generation, not null.
* @param unitConfiguration the configuration of the current configuration
@@ -84,7 +85,7 @@ public class ReplaceTargetFileStrategy i
public void afterGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
OutletResult generationResult,
UnitConfiguration unitConfiguration)
throws GeneratorException
@@ -100,7 +101,7 @@ public class ReplaceTargetFileStrategy i
FileUtils.writeStringToFile(
outputFile,
generationResult.getStringResult(),
- encoding);
+ charSet);
}
else
{
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/SkipExistingTargetFileStrategy.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/SkipExistingTargetFileStrategy.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/SkipExistingTargetFileStrategy.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/SkipExistingTargetFileStrategy.java
Sun Apr 21 13:29:41 2024
@@ -20,6 +20,7 @@ package org.apache.torque.generator.cont
*/
import java.io.File;
+import java.nio.charset.Charset;
import org.apache.torque.generator.configuration.UnitConfiguration;
import org.apache.torque.generator.control.ControllerHelper;
@@ -52,7 +53,7 @@ public class SkipExistingTargetFileStrat
public boolean beforeGeneration(
String outputDirKey,
String outputPath,
- String encoding,
+ Charset charSet,
UnitConfiguration unitConfiguration)
{
File outputFile = ControllerHelper.getOutputFile(
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
Sun Apr 21 13:29:41 2024
@@ -34,17 +34,17 @@ public class WildcardFilter implements F
* The wildcard expression against which the file names are
* checked.
*/
- private String expression;
+ private final String expression;
/**
* Whether directories are accepted at all.
*/
- private boolean acceptDir;
+ private final boolean acceptDir;
/**
* Whether files are accepted at all.
*/
- private boolean acceptFile;
+ private final boolean acceptFile;
/**
* Constructor.
@@ -79,11 +79,7 @@ public class WildcardFilter implements F
@Override
public boolean accept(File file)
{
- if (!acceptDir && file.isDirectory())
- {
- return false;
- }
- if (!acceptFile && file.isFile())
+ if ((!acceptDir && file.isDirectory()) || (!acceptFile &&
file.isFile()))
{
return false;
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/jdbc/SchemaType.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/jdbc/SchemaType.java?rev=1917241&r1=1917240&r2=1917241&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/jdbc/SchemaType.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/jdbc/SchemaType.java
Sun Apr 21 13:29:41 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
