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/08/27 09:48:39 UTC
svn commit: r1839288 [3/20] - 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/c...
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java Mon Aug 27 09:48:33 2018
@@ -52,7 +52,7 @@ abstract class OptionsConfigurationBase
protected Collection<Option> toOptions(
Map<? extends Object, ? extends Object> optionsMap)
{
- Set<Option> options = new HashSet<Option>();
+ Set<Option> options = new HashSet<>();
for (Entry<? extends Object, ? extends Object> entry
: optionsMap.entrySet())
{
@@ -63,7 +63,7 @@ abstract class OptionsConfigurationBase
if (log.isTraceEnabled())
{
log.trace("Setting option " + entry.getKey()
- + " to value " + entry.getValue());
+ + " to value " + entry.getValue());
}
}
return options;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -52,5 +52,5 @@ public abstract interface OptionsSaxHand
* not be created from the given XML element.
*/
OptionsSaxHandler getOptionsSaxHandler()
- throws SAXException;
+ throws SAXException;
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java Mon Aug 27 09:48:33 2018
@@ -46,9 +46,10 @@ public class PropertiesOptionConfigurati
*
* @throws ConfigurationException if the file cannot be accessed or parsed.
*/
+ @Override
public Collection<Option> getOptions(
- ConfigurationProvider configurationProvider)
- throws ConfigurationException
+ ConfigurationProvider configurationProvider)
+ throws ConfigurationException
{
Properties properties = new Properties();
try (InputStream optionsInputStream = configurationProvider.getOptionsInputStream(getPath()))
@@ -58,7 +59,7 @@ public class PropertiesOptionConfigurati
catch (IOException | RuntimeException e)
{
throw new ConfigurationException("Error reading options file "
- + getPath(),
+ + getPath(),
e);
}
return toOptions(properties);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -25,7 +25,7 @@ import org.xml.sax.SAXException;
* A Factory which creates a SAX handler for properties options.
*/
public class PropertiesOptionsSaxHandlerFactory
- implements OptionsSaxHandlerFactory
+implements OptionsSaxHandlerFactory
{
/** The type of the configuration. */
private static final String TYPE = "propertiesOptions";
@@ -37,6 +37,7 @@ public class PropertiesOptionsSaxHandler
*
* @return "propertiesOptions".
*/
+ @Override
public String getType()
{
return TYPE;
@@ -48,8 +49,9 @@ public class PropertiesOptionsSaxHandler
*
* @return a new FileOptionsSaxHandler.
*/
+ @Override
public final FileOptionsSaxHandler getOptionsSaxHandler()
- throws SAXException
+ throws SAXException
{
return new FileOptionsSaxHandler(new PropertiesOptionConfiguration());
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java Mon Aug 27 09:48:33 2018
@@ -47,9 +47,10 @@ public class XmlOptionConfiguration exte
*
* @throws ConfigurationException if the file cannot be accessed or parsed.
*/
+ @Override
public Collection<Option> getOptions(
- ConfigurationProvider configurationProvider)
- throws ConfigurationException
+ ConfigurationProvider configurationProvider)
+ throws ConfigurationException
{
Properties properties = new Properties();
try (InputStream optionsInputStream = configurationProvider.getOptionsInputStream(getPath()))
@@ -59,7 +60,7 @@ public class XmlOptionConfiguration exte
catch (IOException | RuntimeException e)
{
throw new ConfigurationException("Error reading options file "
- + getPath(),
+ + getPath(),
e);
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionsSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionsSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionsSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionsSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -25,7 +25,7 @@ import org.xml.sax.SAXException;
* A Factory which creates a SAX handler for XML Options.
*/
public class XmlOptionsSaxHandlerFactory
- implements OptionsSaxHandlerFactory
+implements OptionsSaxHandlerFactory
{
/** The type of the configuration. */
private static final String TYPE = "xmlOptions";
@@ -37,6 +37,7 @@ public class XmlOptionsSaxHandlerFactory
*
* @return "xmlOptions".
*/
+ @Override
public String getType()
{
return TYPE;
@@ -48,8 +49,9 @@ public class XmlOptionsSaxHandlerFactory
*
* @return a new FileOptionsSaxHandler.
*/
+ @Override
public final FileOptionsSaxHandler getOptionsSaxHandler()
- throws SAXException
+ throws SAXException
{
return new FileOptionsSaxHandler(new XmlOptionConfiguration());
}
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -57,7 +57,7 @@ class CopyOutletSaxHandler extends Outle
ConfigurationProvider configurationProvider,
UnitDescriptor unitDescriptor,
ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
super(outletName,
configurationProvider,
@@ -94,12 +94,12 @@ class CopyOutletSaxHandler extends Outle
String localName,
String rawName,
Attributes attributes)
- throws SAXException
+ throws SAXException
{
if (outletName == null)
{
String nameAttribute
- = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
+ = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
if (nameAttribute == null)
{
throw new SAXException("The attribute "
@@ -116,10 +116,10 @@ class CopyOutletSaxHandler extends Outle
try
{
CopyOutlet result
- = new CopyOutlet(
- outletName,
- getConfigurationProvider(),
- path);
+ = new CopyOutlet(
+ outletName,
+ getConfigurationProvider(),
+ path);
return result;
}
catch (ConfigurationException e)
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -33,7 +33,7 @@ import org.xml.sax.SAXException;
* Creates copy outlet SAX handlers.
*/
public class CopyOutletSaxHandlerFactory
- implements TypedOutletSaxHandlerFactory
+implements TypedOutletSaxHandlerFactory
{
/**
* The type of the outlets which can be processed by the
@@ -46,6 +46,7 @@ public class CopyOutletSaxHandlerFactory
* OutletSaxHandlers created by this factory.
* @return "copyOutlet".
*/
+ @Override
public String getType()
{
return OUTLET_TYPE;
@@ -58,6 +59,7 @@ public class CopyOutletSaxHandlerFactory
* @return the empty list, as this outlet type is not described
* by templates.
*/
+ @Override
public Collection<String> getTemplatesFilenameExtensionsForScan()
{
return Collections.emptyList();
@@ -76,6 +78,7 @@ public class CopyOutletSaxHandlerFactory
*
* @throws UnsupportedOperationException always.
*/
+ @Override
public Outlet createOutletForTemplate(
final String templatePath,
final ConfigurationProvider configurationProvider)
@@ -101,12 +104,13 @@ public class CopyOutletSaxHandlerFactory
*
* @return a new JavaOutletSaxHandler.
*/
+ @Override
public final OutletSaxHandler getOutletSaxHandler(
final QualifiedName outletName,
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
return new CopyOutletSaxHandler(
outletName,
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandler.java Mon Aug 27 09:48:33 2018
@@ -71,12 +71,12 @@ class GroovyOutletSaxHandler extends Out
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
super(outletName,
- configurationProvider,
- unitDescriptor,
- configurationHandlers);
+ configurationProvider,
+ unitDescriptor,
+ configurationHandlers);
}
/**
@@ -108,7 +108,7 @@ class GroovyOutletSaxHandler extends Out
final String localName,
final String rawName,
final Attributes attributes)
- throws SAXException
+ throws SAXException
{
final String path = attributes.getValue(OUTLET_PATH_ATTRIBUTE);
if (path == null)
@@ -123,7 +123,7 @@ class GroovyOutletSaxHandler extends Out
if (outletName == null)
{
final String nameAttribute
- = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
+ = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
if (nameAttribute != null)
{
outletName = new QualifiedName(nameAttribute);
@@ -180,10 +180,10 @@ class GroovyOutletSaxHandler extends Out
result.setOptionsInBinding(optionsInContext);
}
final Boolean sourceElementAttributesInContext
- = SaxHelper.getBooleanAttribute(
- OUTLET_SOURCE_ATTRIBUTES_IN_BINDING_ATTRIBUTE,
- attributes,
- "the groovyOutlet" + outletName);
+ = SaxHelper.getBooleanAttribute(
+ OUTLET_SOURCE_ATTRIBUTES_IN_BINDING_ATTRIBUTE,
+ attributes,
+ "the groovyOutlet" + outletName);
if (sourceElementAttributesInContext != null)
{
result.setSourceAttributesInBinding(
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -37,7 +37,7 @@ import org.xml.sax.SAXException;
* Creates Groovy outlet SAX handlers.
*/
public class GroovyOutletSaxHandlerFactory
- implements TypedOutletSaxHandlerFactory
+implements TypedOutletSaxHandlerFactory
{
/**
* The type of the outlets which can be processed by the
@@ -53,7 +53,7 @@ public class GroovyOutletSaxHandlerFacto
static
{
- List<String> templateFilenameExtensions = new ArrayList<String>();
+ List<String> templateFilenameExtensions = new ArrayList<>();
templateFilenameExtensions.add(".groovy");
TEMPLATE_FILENAMES_EXTENSIONS = Collections.unmodifiableList(
templateFilenameExtensions);
@@ -65,6 +65,7 @@ public class GroovyOutletSaxHandlerFacto
*
* @return "groovyOutlet".
*/
+ @Override
public String getType()
{
return OUTLET_TYPE;
@@ -76,6 +77,7 @@ public class GroovyOutletSaxHandlerFacto
*
* @return A list with the entry ".groovy".
*/
+ @Override
public Collection<String> getTemplatesFilenameExtensionsForScan()
{
return TEMPLATE_FILENAMES_EXTENSIONS;
@@ -90,13 +92,14 @@ public class GroovyOutletSaxHandlerFacto
*
* @return the outlet, not null.
*/
+ @Override
public Outlet createOutletForTemplate(
- final String templatePath,
- final ConfigurationProvider configurationProvider)
- throws ConfigurationException
+ final String templatePath,
+ final ConfigurationProvider configurationProvider)
+ throws ConfigurationException
{
GroovyScriptOutlet result
- = new GroovyScriptOutlet(
+ = new GroovyScriptOutlet(
OutletConfigurationXmlParser.getOutletNameForFilename(
templatePath),
configurationProvider,
@@ -122,12 +125,13 @@ public class GroovyOutletSaxHandlerFacto
*
* @return a new GroovyOutletSaxHandler.
*/
+ @Override
public final OutletSaxHandler getOutletSaxHandler(
final QualifiedName outletName,
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
return new GroovyOutletSaxHandler(
outletName,
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java Mon Aug 27 09:48:33 2018
@@ -77,7 +77,7 @@ class JavaOutletSaxHandler extends Outle
ConfigurationProvider configurationProvider,
UnitDescriptor unitDescriptor,
ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
super(outletName,
configurationProvider,
@@ -107,18 +107,19 @@ class JavaOutletSaxHandler extends Outle
*
* @throws SAXException if an error occurs during creation.
*/
+ @Override
protected Outlet createOutlet(
QualifiedName outletName,
String uri,
String localName,
String rawName,
Attributes attributes)
- throws SAXException
+ throws SAXException
{
if (outletName == null)
{
String nameAttribute
- = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
+ = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
if (nameAttribute == null)
{
throw new SAXException("The attribute "
@@ -158,25 +159,25 @@ class JavaOutletSaxHandler extends Outle
{
throw new SAXException(
"Error while initializing the java outlet "
- + outletName
- + " : Could not load class " + className, e);
+ + outletName
+ + " : Could not load class " + className, e);
}
catch (ExceptionInInitializerError e)
{
log.error(
"Error while initializing the java outlet "
- + outletName
- + " : Could not initialize class " + className
- + " : " + e.getMessage());
+ + outletName
+ + " : Could not initialize class " + className
+ + " : " + e.getMessage());
throw e;
}
catch (LinkageError e)
{
log.error(
"Error while initializing the java outlet "
- + outletName
- + " : Could not link class " + className
- + " : " + e.getMessage());
+ + outletName
+ + " : Could not link class " + className
+ + " : " + e.getMessage());
throw e;
}
@@ -184,65 +185,65 @@ class JavaOutletSaxHandler extends Outle
try
{
Constructor<?> constructor
- = outletClass.getConstructor(QualifiedName.class);
+ = outletClass.getConstructor(QualifiedName.class);
result = (Outlet) constructor.newInstance(outletName);
}
catch (NoSuchMethodException e)
{
throw new SAXException(
"Error while instantiating the java outlet "
- + outletName
- + " : The class " + className
- + " has no constructor which takes a qualified name",
- e);
+ + outletName
+ + " : The class " + className
+ + " has no constructor which takes a qualified name",
+ e);
}
catch (ClassCastException e)
{
throw new SAXException(
"Error while instantiating the java outlet "
- + outletName
- + " : The class " + className
- + " is not an instance of "
- + Outlet.class.getName(),
- e);
+ + outletName
+ + " : The class " + className
+ + " is not an instance of "
+ + Outlet.class.getName(),
+ e);
}
catch (IllegalAccessException e)
{
throw new SAXException(
"Error while instantiating the java outlet "
- + outletName
- + " : The constructor of class "
- + className + " could not be accessed",
- e);
+ + outletName
+ + " : The constructor of class "
+ + className + " could not be accessed",
+ e);
}
catch (InvocationTargetException e)
{
throw new SAXException(
"Error while instantiating the java outlet "
- + outletName
- + " : The constructor of class "
- + className + " could not be called",
- e);
+ + outletName
+ + " : The constructor of class "
+ + className + " could not be called",
+ e);
}
catch (InstantiationException e)
{
throw new SAXException(
"Error while instantiating the java outlet "
- + outletName
- + " : The class " + className
- + " represents an abstract class, "
- + "an interface, an array class, a primitive type, "
- + "or void, or the class has no parameterless constructor, "
- + "or the instantiation fails for some other reason.",
- e);
+ + outletName
+ + " : The class " + className
+ + " represents an abstract class, "
+ + "an interface, an array class, a primitive type, "
+ + "or void, or the class has no parameterless constructor, "
+ + "or the instantiation fails for some other reason.",
+ e);
}
catch (SecurityException e)
{
throw new SAXException(
"Error while instantiating the java outlet "
- + outletName
- + " : The security manager denies instantiation",
- e);
+ + outletName
+ + " : The security manager denies instantiation",
+ e);
}
return result;
@@ -257,11 +258,11 @@ class JavaOutletSaxHandler extends Outle
String localName,
String rawName,
Attributes attributes)
- throws SAXException
+ throws SAXException
{
level++;
if ((level == 2 && MERGEPOINT_TAG.equals(rawName))
- || super.isProcessingMergepointTag())
+ || super.isProcessingMergepointTag())
{
super.startElement(uri, localName, rawName, attributes);
}
@@ -285,7 +286,7 @@ class JavaOutletSaxHandler extends Outle
*/
@Override
public void endElement(String uri, String localName, String rawName)
- throws SAXException
+ throws SAXException
{
level--;
if (propertyName != null)
@@ -310,7 +311,7 @@ class JavaOutletSaxHandler extends Outle
+ getOutlet().getName()
+ " with value "
+ propertyValue.toString(),
- e);
+ e);
}
catch (IllegalAccessException e)
{
@@ -320,7 +321,7 @@ class JavaOutletSaxHandler extends Outle
+ getOutlet().getName()
+ " with value "
+ propertyValue.toString(),
- e);
+ e);
}
propertyName = null;
propertyValue = null;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -33,7 +33,7 @@ import org.xml.sax.SAXException;
* Creates Java outlet SAX handlers.
*/
public class JavaOutletSaxHandlerFactory
- implements TypedOutletSaxHandlerFactory
+implements TypedOutletSaxHandlerFactory
{
/**
* The type of the outlets which can be processed by the
@@ -46,6 +46,7 @@ public class JavaOutletSaxHandlerFactory
* OutletSaxHandlers created by this factory.
* @return "javaOutlet".
*/
+ @Override
public String getType()
{
return OUTLET_TYPE;
@@ -58,6 +59,7 @@ public class JavaOutletSaxHandlerFactory
* @return the empty list, as this outlet type is not described
* by templates.
*/
+ @Override
public Collection<String> getTemplatesFilenameExtensionsForScan()
{
return Collections.emptyList();
@@ -76,6 +78,7 @@ public class JavaOutletSaxHandlerFactory
*
* @throws UnsupportedOperationException always.
*/
+ @Override
public Outlet createOutletForTemplate(
final String templatePath,
final ConfigurationProvider configurationProvider)
@@ -101,12 +104,13 @@ public class JavaOutletSaxHandlerFactory
*
* @return a new JavaOutletSaxHandler.
*/
+ @Override
public final OutletSaxHandler getOutletSaxHandler(
final QualifiedName outletName,
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
return new JavaOutletSaxHandler(
outletName,
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 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<QualifiedName, Outlet>();
+ = new HashMap<>();
/** A map containing all isolated mergepoint mappings,
* keyed by their name. */
private final Map<String, MergepointMapping> mergepointMappings
- = new HashMap<String, MergepointMapping>();
+ = new HashMap<>();
/**
* Whether the mergepoint mappings have been resolved and added to
@@ -64,10 +64,10 @@ public class OutletConfiguration
* @throws NullPointerException if a parameter is null.
*/
public OutletConfiguration(
- final Collection<Outlet> outlets,
- final Collection<MergepointMapping> mergepointMappings,
- final UnitDescriptor unitDescriptor)
- throws ConfigurationException
+ final Collection<Outlet> outlets,
+ final Collection<MergepointMapping> mergepointMappings,
+ final UnitDescriptor unitDescriptor)
+ throws ConfigurationException
{
if (outlets == null)
{
@@ -107,14 +107,14 @@ public class OutletConfiguration
{
String name = entry.getKey();
QualifiedName qualifiedMergepointName
- = new QualifiedName(name);
+ = new QualifiedName(name);
if (qualifiedMergepointName.getNamespace().isRoot())
{
// outlet name is missing
throw new ConfigurationException(
"The isolated mergepoint mapping with the name "
- + name
- + " needs to be qualified with the outlet name");
+ + name
+ + " needs to be qualified with the outlet name");
}
QualifiedName outletName = new QualifiedName(
qualifiedMergepointName.getNamespace().toString());
@@ -123,17 +123,17 @@ public class OutletConfiguration
{
throw new ConfigurationException(
"No outlet with name "
- + outletName
- + "exists (required by the isolated mergepoint mapping"
- + " with the name "
- + name
- + ")");
+ + outletName
+ + "exists (required by the isolated mergepoint mapping"
+ + " with the name "
+ + name
+ + ")");
}
MergepointMapping originalMergepointMapping = entry.getValue();
MergepointMapping resolvedMergepointMapping
- = new MergepointMapping(
- qualifiedMergepointName.getName(),
- originalMergepointMapping.getActions());
+ = new MergepointMapping(
+ qualifiedMergepointName.getName(),
+ originalMergepointMapping.getActions());
outlet.setMergepointMapping(resolvedMergepointMapping);
}
mergepointMappingsResolved = true;
@@ -192,7 +192,7 @@ public class OutletConfiguration
* @throws NullPointerException if outlet is null.
*/
public void addOutlet(Outlet outlet, final UnitDescriptor unitDescriptor)
- throws ConfigurationException
+ throws ConfigurationException
{
if (outlet == null)
{
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -60,14 +60,14 @@ public class OutletConfigurationSaxHandl
private final UnitDescriptor unitDescriptor;
/** The list of outlets which configuration was already parsed. */
- private final List<Outlet> outlets = new ArrayList<Outlet>();
+ private final List<Outlet> outlets = new ArrayList<>();
/**
* The list of separate mergepoint mappings (outside the outlets)
* which configuration was already parsed.
*/
private final List<MergepointMapping> mergepointMappings
- = new ArrayList<MergepointMapping>();
+ = new ArrayList<>();
/** The available configuration handlers. */
private final ConfigurationHandlers configurationHandlers;
@@ -153,11 +153,11 @@ public class OutletConfigurationSaxHandl
*/
@Override
public void startElement(
- final String uri,
- final String localName,
- final String qName,
- final Attributes attributes)
- throws SAXException
+ final String uri,
+ final String localName,
+ final String qName,
+ final Attributes attributes)
+ throws SAXException
{
String unqualifiedName = SaxHelper.getUnqualifiedName(localName, qName);
if (outletHandler != null)
@@ -227,7 +227,7 @@ public class OutletConfigurationSaxHandl
if (mergepointHandler.isFinished())
{
MergepointMapping mergepointMapping
- = mergepointHandler.getMergepointMapping();
+ = mergepointHandler.getMergepointMapping();
mergepointMappings.add(mergepointMapping);
if (log.isDebugEnabled())
{
@@ -272,19 +272,19 @@ public class OutletConfigurationSaxHandl
public OutletSaxHandler getOutletHandler(
final QualifiedName outletName,
final String outletType)
- throws SAXException
+ throws SAXException
{
OutletTypes outletTypes = configurationHandlers.getOutletTypes();
TypedOutletSaxHandlerFactory typedHandlerFactory
- = outletTypes.getTypedOutletHandlerFactories().get(outletType);
+ = outletTypes.getTypedOutletHandlerFactories().get(outletType);
if (typedHandlerFactory != null)
{
OutletSaxHandler outletSaxHandler
- = typedHandlerFactory.getOutletSaxHandler(
- outletName,
- configurationProvider,
- unitDescriptor,
- configurationHandlers);
+ = typedHandlerFactory.getOutletSaxHandler(
+ outletName,
+ configurationProvider,
+ unitDescriptor,
+ configurationHandlers);
return outletSaxHandler;
}
UntypedOutletSaxHandlerFactory untypedHandlerFactory = null;
@@ -301,15 +301,15 @@ public class OutletConfigurationSaxHandl
{
throw new SAXException(
"Unknown outlet type: "
- + outletType);
+ + outletType);
}
OutletSaxHandler outletSaxHandler
- = untypedHandlerFactory.getOutletSaxHandler(
- outletType,
- outletName,
- configurationProvider,
- unitDescriptor,
- configurationHandlers);
+ = untypedHandlerFactory.getOutletSaxHandler(
+ outletType,
+ outletName,
+ configurationProvider,
+ unitDescriptor,
+ configurationHandlers);
return outletSaxHandler;
}
@@ -326,9 +326,9 @@ public class OutletConfigurationSaxHandl
throws SAXException
{
String outletType
- = attributes.getValue(
- XMLConstants.XSI_NAMESPACE,
- XMLConstants.XSI_TYPE_ATTRBUTE_NAME);
+ = attributes.getValue(
+ XMLConstants.XSI_NAMESPACE,
+ XMLConstants.XSI_TYPE_ATTRBUTE_NAME);
if (outletType == null)
{
throw new SAXException("The tag " + OUTLET_TAG
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java Mon Aug 27 09:48:33 2018
@@ -60,44 +60,44 @@ public final class OutletConfigurationTa
* of the "outlet" tag.
*/
public static final String OUTLET_OPTIONS_IN_CONTEXT_ATTRIBUTE
- = "optionsInContext";
+ = "optionsInContext";
/**
* Attribute name for the attribute "sourceAttributesInContext"
* of the "outlet" tag.
*/
public static final String
- OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE
- = "sourceAttributesInContext";
+ OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE
+ = "sourceAttributesInContext";
/**
* Attribute name for the attribute "variablesInContext"
* of the "outlet" tag.
*/
public static final String OUTLET_VARIABLES_IN_CONTEXT_ATTRIBUTE
- = "variablesInContext";
+ = "variablesInContext";
/**
* Attribute name for the attribute "optionsInBinding"
* of the "outlet" tag.
*/
public static final String OUTLET_OPTIONS_IN_BINDING_ATTRIBUTE
- = "optionsInBinding";
+ = "optionsInBinding";
/**
* Attribute name for the attribute "sourceAttributesInBinding"
* of the "outlet" tag.
*/
public static final String
- OUTLET_SOURCE_ATTRIBUTES_IN_BINDING_ATTRIBUTE
- = "sourceAttributesInBinding";
+ OUTLET_SOURCE_ATTRIBUTES_IN_BINDING_ATTRIBUTE
+ = "sourceAttributesInBinding";
/**
* Attribute name for the attribute "variablesInBinding"
* of the "outlet" tag.
*/
public static final String OUTLET_VARIABLES_IN_BINDING_ATTRIBUTE
- = "variablesInBinding";
+ = "variablesInBinding";
/** Tag name for the "input" tag. */
public static final String INPUT_TAG = "input";
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -59,7 +59,7 @@ public class OutletConfigurationXmlParse
/** The logger. */
private static Log log
- = LogFactory.getLog(OutletConfigurationXmlParser.class);
+ = LogFactory.getLog(OutletConfigurationXmlParser.class);
static
{
@@ -109,7 +109,7 @@ public class OutletConfigurationXmlParse
final ConfigurationProvider configurationProvider,
final ConfigurationHandlers configurationHandlers,
final UnitDescriptor unitDescriptor)
- throws ConfigurationException
+ throws ConfigurationException
{
if (configurationHandlers == null)
{
@@ -124,13 +124,13 @@ public class OutletConfigurationXmlParse
throw new NullPointerException("configurationProvider is null");
}
- List<Outlet> allOutlets = new ArrayList<Outlet>();
+ List<Outlet> allOutlets = new ArrayList<>();
List<MergepointMapping> allMergepointMappings
- = new ArrayList<MergepointMapping>();
+ = new ArrayList<>();
// Outlets from all files
Collection<String> outletConfigNames
- = configurationProvider.getOutletConfigurationNames();
+ = configurationProvider.getOutletConfigurationNames();
for (String outletConfigName : outletConfigNames)
{
@@ -138,11 +138,11 @@ public class OutletConfigurationXmlParse
outletConfigName))
{
OutletConfigFileContent fileContent
- = readOutletConfig(
- inputStream,
- configurationProvider,
- unitDescriptor,
- configurationHandlers);
+ = readOutletConfig(
+ inputStream,
+ configurationProvider,
+ unitDescriptor,
+ configurationHandlers);
allOutlets.addAll(fileContent.getOutlets());
allMergepointMappings.addAll(
fileContent.getMergepointMappings());
@@ -151,22 +151,22 @@ public class OutletConfigurationXmlParse
{
throw new ConfigurationException(
"Error parsing outlet configuration "
- + outletConfigName
- + " at line "
- + e.getLineNumber()
- + " column "
- + e.getColumnNumber()
- + " : "
- + e.getMessage(),
- e);
+ + outletConfigName
+ + " at line "
+ + e.getLineNumber()
+ + " column "
+ + e.getColumnNumber()
+ + " : "
+ + e.getMessage(),
+ e);
}
catch (Exception e)
{
throw new ConfigurationException(
"Error parsing outlet configuration "
- + outletConfigName,
- e);
+ + outletConfigName,
+ e);
}
}
// add outlets defined implicitly by templates
@@ -208,19 +208,19 @@ public class OutletConfigurationXmlParse
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException, IOException, ParserConfigurationException,
- ConfigurationException
+ throws SAXException, IOException, ParserConfigurationException,
+ ConfigurationException
{
SAXParser parser = saxFactory.newSAXParser();
OutletConfigurationSaxHandler saxHandler
- = new OutletConfigurationSaxHandler(
- configurationProvider,
- unitDescriptor,
- configurationHandlers);
+ = new OutletConfigurationSaxHandler(
+ configurationProvider,
+ unitDescriptor,
+ configurationHandlers);
InputSource is = new InputSource(outletConfigurationInputStream);
parser.parse(is, saxHandler);
- List<Outlet> outlets = new ArrayList<Outlet>();
+ List<Outlet> outlets = new ArrayList<>();
outlets.addAll(saxHandler.getOutlets());
return new OutletConfigFileContent(
@@ -232,22 +232,22 @@ public class OutletConfigurationXmlParse
final List<Outlet> outlets,
final ConfigurationProvider configurationProvider,
final ConfigurationHandlers configurationHandlers)
- throws ConfigurationException
+ throws ConfigurationException
{
- Set<QualifiedName> outletNames = new HashSet<QualifiedName>();
+ Set<QualifiedName> outletNames = new HashSet<>();
for (Outlet outlet : outlets)
{
outletNames.add(outlet.getName());
}
Collection<String> templateFileNames
- = configurationProvider.getTemplateNames();
+ = configurationProvider.getTemplateNames();
for (String templateFileName : templateFileNames)
{
Collection<TypedOutletSaxHandlerFactory> outletSaxHandlerFactories
- = configurationHandlers.getOutletTypes()
- .getTypedOutletHandlerFactories().values();
+ = configurationHandlers.getOutletTypes()
+ .getTypedOutletHandlerFactories().values();
for (TypedOutletSaxHandlerFactory outletSaxHandlerFactory
- : outletSaxHandlerFactories)
+ : outletSaxHandlerFactories)
{
for (String suffix : outletSaxHandlerFactory
.getTemplatesFilenameExtensionsForScan())
@@ -255,9 +255,9 @@ public class OutletConfigurationXmlParse
if (templateFileName.endsWith(suffix))
{
Outlet outlet
- = outletSaxHandlerFactory.createOutletForTemplate(
- templateFileName,
- configurationProvider);
+ = outletSaxHandlerFactory.createOutletForTemplate(
+ templateFileName,
+ configurationProvider);
QualifiedName outletName = outlet.getName();
if (!outletNames.contains(outletName))
{
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java Mon Aug 27 09:48:33 2018
@@ -133,7 +133,7 @@ public abstract class OutletSaxHandler e
String localName,
String rawName,
Attributes attributes)
- throws SAXException
+ throws SAXException
{
if (startTagRawName == null)
{
@@ -185,7 +185,7 @@ public abstract class OutletSaxHandler e
*/
@Override
public void endElement(String uri, String localName, String rawName)
- throws SAXException
+ throws SAXException
{
if (mergepointSaxHandler != null)
{
@@ -201,8 +201,8 @@ public abstract class OutletSaxHandler e
{
throw new SAXException(
"Could not get mergepoint mapping from the "
- + "mergepoint Sax handler",
- e);
+ + "mergepoint Sax handler",
+ e);
}
mergepointSaxHandler = null;
}
@@ -239,7 +239,7 @@ public abstract class OutletSaxHandler e
String localName,
String rawName,
Attributes attributes)
- throws SAXException;
+ throws SAXException;
/**
* Returns the outlet being configured.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -35,19 +35,19 @@ import org.xml.sax.SAXException;
* Creates outlet SAX handlers using reflection and a naming convention.
*/
public class ReflectionOutletSaxHandlerFactory
- implements UntypedOutletSaxHandlerFactory
+implements UntypedOutletSaxHandlerFactory
{
/**
* The suffix for SAX handler class names.
*/
private static final String SAX_HANDLER_CLASSNAME_SUFFIX
- = "SaxHandler";
+ = "SaxHandler";
/**
* The default package for SAX handler class names.
*/
private static final String DEFAULT_PACKAGE
- = "org.apache.torque.generator.configuration.outlet";
+ = "org.apache.torque.generator.configuration.outlet";
/** The class log. */
private static Log log = LogFactory.getLog(
@@ -106,16 +106,17 @@ public class ReflectionOutletSaxHandlerF
*
* @return a new VelocityOutletSaxHandler.
*/
+ @Override
public final OutletSaxHandler getOutletSaxHandler(
String outletType,
QualifiedName outletName,
ConfigurationProvider configurationProvider,
UnitDescriptor unitDescriptor,
ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
String fullyQualifiedSaxHandlerName
- = getFullyQualifiedHandlerClassName(outletType);
+ = getFullyQualifiedHandlerClassName(outletType);
Class<?> handlerClass;
try
@@ -130,7 +131,7 @@ public class ReflectionOutletSaxHandlerF
}
catch (ClassNotFoundException e)
{
- // should not happen, because otherwise canHandle() would not
+ // should not happen, because otherwise canHandle() would not
// have returned true
throw new RuntimeException(e);
}
@@ -139,19 +140,19 @@ public class ReflectionOutletSaxHandlerF
try
{
constructor = handlerClass.getConstructor(
- QualifiedName.class,
- ConfigurationProvider.class,
- UnitDescriptor.class,
- ConfigurationHandlers.class);
+ QualifiedName.class,
+ ConfigurationProvider.class,
+ UnitDescriptor.class,
+ ConfigurationHandlers.class);
}
catch (NoSuchMethodException e)
{
throw new SAXException("Class " + handlerClass.getName()
- + " has no constructor for types "
- + QualifiedName.class.getName() + ","
- + ConfigurationProvider.class.getName() + ","
- + UnitDescriptor.class.getName() + ","
- + ConfigurationHandlers.class.getName());
+ + " has no constructor for types "
+ + QualifiedName.class.getName() + ","
+ + ConfigurationProvider.class.getName() + ","
+ + UnitDescriptor.class.getName() + ","
+ + ConfigurationHandlers.class.getName());
}
OutletSaxHandler outletSaxHandler;
@@ -172,13 +173,13 @@ public class ReflectionOutletSaxHandlerF
{
throw new SAXException("The class "
+ handlerClass.getName() + " is abstract",
- e);
+ e);
}
catch (IllegalAccessException e)
{
throw new SAXException("Constructor of class "
+ handlerClass.getName() + " is inaccessible",
- e);
+ e);
}
catch (InvocationTargetException e)
{
@@ -186,13 +187,14 @@ public class ReflectionOutletSaxHandlerF
+ handlerClass.getName() + " has thrown an exception",
e);
}
- return outletSaxHandler;
+ return outletSaxHandler;
}
+ @Override
public boolean canHandle(String type, UnitDescriptor unitDescriptor)
{
String fullyQualifiedSaxHandlerName
- = getFullyQualifiedHandlerClassName(type);
+ = getFullyQualifiedHandlerClassName(type);
log.debug("canHandle: Using class name "
+ fullyQualifiedSaxHandlerName);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/TypedOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/TypedOutletSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/TypedOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/TypedOutletSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -69,7 +69,7 @@ public interface TypedOutletSaxHandlerFa
Outlet createOutletForTemplate(
String templatePath,
ConfigurationProvider configurationProvider)
- throws ConfigurationException;
+ throws ConfigurationException;
/**
* Returns a OutletSaxHandler for reading in the configuration of
@@ -97,5 +97,5 @@ public interface TypedOutletSaxHandlerFa
ConfigurationProvider configurationProvider,
UnitDescriptor unitDescriptor,
ConfigurationHandlers configurationHandlers)
- throws SAXException;
+ throws SAXException;
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java Mon Aug 27 09:48:33 2018
@@ -70,5 +70,5 @@ public abstract interface UntypedOutletS
ConfigurationProvider configurationProvider,
UnitDescriptor unitDescriptor,
ConfigurationHandlers configurationHandlers)
- throws SAXException;
+ throws SAXException;
}
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -62,12 +62,12 @@ class VelocityOutletSaxHandler extends O
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
super(outletName,
- configurationProvider,
- unitDescriptor,
- configurationHandlers);
+ configurationProvider,
+ unitDescriptor,
+ configurationHandlers);
}
/**
@@ -99,7 +99,7 @@ class VelocityOutletSaxHandler extends O
final String localName,
final String rawName,
final Attributes attributes)
- throws SAXException
+ throws SAXException
{
final String path = attributes.getValue(OUTLET_PATH_ATTRIBUTE);
if (path == null)
@@ -114,7 +114,7 @@ class VelocityOutletSaxHandler extends O
if (outletName == null)
{
final String nameAttribute
- = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
+ = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
if (nameAttribute != null)
{
outletName = new QualifiedName(nameAttribute);
@@ -131,11 +131,11 @@ class VelocityOutletSaxHandler extends O
try
{
VelocityOutlet result
- = new VelocityOutlet(
- outletName,
- getConfigurationProvider(),
- path,
- encoding);
+ = new VelocityOutlet(
+ outletName,
+ getConfigurationProvider(),
+ path,
+ encoding);
Boolean optionsInContext = SaxHelper.getBooleanAttribute(
OUTLET_OPTIONS_IN_CONTEXT_ATTRIBUTE,
attributes,
@@ -145,10 +145,10 @@ class VelocityOutletSaxHandler extends O
result.setOptionsInContext(optionsInContext);
}
Boolean sourceElementAttributesInContext
- = SaxHelper.getBooleanAttribute(
- OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE,
- attributes,
- "the velocityOutlet" + outletName);
+ = SaxHelper.getBooleanAttribute(
+ OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE,
+ attributes,
+ "the velocityOutlet" + outletName);
if (sourceElementAttributesInContext != null)
{
result.setSourceAttributesInContext(
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=1839288&r1=1839287&r2=1839288&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 Mon Aug 27 09:48:33 2018
@@ -37,7 +37,7 @@ import org.xml.sax.SAXException;
* Creates Velocity outlet SAX handlers.
*/
public class VelocityOutletSaxHandlerFactory
- implements TypedOutletSaxHandlerFactory
+implements TypedOutletSaxHandlerFactory
{
/**
* The type of the outlets which can be processed by the
@@ -53,7 +53,7 @@ public class VelocityOutletSaxHandlerFac
static
{
- List<String> templateFilenameExtensions = new ArrayList<String>();
+ List<String> templateFilenameExtensions = new ArrayList<>();
templateFilenameExtensions.add(".vm");
TEMPLATE_FILENAMES_EXTENSIONS = Collections.unmodifiableList(
templateFilenameExtensions);
@@ -65,6 +65,7 @@ public class VelocityOutletSaxHandlerFac
*
* @return "velocityOutlet".
*/
+ @Override
public String getType()
{
return OUTLET_TYPE;
@@ -76,6 +77,7 @@ public class VelocityOutletSaxHandlerFac
*
* @return A list with the entry ".vm".
*/
+ @Override
public Collection<String> getTemplatesFilenameExtensionsForScan()
{
return TEMPLATE_FILENAMES_EXTENSIONS;
@@ -90,13 +92,14 @@ public class VelocityOutletSaxHandlerFac
*
* @return the outlet, not null.
*/
+ @Override
public Outlet createOutletForTemplate(
- final String templatePath,
- final ConfigurationProvider configurationProvider)
- throws ConfigurationException
+ final String templatePath,
+ final ConfigurationProvider configurationProvider)
+ throws ConfigurationException
{
VelocityOutlet result
- = new VelocityOutlet(
+ = new VelocityOutlet(
OutletConfigurationXmlParser.getOutletNameForFilename(
templatePath),
configurationProvider,
@@ -122,12 +125,13 @@ public class VelocityOutletSaxHandlerFac
*
* @return a new VelocityOutletSaxHandler.
*/
+ @Override
public final OutletSaxHandler getOutletSaxHandler(
final QualifiedName outletName,
final ConfigurationProvider configurationProvider,
final UnitDescriptor unitDescriptor,
final ConfigurationHandlers configurationHandlers)
- throws SAXException
+ throws SAXException
{
return new VelocityOutletSaxHandler(
outletName,
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java Mon Aug 27 09:48:33 2018
@@ -46,7 +46,7 @@ public class CustomProjectPaths implemen
/**
* The output directories for the files, keyed by the output directory key.
*/
- private Map<String, File> outputDirectoryMap = new HashMap<String, File>();
+ private Map<String, File> outputDirectoryMap = new HashMap<>();
/**
* The work directory where the torque generator can store internal files.
@@ -69,7 +69,7 @@ public class CustomProjectPaths implemen
this.configurationDir = toCopy.getConfigurationPath();
this.configurationPackage = toCopy.getConfigurationPackage();
this.sourceDir = toCopy.getDefaultSourcePath();
- this.outputDirectoryMap = new HashMap<String, File>(
+ this.outputDirectoryMap = new HashMap<>(
toCopy.getOutputDirectoryMap());
this.workDir = toCopy.getWorkDirectory();
this.cacheDir = toCopy.getCacheDirectory();
@@ -103,7 +103,7 @@ public class CustomProjectPaths implemen
this.configurationDir = configurationDir;
this.configurationPackage = configurationPackage;
this.sourceDir = sourceDir;
- this.outputDirectoryMap = new HashMap<String, File>(outputDirectoryMap);
+ this.outputDirectoryMap = new HashMap<>(outputDirectoryMap);
this.workDir = workDir;
this.cacheDir = cacheDir;
}
@@ -205,6 +205,7 @@ public class CustomProjectPaths implemen
* @throws IllegalStateException if one of the required parameters
* is not set.
*/
+ @Override
public File getConfigurationPath()
{
checkInit();
@@ -218,6 +219,7 @@ public class CustomProjectPaths implemen
* @throws IllegalStateException if one of the required parameters
* is not set.
*/
+ @Override
public String getConfigurationPackage()
{
checkInit();
@@ -234,6 +236,7 @@ public class CustomProjectPaths implemen
* @throws IllegalStateException if one of the required parameters
* is not set.
*/
+ @Override
public File getDefaultSourcePath()
{
checkInit();
@@ -253,6 +256,7 @@ public class CustomProjectPaths implemen
* is not set.
* @throws IllegalArgumentException if the outputDirKey is unknown.
*/
+ @Override
public File getOutputDirectory(String outputDirKey)
{
checkInit();
@@ -275,6 +279,7 @@ public class CustomProjectPaths implemen
* @throws IllegalStateException if one of the required parameters
* is not set.
*/
+ @Override
public Map<String, File> getOutputDirectoryMap()
{
checkInit();
@@ -290,6 +295,7 @@ public class CustomProjectPaths implemen
* @throws IllegalStateException if one of the required parameters
* is not set.
*/
+ @Override
public File getWorkDirectory()
{
checkInit();
@@ -305,6 +311,7 @@ public class CustomProjectPaths implemen
* @throws IllegalStateException if one of the required parameters
* is not set.
*/
+ @Override
public File getCacheDirectory()
{
checkInit();
@@ -323,27 +330,27 @@ public class CustomProjectPaths implemen
if (configurationDir == null && configurationPackage == null)
{
throw new IllegalStateException(
- "configurationDir or configurationPackage must not be null.");
+ "configurationDir or configurationPackage must not be null.");
}
if (sourceDir == null)
{
throw new IllegalStateException(
- "sourceDir must not be null.");
+ "sourceDir must not be null.");
}
if (outputDirectoryMap.get(null) == null)
{
throw new IllegalStateException(
- "default output directory must not be null.");
+ "default output directory must not be null.");
}
if (workDir == null)
{
throw new IllegalStateException(
- "workDir must not be null.");
+ "workDir must not be null.");
}
if (cacheDir == null)
{
throw new IllegalStateException(
- "cacheDir must not be null.");
+ "cacheDir must not be null.");
}
}
@@ -351,11 +358,11 @@ public class CustomProjectPaths implemen
public String toString()
{
return "(CustomProjectPaths: configurationDir=" + configurationDir
- + ", configurationPackage=" + configurationPackage
- + ", sourceDir=" + sourceDir
- + ", outputDirectoryMap=" + outputDirectoryMap
- + ", workDir=" + workDir
- + ", cacheDir=" + cacheDir
- + ")";
+ + ", configurationPackage=" + configurationPackage
+ + ", sourceDir=" + sourceDir
+ + ", outputDirectoryMap=" + outputDirectoryMap
+ + ", workDir=" + workDir
+ + ", cacheDir=" + cacheDir
+ + ")";
}
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java Mon Aug 27 09:48:33 2018
@@ -36,7 +36,7 @@ public class DefaultTorqueGeneratorPaths
* configuration directory.
*/
private static final String CONTROL_CONFIGURATION_FILE_NAME
- = "control.xml";
+ = "control.xml";
/**
* The path to the template directory, relative to the torque-generator
@@ -55,35 +55,40 @@ public class DefaultTorqueGeneratorPaths
* configuration root directory.
*/
private static final String OUTLET_DIRECTORY
- = "outlets";
+ = "outlets";
/**
* The path to the resource directory, relative to the
* configuration root directory.
*/
private static final String RESOURCE_DIRECTORY
- = "resources";
+ = "resources";
+ @Override
public String getControlConfigurationFile()
{
return CONTROL_CONFIGURATION_FILE_NAME;
}
+ @Override
public String getTemplateDirectory()
{
return TEMPLATES_DIRECTORY;
}
+ @Override
public String getConfigurationDirectory()
{
return CONFIGURATION_DIRECTORY;
}
+ @Override
public String getOutletDirectory()
{
return OUTLET_DIRECTORY;
}
+ @Override
public String getResourceDirectory()
{
return RESOURCE_DIRECTORY;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java Mon Aug 27 09:48:33 2018
@@ -35,7 +35,7 @@ public abstract class Maven2ProjectPaths
{
/** The log for the class. */
private static Log log
- = LogFactory.getLog(Maven2ProjectPaths.class);
+ = LogFactory.getLog(Maven2ProjectPaths.class);
/**
* Default configuration root directory,
@@ -54,33 +54,33 @@ public abstract class Maven2ProjectPaths
* which are modifiable by the user, relative to the project root.
*/
public static final String MODIFIABLE_OUTPUT_DIR_KEY
- = "modifiable";
+ = "modifiable";
/**
* Default generation target directory for generated files
* which are modifiable by the user, relative to the project root.
*/
public static final String MODIFIABLE_OUTPUT_DIR
- = "src/main/generated-java";
+ = "src/main/generated-java";
/**
* Default generation target directory,
* relative to the project root.
*/
protected static final String DEFAULT_OUTPUT_DIR
- = "target/generated-sources";
+ = "target/generated-sources";
/**
* Default working directory.
*/
protected static final String WORK_DIR
- = "src/main/torque-gen/work";
+ = "src/main/torque-gen/work";
/**
* Default cache directory.
*/
protected static final String CACHE_DIR
- = "target/torque-gen/cache";
+ = "target/torque-gen/cache";
/**
* The root directory of the whole maven2 project.
@@ -91,7 +91,7 @@ public abstract class Maven2ProjectPaths
* The output directory map which contains the mapping
* from output directory key to output directory.
*/
- private final Map<String, File> outputDirectoryMap = new HashMap<String, File>();
+ private final Map<String, File> outputDirectoryMap = new HashMap<>();
/**
* Constructor.
@@ -116,8 +116,10 @@ public abstract class Maven2ProjectPaths
new File(projectRoot, MODIFIABLE_OUTPUT_DIR));
}
+ @Override
public abstract File getConfigurationPath();
+ @Override
public abstract String getConfigurationPackage();
/**
@@ -125,6 +127,7 @@ public abstract class Maven2ProjectPaths
*
* @return the path to for the source files, not null.
*/
+ @Override
public File getDefaultSourcePath()
{
return new File(projectRoot, SOURCE_DIR);
@@ -140,6 +143,7 @@ public abstract class Maven2ProjectPaths
* @throws IllegalStateException if the current state of the object
* is not valid.
*/
+ @Override
public Map<String, File> getOutputDirectoryMap()
{
return Collections.unmodifiableMap(outputDirectoryMap);
@@ -156,6 +160,7 @@ public abstract class Maven2ProjectPaths
*
* @throws IllegalArgumentException if the outputDirKey is unknown.
*/
+ @Override
public File getOutputDirectory(final String outputDirKey)
{
File result = outputDirectoryMap.get(outputDirKey);
@@ -173,6 +178,7 @@ public abstract class Maven2ProjectPaths
*
* @return the work subdirectory, not null.
*/
+ @Override
public File getWorkDirectory()
{
return new File(projectRoot, WORK_DIR);
@@ -184,6 +190,7 @@ public abstract class Maven2ProjectPaths
*
* @return the work subdirectory, not null.
*/
+ @Override
public File getCacheDirectory()
{
return new File(projectRoot, CACHE_DIR);
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java Mon Aug 27 09:48:33 2018
@@ -123,8 +123,8 @@ public class ConfigurableClassSaxHandler
*/
@Override
public void startElement(final String uri, final String localName, final String rawName,
- final Attributes attributes)
- throws SAXException
+ final Attributes attributes)
+ throws SAXException
{
if (level == 0)
{
@@ -162,12 +162,12 @@ public class ConfigurableClassSaxHandler
{
throw new SAXException(
"Cannot parse both text content and child elements "
- + " in element " + propertyName);
+ + " in element " + propertyName);
}
simplePropertyValue = null;
if (listPropertyValue == null)
{
- listPropertyValue = new ArrayList<String>();
+ listPropertyValue = new ArrayList<>();
}
listPropertyEntry = new StringBuilder();
}
@@ -182,7 +182,7 @@ public class ConfigurableClassSaxHandler
*/
@Override
public void endElement(final String uri, final String localName, final String rawName)
- throws SAXException
+ throws SAXException
{
level--;
if (level == 2)
@@ -223,7 +223,7 @@ public class ConfigurableClassSaxHandler
+ configuredClass.getClass().getName()
+ " with value "
+ propertyValue.toString(),
- e);
+ e);
}
catch (IllegalAccessException e)
{
@@ -233,7 +233,7 @@ public class ConfigurableClassSaxHandler
+ configuredClass.getClass().getName()
+ " with value "
+ propertyValue.toString(),
- e);
+ e);
}
propertyName = null;
propertyValue = null;
@@ -309,7 +309,7 @@ public class ConfigurableClassSaxHandler
private T createConfiguredClass(
final String className,
final UnitDescriptor unitDescriptor)
- throws SAXException
+ throws SAXException
{
Class<?> transformerClass;
try
@@ -318,7 +318,7 @@ public class ConfigurableClassSaxHandler
if (classLoader == null)
{
classLoader
- = ConfigurableClassSaxHandler.class.getClassLoader();
+ = ConfigurableClassSaxHandler.class.getClassLoader();
}
transformerClass = Class.forName(className, true, classLoader);
}
@@ -326,22 +326,22 @@ public class ConfigurableClassSaxHandler
{
throw new SAXException(
"Error while initializing a source transformer :"
- + " Could not load class " + className, e);
+ + " Could not load class " + className, e);
}
catch (ExceptionInInitializerError e)
{
log.error(
"Error while initializing a source transformer :"
- + " Could not initialize class " + className
- + " : " + e.getMessage());
+ + " Could not initialize class " + className
+ + " : " + e.getMessage());
throw e;
}
catch (LinkageError e)
{
log.error(
"Error while initializing a source transformer :"
- + " Could not link class " + className
- + " : " + e.getMessage());
+ + " Could not link class " + className
+ + " : " + e.getMessage());
throw e;
}
@@ -349,60 +349,60 @@ public class ConfigurableClassSaxHandler
try
{
Constructor<?> constructor
- = transformerClass.getConstructor();
+ = transformerClass.getConstructor();
result = (T) constructor.newInstance();
}
catch (NoSuchMethodException e)
{
throw new SAXException(
"Error while instantiating a source transformer :"
- + " The class " + className
- + " has no default constructor",
- e);
+ + " The class " + className
+ + " has no default constructor",
+ e);
}
catch (ClassCastException e)
{
throw new SAXException(
"Error while instantiating a source transformer :"
- + " The class " + className
- + " is not an instance of "
- + SourceTransformer.class.getName(),
- e);
+ + " The class " + className
+ + " is not an instance of "
+ + SourceTransformer.class.getName(),
+ e);
}
catch (IllegalAccessException e)
{
throw new SAXException(
"Error while instantiating a source transformer :"
- + " The constructor of class "
- + className + " could not be accessed",
- e);
+ + " The constructor of class "
+ + className + " could not be accessed",
+ e);
}
catch (InvocationTargetException e)
{
throw new SAXException(
"Error while instantiating a source transformer :"
- + " The constructor of class "
- + className + " could not be called",
- e);
+ + " The constructor of class "
+ + className + " could not be called",
+ e);
}
catch (InstantiationException e)
{
throw new SAXException(
"Error while instantiating a source transformer :"
- + " The class " + className
- + " represents an abstract class, "
- + "an interface, an array class, a primitive type, "
- + "or void, or the class has no parameterless constructor, "
- + "or the instantiation fails for some other reason.",
- e);
+ + " The class " + className
+ + " represents an abstract class, "
+ + "an interface, an array class, a primitive type, "
+ + "or void, or the class has no parameterless constructor, "
+ + "or the instantiation fails for some other reason.",
+ e);
}
catch (SecurityException e)
{
throw new SAXException(
"Error while instantiating a source transformer :"
- + " The security manager denies instantiation of the class "
- + className,
- e);
+ + " The security manager denies instantiation of the class "
+ + className,
+ e);
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org