Style fixes

atorralba · atorralba · commit 8790df7a34ae · 2022-03-16T15:11:04.000+01:00
diff --git a/java/ql/lib/semmle/code/java/frameworks/MyBatis.qll b/java/ql/lib/semmle/code/java/frameworks/MyBatis.qll
@@ -105,8 +105,8 @@ class TypeParam extends Interface {
   TypeParam() { this.hasQualifiedName("org.apache.ibatis.annotations", "Param") }
 }
 
-private class MyBatisAbstractSQL extends RefType {
-  MyBatisAbstractSQL() { this.hasQualifiedName("org.apache.ibatis.jdbc", "AbstractSQL") }
+private class MyBatisAbstractSql extends RefType {
+  MyBatisAbstractSql() { this.hasQualifiedName("org.apache.ibatis.jdbc", "AbstractSQL") }
 }
 
 private class MyBatisProvider extends RefType {
@@ -116,12 +116,12 @@ private class MyBatisProvider extends RefType {
   }
 }
 
-private class MyBatisAbstractSQLMethod extends Method {
+private class MyBatisAbstractSqlMethod extends Method {
   string taintedArgs;
   string signature;
 
-  MyBatisAbstractSQLMethod() {
-    this.getDeclaringType().getSourceDeclaration() instanceof MyBatisAbstractSQL and
+  MyBatisAbstractSqlMethod() {
+    this.getDeclaringType().getSourceDeclaration() instanceof MyBatisAbstractSql and
     (
       this.hasName([
           "UPDATE", "SET", "INSERT_INTO", "SELECT", "OFFSET_ROWS", "LIMIT", "OFFSET",
@@ -183,15 +183,15 @@ private class MyBatisProviderStep extends TaintTracking::AdditionalValueStep {
   }
 }
 
-private class MyBatisAbstractSQLToStringStep extends SummaryModelCsv {
+private class MyBatisAbstractSqlToStringStep extends SummaryModelCsv {
   override predicate row(string row) {
-    row = ["org.apache.ibatis.jdbc;AbstractSQL;true;toString;;;Argument[-1];ReturnValue;taint"]
+    row = "org.apache.ibatis.jdbc;AbstractSQL;true;toString;;;Argument[-1];ReturnValue;taint"
   }
 }
 
-private class MyBatisAbstractSQLMethodsStep extends SummaryModelCsv {
+private class MyBatisAbstractSqlMethodsStep extends SummaryModelCsv {
   override predicate row(string row) {
-    exists(MyBatisAbstractSQLMethod m |
+    exists(MyBatisAbstractSqlMethod m |
       row =
         "org.apache.ibatis.jdbc;AbstractSQL;true;" + m.getName() + ";(" + m.getCsvSignature() +
           ");;" + m.getTaintedArgs() + ";Argument[-1];taint"

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ class TypeParam extends Interface {`
`105`	`105`	`TypeParam() { this.hasQualifiedName("org.apache.ibatis.annotations", "Param") }`
`106`	`106`	`}`
`107`	`107`
`108`		`-private class MyBatisAbstractSQL extends RefType {`
`109`		`- MyBatisAbstractSQL() { this.hasQualifiedName("org.apache.ibatis.jdbc", "AbstractSQL") }`
	`108`	`+private class MyBatisAbstractSql extends RefType {`
	`109`	`+ MyBatisAbstractSql() { this.hasQualifiedName("org.apache.ibatis.jdbc", "AbstractSQL") }`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`private class MyBatisProvider extends RefType {`
`@@ -116,12 +116,12 @@ private class MyBatisProvider extends RefType {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`-private class MyBatisAbstractSQLMethod extends Method {`
	`119`	`+private class MyBatisAbstractSqlMethod extends Method {`
`120`	`120`	`string taintedArgs;`
`121`	`121`	`string signature;`
`122`	`122`
`123`		`- MyBatisAbstractSQLMethod() {`
`124`		`- this.getDeclaringType().getSourceDeclaration() instanceof MyBatisAbstractSQL and`
	`123`	`+ MyBatisAbstractSqlMethod() {`
	`124`	`+ this.getDeclaringType().getSourceDeclaration() instanceof MyBatisAbstractSql and`
`125`	`125`	`(`
`126`	`126`	`this.hasName([`
`127`	`127`	`"UPDATE", "SET", "INSERT_INTO", "SELECT", "OFFSET_ROWS", "LIMIT", "OFFSET",`
`@@ -183,15 +183,15 @@ private class MyBatisProviderStep extends TaintTracking::AdditionalValueStep {`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`186`		`-private class MyBatisAbstractSQLToStringStep extends SummaryModelCsv {`
	`186`	`+private class MyBatisAbstractSqlToStringStep extends SummaryModelCsv {`
`187`	`187`	`override predicate row(string row) {`
`188`		`- row = ["org.apache.ibatis.jdbc;AbstractSQL;true;toString;;;Argument[-1];ReturnValue;taint"]`
	`188`	`+ row = "org.apache.ibatis.jdbc;AbstractSQL;true;toString;;;Argument[-1];ReturnValue;taint"`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`-private class MyBatisAbstractSQLMethodsStep extends SummaryModelCsv {`
	`192`	`+private class MyBatisAbstractSqlMethodsStep extends SummaryModelCsv {`
`193`	`193`	`override predicate row(string row) {`
`194`		`- exists(MyBatisAbstractSQLMethod m \|`
	`194`	`+ exists(MyBatisAbstractSqlMethod m \|`
`195`	`195`	`row =`
`196`	`196`	`"org.apache.ibatis.jdbc;AbstractSQL;true;" + m.getName() + ";(" + m.getCsvSignature() +`
`197`	`197`	`");;" + m.getTaintedArgs() + ";Argument[-1];taint"`