Java: Improve QLDoc & simplify code

intrigus-lgtm · aschackmull · web-flow · commit 4cfdb10ddc0f · 2021-01-11T18:50:43.000+01:00
Co-authored-by: Anders Schack-Mulligen &lt;aschackmull@users.noreply.github.com&gt;
diff --git a/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql b/java/ql/src/Security/CWE/CWE-297/UnsafeHostnameVerification.ql
@@ -97,9 +97,7 @@ private class FlagType extends Type {
   FlagType() {
     this instanceof TypeString
     or
-    exists(BoxedType boxedBoolean | boxedBoolean.getPrimitiveType().hasName("boolean") |
-      this = boxedBoolean or this = boxedBoolean.getPrimitiveType()
-    )
+    this instanceof BooleanType
   }
 }
 
diff --git a/java/ql/src/semmle/code/java/security/Encryption.qll b/java/ql/src/semmle/code/java/security/Encryption.qll
@@ -29,7 +29,7 @@ class SSLContext extends RefType {
   SSLContext() { hasQualifiedName("javax.net.ssl", "SSLContext") }
 }
 
-/** Models the `javax.net.ssl.SSLSession` class. */
+/** The `javax.net.ssl.SSLSession` class. */
 class SSLSession extends RefType {
   SSLSession() { hasQualifiedName("javax.net.ssl", "SSLSession") }
 }
@@ -38,7 +38,7 @@ class HostnameVerifier extends RefType {
   HostnameVerifier() { hasQualifiedName("javax.net.ssl", "HostnameVerifier") }
 }
 
-/** Models the `verify` method of the class `javax.net.ssl.HostnameVerifier`. */
+/** The `verify` method of the class `javax.net.ssl.HostnameVerifier`. */
 class HostnameVerifierVerify extends Method {
   HostnameVerifierVerify() {
     hasName("verify") and
@@ -83,7 +83,7 @@ class SetHostnameVerifierMethod extends Method {
   }
 }
 
-/** Models the `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsURLConnection`. */
+/** The `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsURLConnection`. */
 class SetDefaultHostnameVerifierMethod extends Method {
   SetDefaultHostnameVerifierMethod() {
     hasName("setDefaultHostnameVerifier") and

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,7 @@ private class FlagType extends Type {`
`97`	`97`	`FlagType() {`
`98`	`98`	`this instanceof TypeString`
`99`	`99`	`or`
`100`		`- exists(BoxedType boxedBoolean \| boxedBoolean.getPrimitiveType().hasName("boolean") \|`
`101`		`- this = boxedBoolean or this = boxedBoolean.getPrimitiveType()`
`102`		`- )`
	`100`	`+ this instanceof BooleanType`
`103`	`101`	`}`
`104`	`102`	`}`
`105`	`103`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class SSLContext extends RefType {`
`29`	`29`	`SSLContext() { hasQualifiedName("javax.net.ssl", "SSLContext") }`
`30`	`30`	`}`
`31`	`31`
`32`		-/** Models the `javax.net.ssl.SSLSession` class. */
	`32`	+/** The `javax.net.ssl.SSLSession` class. */
`33`	`33`	`class SSLSession extends RefType {`
`34`	`34`	`SSLSession() { hasQualifiedName("javax.net.ssl", "SSLSession") }`
`35`	`35`	`}`
`@@ -38,7 +38,7 @@ class HostnameVerifier extends RefType {`
`38`	`38`	`HostnameVerifier() { hasQualifiedName("javax.net.ssl", "HostnameVerifier") }`
`39`	`39`	`}`
`40`	`40`
`41`		-/** Models the `verify` method of the class `javax.net.ssl.HostnameVerifier`. */
	`41`	+/** The `verify` method of the class `javax.net.ssl.HostnameVerifier`. */
`42`	`42`	`class HostnameVerifierVerify extends Method {`
`43`	`43`	`HostnameVerifierVerify() {`
`44`	`44`	`hasName("verify") and`
`@@ -83,7 +83,7 @@ class SetHostnameVerifierMethod extends Method {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		-/** Models the `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsURLConnection`. */
	`86`	+/** The `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsURLConnection`. */
`87`	`87`	`class SetDefaultHostnameVerifierMethod extends Method {`
`88`	`88`	`SetDefaultHostnameVerifierMethod() {`
`89`	`89`	`hasName("setDefaultHostnameVerifier") and`