From f503ebc62b8cebf777ea038d5101e22a933f963e Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Fri, 11 Oct 2024 06:17:12 -0700 Subject: [PATCH] Change smart to dumb quotes --- .../checker/sqlquotes/qual/SqlEvenQuotes.java | 8 ++++---- .../checker/sqlquotes/qual/SqlOddQuotes.java | 12 ++++++------ .../resourceleak/MustCallConsistencyAnalyzer.java | 2 +- docs/examples/MavenExample/pom.xml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlEvenQuotes.java b/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlEvenQuotes.java index caa9fa7847d..20da1db881f 100644 --- a/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlEvenQuotes.java +++ b/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlEvenQuotes.java @@ -9,14 +9,14 @@ /** * Denotes a String that contains either zero or an even number of unescaped single quotes — - * i.e., there must be either zero or an even number of {@code ‘} characters in a SqlEvenQuotes - * String that are not preceded immediately by another {@code ‘} character. (Thus, all SqlEvenQuotes + * i.e., there must be either zero or an even number of {@code '} characters in a SqlEvenQuotes + * String that are not preceded immediately by another {@code '} character. (Thus, all SqlEvenQuotes * Strings ultimately contain an even number of {@code '} characters.) A SqlEvenQuotes String is * syntactical to be passed to query execution methods and is guaranteed not to affect whether * subsequent concatenations are interpreted as SQL command code or as SQL query values. * - *

Common use cases include: SQL query fragments, such as “SELECT * FROM”; properly sanitized - * user input; and complete SQL queries, such as “SELECT * FROM table WHERE field = 'value'”. + *

Common use cases include: SQL query fragments, such as "SELECT * FROM"; properly sanitized + * user input; and complete SQL queries, such as "SELECT * FROM table WHERE field = 'value'". * * @checker_framework.manual #sql-quotes-checker SQL Quotes Checker */ diff --git a/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlOddQuotes.java b/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlOddQuotes.java index a53dc706bc2..05a6c99d42f 100644 --- a/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlOddQuotes.java +++ b/checker-qual/src/main/java/org/checkerframework/checker/sqlquotes/qual/SqlOddQuotes.java @@ -8,17 +8,17 @@ import org.checkerframework.framework.qual.SubtypeOf; /** - * Denotes a String that contains an odd number of unescaped single quotes – i.e., there must be an - * odd number of ‘ characters in a SqlOddQuotes String that are not preceded immediately by another + * Denotes a String that contains an odd number of unescaped single quotes -- i.e., there must be an + * odd number of ' characters in a SqlOddQuotes String that are not preceded immediately by another * ' character. (Thus, all SqlOddQuotes Strings ultimately contain an odd number of single quotes, * escaped or otherwise.) SqlOddQuotes Strings are not syntactical to be passed to query execution * methods. * *

Common use cases include: SQL query fragments to be concatenated with user input, such as - * “SELECT * FROM table WHERE field = ‘”; SQL query fragments containing user input but missing an - * ending single quote, such as “SELECT * FROM table WHERE field = ‘value”; connecting punctuation, - * such as “’, “; and any combinations of the above with paired-off single quotes, such as “SELECT * - * FROM table WHERE field1 = ‘value1’, field2 = ‘value2’, field3 = ‘”. + * "SELECT * FROM table WHERE field = '"; SQL query fragments containing user input but missing an + * ending single quote, such as "SELECT * FROM table WHERE field = 'value"; connecting punctuation, + * such as "', "; and any combinations of the above with paired-off single quotes, such as "SELECT * + * FROM table WHERE field1 = 'value1', field2 = 'value2', field3 = '". * * @checker_framework.manual #sql-quotes-checker SQL Quotes Checker */ diff --git a/checker/src/main/java/org/checkerframework/checker/resourceleak/MustCallConsistencyAnalyzer.java b/checker/src/main/java/org/checkerframework/checker/resourceleak/MustCallConsistencyAnalyzer.java index e970501df77..6d2552379d1 100644 --- a/checker/src/main/java/org/checkerframework/checker/resourceleak/MustCallConsistencyAnalyzer.java +++ b/checker/src/main/java/org/checkerframework/checker/resourceleak/MustCallConsistencyAnalyzer.java @@ -456,7 +456,7 @@ public int hashCode() { * *

diff --git a/docs/examples/MavenExample/pom.xml b/docs/examples/MavenExample/pom.xml index 9846f16cfee..deb899a99be 100644 --- a/docs/examples/MavenExample/pom.xml +++ b/docs/examples/MavenExample/pom.xml @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-dependency-plugin