Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java Mon Aug 27 09:48:33 2018 @@ -36,11 +36,11 @@ import org.apache.torque.generator.confi * jar file. */ public class JarConfigurationProvider - extends AbstractConfigurationProvider +extends AbstractConfigurationProvider { /** The logger. */ private static Log log - = LogFactory.getLog(JarConfigurationProvider.class); + = LogFactory.getLog(JarConfigurationProvider.class); /** * The paths needed to interact with the enclosing project, not null. @@ -72,7 +72,7 @@ public class JarConfigurationProvider public JarConfigurationProvider( final ProjectPaths projectPaths, final TorqueGeneratorPaths configurationPaths) - throws ConfigurationException + throws ConfigurationException { super(configurationPaths); if (projectPaths == null) @@ -90,25 +90,26 @@ public class JarConfigurationProvider { log.error("Could not open jar File " + projectPaths.getConfigurationPath() - .getAbsolutePath()); + .getAbsolutePath()); throw new ConfigurationException(e); } } + @Override public String getControlConfigurationLocation() throws ConfigurationException { return projectPaths.getConfigurationPath() + ":" - + configurationPaths.getConfigurationDirectory() + "/" - + configurationPaths.getControlConfigurationFile(); + + configurationPaths.getConfigurationDirectory() + "/" + + configurationPaths.getControlConfigurationFile(); } @Override protected InputStream getInputStream( - final String name, - final String directory, - final String description) - throws ConfigurationException + final String name, + final String directory, + final String description) + throws ConfigurationException { String fileName = directory + "/" + name; @@ -122,10 +123,10 @@ public class JarConfigurationProvider { throw new ConfigurationException( "Could not read " + description + " file " - + fileName - + " in jar file " - + projectPaths.getConfigurationPath(), - e); + + fileName + + " in jar file " + + projectPaths.getConfigurationPath(), + e); } BufferedInputStream bis = new BufferedInputStream(inputStream); if (log.isDebugEnabled()) @@ -138,8 +139,9 @@ public class JarConfigurationProvider return bis; } + @Override public Collection<String> getOutletConfigurationNames() - throws ConfigurationException + throws ConfigurationException { return PackageResources.getFilesInJarDirectoryWithSuffix( configurationPaths.getOutletDirectory(), @@ -151,6 +153,7 @@ public class JarConfigurationProvider /** * @see ConfigurationProvider#getTemplateNames() */ + @Override public Collection<String> getTemplateNames() throws ConfigurationException {
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java Mon Aug 27 09:48:33 2018 @@ -43,15 +43,15 @@ public class OutletTypes * keyed by the type of the outlet. */ private final Map<String, TypedOutletSaxHandlerFactory> - typedOutletHandlerFactories - = new HashMap<String, TypedOutletSaxHandlerFactory>(); + typedOutletHandlerFactories + = new HashMap<>(); /** * A List containing all untyped OutletSaxHandlerFactories. */ private final List<UntypedOutletSaxHandlerFactory> - untypedOutletHandlerFactories - = new ArrayList<UntypedOutletSaxHandlerFactory>(); + untypedOutletHandlerFactories + = new ArrayList<>(); /** * Constructor. Creates a new instance containing the mappings to the @@ -90,7 +90,7 @@ public class OutletTypes */ public void registerTypedOutletHandlerFactory( final TypedOutletSaxHandlerFactory factory) - throws ConfigurationException + throws ConfigurationException { if (factory == null) { @@ -98,18 +98,18 @@ public class OutletTypes } final String type = factory.getType(); final TypedOutletSaxHandlerFactory oldFactory - = typedOutletHandlerFactories.get(type); + = typedOutletHandlerFactories.get(type); if (oldFactory != null) { throw new ConfigurationException( "Attempted to register a OutletSaxHandlerFactory " - + "of type " - + factory.getType() - + " and class " - + factory.getClass().getName() - + " : A factory with this type already exists, " - + " it has the class " - + oldFactory.getClass().getName()); + + "of type " + + factory.getType() + + " and class " + + factory.getClass().getName() + + " : A factory with this type already exists, " + + " it has the class " + + oldFactory.getClass().getName()); } typedOutletHandlerFactories.put(factory.getType(), factory); } @@ -125,7 +125,7 @@ public class OutletTypes */ public void registerUntypedOutletHandlerFactory( final UntypedOutletSaxHandlerFactory factory) - throws ConfigurationException + throws ConfigurationException { if (factory == null) { @@ -141,7 +141,7 @@ public class OutletTypes * @return all typed outlet handler factories, not null. */ public Map<String, TypedOutletSaxHandlerFactory> - getTypedOutletHandlerFactories() + getTypedOutletHandlerFactories() { return Collections.unmodifiableMap(typedOutletHandlerFactories); } @@ -153,7 +153,7 @@ public class OutletTypes * @return all untyped outlet handler factories, not null. */ public List<UntypedOutletSaxHandlerFactory> - getUntypedOutletHandlerFactories() + getUntypedOutletHandlerFactories() { return Collections.unmodifiableList(untypedOutletHandlerFactories); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java Mon Aug 27 09:48:33 2018 @@ -44,13 +44,13 @@ public class PackageResources /** The logger. */ private static Log log - = LogFactory.getLog(PackageResources.class); + = LogFactory.getLog(PackageResources.class); /** The jar files containing the package. */ - private final List<JarFile> jarFiles = new ArrayList<JarFile>(); + private final List<JarFile> jarFiles = new ArrayList<>(); /** The directories containing the package. */ - private final List<File> directories = new ArrayList<File>(); + private final List<File> directories = new ArrayList<>(); /** The path to the package, not null. */ private final String packagePath; @@ -65,9 +65,9 @@ public class PackageResources * @throws ConfigurationException when accessing the class path fails. */ public PackageResources( - final String packageToFind, - final ClassLoader classLoader) - throws ConfigurationException + final String packageToFind, + final ClassLoader classLoader) + throws ConfigurationException { if (packageToFind == null) { @@ -131,11 +131,11 @@ public class PackageResources { throw new ConfigurationException( "Could not read directory " - + packagePath - + " in classpath; directory URL is " - + dirUrl - + " file is " - + dirUrl.getFile()); + + packagePath + + " in classpath; directory URL is " + + dirUrl + + " file is " + + dirUrl.getFile()); } directories.add(directory); } @@ -185,7 +185,7 @@ public class PackageResources final String suffix, final boolean recurse) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (JarFile jarFile : jarFiles) { String dirNameInJar = packagePath; @@ -234,15 +234,15 @@ public class PackageResources + " with subdirectory " + prefixToResult + " for files with suffix " + suffix); } - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); if (!directoryToScan.isDirectory()) { log.debug("Directory " - + directoryToScan.getAbsolutePath() - + "is not a directory, " - + "no outlet definitions will be read " - + "(template outlets may still be available " - + "through scanning the templates directory)"); + + directoryToScan.getAbsolutePath() + + "is not a directory, " + + "no outlet definitions will be read " + + "(template outlets may still be available " + + "through scanning the templates directory)"); return result; } String[] filenames = directoryToScan.list(); @@ -310,10 +310,10 @@ public class PackageResources if (log.isDebugEnabled()) { log.debug("Analyzing jar file " + jarFile.getName() - + " seeking directory " + directory - + " for files with suffix " + suffix); + + " seeking directory " + directory + + " for files with suffix " + suffix); } - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); Enumeration<JarEntry> entries = jarFile.entries(); while (entries.hasMoreElements()) Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java Mon Aug 27 09:48:33 2018 @@ -54,7 +54,7 @@ public final class SaxHelper String attributeName, Attributes attributes, String elementDescription) - throws SAXException + throws SAXException { String attributeAsString = attributes.getValue(attributeName); if (attributeAsString == null) Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java Mon Aug 27 09:48:33 2018 @@ -41,7 +41,7 @@ import org.apache.torque.generator.sourc public class UnitConfiguration { /** The list of all output activities of the generation unit. */ - private List<Output> outputList = new ArrayList<Output>(); + private List<Output> outputList = new ArrayList<>(); /** All options for the generation unit. */ private Options options; @@ -65,7 +65,7 @@ public class UnitConfiguration * The base output directories for the generated files, * keyed by the output directory key. */ - private final Map<String, File> outputDirectoryMap = new HashMap<String, File>(); + private final Map<String, File> outputDirectoryMap = new HashMap<>(); /** * A work directory where the Torque generator can store internal files. @@ -220,7 +220,7 @@ public class UnitConfiguration { throw new IllegalStateException( "outputDirectoryMap does not contain a mapping" - + " for the key null"); + + " for the key null"); } return Collections.unmodifiableMap(outputDirectoryMap); } @@ -617,14 +617,14 @@ public class UnitConfiguration public boolean isInit() { if (outputList == null - || options == null - || outletConfiguration == null - || outputDirectoryMap.get(null) == null - || loglevel == null - || configurationHandlers == null - || entityReferences == null - || !overrideSourceProviderInitialized - || templateSetName == null) + || options == null + || outletConfiguration == null + || outputDirectoryMap.get(null) == null + || loglevel == null + || configurationHandlers == null + || entityReferences == null + || !overrideSourceProviderInitialized + || templateSetName == null) { return false; } @@ -636,18 +636,18 @@ public class UnitConfiguration { StringBuffer result = new StringBuffer(); result.append("(outputFiles=") - .append(outputList.toString()) - .append(", options=") - .append(options) - .append(", outletConfiguration=") - .append(outletConfiguration) - .append(", outputDirectoryMap=") - .append(outputDirectoryMap) - .append(", loglevel=") - .append(loglevel) - .append(", name=") - .append(templateSetName) - .append(")"); + .append(outputList.toString()) + .append(", options=") + .append(options) + .append(", outletConfiguration=") + .append(outletConfiguration) + .append(", outputDirectoryMap=") + .append(outputDirectoryMap) + .append(", loglevel=") + .append(loglevel) + .append(", name=") + .append(templateSetName) + .append(")"); return result.toString(); } } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java Mon Aug 27 09:48:33 2018 @@ -68,7 +68,7 @@ class UnitConfigurationReader public UnitConfiguration read( final UnitDescriptor unitDescriptor, final ConfigurationHandlers configurationHandlers) - throws ConfigurationException + throws ConfigurationException { if (unitDescriptor == null) { @@ -116,7 +116,7 @@ class UnitConfigurationReader unitConfiguration.setTemplateSetName(name.toString()); ConfigurationProvider configurationProvider - = createConfigurationProvider(unitDescriptor); + = createConfigurationProvider(unitDescriptor); readControlConfiguration( unitConfiguration, unitDescriptor, @@ -129,11 +129,11 @@ class UnitConfigurationReader log.debug("Start reading outlet configuration"); } OutletConfiguration outletConfiguration - = new OutletConfigurationXmlParser() - .readOutletConfiguration( - configurationProvider, - configurationHandlers, - unitDescriptor); + = new OutletConfigurationXmlParser() + .readOutletConfiguration( + configurationProvider, + configurationHandlers, + unitDescriptor); unitConfiguration.setOutletConfiguration(outletConfiguration); } @@ -147,7 +147,7 @@ class UnitConfigurationReader if (unitDescriptor.getInheritsFrom() == null) { OutletConfiguration outletConfiguration - = unitConfiguration.getOutletConfiguration(); + = unitConfiguration.getOutletConfiguration(); outletConfiguration.resolveMergepointMappings(); return unitConfiguration; } @@ -184,9 +184,9 @@ class UnitConfigurationReader final UnitConfiguration unitConfiguration, final UnitConfiguration inheritedConfiguration) { - List<Output> outputFiles = new ArrayList<Output>(); + List<Output> outputFiles = new ArrayList<>(); // inherited Files are generated first. - Set<QualifiedName> qualifiedNames = new HashSet<QualifiedName>(); + Set<QualifiedName> qualifiedNames = new HashSet<>(); for (Output output : inheritedConfiguration.getOutputList()) { outputFiles.add(output); @@ -203,7 +203,7 @@ class UnitConfigurationReader { addedOutputIt.remove(); log.info("Output with name " + output.getName() - + " is overridden in child and is replaced."); + + " is overridden in child and is replaced."); break; } } @@ -226,10 +226,10 @@ class UnitConfigurationReader final UnitConfiguration inheritedConfiguration) { EntityReferences entityReferences - = unitConfiguration.getEntityReferences(); + = unitConfiguration.getEntityReferences(); Map<String, byte[]> inheritedReferences - = inheritedConfiguration.getEntityReferences() - .getEntityReferences(); + = inheritedConfiguration.getEntityReferences() + .getEntityReferences(); for (Map.Entry<String, byte[]> inheritedReference : inheritedReferences.entrySet()) { @@ -267,7 +267,7 @@ class UnitConfigurationReader Options options = unitConfiguration.getOptions(); Options inheritedOptions = inheritedConfiguration.getOptions(); for (Map.Entry<QualifiedName, Option> entry - : inheritedOptions.getGlobalScope().entrySet()) + : inheritedOptions.getGlobalScope().entrySet()) { QualifiedName optionName = entry.getKey(); Option option = entry.getValue(); @@ -290,18 +290,18 @@ class UnitConfigurationReader * @throws ConfigurationException will not normally happen. */ private void mergeInheritedOutletConfiguration( - final UnitDescriptor unitDescriptor, - final UnitConfiguration unitConfiguration, - final UnitConfiguration inheritedConfiguration) - throws ConfigurationException + final UnitDescriptor unitDescriptor, + final UnitConfiguration unitConfiguration, + final UnitConfiguration inheritedConfiguration) + throws ConfigurationException { OutletConfiguration outletConfiguration - = unitConfiguration.getOutletConfiguration(); + = unitConfiguration.getOutletConfiguration(); OutletConfiguration inheritedOutletConfiguration - = inheritedConfiguration.getOutletConfiguration(); + = inheritedConfiguration.getOutletConfiguration(); Map<QualifiedName, Outlet> inheritedOutlets - = inheritedOutletConfiguration.getOutlets(); + = inheritedOutletConfiguration.getOutlets(); for (Map.Entry<QualifiedName, Outlet> entry : inheritedOutlets.entrySet()) @@ -332,22 +332,22 @@ class UnitConfigurationReader * the configuration. */ private void readControlConfiguration( - final UnitConfiguration unitConfiguration, - final UnitDescriptor unitDescriptor, - final ConfigurationHandlers configurationHandlers, - final ConfigurationProvider configurationProvider) - throws ConfigurationException + final UnitConfiguration unitConfiguration, + final UnitDescriptor unitDescriptor, + final ConfigurationHandlers configurationHandlers, + final ConfigurationProvider configurationProvider) + throws ConfigurationException { if (log.isDebugEnabled()) { log.debug("Start reading control configuration"); } ControlConfiguration controlConfiguration - = new ControlConfigurationXmlParser() - .readControllerConfiguration( - configurationProvider, - unitDescriptor, - configurationHandlers); + = new ControlConfigurationXmlParser() + .readControllerConfiguration( + configurationProvider, + unitDescriptor, + configurationHandlers); if (unitDescriptor.getLoglevel() == null) { unitConfiguration.setLoglevel(controlConfiguration.getLoglevel()); @@ -362,7 +362,7 @@ class UnitConfigurationReader log.debug("Start reading options"); } List<OptionsConfiguration> optionConfigurations - = new ArrayList<OptionsConfiguration>(); + = new ArrayList<>(); optionConfigurations.addAll( controlConfiguration.getOptionsConfigurations()); if (unitDescriptor.getOverrideOptions() != null) @@ -406,8 +406,8 @@ class UnitConfigurationReader * or if a jar file cannot be accessed. */ private ConfigurationProvider createConfigurationProvider( - final UnitDescriptor unitDescriptor) - throws ConfigurationException + final UnitDescriptor unitDescriptor) + throws ConfigurationException { ConfigurationProvider configurationProvider; if (UnitDescriptor.Packaging.DIRECTORY == unitDescriptor.getPackaging()) Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java Mon Aug 27 09:48:33 2018 @@ -48,9 +48,9 @@ public class UnitDescriptor */ private final Packaging packaging; - /** - * The paths the Torque generator must know about the surrounding project. - */ + /** + * The paths the Torque generator must know about the surrounding project. + */ private final ProjectPaths projectPaths; /** Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java Mon Aug 27 09:48:33 2018 @@ -35,19 +35,19 @@ public final class XMLConstants * The XML Schema Namespace. */ public static final String XS_NAMESPACE - = "http://www.w3.org/2001/XMLSchema";; + = "http://www.w3.org/2001/XMLSchema";; /** * The XML Schema Instance Namespace. */ public static final String XSI_NAMESPACE - = "http://www.w3.org/2001/XMLSchema-instance";; + = "http://www.w3.org/2001/XMLSchema-instance";; /** * The Torque generator configuration Namespace. */ public static final String GENERATOR_CONFIGURATION_NAMESPACE - = "http://db.apache.org/torque/4.0/generator/configuration";; + = "http://db.apache.org/torque/4.0/generator/configuration";; /** * The name of the XSI type attribute. Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java Mon Aug 27 09:48:33 2018 @@ -52,15 +52,15 @@ import org.apache.torque.generator.confi public class ControlConfiguration { /** The list of all activities of the generation unit. */ - private List<Output> outputList = new ArrayList<Output>(); + private List<Output> outputList = new ArrayList<>(); /** The list of all options definitions within the generation unit. */ private List<OptionsConfiguration> optionsConfigurations - = new ArrayList<OptionsConfiguration>(); + = new ArrayList<>(); /** The entity references within the generation unit. */ private EntityReferences entityReferences - = new EntityReferences(); + = new EntityReferences(); /** The loglevel during generation, not null. */ private Loglevel loglevel = Loglevel.INFO; @@ -143,10 +143,10 @@ public class ControlConfiguration { StringBuffer result = new StringBuffer(); result.append("(outputFiles=") - .append(outputList.toString()) - .append(", optionsConfigurations=") - .append(optionsConfigurations.toString()) - .append(")"); + .append(outputList.toString()) + .append(", optionsConfigurations=") + .append(optionsConfigurations.toString()) + .append(")"); return result.toString(); } @@ -173,6 +173,6 @@ public class ControlConfiguration { throw new NullPointerException("loglevel is null"); } - this.loglevel = loglevel; + this.loglevel = loglevel; } } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -126,15 +126,15 @@ public class ControlConfigurationSaxHand this.controllerConfiguration = controllerConfiguration; this.configurationHandlers = configurationHandlers; this.unitDescriptor = unitDescriptor; - } + } /** * {@inheritDoc} */ @Override public void startElement(String uri, String localName, String qName, - Attributes attributes) - throws SAXException + Attributes attributes) + throws SAXException { String unqualifiedName = SaxHelper.getUnqualifiedName(localName, qName); if (outputSaxHandler != null) @@ -185,10 +185,10 @@ public class ControlConfigurationSaxHand } OptionsSaxHandlerFactories optionsSaxHandlerFactories - = configurationHandlers.getOptionsSaxHandlerFactories(); + = configurationHandlers.getOptionsSaxHandlerFactories(); OptionsSaxHandlerFactory optionsSaxHandlerFactory - = optionsSaxHandlerFactories.getOptionsSaxHandlerFactory( - type); + = optionsSaxHandlerFactories.getOptionsSaxHandlerFactory( + type); if (optionsSaxHandlerFactory == null) { throw new SAXException("No handler found for the action " @@ -232,7 +232,7 @@ public class ControlConfigurationSaxHand */ @Override public void endElement(String uri, String localName, String rawName) - throws SAXException + throws SAXException { if (optionsSaxHandler != null) { @@ -240,7 +240,7 @@ public class ControlConfigurationSaxHand if (optionsSaxHandler.isFinished()) { OptionsConfiguration optionsConfiguration - = optionsSaxHandler.getOptionsConfiguration(); + = optionsSaxHandler.getOptionsConfiguration(); controllerConfiguration.addOptionsConfiguration( optionsConfiguration); optionsSaxHandler = null; @@ -273,16 +273,16 @@ public class ControlConfigurationSaxHand try { controllerConfiguration.getEntityReferences() - .addEntityReference( - entityReferenceSaxHandler.getSystemId(), - entityReferenceSaxHandler.readResource()); + .addEntityReference( + entityReferenceSaxHandler.getSystemId(), + entityReferenceSaxHandler.readResource()); } catch (ConfigurationException e) { throw new SAXException( "Could not read entity reference " - + entityReferenceSaxHandler.getSystemId(), - e); + + entityReferenceSaxHandler.getSystemId(), + e); } entityReferenceSaxHandler = null; } @@ -320,6 +320,7 @@ public class ControlConfigurationSaxHand * * @see ConfigurationEntityResolver#resolveEntity(String, String) */ + @Override public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Mon Aug 27 09:48:33 2018 @@ -50,7 +50,7 @@ public class ControlConfigurationXmlPars /** The logger. */ private static Log log - = LogFactory.getLog(ControlConfigurationXmlParser.class); + = LogFactory.getLog(ControlConfigurationXmlParser.class); static { @@ -89,10 +89,10 @@ public class ControlConfigurationXmlPars final ConfigurationProvider configurationProvider, final UnitDescriptor unitDescriptor, final ConfigurationHandlers configurationHandlers) - throws ConfigurationException + throws ConfigurationException { InputStream controlConfigurationInputStream - = configurationProvider.getControlConfigurationInputStream(); + = configurationProvider.getControlConfigurationInputStream(); try { ControlConfiguration result = new ControlConfiguration(); @@ -100,7 +100,7 @@ public class ControlConfigurationXmlPars { SAXParser parser = saxFactory.newSAXParser(); InputSource is - = new InputSource(controlConfigurationInputStream); + = new InputSource(controlConfigurationInputStream); parser.parse( is, new ControlConfigurationSaxHandler( @@ -113,26 +113,26 @@ public class ControlConfigurationXmlPars { throw new ConfigurationException( "Error parsing controller Configuration " - + configurationProvider + + configurationProvider .getControlConfigurationLocation() - + " at line " - + e.getLineNumber() - + " column " - + e.getColumnNumber() - + " : " - + e.getMessage(), - e); + + " at line " + + e.getLineNumber() + + " column " + + e.getColumnNumber() + + " : " + + e.getMessage(), + e); } catch (Exception e) { throw new ConfigurationException( "Error parsing controller Configuration " - + configurationProvider + + configurationProvider .getControlConfigurationLocation() - + " : " - + e.getMessage(), - e); + + " : " + + e.getMessage(), + e); } return result; } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java Mon Aug 27 09:48:33 2018 @@ -40,6 +40,7 @@ public class DummyLoggingAdapter impleme * * @return <code>Loglevel.INFO</code>. */ + @Override public Loglevel getCurrentLoglevel() { return Loglevel.INFO; @@ -50,6 +51,7 @@ public class DummyLoggingAdapter impleme * * @param loglevel ignored. */ + @Override public void setLoglevel(Loglevel loglevel) { log.debug("apply() : Not Setting loglevel to " + loglevel Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java Mon Aug 27 09:48:33 2018 @@ -43,7 +43,7 @@ public class Log4jLoggingAdapter impleme public Log4jLoggingAdapter() { - Map<Loglevel, Level> levels = new HashMap<Loglevel, Level>(); + Map<Loglevel, Level> levels = new HashMap<>(); levels.put(Loglevel.TRACE, Level.TRACE); levels.put(Loglevel.DEBUG, Level.DEBUG); levels.put(Loglevel.INFO, Level.INFO); @@ -58,6 +58,7 @@ public class Log4jLoggingAdapter impleme * @return the current loglevel, or INFO if the current loglevel cannot * be determined. */ + @Override public Loglevel getCurrentLoglevel() { Level level = Logger.getRootLogger().getLevel(); @@ -77,6 +78,7 @@ public class Log4jLoggingAdapter impleme * * @param loglevel the loglevel to set, not null. */ + @Override public void setLoglevel(final Loglevel loglevel) { if (loglevel == null) Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -48,8 +48,8 @@ public class OutletReferenceSaxHandler e */ @Override public void startElement(String uri, String localName, String rawName, - Attributes attributes) - throws SAXException + Attributes attributes) + throws SAXException { if (OUTLET_TAG.equals(rawName)) { @@ -67,7 +67,7 @@ public class OutletReferenceSaxHandler e */ @Override public void endElement(String uri, String localName, String rawName) - throws SAXException + throws SAXException { if (OUTLET_TAG.equals(rawName)) { Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java Mon Aug 27 09:48:33 2018 @@ -64,7 +64,7 @@ public class Output * The information on how to post-process the sources after generation. */ private final List<PostprocessorDefinition> postprocessorDefinitions - = new ArrayList<PostprocessorDefinition>();; + = new ArrayList<>();; /** * The outlet which generates the content. @@ -89,7 +89,7 @@ public class Output * The strategy how existing target files should be handled. */ private String existingTargetStrategy - = ReplaceTargetFileStrategy.STRATEGY_NAME; + = ReplaceTargetFileStrategy.STRATEGY_NAME; /** * The type of the generated output, e.g. java, xml, html. @@ -409,17 +409,17 @@ public class Output { StringBuffer result = new StringBuffer(); result.append("(OutputFile: sourceProvider=").append(sourceProvider) - .append(",existingTargetStrategy=") - .append(existingTargetStrategy) - .append(",encoding=") - .append(encoding) - .append(",filenameOutlet=") - .append(filenameOutlet) - .append(",contentOutlet=") - .append(contentOutlet) - .append(",type=") - .append(type) - .append(")"); + .append(",existingTargetStrategy=") + .append(existingTargetStrategy) + .append(",encoding=") + .append(encoding) + .append(",filenameOutlet=") + .append(filenameOutlet) + .append(",contentOutlet=") + .append(contentOutlet) + .append(",type=") + .append(type) + .append(")"); return result.toString(); } } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java Mon Aug 27 09:48:33 2018 @@ -39,11 +39,11 @@ public final class OutputConfigurationTa /** Attribute name for the "existingTargetStrategy" attribute. */ public static final String EXISTING_TARGET_STRATEGY_ATTRIBUTE - = "existingTargetStrategy"; + = "existingTargetStrategy"; /** Attribute name for the "existingTargetStrategy" attribute. */ public static final String OUTPUT_DIR_KEY_ATTRIBUTE - = "outputDirKey"; + = "outputDirKey"; /** Attribute name for the "file" attribute. */ public static final String FILE_ATTRIBUTE = "file"; Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -56,8 +56,8 @@ public class OutputSaxHandler extends De { /** The qualified name for the filename outlet. */ private static final QualifiedName FILENAME_OUTLET_NAME - = new QualifiedName( - "org.apache.torque.generator.configuration.filenameOutlet"); + = new QualifiedName( + "org.apache.torque.generator.configuration.filenameOutlet"); /** The access object for the configuration files, not null. */ private final ConfigurationProvider configurationProvider; @@ -85,7 +85,7 @@ public class OutputSaxHandler extends De /** The handler which handles postprocessor elements. */ private ConfigurableClassSaxHandler<StringProcessor> - postprocessorSaxHandler; + postprocessorSaxHandler; /** * The SAX handler which handles the filename outlet configuration, @@ -149,7 +149,7 @@ public class OutputSaxHandler extends De final String localName, final String rawName, final Attributes attributes) - throws SAXException + throws SAXException { if (contentOutletSaxHandler != null) { @@ -225,9 +225,9 @@ public class OutputSaxHandler extends De XMLConstants.XSI_NAMESPACE, XMLConstants.XSI_TYPE_ATTRBUTE_NAME); SourceSaxHandlerFactories sourceSaxHandlerFactories - = configurationHandlers.getSourceSaxHandlerFactories(); + = configurationHandlers.getSourceSaxHandlerFactories(); SourceSaxHandlerFactory sourceSaxHandlerFactory - = sourceSaxHandlerFactories.getSourceSaxHandlerFactory(type); + = sourceSaxHandlerFactories.getSourceSaxHandlerFactory(type); if (sourceSaxHandlerFactory == null) { throw new SAXException("Unknown source type " @@ -244,7 +244,7 @@ public class OutputSaxHandler extends De else if (OUTLET_TAG.equals(rawName)) { contentOutletSaxHandler - = new OutletReferenceSaxHandler(); + = new OutletReferenceSaxHandler(); contentOutletSaxHandler.startElement( uri, localName, @@ -254,27 +254,27 @@ public class OutputSaxHandler extends De else if (POSTPROCESSOR_TAG.equals(rawName)) { postprocessorSaxHandler - = new ConfigurableClassSaxHandler<StringProcessor>( - configurationProvider, - unitDescriptor, - POSTPROCESSOR_TAG); + = new ConfigurableClassSaxHandler<>( + configurationProvider, + unitDescriptor, + POSTPROCESSOR_TAG); postprocessorSaxHandler.startElement( uri, localName, rawName, attributes); } else if (FILENAME_GENERATOR_TAG.equals(rawName)) { OutletConfigurationSaxHandler outletConfigurationSaxHandler - = new OutletConfigurationSaxHandler( - configurationProvider, - unitDescriptor, - configurationHandlers); + = new OutletConfigurationSaxHandler( + configurationProvider, + unitDescriptor, + configurationHandlers); String outletType - = OutletConfigurationSaxHandler.getOutletType( - attributes); + = OutletConfigurationSaxHandler.getOutletType( + attributes); filenameOutletSaxHandler - = outletConfigurationSaxHandler.getOutletHandler( - FILENAME_OUTLET_NAME, - outletType); + = outletConfigurationSaxHandler.getOutletHandler( + FILENAME_OUTLET_NAME, + outletType); filenameOutletSaxHandler.startElement( uri, localName, @@ -292,7 +292,7 @@ public class OutputSaxHandler extends De */ @Override public void endElement(final String uri, final String localName, final String rawName) - throws SAXException + throws SAXException { if (contentOutletSaxHandler != null) { @@ -304,7 +304,7 @@ public class OutputSaxHandler extends De { output.setContentOutlet( contentOutletSaxHandler - .getOutletReference()); + .getOutletReference()); contentOutletSaxHandler = null; } } @@ -329,8 +329,8 @@ public class OutputSaxHandler extends De if (postprocessorSaxHandler.isFinished()) { output.getPostprocessorDefinitions().add( - new PostprocessorDefinition( - postprocessorSaxHandler.getConfiguredClass())); + new PostprocessorDefinition( + postprocessorSaxHandler.getConfiguredClass())); postprocessorSaxHandler = null; } } @@ -341,7 +341,7 @@ public class OutputSaxHandler extends De { output.setFilenameOutlet( filenameOutletSaxHandler - .getOutlet()); + .getOutlet()); filenameOutletSaxHandler = null; } } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -93,7 +93,7 @@ public abstract class ActionSaxHandler e String localName, String rawName, Attributes attributes) - throws SAXException + throws SAXException { throw new SAXException("unknown Element " + rawName); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java Mon Aug 27 09:48:33 2018 @@ -41,7 +41,7 @@ public class ActionSaxHandlerFactories * keyed by the type of the action. */ private Map<String, ActionSaxHandlerFactory> actionSaxHandlerFactories - = new HashMap<String, ActionSaxHandlerFactory>(); + = new HashMap<>(); /** * Constructor. Registers the default Factories. @@ -76,21 +76,21 @@ public class ActionSaxHandlerFactories */ public void register( ActionSaxHandlerFactory factory) - throws ConfigurationException + throws ConfigurationException { ActionSaxHandlerFactory oldFactory - = actionSaxHandlerFactories.get(factory.getType()); + = actionSaxHandlerFactories.get(factory.getType()); if (oldFactory != null) { throw new ConfigurationException( "Attempted to register an ActionSaxHandlerFactory " - + "of type " - + factory.getType() - + " and class " - + factory.getClass().getName() - + " : A factory with this type already exists, " - + " it has the class " - + oldFactory.getClass().getName()); + + "of type " + + factory.getType() + + " and class " + + factory.getClass().getName() + + " : A factory with this type already exists, " + + " it has the class " + + oldFactory.getClass().getName()); } actionSaxHandlerFactories.put(factory.getType(), factory); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java Mon Aug 27 09:48:33 2018 @@ -73,5 +73,5 @@ public abstract interface ActionSaxHandl Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException; + throws SAXException; } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -64,7 +64,7 @@ public class ApplyActionSaxHandler exten Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException + throws SAXException { super(createAction(attributes), configurationProvider, unitDescriptor); } @@ -100,7 +100,7 @@ public class ApplyActionSaxHandler exten String localName, String rawName, Attributes attributes) - throws SAXException + throws SAXException { throw new SAXException("Unknown tag " + rawName); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java Mon Aug 27 09:48:33 2018 @@ -28,7 +28,7 @@ import org.xml.sax.SAXException; * A Factory which creates a SAX handler for an ApplyAction. */ public class ApplyActionSaxHandlerFactory - implements ActionSaxHandlerFactory +implements ActionSaxHandlerFactory { /** * The type of the actions which can be processed by the @@ -41,6 +41,7 @@ public class ApplyActionSaxHandlerFactor * ActionSaxHandlers created by this factory. * @return "applyAction". */ + @Override public String getType() { return ACTION_TYPE; @@ -64,6 +65,7 @@ public class ApplyActionSaxHandlerFactor * * @return a new ApplyActionSaxHandler. */ + @Override public final ApplyActionSaxHandler getActionSaxHandler( String uri, String localName, @@ -71,7 +73,7 @@ public class ApplyActionSaxHandlerFactor Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException + throws SAXException { return new ApplyActionSaxHandler( uri, Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java Mon Aug 27 09:48:33 2018 @@ -38,7 +38,7 @@ public class MergepointMapping /** * The list of actions whichare executed at the mergepoint. */ - private List<MergepointAction> actions = new ArrayList<MergepointAction>(); + private List<MergepointAction> actions = new ArrayList<>(); /** * Constructor. @@ -111,8 +111,8 @@ public class MergepointMapping { StringBuffer result = new StringBuffer(); result.append("(name=").append(name) - .append(",actions=").append(actions) - .append(")"); + .append(",actions=").append(actions) + .append(")"); return result.toString(); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -146,7 +146,7 @@ public class MergepointSaxHandler String localName, String qName, Attributes attributes) - throws SAXException + throws SAXException { if (delegateHandler != null) { @@ -179,9 +179,9 @@ public class MergepointSaxHandler } ActionSaxHandlerFactories actionSaxHandlerFactories - = configurationHandlers.getActionSaxHandlerFactories(); + = configurationHandlers.getActionSaxHandlerFactories(); ActionSaxHandlerFactory handlerFactory - = actionSaxHandlerFactories.getActionSaxHandlerFactory(type); + = actionSaxHandlerFactories.getActionSaxHandlerFactory(type); if (handlerFactory == null) { throw new SAXException("No handler found for the action " Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -63,10 +63,10 @@ public class OptionActionSaxHandler exte Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException - { + throws SAXException + { super(createAction(attributes), configurationProvider, unitDescriptor); - } + } /** * Creates the action from the attributes of the action element. @@ -98,7 +98,7 @@ public class OptionActionSaxHandler exte String localName, String rawName, Attributes attributes) - throws SAXException + throws SAXException { throw new SAXException("Unknown tag " + rawName); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java Mon Aug 27 09:48:33 2018 @@ -28,7 +28,7 @@ import org.xml.sax.SAXException; * A Factory which creates a SAX handler for an OptionAction. */ public class OptionActionSaxHandlerFactory - implements ActionSaxHandlerFactory +implements ActionSaxHandlerFactory { /** * The type of the actions which can be processed by the @@ -41,6 +41,7 @@ public class OptionActionSaxHandlerFacto * ActionSaxHandlers created by this factory. * @return "optionAction". */ + @Override public String getType() { return ACTION_TYPE; @@ -64,6 +65,7 @@ public class OptionActionSaxHandlerFacto * * @return a new OptionActionSaxHandler. */ + @Override public final OptionActionSaxHandler getActionSaxHandler( String uri, String localName, @@ -71,7 +73,7 @@ public class OptionActionSaxHandlerFacto Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException + throws SAXException { return new OptionActionSaxHandler( uri, Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java Mon Aug 27 09:48:33 2018 @@ -38,14 +38,14 @@ public class OptionsSaxHandlerFactories { /** The class log. */ private static Log log - = LogFactory.getLog(OptionsSaxHandlerFactories.class); + = LogFactory.getLog(OptionsSaxHandlerFactories.class); /** * A map containing all known ActionSaxHandlerFactories, * keyed by the type of the action. */ private Map<String, OptionsSaxHandlerFactory> factories - = new HashMap<String, OptionsSaxHandlerFactory>(); + = new HashMap<>(); /** * Constructor. Registers the default OptionsSaxHandlerFactories. @@ -75,7 +75,7 @@ public class OptionsSaxHandlerFactories * already exists. */ public void register(OptionsSaxHandlerFactory optionsSaxHandlerFactory) - throws ConfigurationException + throws ConfigurationException { String type = optionsSaxHandlerFactory.getType(); @@ -84,13 +84,13 @@ public class OptionsSaxHandlerFactories { throw new ConfigurationException( "Attempted to register an OptionsSaxHandlerFactory " - + "of type " - + optionsSaxHandlerFactory.getType() - + " and class " - + optionsSaxHandlerFactory.getClass().getName() - + " : A factory with this type already exists, " - + " it has the class " - + oldFactory.getClass().getName()); + + "of type " + + optionsSaxHandlerFactory.getType() + + " and class " + + optionsSaxHandlerFactory.getClass().getName() + + " : A factory with this type already exists, " + + " it has the class " + + oldFactory.getClass().getName()); } factories.put(type, optionsSaxHandlerFactory); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -61,10 +61,10 @@ public class OutputActionSaxHandler exte Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException - { + throws SAXException + { super(createAction(attributes), configurationProvider, unitDescriptor); - } + } /** * Creates the action from the attributes of the action element. @@ -92,7 +92,7 @@ public class OutputActionSaxHandler exte String localName, String rawName, Attributes attributes) - throws SAXException + throws SAXException { throw new SAXException("Unknown tag " + rawName); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java Mon Aug 27 09:48:33 2018 @@ -28,7 +28,7 @@ import org.xml.sax.SAXException; * A Factory which creates a SAX handler for an OutputAction. */ public class OutputActionSaxHandlerFactory - implements ActionSaxHandlerFactory +implements ActionSaxHandlerFactory { /** * The type of the actions which can be processed by the @@ -42,6 +42,7 @@ public class OutputActionSaxHandlerFacto * * @return "outputAction". */ + @Override public String getType() { return ACTION_TYPE; @@ -65,6 +66,7 @@ public class OutputActionSaxHandlerFacto * * @return a new OptionActionSaxHandler. */ + @Override public final OutputActionSaxHandler getActionSaxHandler( String uri, String localName, @@ -72,7 +74,7 @@ public class OutputActionSaxHandlerFacto Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException + throws SAXException { return new OutputActionSaxHandler( uri, Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -62,10 +62,10 @@ public class SourceElementAttributeActio Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException - { + throws SAXException + { super(createAction(attributes), configurationProvider, unitDescriptor); - } + } /** * Creates the action from the attributes of the action element. @@ -78,7 +78,7 @@ public class SourceElementAttributeActio */ private static SourceElementAttributeAction createAction( Attributes attributes) - throws SAXException + throws SAXException { String element = attributes.getValue(ACTION_ELEMENT_ATTRIBUTE); String attribute = attributes.getValue(ACTION_ATTRIBUTE_ATTRIBUTE); @@ -87,10 +87,10 @@ public class SourceElementAttributeActio attributes, "the SourceElementAttributeAction " + element); SourceElementAttributeAction action - = new SourceElementAttributeAction( - element, - attribute, - acceptNotSet); + = new SourceElementAttributeAction( + element, + attribute, + acceptNotSet); return action; } @@ -103,7 +103,7 @@ public class SourceElementAttributeActio String localName, String rawName, Attributes attributes) - throws SAXException + throws SAXException { throw new SAXException("Unknown tag " + rawName); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java Mon Aug 27 09:48:33 2018 @@ -28,7 +28,7 @@ import org.xml.sax.SAXException; * A Factory which creates a SAX handler for a SourceElementAttributeAction. */ public class SourceElementAttributeActionSaxHandlerFactory - implements ActionSaxHandlerFactory +implements ActionSaxHandlerFactory { /** * The type of the actions which can be processed by the @@ -41,6 +41,7 @@ public class SourceElementAttributeActio * ActionSaxHandlers created by this factory. * @return "sourceElementAction". */ + @Override public String getType() { return ACTION_TYPE; @@ -64,6 +65,7 @@ public class SourceElementAttributeActio * * @return a new SourceElementAttributeActionSaxHandler. */ + @Override public final SourceElementAttributeActionSaxHandler getActionSaxHandler( String uri, String localName, @@ -71,7 +73,7 @@ public class SourceElementAttributeActio Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException + throws SAXException { return new SourceElementAttributeActionSaxHandler( uri, Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -63,10 +63,10 @@ public class TraverseAllActionSaxHandler Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException - { + throws SAXException + { super(createAction(attributes), configurationProvider, unitDescriptor); - } + } /** * Creates the action from the attributes of the action element. @@ -102,7 +102,7 @@ public class TraverseAllActionSaxHandler String localName, String rawName, Attributes attributes) - throws SAXException + throws SAXException { throw new SAXException("Unknown tag " + rawName); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java Mon Aug 27 09:48:33 2018 @@ -28,7 +28,7 @@ import org.xml.sax.SAXException; * A Factory which creates a SAX handler for a TraverseAllAction. */ public class TraverseAllActionSaxHandlerFactory - implements ActionSaxHandlerFactory +implements ActionSaxHandlerFactory { /** * The type of the actions which can be processed by the @@ -42,6 +42,7 @@ public class TraverseAllActionSaxHandler * * @return "traverseAllAction". */ + @Override public String getType() { return ACTION_TYPE; @@ -65,6 +66,7 @@ public class TraverseAllActionSaxHandler * * @return a new TraverseAllActionSaxHandler. */ + @Override public final TraverseAllActionSaxHandler getActionSaxHandler( String uri, String localName, @@ -72,7 +74,7 @@ public class TraverseAllActionSaxHandler Attributes attributes, ConfigurationProvider configurationProvider, UnitDescriptor unitDescriptor) - throws SAXException + throws SAXException { return new TraverseAllActionSaxHandler( uri, Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java Mon Aug 27 09:48:33 2018 @@ -62,7 +62,7 @@ public abstract class FileOptionsConfigu { StringBuffer result = new StringBuffer(); result.append("(path=") - .append(path); + .append(path); result.append(")"); return result.toString(); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java Mon Aug 27 09:48:33 2018 @@ -50,8 +50,8 @@ public class FileOptionsSaxHandler exten */ @Override public void startElement(String uri, String localName, String qName, - Attributes attributes) - throws SAXException + Attributes attributes) + throws SAXException { String unqualifiedName = SaxHelper.getUnqualifiedName(localName, qName); if (OPTIONS_TAG.equals(unqualifiedName)) @@ -75,7 +75,7 @@ public class FileOptionsSaxHandler exten */ @Override public void endElement(String uri, String localName, String qName) - throws SAXException + throws SAXException { String unqualifiedName = SaxHelper.getUnqualifiedName(localName, qName); if (OPTIONS_TAG.equals(unqualifiedName)) Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java Mon Aug 27 09:48:33 2018 @@ -46,7 +46,7 @@ public class MapOptionsConfiguration ext */ public MapOptionsConfiguration(final Map<String, String> content) { - optionMap = new HashMap<String, String>(content); + optionMap = new HashMap<>(content); } /** @@ -67,9 +67,10 @@ public class MapOptionsConfiguration ext * * @return the options contained in this configuration, not null. */ + @Override public Collection<Option> getOptions( - ConfigurationProvider configurationProvider) - throws ConfigurationException + ConfigurationProvider configurationProvider) + throws ConfigurationException { return toOptions(optionMap); } @@ -79,7 +80,7 @@ public class MapOptionsConfiguration ext { StringBuffer result = new StringBuffer(); result.append("(optionMap=") - .append(optionMap); + .append(optionMap); result.append(")"); return result.toString(); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java Mon Aug 27 09:48:33 2018 @@ -35,7 +35,7 @@ public interface OptionsConfiguration * * @param configurationProvider The configuration provider to access * the option files. - * + * * @return the read options, not null. * * @throws ConfigurationException if an error occurs while reading @@ -43,5 +43,5 @@ public interface OptionsConfiguration */ Collection<Option> getOptions( ConfigurationProvider configurationProvider) - throws ConfigurationException; + throws ConfigurationException; } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
