Author: tv
Date: Sun Apr 21 10:21:37 2024
New Revision: 1917232
URL: http://svn.apache.org/viewvc?rev=1917232&view=rev
Log:
Update deprecated code, add charset objects where appropriate
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java
Sun Apr 21 10:21:37 2024
@@ -1,7 +1,5 @@
package org.apache.torque.generator.configuration;
-import java.lang.reflect.InvocationTargetException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java
Sun Apr 21 10:21:37 2024
@@ -21,6 +21,7 @@ package org.apache.torque.generator.cont
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -43,9 +44,6 @@ public class Checksums
/** Array containing the 16 hex characters. */
private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
- /** The file encoding for the lastChanges file. */
- private static final String FILE_ENCODING = "ISO-8859-1";
-
/** The '0' character as byte. */
private static final byte ZERO_LITERAL_AS_BYTE = (byte) '0';
@@ -175,7 +173,7 @@ public class Checksums
FileUtils.writeStringToFile(
toWriteTo,
content.toString(),
- FILE_ENCODING);
+ StandardCharsets.ISO_8859_1);
return this;
}
@@ -193,7 +191,7 @@ public class Checksums
String content = FileUtils.readFileToString(
toReadFrom,
- FILE_ENCODING);
+ StandardCharsets.ISO_8859_1);
for (String line : StringUtils.split(content, "\n"))
{
if (StringUtils.isBlank(line))
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java
Sun Apr 21 10:21:37 2024
@@ -21,7 +21,8 @@ package org.apache.torque.generator.merg
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
import org.apache.torque.generator.GeneratorException;
import org.eclipse.jgit.diff.RawText;
@@ -58,20 +59,24 @@ public class ThreeWayMerger
{
MergeAlgorithm mergeAlgorithm = new MergeAlgorithm();
MergeResult<RawText> mergeResult;
+ Charset charSet;
try
{
- mergeResult = mergeAlgorithm.merge(
- RawTextComparator.DEFAULT,
- new RawText(base.getBytes(charsetName)),
- new RawText(generated.getBytes(charsetName)),
- new RawText(edited.getBytes(charsetName)));
+ charSet = Charset.forName(charsetName);
}
- catch (UnsupportedEncodingException e)
+ catch (UnsupportedCharsetException e)
{
throw new GeneratorException(
"unknown character set " + charsetName,
e);
}
+
+ mergeResult = mergeAlgorithm.merge(
+ RawTextComparator.DEFAULT,
+ new RawText(base.getBytes(charSet)),
+ new RawText(generated.getBytes(charSet)),
+ new RawText(edited.getBytes(charSet)));
+
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
try
{
@@ -81,23 +86,13 @@ public class ThreeWayMerger
"base",
"generated",
"edited",
- charsetName);
+ charSet);
}
catch (IOException e)
{
throw new GeneratorException("could nor render merge result", e);
}
- try
- {
- String result
- = new String(outputStream.toByteArray(), charsetName);
- return result;
- }
- catch (UnsupportedEncodingException e)
- {
- throw new GeneratorException(
- "unknown character set " + charsetName,
- e);
- }
+
+ return new String(outputStream.toByteArray(), charSet);
}
}
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
Sun Apr 21 10:21:37 2024
@@ -1,5 +1,7 @@
package org.apache.torque.generator.source.transform;
+import java.lang.reflect.InvocationTargetException;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -122,14 +124,14 @@ public class SourceElementToModelTransfo
/**
* @see
org.apache.torque.generator.source.transform.SourceTransformer#transform(java.lang.Object,
org.apache.torque.generator.control.ControllerState)
- *
+ *
* Transforms the source graph into the model. This is done by recursively
* walking through the source graph and setting the fields corresponding
- * to the names of the attributes resp. child elements.
- *
+ * to the names of the attributes resp. child elements.
+ *
* @param modelRoot the root object to fill, not null.
* @param controllerState the controller state object
- *
+ *
* @throws SourceTransformerException if filling the source graph fails,
* e.g. if an attribute name or element name has no corresponding
* field in a model element.
@@ -320,7 +322,7 @@ public class SourceElementToModelTransfo
classLoader = ClassHelper.class.getClassLoader();
}
final Class<?> clazz = Class.forName(className, true, classLoader);
- result = clazz.newInstance();
+ result = clazz.getDeclaredConstructor().newInstance();
}
catch (final ClassNotFoundException e)
{
@@ -329,7 +331,8 @@ public class SourceElementToModelTransfo
+ " could not be found.",
e);
}
- catch (final IllegalAccessException e)
+ catch (final IllegalAccessException | IllegalArgumentException |
InvocationTargetException |
+ NoSuchMethodException | SecurityException e)
{
throw new SourceTransformerException("Instantiating "
+ className
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
(original)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
Sun Apr 21 10:21:37 2024
@@ -797,14 +797,12 @@ public class PropertyAccess
{
@SuppressWarnings("unchecked")
final Collection<Object> result
- = (Collection<Object>) type.newInstance();
+ = (Collection<Object>)
type.getDeclaredConstructor().newInstance();
return result;
}
- catch (final InstantiationException e)
- {
- throw new SourceTransformerException(e);
- }
- catch (final IllegalAccessException e)
+ catch (final InstantiationException | IllegalAccessException |
+ IllegalArgumentException | InvocationTargetException |
+ NoSuchMethodException | SecurityException e)
{
throw new SourceTransformerException(e);
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
Sun Apr 21 10:21:37 2024
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -87,7 +88,7 @@ public class ChecksumsTest extends BaseT
assertTrue(CHECKSUM_FILE.exists());
String fileContent = FileUtils.readFileToString(
CHECKSUM_FILE,
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
// order of lines not fixed, therefore check substrings.
// expected is
// "12345--nameModDateOnly\n"
@@ -122,7 +123,7 @@ public class ChecksumsTest extends BaseT
"946743196000-00649C01FF-name\n"
+ "-7F-nameChecksumOnly\n"
+"12345--name - ModDateOnly\n",
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
// check that existing entries are cleared
lastChangesContent.setChecksum("a", new byte[] {1});
lastChangesContent.setModificationDate("b", new Date());
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
Sun Apr 21 10:21:37 2024
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Asse
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
@@ -119,30 +120,30 @@ public class ExistingTargetStrategyTest
"/mergeStrategy");
String intermediateTargetContent1 = FileUtils.readFileToString(
new File(mergeStrategyDir, srcPath1),
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
intermediateTargetContent1 = Pattern.compile("#.*\\r?\\n{1}?")
.matcher(intermediateTargetContent1)
.replaceAll("");
FileUtils.writeStringToFile(
targetFile1,
intermediateTargetContent1,
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
String intermediateTargetContent2 = FileUtils.readFileToString(
new File(mergeStrategyDir, srcPath2),
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
intermediateTargetContent2 = Pattern.compile("#.*\\r?\\n{1}?")
.matcher(intermediateTargetContent2)
.replaceAll("");
FileUtils.writeStringToFile(
targetFile2,
intermediateTargetContent2,
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
runGeneration(configurationDirectory, initialSourceDir);
String endGenerationContent1
- = FileUtils.readFileToString(targetFile1, "ISO-8859-1");
+ = FileUtils.readFileToString(targetFile1, StandardCharsets.ISO_8859_1);
assertEquals(intermediateTargetContent1, endGenerationContent1);
String endGenerationContent2
- = FileUtils.readFileToString(targetFile2, "ISO-8859-1");
+ = FileUtils.readFileToString(targetFile2, StandardCharsets.ISO_8859_1);
assertEquals(intermediateTargetContent2, endGenerationContent2);
assertFile(new File(initialSourceDirectory, srcPath1), workFile1);
assertFile(new File(initialSourceDirectory, srcPath2), workFile2);
@@ -168,21 +169,21 @@ public class ExistingTargetStrategyTest
"src/main/torque-gen/src/source1.properties");
String newTargetContent1 = FileUtils.readFileToString(
newTargetContentsFile1,
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
newTargetContent1 = Pattern.compile("#.*\\r?\\n{1}?")
.matcher(newTargetContent1)
.replaceAll("");
- FileUtils.writeStringToFile(targetFile1, newTargetContent1,
"ISO-8859-1");
+ FileUtils.writeStringToFile(targetFile1, newTargetContent1,
StandardCharsets.ISO_8859_1);
File newTargetContentsFile2 = new File(
configurationDirectory,
"src/main/torque-gen/src/source2.properties");
String newTargetContent2 = FileUtils.readFileToString(
newTargetContentsFile2,
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
newTargetContent2 = Pattern.compile("#.*\\r?\\n{1}?")
.matcher(newTargetContent2)
.replaceAll("");
- FileUtils.writeStringToFile(targetFile2, newTargetContent2,
"ISO-8859-1");
+ FileUtils.writeStringToFile(targetFile2, newTargetContent2,
StandardCharsets.ISO_8859_1);
File conflictSourceDir = new File(configurationDirectory, "conflict");
runGeneration(configurationDirectory, conflictSourceDir);
assertFile(
@@ -242,19 +243,19 @@ public class ExistingTargetStrategyTest
File expectedTargetFile1 = new File(targetDir1, "expectedOutput1.txt");
String initial1 = FileUtils.readFileToString(
new File(configurationDirectoryInitial, srcPath1),
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
String appended1 = FileUtils.readFileToString(
new File(configurationDirectoryAppend, srcPath1),
- "ISO-8859-1");
- FileUtils.writeStringToFile(expectedTargetFile1, initial1 + appended1);
+ StandardCharsets.ISO_8859_1);
+ FileUtils.writeStringToFile(expectedTargetFile1, initial1 + appended1,
StandardCharsets.ISO_8859_1);
File expectedTargetFile2 = new File(targetDir1, "expectedOutput2.txt");
String initial2 = FileUtils.readFileToString(
new File(configurationDirectoryInitial, srcPath2),
- "ISO-8859-1");
+ StandardCharsets.ISO_8859_1);
String appended2 = FileUtils.readFileToString(
new File(configurationDirectoryAppend, srcPath2),
- "ISO-8859-1");
- FileUtils.writeStringToFile(expectedTargetFile2, initial2 + appended2);
+ StandardCharsets.ISO_8859_1);
+ FileUtils.writeStringToFile(expectedTargetFile2, initial2 + appended2,
StandardCharsets.ISO_8859_1);
assertFile(expectedTargetFile1, targetFile1);
assertFile(expectedTargetFile2, targetFile2);
}
@@ -285,12 +286,12 @@ public class ExistingTargetStrategyTest
throws IOException
{
assertTrue(actualFile.exists());
- String expected = FileUtils.readFileToString(expectedFile);
+ String expected = FileUtils.readFileToString(expectedFile,
StandardCharsets.ISO_8859_1);
// remove Apache license header
expected = Pattern.compile("#.*\\r?\\n{1}?")
.matcher(expected)
.replaceAll("");
- String actual = FileUtils.readFileToString(actualFile);
+ String actual = FileUtils.readFileToString(actualFile,
StandardCharsets.ISO_8859_1);
assertEquals(expected, actual);
}
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
Sun Apr 21 10:21:37 2024
@@ -23,6 +23,8 @@ import static org.junit.jupiter.api.Asse
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -66,13 +68,13 @@ public class OutputEncodingTest extends
assertTrue(new File(targetDir, "defaultEncoding.txt").exists());
checkFile(
new File(targetDir, "iso-8859-1.txt"),
- "iso-8859-1");
+ StandardCharsets.ISO_8859_1);
checkFile(
new File(targetDir, "utf8.txt"),
- "utf-8");
+ StandardCharsets.UTF_8);
}
- private void checkFile(File file, String encoding)
+ private void checkFile(File file, Charset encoding)
throws IOException
{
assertTrue(file.exists());
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
Sun Apr 21 10:21:37 2024
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -59,7 +60,7 @@ public class PostprocessorTest extends B
assertTrue(targetDir.exists());
File targetFile = new File(targetDir, "output.txt");
assertTrue(targetFile.exists());
- String content = FileUtils.readFileToString(targetFile, "ISO-8859-1");
+ String content = FileUtils.readFileToString(targetFile,
StandardCharsets.ISO_8859_1);
assertEquals("Test Outlet outputy foo=yyyy bar=bar", content);
}
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
Sun Apr 21 10:21:37 2024
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Asse
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -49,7 +50,6 @@ public class RunOnlyOnSourceChangeTest e
private static Log log = LogFactory.getLog(Controller.class);
@Test
- @SuppressWarnings("unchecked")
public void testRunOnlyOnSourceChange() throws Exception
{
File targetDir = new File("target/test/runOnlyOnSourceChange");
@@ -155,7 +155,7 @@ public class RunOnlyOnSourceChangeTest e
{
File targetFile = new File(targetDir, filename);
assertTrue(targetFile.exists());
- assertEquals(expectedContent, FileUtils.readFileToString(targetFile,
"ISO-8859-1"));
+ assertEquals(expectedContent, FileUtils.readFileToString(targetFile,
StandardCharsets.ISO_8859_1));
return targetFile.lastModified();
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
Sun Apr 21 10:21:37 2024
@@ -1,5 +1,8 @@
package org.apache.torque.generator.file;
+import static
org.apache.torque.generator.file.FileTestUtils.assertFileListEquals;
+import static org.apache.torque.generator.file.FileTestUtils.createSetFrom;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,8 +23,6 @@ package org.apache.torque.generator.file
*/
import static org.junit.Assert.assertEquals;
-import static
org.apache.torque.generator.file.FileTestUtils.assertFileListEquals;
-import static org.apache.torque.generator.file.FileTestUtils.createSetFrom;
import java.io.File;
import java.io.IOException;
@@ -29,7 +30,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import org.apache.torque.generator.file.Fileset;
import org.junit.Test;
/**
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java
Sun Apr 21 10:21:37 2024
@@ -21,8 +21,6 @@ package org.apache.torque.generator.proc
import static org.junit.Assert.assertEquals;
-
-import org.apache.torque.generator.processor.string.Camelbacker;
import org.junit.Before;
import org.junit.Test;
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
Sun Apr 21 10:21:37 2024
@@ -21,6 +21,8 @@ package org.apache.torque.generator.proc
import static org.junit.Assert.assertEquals;
+import java.nio.charset.StandardCharsets;
+
import org.apache.commons.io.IOUtils;
import org.apache.torque.generator.BaseTest;
import org.junit.Test;
@@ -57,9 +59,11 @@ public class RemoveUnusedImportsProcesso
@Test
public void testProcessLong() throws Exception
{
- String source =
IOUtils.toString(getClass().getResourceAsStream("removeUnusedImports.txt"));
+ String source =
IOUtils.toString(getClass().getResourceAsStream("removeUnusedImports.txt"),
+ StandardCharsets.ISO_8859_1);
String result = organizeImportsProcessor.process(source);
- String expected =
IOUtils.toString(getClass().getResourceAsStream("removeUnusedExpected.txt"));
+ String expected =
IOUtils.toString(getClass().getResourceAsStream("removeUnusedExpected.txt"),
+ StandardCharsets.ISO_8859_1);
assertEquals(expected, result);
}
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
Sun Apr 21 10:21:37 2024
@@ -22,7 +22,6 @@ package org.apache.torque.generator.qnam
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.torque.generator.qname.Namespace;
import org.junit.Test;
public class NamespaceTest
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
Sun Apr 21 10:21:37 2024
@@ -22,8 +22,6 @@ package org.apache.torque.generator.qnam
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import org.apache.torque.generator.qname.QualifiedName;
-import org.apache.torque.generator.qname.QualifiedNameMap;
import org.junit.Test;
public class QualifiedNameMapTest
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
Sun Apr 21 10:21:37 2024
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-import org.apache.torque.generator.qname.Namespace;
-import org.apache.torque.generator.qname.QualifiedName;
import org.junit.Test;
public class QualifiedNameTest
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
Sun Apr 21 10:21:37 2024
@@ -26,6 +26,7 @@ import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -47,8 +48,6 @@ public class JdbcMetadataSourceTest
private static String SQL_FILENAME = "jdbcMetadataSourceTest.sql";
- private static String SQL_CHARSET = "iso-8859-1";
-
private static String URL = "jdbc:derby:memory:myDb;create=true";
private static String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
@@ -66,7 +65,7 @@ public class JdbcMetadataSourceTest
Connection connection = DriverManager.getConnection(URL);
InputStream inputStream = getClass().getResourceAsStream(SQL_FILENAME);
BufferedReader bufferedReader = new BufferedReader(
- new InputStreamReader(inputStream, SQL_CHARSET));
+ new InputStreamReader(inputStream,
StandardCharsets.ISO_8859_1));
String line;
StringBuilder queryBuffer = new StringBuilder();
while ((line = bufferedReader.readLine()) != null)
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java
Sun Apr 21 10:21:37 2024
@@ -53,7 +53,7 @@ public class CombinedFileSourceTest
@Before
public void setUp() throws Exception
{
- MockitoAnnotations.initMocks(this);
+ MockitoAnnotations.openMocks(this);
List<FileSource> fileSources = new ArrayList<>();
fileSources.add(fileSource1);
fileSources.add(fileSource2);
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java
Sun Apr 21 10:21:37 2024
@@ -22,6 +22,7 @@ package org.apache.torque.generator.sour
import static org.junit.Assert.assertEquals;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
@@ -29,9 +30,6 @@ import org.apache.torque.generator.confi
import org.apache.torque.generator.configuration.source.EntityReferences;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
-import org.apache.torque.generator.source.stream.FileSource;
-import org.apache.torque.generator.source.stream.SourceToXml;
-import org.apache.torque.generator.source.stream.XmlSourceFormat;
import org.junit.Test;
/**
@@ -63,7 +61,8 @@ public class SourceToXmlTest
String result = new SourceToXml().toXml(rootElement, true);
String expected = FileUtils.readFileToString(new File(
-
"src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlResult.xml"));
+
"src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlResult.xml"),
+ StandardCharsets.ISO_8859_1);
// remove license from expected file
expected = StringUtils.substringAfterLast(expected, "-->\n\n");
assertEquals(expected, result);
@@ -84,7 +83,8 @@ public class SourceToXmlTest
String result = new SourceToXml().toXml(rootElement, true);
String expected = FileUtils.readFileToString(new File(
-
"src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlWithReferenceResult.xml"));
+
"src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlWithReferenceResult.xml"),
+ StandardCharsets.ISO_8859_1);
// remove license from expected file
expected = StringUtils.substringAfterLast(expected, "-->\n\n");
assertEquals(expected, result);
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
Sun Apr 21 10:21:37 2024
@@ -18,10 +18,11 @@ package org.apache.torque.generator.sour
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -74,7 +75,7 @@ public class LoadAdditionalSourceTransfo
File targetFile = new File(targetDir, "output.txt");
assertTrue(targetFile.exists());
- String content = FileUtils.readFileToString(targetFile);
+ String content = FileUtils.readFileToString(targetFile,
StandardCharsets.ISO_8859_1);
assertEquals(EXPECTED, content.toString());
}
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
Sun Apr 21 10:21:37 2024
@@ -18,11 +18,10 @@ package org.apache.torque.generator.sour
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -81,7 +80,7 @@ public class LoadAllSourceFilesTransform
targetFile = new File(targetDir, "output_for_source2.xml");
assertTrue(targetFile.exists());
expectedFile = new File(TEST_RESOURCES_ROOT, "expected2.xml");
-
+
result = FileUtils.readFileToString(targetFile,
StandardCharsets.UTF_8);
reference = FileUtils.readFileToString(expectedFile,
StandardCharsets.UTF_8);
myDiffIdentical =
DiffBuilder.compare(reference).ignoreComments().withTest(result)
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
Sun Apr 21 10:21:37 2024
@@ -58,14 +58,14 @@ public class SourceElementToModelTransfo
rootSourceElement.setAttribute("stringAttribute",
"stringAttributeValue");
rootSourceElement.setAttribute("stringBooleanAttribute", "true");
SourceElement child0level1 = new SourceElement("child");
- child0level1.setAttribute("level", new Integer(1));
+ child0level1.setAttribute("level", Integer.valueOf(1));
child0level1.setAttribute("name", "child0level1");
rootSourceElement.getChildren().add(child0level1);
SourceElement child1level1 = new SourceElement("child");
- child1level1.setAttribute("level", new Integer(1));
+ child1level1.setAttribute("level", Integer.valueOf(1));
rootSourceElement.getChildren().add(child1level1);
SourceElement child0level2 = new SourceElement("child");
- child0level2.setAttribute("level", new Integer(2));
+ child0level2.setAttribute("level", Integer.valueOf(2));
child0level2.setAttribute("name", "child0level2");
child0level1.getChildren().add(child0level2);
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java
Sun Apr 21 10:21:37 2024
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -78,10 +79,10 @@ public class GroovyTest
assertTrue(SCRIPT_OUTPUT_FILE.exists());
assertEquals(
"groovy script output: root",
- FileUtils.readFileToString(SCRIPT_OUTPUT_FILE));
+ FileUtils.readFileToString(SCRIPT_OUTPUT_FILE,
StandardCharsets.ISO_8859_1));
assertTrue(TEMPLATE_OUTPUT_FILE.exists());
assertEquals(
"groovy template output: root",
- FileUtils.readFileToString(TEMPLATE_OUTPUT_FILE));
+ FileUtils.readFileToString(TEMPLATE_OUTPUT_FILE,
StandardCharsets.ISO_8859_1));
}
}
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java
Sun Apr 21 10:21:37 2024
@@ -21,11 +21,14 @@ package org.apache.torque.generator.temp
*/
import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -115,9 +118,9 @@ public class VelocityTemplateFilterTest
throws IOException
{
InputStream inputStream = velocityTemplateFilter.filter(
- new ByteArrayInputStream(expected.getBytes("ISO-8859-1")),
- "ISO-8859-1");
- String result = readAndCloseStream(inputStream, "ISO-8859-1");
+ new
ByteArrayInputStream(expected.getBytes(StandardCharsets.ISO_8859_1)),
+ StandardCharsets.ISO_8859_1.name());
+ String result = readAndCloseStream(inputStream,
StandardCharsets.ISO_8859_1);
assertEquals(expected, result);
}
@@ -131,7 +134,7 @@ public class VelocityTemplateFilterTest
*
* @throws IOException If an IO Error occurs during reading.
*/
- private String readAndCloseStream(InputStream stream, String encoding)
+ private String readAndCloseStream(InputStream stream, Charset encoding)
throws IOException
{
Reader reader;
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java?rev=1917232&r1=1917231&r2=1917232&view=diff
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
(original)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
Sun Apr 21 10:21:37 2024
@@ -25,8 +25,6 @@ import static org.junit.Assert.assertNul
import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.qname.QualifiedName;
import org.apache.torque.generator.qname.QualifiedNameMap;
-import org.apache.torque.generator.variable.Variable;
-import org.apache.torque.generator.variable.VariableStore;
import org.junit.Test;
public class VariableStoreTest extends BaseTest
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
