QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminated all warnings.

Browse Source
This commit is contained in:
darin.kelkhoff
2024-07-19 12:38:02 -05:00
parent f9af2ba983
commit 912e40fe0b
87 changed files with 257 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qqq-middleware-picocli/src/main/java/com/kingsrook/qqq/frontend/picocli/QPicoCliImplementation.java
View File

@ -29,6 +29,7 @@ import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@ -129,7 +130,7 @@ public class QPicoCliImplementation
if(args.length > 0 && args[0].startsWith("--qInstanceJsonFile="))
{
String filePath = args[0].replaceFirst("--.*=", "");
String qInstanceJson = FileUtils.readFileToString(new File(filePath));
String qInstanceJson = FileUtils.readFileToString(new File(filePath), StandardCharsets.UTF_8);
qInstance = new QInstanceAdapter().jsonToQInstanceIncludingBackends(qInstanceJson);
String[] subArgs = Arrays.copyOfRange(args, 1, args.length);
@ -716,7 +717,7 @@ public class QPicoCliImplementation
try
{
String path = subParseResult.matchedOptionValue("--jsonFile", "");
String json = FileUtils.readFileToString(new File(path));
String json = FileUtils.readFileToString(new File(path), StandardCharsets.UTF_8);
recordList = new JsonToQRecordAdapter().buildRecordsFromJson(json, table, mapping);
}
catch(IOException e)
@ -729,7 +730,7 @@ public class QPicoCliImplementation
try
{
String path = subParseResult.matchedOptionValue("--csvFile", "");
String csv = FileUtils.readFileToString(new File(path));
String csv = FileUtils.readFileToString(new File(path), StandardCharsets.UTF_8);
recordList = new CsvToQRecordAdapter().buildRecordsFromCsv(csv, table, mapping);
}
catch(IOException e)

13
qqq-middleware-picocli/src/test/java/com/kingsrook/qqq/frontend/picocli/QPicoCliImplementationTest.java
View File

@ -395,7 +395,7 @@ class QPicoCliImplementationTest
File file = new File("/tmp/" + UUID.randomUUID() + ".json");
file.deleteOnExit();
FileUtils.writeStringToFile(file, jsonContents);
FileUtils.writeStringToFile(file, jsonContents, StandardCharsets.UTF_8);
TestOutput testOutput = testCli("person", "insert", mapping, "--jsonFile=" + file.getAbsolutePath());
JSONObject insertResult = JsonUtils.toJSONObject(testOutput.getOutput());
@ -433,7 +433,7 @@ class QPicoCliImplementationTest
File file = new File("/tmp/" + UUID.randomUUID() + ".csv");
file.deleteOnExit();
FileUtils.writeStringToFile(file, csvContents);
FileUtils.writeStringToFile(file, csvContents, StandardCharsets.UTF_8);
TestOutput testOutput = testCli("person", "insert", mapping, "--csvFile=" + file.getAbsolutePath());
JSONObject insertResult = JsonUtils.toJSONObject(testOutput.getOutput());
@ -683,8 +683,7 @@ class QPicoCliImplementationTest
assertTestOutputContains(testOutput, "Wrote 3 records to file " + filename);
File file = new File(filename);
@SuppressWarnings("unchecked")
List<String> list = FileUtils.readLines(file);
List<String> list = FileUtils.readLines(file, StandardCharsets.UTF_8);
assertEquals(4, list.size());
assertThat(list.get(0)).contains("""
"Id","Create Date","Modify Date\"""");
@ -710,8 +709,7 @@ class QPicoCliImplementationTest
assertTestOutputContains(testOutput, "Wrote 4 records to file " + filename);
File file = new File(filename);
@SuppressWarnings("unchecked")
List<String> list = FileUtils.readLines(file);
List<String> list = FileUtils.readLines(file, StandardCharsets.UTF_8);
assertEquals(5, list.size());
assertThat(list.get(0)).contains("""
"Id","Create Date","Modify Date\"""");
@ -842,8 +840,7 @@ class QPicoCliImplementationTest
TestOutput testOutput = testCli("person", "export", "--filename=" + filename, "--fieldNames=id,lastName,birthDate");
File file = new File(filename);
@SuppressWarnings("unchecked")
List<String> list = FileUtils.readLines(file);
List<String> list = FileUtils.readLines(file, StandardCharsets.UTF_8);
assertEquals(6, list.size());
assertThat(list.get(0)).isEqualTo("""
"Id","Last Name","Birth Date\"""");

5
qqq-middleware-picocli/src/test/java/com/kingsrook/qqq/frontend/picocli/TestUtils.java
View File

@ -23,6 +23,7 @@ package com.kingsrook.qqq.frontend.picocli;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.util.List;
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType;
@ -65,7 +66,7 @@ public class TestUtils
{
InputStream primeTestDatabaseSqlStream = TestUtils.class.getResourceAsStream("/prime-test-database.sql");
assertNotNull(primeTestDatabaseSqlStream);
List<String> lines = (List<String>) IOUtils.readLines(primeTestDatabaseSqlStream);
List<String> lines = (List<String>) IOUtils.readLines(primeTestDatabaseSqlStream, StandardCharsets.UTF_8);
lines = lines.stream().filter(line -> !line.startsWith("-- ")).toList();
String joinedSQL = String.join("\n", lines);
for(String sql : joinedSQL.split(";"))
@ -182,7 +183,7 @@ public class TestUtils
.withOutputMetaData(new QFunctionOutputMetaData()
.withRecordListMetaData(new QRecordListMetaData()
.withTableName("person")
.addField(new QFieldMetaData("fullGreeting", QFieldType.STRING))
.withField(new QFieldMetaData("fullGreeting", QFieldType.STRING))
)
.withFieldList(List.of(new QFieldMetaData("outputMessage", QFieldType.STRING))))
);