Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Mon Aug 27 09:48:33 2018 @@ -109,13 +109,13 @@ public class VelocityOutlet extends Temp ConfigurationProvider configurationProvider, String path, String encoding) - throws ConfigurationException + throws ConfigurationException { super(name, - configurationProvider, - path, - encoding, - new VelocityTemplateFilter()); + configurationProvider, + path, + encoding, + new VelocityTemplateFilter()); } /** @@ -202,7 +202,7 @@ public class VelocityOutlet extends Temp */ @Override public OutletResult execute(ControllerState controllerState) - throws GeneratorException + throws GeneratorException { if (log.isDebugEnabled()) @@ -244,15 +244,15 @@ public class VelocityOutlet extends Temp catch (Exception e) { log.error("error during execution of outlet " - + getName() - + " : " + e.getMessage(), + + getName() + + " : " + e.getMessage(), e); throw new GeneratorException( "Error during execution of outlet " - + getName() - + " : " - + e.getMessage(), - e); + + getName() + + " : " + + e.getMessage(), + e); } return new OutletResult(writer.toString()); @@ -287,7 +287,7 @@ public class VelocityOutlet extends Temp { // Only consider options visible from the current namespace. Options visibleOptions - = controllerState.getVisibleOptions(); + = controllerState.getVisibleOptions(); for (Option option : visibleOptions.values()) { QualifiedName qualifiedName = option.getQualifiedName(); @@ -341,11 +341,11 @@ public class VelocityOutlet extends Temp // only consider the most significant name. Namespace namespace = getName().getNamespace(); VariableStore variableStore - = controllerState.getVariableStore(); + = controllerState.getVariableStore(); QualifiedNameMap<Variable> visibleVariables - = variableStore - .getContent() - .getInHierarchy(namespace); + = variableStore + .getContent() + .getInHierarchy(namespace); for (Variable variable : visibleVariables.values()) { QualifiedName qualifiedName = variable.getName();
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java Mon Aug 27 09:48:33 2018 @@ -55,6 +55,7 @@ public class VelocityTemplateFilter impl * * @throws IOException if creating, reading or writing to a stream fails. */ + @Override public InputStream filter(InputStream resource, String encoding) throws IOException { @@ -135,7 +136,7 @@ public class VelocityTemplateFilter impl outputStreamWriter.write(readChar); onlySpacesInLineSoFar = false; - } + } } } outputStreamWriter.write(startLineBuffer.toString()); Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java Mon Aug 27 09:48:33 2018 @@ -209,9 +209,9 @@ public class Variable { StringBuilder result = new StringBuilder(); result.append("(name=").append(name) - .append(", value=").append(value) - .append(", scope=").append(scope) - .append(")"); + .append(", value=").append(value) + .append(", scope=").append(scope) + .append(")"); return result.toString(); } } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java Mon Aug 27 09:48:33 2018 @@ -35,7 +35,7 @@ public class VariableStore * <code>Variable.Scope.OUTLET<code>. */ private QualifiedNameMap<Variable> outletScope - = new QualifiedNameMap<Variable>(); + = new QualifiedNameMap<>(); /** * contains all variables with the scope @@ -45,21 +45,21 @@ public class VariableStore * to the respective calling outlets. */ private LinkedList<QualifiedNameMap<Variable>> childrenScopeList - = new LinkedList<QualifiedNameMap<Variable>>(); + = new LinkedList<>(); /** * contains all variables with the scope * <code>Variable.Scope.FILE<code>. */ private QualifiedNameMap<Variable> fileScope - = new QualifiedNameMap<Variable>(); + = new QualifiedNameMap<>(); /** * contains all variables with the scope * <code>Variable.Scope.GLOBAL<code>. */ private QualifiedNameMap<Variable> globalScope - = new QualifiedNameMap<Variable>(); + = new QualifiedNameMap<>(); /** * Sets a variable. @@ -77,7 +77,7 @@ public class VariableStore else if (Variable.Scope.CHILDREN.equals(variable.getScope())) { QualifiedNameMap<Variable> qualifiedNameMap - = childrenScopeList.getLast(); + = childrenScopeList.getLast(); qualifiedNameMap.put(variable.getName(), variable); } else if (Variable.Scope.FILE.equals(variable.getScope())) @@ -106,7 +106,7 @@ public class VariableStore else if (Variable.Scope.CHILDREN.equals(variable.getScope())) { QualifiedNameMap<Variable> qualifiedNameMap - = childrenScopeList.getLast(); + = childrenScopeList.getLast(); qualifiedNameMap.remove(variable.getName()); } else if (Variable.Scope.FILE.equals(variable.getScope())) @@ -188,7 +188,7 @@ public class VariableStore */ public QualifiedNameMap<Variable> getContent() { - QualifiedNameMap<Variable> result = new QualifiedNameMap<Variable>(); + QualifiedNameMap<Variable> result = new QualifiedNameMap<>(); result.putAll(globalScope); result.putAll(fileScope); @@ -262,9 +262,9 @@ public class VariableStore return variable1; } Namespace variable1Namespace - = variable1.getName().getNamespace(); + = variable1.getName().getNamespace(); Namespace variable2Namespace - = variable2.getName().getNamespace(); + = variable2.getName().getNamespace(); if (variable2Namespace.isVisibleFrom(variable1Namespace)) { // variable1 is more specific or in the same naemspace Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ClasspathConfigurationProviderTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ClasspathConfigurationProviderTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ClasspathConfigurationProviderTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ClasspathConfigurationProviderTest.java Mon Aug 27 09:48:33 2018 @@ -49,7 +49,7 @@ public class ClasspathConfigurationProvi @Before public void before() { - Map<String, File> outputDirMap = new HashMap<String, File>(); + Map<String, File> outputDirMap = new HashMap<>(); outputDirMap.put(null, new File("generated-sources")); ProjectPaths projectPaths = new CustomProjectPaths( null, @@ -73,11 +73,11 @@ public class ClasspathConfigurationProvi assertArrayEquals( FileUtils.readFileToByteArray(new File( "src/test/resources/org/" - + "apache/torque/generator/test/readfromclasspath/" - + "templates/testTemplate.vm")), + + "apache/torque/generator/test/readfromclasspath/" + + "templates/testTemplate.vm")), IOUtils.toByteArray( classpathConfigurationProvider.getTemplateInputStream( - "testTemplate.vm"))); + "testTemplate.vm"))); } @Test @@ -86,11 +86,11 @@ public class ClasspathConfigurationProvi assertArrayEquals( FileUtils.readFileToByteArray(new File( "src/test/resources/org/" - + "apache/torque/generator/test/readfromclasspath/" - + "templates/testTemplate.vm")), + + "apache/torque/generator/test/readfromclasspath/" + + "templates/testTemplate.vm")), IOUtils.toByteArray( classpathConfigurationProvider.getResourceInputStream( - "../templates/testTemplate.vm"))); + "../templates/testTemplate.vm"))); } @Test @@ -101,19 +101,19 @@ public class ClasspathConfigurationProvi "/org/apache/commons/io/CopyUtils.class")), IOUtils.toByteArray( classpathConfigurationProvider.getResourceInputStream( - "../../../../../commons/io/CopyUtils.class"))); + "../../../../../commons/io/CopyUtils.class"))); } @Test public void testGetOutletConfigurationNames() throws Exception { - Set<String> expected = new HashSet<String>(); + Set<String> expected = new HashSet<>(); expected.add("javaOutlets.xml"); expected.add("velocityOutlets.xml"); assertEquals( - expected, - new HashSet<String>( - classpathConfigurationProvider.getOutletConfigurationNames())); + expected, + new HashSet<>( + classpathConfigurationProvider.getOutletConfigurationNames())); } } Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -25,6 +25,7 @@ import org.apache.torque.generator.sourc public class ConfigurationTestSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { return false; Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestTransformer.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestTransformer.java Mon Aug 27 09:48:33 2018 @@ -30,6 +30,7 @@ import org.apache.torque.generator.sourc */ public class ConfigurationTestTransformer implements SourceTransformer { + @Override public Object transform(Object toTransformRoot, ControllerState controllerState) throws SourceTransformerException { Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/DirectoryConfigurationProviderTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/DirectoryConfigurationProviderTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/DirectoryConfigurationProviderTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/DirectoryConfigurationProviderTest.java Mon Aug 27 09:48:33 2018 @@ -49,7 +49,7 @@ public class DirectoryConfigurationProvi @Before public void before() { - Map<String, File> outputDirMap = new HashMap<String, File>(); + Map<String, File> outputDirMap = new HashMap<>(); outputDirMap.put(null, new File("generated-sources")); ProjectPaths projectPaths = new CustomProjectPaths( new File("src/test/resources/org/apache/torque/generator/test/readfromclasspath"), @@ -70,11 +70,11 @@ public class DirectoryConfigurationProvi assertArrayEquals( FileUtils.readFileToByteArray(new File( "src/test/resources/org/" - + "apache/torque/generator/test/readfromclasspath/" - + "templates/testTemplate.vm")), + + "apache/torque/generator/test/readfromclasspath/" + + "templates/testTemplate.vm")), IOUtils.toByteArray( directoryConfigurationProvider.getTemplateInputStream( - "testTemplate.vm"))); + "testTemplate.vm"))); } @Test @@ -83,22 +83,22 @@ public class DirectoryConfigurationProvi assertArrayEquals( FileUtils.readFileToByteArray(new File( "src/test/resources/org/" - + "apache/torque/generator/test/readfromclasspath/" - + "templates/testTemplate.vm")), + + "apache/torque/generator/test/readfromclasspath/" + + "templates/testTemplate.vm")), IOUtils.toByteArray( directoryConfigurationProvider.getResourceInputStream( - "../templates/testTemplate.vm"))); + "../templates/testTemplate.vm"))); } @Test public void testGetOutletConfigurationNames() throws Exception { - Set<String> expected = new HashSet<String>(); + Set<String> expected = new HashSet<>(); expected.add("javaOutlets.xml"); expected.add("velocityOutlets.xml"); assertEquals( - expected, - new HashSet<String>( - directoryConfigurationProvider.getOutletConfigurationNames())); + expected, + new HashSet<>( + directoryConfigurationProvider.getOutletConfigurationNames())); } } Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/JarConfigurationProviderTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/JarConfigurationProviderTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/JarConfigurationProviderTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/JarConfigurationProviderTest.java Mon Aug 27 09:48:33 2018 @@ -49,7 +49,7 @@ public class JarConfigurationProviderTes @Before public void before() throws ConfigurationException { - Map<String, File> outputDirMap = new HashMap<String, File>(); + Map<String, File> outputDirMap = new HashMap<>(); outputDirMap.put(null, new File("generated-sources")); ProjectPaths projectPaths = new CustomProjectPaths( new File("target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar"), @@ -70,16 +70,16 @@ public class JarConfigurationProviderTes assertArrayEquals( FileUtils.readFileToByteArray(new File( "src/test/propertyToJava/src/main/torque-gen/templates/" - + "propertiesToJava.vm")), + + "propertiesToJava.vm")), IOUtils.toByteArray( jarConfigurationProvider.getTemplateInputStream( - "propertiesToJava.vm"))); + "propertiesToJava.vm"))); } @Test public void testGetOutletConfigurationNames() throws Exception { - Set<String> expected = new HashSet<String>(); + Set<String> expected = new HashSet<>(); expected.add("javaTestOutlet.xml"); expected.add("logoCopyOutlet.xml"); expected.add("velocityExtendedPropertiesOutlet.xml"); @@ -89,7 +89,7 @@ public class JarConfigurationProviderTes expected.add("velocityVariableDefinition.xml"); assertEquals( expected, - new HashSet<String>( - jarConfigurationProvider.getOutletConfigurationNames())); + new HashSet<>( + jarConfigurationProvider.getOutletConfigurationNames())); } } Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestSkipDecider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestSkipDecider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestSkipDecider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestSkipDecider.java Mon Aug 27 09:48:33 2018 @@ -25,6 +25,7 @@ import org.apache.torque.generator.sourc public class OtherConfigurationTestSkipDecider implements SkipDecider { + @Override public boolean proceed(ControllerState controllerState) { return false; Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestTransformer.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestTransformer.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestTransformer.java Mon Aug 27 09:48:33 2018 @@ -30,6 +30,7 @@ import org.apache.torque.generator.sourc */ public class OtherConfigurationTestTransformer implements SourceTransformer { + @Override public Object transform(Object toTransformRoot, ControllerState controllerState) throws SourceTransformerException { Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java Mon Aug 27 09:48:33 2018 @@ -143,13 +143,13 @@ public class PackageResourcesTest public void testFileNamesInDirectory() { - HashSet<String> actual = new HashSet<String>(); + HashSet<String> actual = new HashSet<>(); actual.addAll(PackageResources.getFilesInDirectoryWithSuffix( new File("src/test/file"), ".properties", "", false)); - HashSet<String> expected = new HashSet<String>(); + HashSet<String> expected = new HashSet<>(); expected.add("1.properties"); expected.add("11.properties"); assertEquals(expected, actual); @@ -157,13 +157,13 @@ public class PackageResourcesTest public void testFileNamesInDirectorySearchSubdirectories() { - HashSet<String> actual = new HashSet<String>(); + HashSet<String> actual = new HashSet<>(); actual.addAll(PackageResources.getFilesInDirectoryWithSuffix( new File("src/test/file"), ".properties", "", true)); - HashSet<String> expected = new HashSet<String>(); + HashSet<String> expected = new HashSet<>(); expected.add("1.properties"); expected.add("11.properties"); expected.add("subfolder/2.properties"); @@ -173,25 +173,25 @@ public class PackageResourcesTest public void testFileNamesInDirectorySuffixNull() { - HashSet<String> actual = new HashSet<String>(); + HashSet<String> actual = new HashSet<>(); actual.addAll(PackageResources.getFilesInDirectoryWithSuffix( new File("src/test/file"), null, "", true)); - HashSet<String> expected = new HashSet<String>(); + HashSet<String> expected = new HashSet<>(); assertEquals(expected, actual); } public void testFileNamesInJarDirectory() throws Exception { - HashSet<String> actual = new HashSet<String>(); + HashSet<String> actual = new HashSet<>(); actual.addAll(PackageResources.getFilesInJarDirectoryWithSuffix( "templates", new JarFile("target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar"), ".vm", false)); - HashSet<String> expected = new HashSet<String>(); + HashSet<String> expected = new HashSet<>(); expected.add("propertyCopy/propertiesCopy.vm"); expected.add("propertiesExtendedToJava.vm"); expected.add("propertiesToJava.vm"); @@ -204,7 +204,7 @@ public class PackageResourcesTest public void testFileNamesInJarDirectorySearchSubdirectories() throws Exception { - HashSet<String> actual = new HashSet<String>(); + HashSet<String> actual = new HashSet<>(); actual.addAll(PackageResources.getFilesInJarDirectoryWithSuffix( "templates", new JarFile("target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar"), @@ -217,13 +217,13 @@ public class PackageResourcesTest public void testFileNamesInJarDirectorySuffixNull() throws Exception { - HashSet<String> actual = new HashSet<String>(); + HashSet<String> actual = new HashSet<>(); actual.addAll(PackageResources.getFilesInJarDirectoryWithSuffix( "templates", new JarFile("target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar"), null, true)); - HashSet<String> expected = new HashSet<String>(); + HashSet<String> expected = new HashSet<>(); assertEquals(expected, actual); } } Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java Mon Aug 27 09:48:33 2018 @@ -101,23 +101,23 @@ public class ReadConfigurationTest exten projectPaths, new DefaultTorqueGeneratorPaths()); UnitConfigurationReader configurationReader - = new UnitConfigurationReader(); + = new UnitConfigurationReader(); ConfigurationHandlers configurationHandlers - = new ConfigurationHandlers(); + = new ConfigurationHandlers(); UnitConfiguration unitConfiguration - = configurationReader.read( - unitDescriptor, - configurationHandlers); + = configurationReader.read( + unitDescriptor, + configurationHandlers); { File defaultTargetDirectory - = unitConfiguration.getOutputDirectory(null); + = unitConfiguration.getOutputDirectory(null); File expected = new File( "src/test/configuration/target/generated-sources"); assertEquals(expected, defaultTargetDirectory); } { File modifiableTargetDirectory - = unitConfiguration.getOutputDirectory("modifiable"); + = unitConfiguration.getOutputDirectory("modifiable"); File expected = new File( "src/test/configuration/src/main/generated-java"); assertEquals(expected, modifiableTargetDirectory); @@ -136,7 +136,7 @@ public class ReadConfigurationTest exten { Options expectedOptions = new Options(); - Set<Option> expectedOptionSet = new HashSet<Option>(); + Set<Option> expectedOptionSet = new HashSet<>(); expectedOptionSet.add(new OptionImpl( new QualifiedName("org.apache.torque.generator.optionWithNamespace"), "optionWithNamespaceValue")); @@ -163,7 +163,7 @@ public class ReadConfigurationTest exten { EntityReferences entityReferences - = unitConfiguration.getEntityReferences(); + = unitConfiguration.getEntityReferences(); Map<String, byte[]> actual = entityReferences.getEntityReferences(); assertEquals(2, actual.size()); assertArrayEquals( @@ -195,16 +195,16 @@ public class ReadConfigurationTest exten { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.javaOutlet"), + "org.apache.torque.generator.test.readConfiguration.javaOutlet"), outletConfiguration.getName()); } { JavaOutlet filenameOutlet - = (JavaOutlet) output.getFilenameOutlet(); + = (JavaOutlet) output.getFilenameOutlet(); assertEquals("Foo", filenameOutlet.getFoo()); assertEquals("Bar", filenameOutlet.getBar()); assertEquals( @@ -252,22 +252,22 @@ public class ReadConfigurationTest exten { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.anotherOutlet"), + "org.apache.torque.generator.test.readConfiguration.anotherOutlet"), outletConfiguration.getName()); } { VelocityOutlet filenameOutlet - = (VelocityOutlet) output.getFilenameOutlet(); + = (VelocityOutlet) output.getFilenameOutlet(); String templateContent - = filenameOutlet.getContent(controllerState); + = filenameOutlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved - = StringUtils.substringAfterLast(templateContent, "\r\n"); + = StringUtils.substringAfterLast(templateContent, "\r\n"); assertEquals( "test template output", templateContentLicenseRemoved); @@ -301,11 +301,11 @@ public class ReadConfigurationTest exten } { SourceProcessConfiguration sourceProcessConfiguration - = new SourceProcessConfiguration(); + = new SourceProcessConfiguration(); sourceProcessConfiguration.setStartElementsPath( "properties/entry"); List<SourceTransformerDefinition> transformerDefinitions - = new ArrayList<SourceTransformerDefinition>(); + = new ArrayList<>(); transformerDefinitions.add( new SourceTransformerDefinition( @@ -349,21 +349,21 @@ public class ReadConfigurationTest exten { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.thirdOutlet"), + "org.apache.torque.generator.test.readConfiguration.thirdOutlet"), outletConfiguration.getName()); } { JdbcMetadataSourceProvider sourceProvider - = new JdbcMetadataSourceProvider( - "jdbcUrl", - "jdbcDriver", - "jdbcUsername", - "jdbcPassword", - "jdbcSchema"); + = new JdbcMetadataSourceProvider( + "jdbcUrl", + "jdbcDriver", + "jdbcUsername", + "jdbcPassword", + "jdbcSchema"); sourceProvider.init( configurationHandlers, controllerState); @@ -382,25 +382,25 @@ public class ReadConfigurationTest exten { OutletConfiguration outletConfiguration - = unitConfiguration.getOutletConfiguration(); + = unitConfiguration.getOutletConfiguration(); Map<QualifiedName, Outlet> outletMap - = outletConfiguration.getOutlets(); + = outletConfiguration.getOutlets(); assertEquals(3, outletMap.size()); { JavaOutlet outlet - = (JavaOutlet) outletMap.get(new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.javaOutlet")); + = (JavaOutlet) outletMap.get(new QualifiedName( + "org.apache.torque.generator.test.readConfiguration.javaOutlet")); assertEquals("Foo2", outlet.getFoo()); assertEquals("Bar2", outlet.getBar()); Map<String, MergepointMapping> mergepointMappings - = outlet.getMergepointMappings(); + = outlet.getMergepointMappings(); assertEquals(3, mergepointMappings.size()); { MergepointMapping mergepointMapping - = mergepointMappings.get("properties"); + = mergepointMappings.get("properties"); assertEquals(1, mergepointMapping.getActions().size()); MergepointAction action - = mergepointMapping.getActions().get(0); + = mergepointMapping.getActions().get(0); assertEquals( new TraverseAllAction( "entry", @@ -411,10 +411,10 @@ public class ReadConfigurationTest exten { // mergepoint from the separate mapping MergepointMapping mergepointMapping - = mergepointMappings.get("mergepointName"); + = mergepointMappings.get("mergepointName"); assertEquals(1, mergepointMapping.getActions().size()); MergepointAction action - = mergepointMapping.getActions().get(0); + = mergepointMapping.getActions().get(0); assertEquals( new ApplyAction( null, @@ -425,10 +425,10 @@ public class ReadConfigurationTest exten { // other mergepoint from the separate mapping MergepointMapping mergepointMapping - = mergepointMappings.get("mergepointFromParent"); + = mergepointMappings.get("mergepointFromParent"); assertEquals(1, mergepointMapping.getActions().size()); MergepointAction action - = mergepointMapping.getActions().get(0); + = mergepointMapping.getActions().get(0); assertEquals( new ApplyAction( null, @@ -440,14 +440,14 @@ public class ReadConfigurationTest exten { VelocityOutlet outlet - = (VelocityOutlet) outletMap.get(new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.anotherOutlet")); + = (VelocityOutlet) outletMap.get(new QualifiedName( + "org.apache.torque.generator.test.readConfiguration.anotherOutlet")); String templateContent - = outlet.getContent(controllerState); + = outlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved - = StringUtils.substringAfterLast(templateContent, "\r\n"); + = StringUtils.substringAfterLast(templateContent, "\r\n"); assertEquals( "test template output", templateContentLicenseRemoved); @@ -459,14 +459,14 @@ public class ReadConfigurationTest exten { VelocityOutlet outlet - = (VelocityOutlet) outletMap.get(new QualifiedName( - "testTemplate")); + = (VelocityOutlet) outletMap.get(new QualifiedName( + "testTemplate")); String templateContent - = outlet.getContent(controllerState); + = outlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved - = StringUtils.substringAfterLast(templateContent, "\r\n"); + = StringUtils.substringAfterLast(templateContent, "\r\n"); assertEquals( "test template output", templateContentLicenseRemoved); @@ -481,7 +481,7 @@ public class ReadConfigurationTest exten @Test public void testReadConfigFromClasspath() throws Exception { - Map<String, File> outputDirMap = new HashMap<String, File>(); + Map<String, File> outputDirMap = new HashMap<>(); outputDirMap.put(null, new File("generated-sources")); ProjectPaths projectPaths = new CustomProjectPaths( null, @@ -495,13 +495,13 @@ public class ReadConfigurationTest exten projectPaths, new DefaultTorqueGeneratorPaths()); ConfigurationHandlers configurationHandlers - = new ConfigurationHandlers(); + = new ConfigurationHandlers(); UnitConfigurationReader configurationReader - = new UnitConfigurationReader(); + = new UnitConfigurationReader(); UnitConfiguration unitConfiguration - = configurationReader.read( - unitDescriptor, - configurationHandlers); + = configurationReader.read( + unitDescriptor, + configurationHandlers); // check that we have read the correct configuration { @@ -516,9 +516,9 @@ public class ReadConfigurationTest exten // two from explicit configuration and one from the templates { OutletConfiguration outletConfiguration - = unitConfiguration.getOutletConfiguration(); + = unitConfiguration.getOutletConfiguration(); Map<QualifiedName, Outlet> outletMap - = outletConfiguration.getOutlets(); + = outletConfiguration.getOutlets(); assertEquals(3, outletMap.size()); } } @@ -528,11 +528,11 @@ public class ReadConfigurationTest exten { ProjectPaths projectPaths = new Maven2DirectoryProjectPaths( new File("src/test/configuration")); - Map<String, String> overrideOptions = new HashMap<String, String>(); + Map<String, String> overrideOptions = new HashMap<>(); overrideOptions.put("optionWithoutNamespace", "overriddenValue"); overrideOptions.put("newOption", "newValue"); OptionsConfiguration optionConfiguration - = new MapOptionsConfiguration(overrideOptions); + = new MapOptionsConfiguration(overrideOptions); UnitDescriptor unitDescriptor = new UnitDescriptor( UnitDescriptor.Packaging.DIRECTORY, @@ -540,13 +540,13 @@ public class ReadConfigurationTest exten new DefaultTorqueGeneratorPaths()); unitDescriptor.setOverrideOptions(optionConfiguration); ConfigurationHandlers configurationHandlers - = new ConfigurationHandlers(); + = new ConfigurationHandlers(); UnitConfigurationReader configurationReader - = new UnitConfigurationReader(); + = new UnitConfigurationReader(); UnitConfiguration unitConfiguration - = configurationReader.read( - unitDescriptor, - configurationHandlers); + = configurationReader.read( + unitDescriptor, + configurationHandlers); Options options = unitConfiguration.getOptions(); { Option option = options.getInHierarchy( @@ -567,13 +567,13 @@ public class ReadConfigurationTest exten CustomProjectPaths projectPaths; UnitConfiguration unitConfiguration; ConfigurationHandlers configurationHandlers - = new ConfigurationHandlers(); + = new ConfigurationHandlers(); UnitDescriptor unitDescriptor; { CustomProjectPaths parentProjectPaths - = new CustomProjectPaths( - new Maven2DirectoryProjectPaths( - new File("src/test/configuration"))); + = new CustomProjectPaths( + new Maven2DirectoryProjectPaths( + new File("src/test/configuration"))); parentProjectPaths.setConfigurationDir( new File("src/test/configuration/src/main/torque-gen-parent")); parentProjectPaths.setOutputDirectory( @@ -602,31 +602,31 @@ public class ReadConfigurationTest exten new DefaultTorqueGeneratorPaths()); unitDescriptor.setInheritsFrom(parentUnitDescriptor); UnitConfigurationReader configurationReader - = new UnitConfigurationReader(); + = new UnitConfigurationReader(); unitConfiguration - = configurationReader.read( - unitDescriptor, - configurationHandlers); + = configurationReader.read( + unitDescriptor, + configurationHandlers); } assertEquals(Loglevel.DEBUG, unitConfiguration.getLoglevel()); { File newFileTargetDirectory - = unitConfiguration.getOutputDirectory(null); + = unitConfiguration.getOutputDirectory(null); File expected = new File("src/test/configuration/target/custom"); assertEquals(expected, newFileTargetDirectory); } { File modifiableFileTargetDirectory - = unitConfiguration.getOutputDirectory("modifiable"); + = unitConfiguration.getOutputDirectory("modifiable"); File expected = new File("src/test/configuration/src/main/custom"); assertEquals(expected, modifiableFileTargetDirectory); } { Options expectedOptions = new Options(); - Set<Option> expectedOptionSet = new HashSet<Option>(); + Set<Option> expectedOptionSet = new HashSet<>(); expectedOptionSet.add(new OptionImpl( new QualifiedName("org.apache.torque.generator.optionWithNamespace"), "optionWithNamespaceValue")); @@ -659,7 +659,7 @@ public class ReadConfigurationTest exten { EntityReferences entityReferences - = unitConfiguration.getEntityReferences(); + = unitConfiguration.getEntityReferences(); Map<String, byte[]> actual = entityReferences.getEntityReferences(); assertEquals(3, actual.size()); assertArrayEquals( @@ -694,15 +694,15 @@ public class ReadConfigurationTest exten assertNull(output.getFilename()); { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.testParentOutlet"), + "org.apache.torque.generator.test.readConfiguration.testParentOutlet"), outletConfiguration.getName()); } { JavaOutlet filenameOutlet - = (JavaOutlet) output.getFilenameOutlet(); + = (JavaOutlet) output.getFilenameOutlet(); assertEquals("ParentFoo", filenameOutlet.getFoo()); assertEquals("ParentBar", filenameOutlet.getBar()); assertEquals( @@ -732,10 +732,10 @@ public class ReadConfigurationTest exten } { SourceProcessConfiguration sourceProcessConfiguration - = new SourceProcessConfiguration(); + = new SourceProcessConfiguration(); sourceProcessConfiguration.setStartElementsPath("parentSourceElement"); List<SourceTransformerDefinition> transformerDefinitions - = new ArrayList<SourceTransformerDefinition>(); + = new ArrayList<>(); transformerDefinitions.add( new SourceTransformerDefinition( @@ -765,15 +765,15 @@ public class ReadConfigurationTest exten { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.javaOutlet"), + "org.apache.torque.generator.test.readConfiguration.javaOutlet"), outletConfiguration.getName()); } { JavaOutlet filenameOutlet - = (JavaOutlet) output.getFilenameOutlet(); + = (JavaOutlet) output.getFilenameOutlet(); assertEquals("Foo", filenameOutlet.getFoo()); assertEquals("Bar", filenameOutlet.getBar()); assertEquals( @@ -821,21 +821,21 @@ public class ReadConfigurationTest exten { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.anotherOutlet"), + "org.apache.torque.generator.test.readConfiguration.anotherOutlet"), outletConfiguration.getName()); } { VelocityOutlet filenameOutlet - = (VelocityOutlet) output.getFilenameOutlet(); + = (VelocityOutlet) output.getFilenameOutlet(); String templateContent - = filenameOutlet.getContent(controllerState); + = filenameOutlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved - = StringUtils.substringAfterLast(templateContent, "\r\n"); + = StringUtils.substringAfterLast(templateContent, "\r\n"); assertEquals( "test template output", templateContentLicenseRemoved); @@ -866,10 +866,10 @@ public class ReadConfigurationTest exten } { SourceProcessConfiguration sourceProcessConfiguration - = new SourceProcessConfiguration(); + = new SourceProcessConfiguration(); sourceProcessConfiguration.setStartElementsPath("properties/entry"); List<SourceTransformerDefinition> transformerDefinitions - = new ArrayList<SourceTransformerDefinition>(); + = new ArrayList<>(); transformerDefinitions.add( new SourceTransformerDefinition( new ConfigurationTestTransformer())); @@ -879,8 +879,8 @@ public class ReadConfigurationTest exten sourceProcessConfiguration.setSourceTransformerDefinitions( transformerDefinitions); sourceProcessConfiguration.setSkipDecider( - "org.apache.torque.generator.configuration.ConfigurationTestSkipDecider", - unitDescriptor); + "org.apache.torque.generator.configuration.ConfigurationTestSkipDecider", + unitDescriptor); assertSourceProcessConfigurationEquals( sourceProcessConfiguration, output.getSourceProcessConfiguration()); @@ -902,21 +902,21 @@ public class ReadConfigurationTest exten { OutletReference outletConfiguration - = output.getContentOutlet(); + = output.getContentOutlet(); assertEquals( new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.thirdOutlet"), + "org.apache.torque.generator.test.readConfiguration.thirdOutlet"), outletConfiguration.getName()); } { JdbcMetadataSourceProvider sourceProvider - = new JdbcMetadataSourceProvider( - "jdbcUrl", - "jdbcDriver", - "jdbcUsername", - "jdbcPassword", - "jdbcSchema"); + = new JdbcMetadataSourceProvider( + "jdbcUrl", + "jdbcDriver", + "jdbcUsername", + "jdbcPassword", + "jdbcSchema"); sourceProvider.init( configurationHandlers, controllerState); @@ -935,25 +935,25 @@ public class ReadConfigurationTest exten { OutletConfiguration outletConfiguration - = unitConfiguration.getOutletConfiguration(); + = unitConfiguration.getOutletConfiguration(); Map<QualifiedName, Outlet> outletMap - = outletConfiguration.getOutlets(); + = outletConfiguration.getOutlets(); assertEquals(4, outletMap.size()); { JavaOutlet outlet - = (JavaOutlet) outletMap.get(new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.javaOutlet")); + = (JavaOutlet) outletMap.get(new QualifiedName( + "org.apache.torque.generator.test.readConfiguration.javaOutlet")); assertEquals("Foo2", outlet.getFoo()); assertEquals("Bar2", outlet.getBar()); Map<String, MergepointMapping> mergepointMappings - = outlet.getMergepointMappings(); + = outlet.getMergepointMappings(); assertEquals(3, mergepointMappings.size()); { MergepointMapping mergepointMapping - = mergepointMappings.get("properties"); + = mergepointMappings.get("properties"); assertEquals(1, mergepointMapping.getActions().size()); MergepointAction action - = mergepointMapping.getActions().get(0); + = mergepointMapping.getActions().get(0); assertEquals( new TraverseAllAction( "entry", @@ -964,10 +964,10 @@ public class ReadConfigurationTest exten { // mergepoint from the separate mapping in child MergepointMapping mergepointMapping - = mergepointMappings.get("mergepointName"); + = mergepointMappings.get("mergepointName"); assertEquals(1, mergepointMapping.getActions().size()); MergepointAction action - = mergepointMapping.getActions().get(0); + = mergepointMapping.getActions().get(0); assertEquals( new ApplyAction( null, @@ -978,10 +978,10 @@ public class ReadConfigurationTest exten { // other mergepoint from the separate mapping in child MergepointMapping mergepointMapping - = mergepointMappings.get("mergepointFromParent"); + = mergepointMappings.get("mergepointFromParent"); assertEquals(1, mergepointMapping.getActions().size()); MergepointAction action - = mergepointMapping.getActions().get(0); + = mergepointMapping.getActions().get(0); assertEquals( new ApplyAction( null, @@ -993,14 +993,14 @@ public class ReadConfigurationTest exten { VelocityOutlet outlet - = (VelocityOutlet) outletMap.get(new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.anotherOutlet")); + = (VelocityOutlet) outletMap.get(new QualifiedName( + "org.apache.torque.generator.test.readConfiguration.anotherOutlet")); String templateContent - = outlet.getContent(controllerState); + = outlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved - = StringUtils.substringAfterLast(templateContent, "\r\n"); + = StringUtils.substringAfterLast(templateContent, "\r\n"); assertEquals( "test template output", templateContentLicenseRemoved); @@ -1008,10 +1008,10 @@ public class ReadConfigurationTest exten } { VelocityOutlet outlet - = (VelocityOutlet) outletMap.get(new QualifiedName( - "org.apache.torque.generator.test.readConfiguration.parentOutlet")); + = (VelocityOutlet) outletMap.get(new QualifiedName( + "org.apache.torque.generator.test.readConfiguration.parentOutlet")); String templateContent - = outlet.getContent(controllerState); + = outlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved @@ -1023,14 +1023,14 @@ public class ReadConfigurationTest exten } { VelocityOutlet outlet - = (VelocityOutlet) outletMap.get(new QualifiedName( - "testTemplate")); + = (VelocityOutlet) outletMap.get(new QualifiedName( + "testTemplate")); String templateContent - = outlet.getContent(controllerState); + = outlet.getContent(controllerState); // remove License from template by comparing only // the last line String templateContentLicenseRemoved - = StringUtils.substringAfterLast(templateContent, "\r\n"); + = StringUtils.substringAfterLast(templateContent, "\r\n"); assertEquals( "test template output", templateContentLicenseRemoved); @@ -1102,9 +1102,9 @@ public class ReadConfigurationTest exten private static void assertOptionsEquals(final Options expected, final Options actual) { Map<QualifiedName, Option> expectedMap - = expected.getGlobalScope(); + = expected.getGlobalScope(); Map<QualifiedName, Option> actualMap - = actual.getGlobalScope(); + = actual.getGlobalScope(); assertEquals(expectedMap.size(), actualMap.size()); for (QualifiedName expectedKey : expectedMap.keySet()) @@ -1147,7 +1147,7 @@ public class ReadConfigurationTest exten */ private static Set<String> createSetFrom(final String... content) { - Set<String> result = new HashSet<String>(); + Set<String> result = new HashSet<>(); for (String part : content) { result.add(part); Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java Mon Aug 27 09:48:33 2018 @@ -54,13 +54,13 @@ public class OutletConfigurationTest @Test public void testGetOutlets() throws ConfigurationException { - List<Outlet> outlets = new ArrayList<Outlet>(); + List<Outlet> outlets = new ArrayList<>(); outlets.add(new JavaOutlet( new QualifiedName("test.outlet.0"))); outlets.add(new PackageToPathOutlet( new QualifiedName("test.outlet.1"))); List<MergepointMapping> mergepointMappings - = new ArrayList<MergepointMapping>(); + = new ArrayList<>(); OutletConfiguration outletConfiguration = new OutletConfiguration( outlets, @@ -89,13 +89,13 @@ public class OutletConfigurationTest public void testConstructorWithSameOutletName() throws ConfigurationException { - List<Outlet> outlets = new ArrayList<Outlet>(); + List<Outlet> outlets = new ArrayList<>(); outlets.add(new JavaOutlet( new QualifiedName("sameName"))); outlets.add(new PackageToPathOutlet( new QualifiedName("sameName"))); List<MergepointMapping> mergepointMappings - = new ArrayList<MergepointMapping>(); + = new ArrayList<>(); new OutletConfiguration(outlets, mergepointMappings, unitDescriptor); } @@ -107,13 +107,13 @@ public class OutletConfigurationTest @Test public void testResolveMergepointMappings() throws ConfigurationException { - List<Outlet> outlets = new ArrayList<Outlet>(); + List<Outlet> outlets = new ArrayList<>(); outlets.add(new JavaOutlet( new QualifiedName("test.outlet"))); outlets.add(new PackageToPathOutlet( new QualifiedName("test.outlet.2"))); List<MergepointMapping> mergepointMappings - = new ArrayList<MergepointMapping>(); + = new ArrayList<>(); mergepointMappings.add( new MergepointMapping("test.outlet.testMergepoint")); mergepointMappings.get(0).addAction( @@ -131,7 +131,7 @@ public class OutletConfigurationTest assertEquals( 1, outlet.getMergepointMapping("testMergepoint") - .getActions().size()); + .getActions().size()); } /** @@ -142,11 +142,11 @@ public class OutletConfigurationTest public void testResolveMergepointMappingsNotExistingOutlet() throws ConfigurationException { - List<Outlet> outlets = new ArrayList<Outlet>(); + List<Outlet> outlets = new ArrayList<>(); outlets.add(new JavaOutlet( new QualifiedName("test.outlet"))); List<MergepointMapping> mergepointMappings - = new ArrayList<MergepointMapping>(); + = new ArrayList<>(); mergepointMappings.add( new MergepointMapping("not.existing.outlet.testMergepoint")); @@ -165,11 +165,11 @@ public class OutletConfigurationTest public void testResolveMergepointMappingsNoNamespace() throws ConfigurationException { - List<Outlet> outlets = new ArrayList<Outlet>(); + List<Outlet> outlets = new ArrayList<>(); outlets.add(new JavaOutlet( new QualifiedName("test.outlet"))); List<MergepointMapping> mergepointMappings - = new ArrayList<MergepointMapping>(); + = new ArrayList<>(); mergepointMappings.add( new MergepointMapping("testMergepoint")); Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java Mon Aug 27 09:48:33 2018 @@ -41,10 +41,10 @@ import org.junit.Test; public class ChecksumsTest extends BaseTest { private static final File CHECKSUM_DIR - = new File("target/test/lastChangesContent"); + = new File("target/test/lastChangesContent"); private static final File CHECKSUM_FILE - = new File(CHECKSUM_DIR, "checksum"); + = new File(CHECKSUM_DIR, "checksum"); @Before public void cleanUp() @@ -98,8 +98,8 @@ public class ChecksumsTest extends BaseT String expectedLine2 = "-7F-nameChecksumOnly\n"; String expectedLine3 = "12345--name - ModDateOnly\n"; assertEquals(expectedLine1.length() - + expectedLine2.length() - + expectedLine3.length(), + + expectedLine2.length() + + expectedLine3.length(), fileContent.length()); assertTrue( "Content " + fileContent + " should contain " + expectedLine1, @@ -120,8 +120,8 @@ public class ChecksumsTest extends BaseT FileUtils.writeStringToFile( CHECKSUM_FILE, "946743196000-00649C01FF-name\n" - + "-7F-nameChecksumOnly\n" - +"12345--name - ModDateOnly\n", + + "-7F-nameChecksumOnly\n" + +"12345--name - ModDateOnly\n", "ISO-8859-1"); // check that existing entries are cleared lastChangesContent.setChecksum("a", new byte[] {1}); Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java Mon Aug 27 09:48:33 2018 @@ -47,7 +47,7 @@ public class DeeplyNestedMergepointsTest File targetDir = new File("target/test/deeplyNestedMergepoints"); FileUtils.deleteDirectory(targetDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/deeplyNestedMergepoints"))); Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java Mon Aug 27 09:48:33 2018 @@ -44,7 +44,7 @@ public class ExistingTargetStrategyTest private final File targetDir1 = new File("target/test/existingTargetStrategy/target1"); private final File targetDir2 = new File("target/test/existingTargetStrategy/target2"); private final File workDir - = new File("target/test/existingTargetStrategy/work"); + = new File("target/test/existingTargetStrategy/work"); private final File targetFile1 = new File(targetDir1, "output1.txt"); private final File targetFile2 = new File(targetDir2, "output2.txt"); private final File workFile1 = new File(workDir, "raw-generated/default/output1.txt"); @@ -79,7 +79,7 @@ public class ExistingTargetStrategyTest { File configurationDirectory = new File(confRootDir, "mergeStrategy"); File initialSourceDir - = new File(confRootDir, "/initial/src/main/torque-gen/src"); + = new File(confRootDir, "/initial/src/main/torque-gen/src"); runGeneration(configurationDirectory, initialSourceDir); File initialSourceDirectory = new File(confRootDir, "initial"); assertFile(new File(initialSourceDirectory, srcPath1), targetFile1); @@ -104,7 +104,7 @@ public class ExistingTargetStrategyTest { File configurationDirectory = new File(confRootDir, "mergeStrategy"); File initialSourceDir - = new File(confRootDir, "/initial/src/main/torque-gen/src"); + = new File(confRootDir, "/initial/src/main/torque-gen/src"); runGeneration(configurationDirectory, initialSourceDir); File initialSourceDirectory = new File(confRootDir, "initial"); assertFile(new File(initialSourceDirectory, srcPath1), targetFile1); @@ -139,10 +139,10 @@ public class ExistingTargetStrategyTest "ISO-8859-1"); runGeneration(configurationDirectory, initialSourceDir); String endGenerationContent1 - = FileUtils.readFileToString(targetFile1, "ISO-8859-1"); + = FileUtils.readFileToString(targetFile1, "ISO-8859-1"); assertEquals(intermediateTargetContent1, endGenerationContent1); String endGenerationContent2 - = FileUtils.readFileToString(targetFile2, "ISO-8859-1"); + = FileUtils.readFileToString(targetFile2, "ISO-8859-1"); assertEquals(intermediateTargetContent2, endGenerationContent2); assertFile(new File(initialSourceDirectory, srcPath1), workFile1); assertFile(new File(initialSourceDirectory, srcPath2), workFile2); @@ -154,7 +154,7 @@ public class ExistingTargetStrategyTest { File configurationDirectory = new File(confRootDir, "mergeStrategy"); File initialSourceDir - = new File(confRootDir, "/initial/src/main/torque-gen/src"); + = new File(confRootDir, "/initial/src/main/torque-gen/src"); runGeneration(configurationDirectory, initialSourceDir); File initialSourceDirectory = new File(confRootDir, "initial"); assertFile(new File(initialSourceDirectory, srcPath1), targetFile1); @@ -201,7 +201,7 @@ public class ExistingTargetStrategyTest { File configurationDirectory = new File(confRootDir, "mergeStrategyNoNewlinesAtEndOfFile"); File initialSourceDir - = new File(confRootDir, "/initial/src/main/torque-gen/src"); + = new File(confRootDir, "/initial/src/main/torque-gen/src"); runGeneration(configurationDirectory, initialSourceDir); assertFile(new File(configurationDirectory, "src/main/torque-gen/templates/simpleOutput.vm"), targetFile1); assertFile(new File(configurationDirectory, "src/main/torque-gen/templates/simpleOutput.vm"), workFile1); @@ -237,7 +237,7 @@ public class ExistingTargetStrategyTest new File(configurationDirectoryInitial, srcPath2), targetFile2); File configurationDirectoryAppend - = new File(confRootDir, "appendStrategy"); + = new File(confRootDir, "appendStrategy"); runGeneration(configurationDirectoryAppend, null); File expectedTargetFile1 = new File(targetDir1, "expectedOutput1.txt"); String initial1 = FileUtils.readFileToString( @@ -263,7 +263,7 @@ public class ExistingTargetStrategyTest throws GeneratorException { Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths(configurationDirectory)); projectPaths.setOutputDirectory(null, targetDir1); @@ -288,8 +288,8 @@ public class ExistingTargetStrategyTest String expected = FileUtils.readFileToString(expectedFile); // remove Apache license header expected = Pattern.compile("#.*\\r?\\n{1}?") - .matcher(expected) - .replaceAll(""); + .matcher(expected) + .replaceAll(""); String actual = FileUtils.readFileToString(actualFile); assertEquals(expected, actual); } Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java Mon Aug 27 09:48:33 2018 @@ -46,7 +46,7 @@ public class OutputEncodingTest extends File targetDir = new File("target/test/outputEncoding"); FileUtils.deleteDirectory(targetDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/outputEncoding"))); Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java Mon Aug 27 09:48:33 2018 @@ -45,7 +45,7 @@ public class PostprocessorTest extends B File targetDir = new File("target/test/postprocessor"); FileUtils.deleteDirectory(targetDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/postprocessor"))); Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java Mon Aug 27 09:48:33 2018 @@ -59,7 +59,7 @@ public class PropertyToJavaGenerationTes File targetDir = new File("target/test/propertyToJava"); FileUtils.deleteDirectory(targetDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/propertyToJava"))); @@ -77,15 +77,15 @@ public class PropertyToJavaGenerationTes File logoResultFile = new File(targetDir, "logo.png"); assertTrue(logoResultFile.exists()); byte[] expectedContent = FileUtils.readFileToByteArray( - new File("src/test/propertyToJava/src/main/torque-gen/resources/torque-logo-new.png")); + new File("src/test/propertyToJava/src/main/torque-gen/resources/torque-logo-new.png")); assertArrayEquals( expectedContent, FileUtils.readFileToByteArray(logoResultFile)); File propertiesResultFile - = new File(targetDir, "Properties.properties"); + = new File(targetDir, "Properties.properties"); assertTrue(propertiesResultFile.exists()); File propertiesExpectedFile - = new File("src/test/propertyToJava/expectedProperties.properties"); + = new File("src/test/propertyToJava/expectedProperties.properties"); assertEquals(FileUtils.readFileToString(propertiesExpectedFile), FileUtils.readFileToString(propertiesResultFile)); } @@ -103,7 +103,7 @@ public class PropertyToJavaGenerationTes File targetDir = new File("target/test/propertyToJava"); FileUtils.deleteDirectory(targetDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/propertyToJava"))); @@ -128,10 +128,10 @@ public class PropertyToJavaGenerationTes expectedContent, FileUtils.readFileToByteArray(logoResultFile)); File propertiesResultFile - = new File(targetDir, "Properties.properties"); + = new File(targetDir, "Properties.properties"); assertTrue(propertiesResultFile.exists()); File propertiesExpectedFile - = new File("src/test/propertyToJava/expectedPropertiesDebugOutput.properties"); + = new File("src/test/propertyToJava/expectedPropertiesDebugOutput.properties"); assertEquals(FileUtils.readFileToString(propertiesExpectedFile), FileUtils.readFileToString(propertiesResultFile)); } @@ -157,7 +157,7 @@ public class PropertyToJavaGenerationTes new File("src/test/propertyToJava/src/main/torque-gen/src"), sourceDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/propertyToJava"))); @@ -174,7 +174,7 @@ public class PropertyToJavaGenerationTes // run first time controller.run(unitDescriptors); File propertiesResultFile - = new File(targetDir, "Properties.properties"); + = new File(targetDir, "Properties.properties"); assertTrue(propertiesResultFile.exists()); // delete target so we can see if generation does not run again @@ -208,7 +208,7 @@ public class PropertyToJavaGenerationTes new File("src/test/propertyToJava/src/main/torque-gen/src"), sourceDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/propertyToJava"))); @@ -225,7 +225,7 @@ public class PropertyToJavaGenerationTes // run first time controller.run(unitDescriptors); File propertiesResultFile - = new File(targetDir, "Properties.properties"); + = new File(targetDir, "Properties.properties"); assertTrue(propertiesResultFile.exists()); // change checksum in checksums file @@ -272,7 +272,7 @@ public class PropertyToJavaGenerationTes new File("src/test/propertyToJava/src/main/torque-gen/src"), sourceDir); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/propertyToJava"))); @@ -289,7 +289,7 @@ public class PropertyToJavaGenerationTes // run first time controller.run(unitDescriptors); File propertiesResultFile - = new File(targetDir, "Properties.properties"); + = new File(targetDir, "Properties.properties"); assertTrue(propertiesResultFile.exists()); // change modification date of source file Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java Mon Aug 27 09:48:33 2018 @@ -43,7 +43,7 @@ public class PropertyToJavaJarGeneration File target = new File("target/test/propertyToJavaJar/target"); FileUtils.deleteDirectory(target); Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); unitDescriptors.add(new UnitDescriptor( UnitDescriptor.Packaging.JAR, new Maven2JarProjectPaths( Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java Mon Aug 27 09:48:33 2018 @@ -71,7 +71,7 @@ public class RunOnlyOnSourceChangeTest e Controller controller = new Controller(); // run first generation with two unit descriptors to reproduce TORQUE-338 - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths( new File("src/test/runOnlyOnSourceChange"))); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
