Java metavariable-type via real structural matching (drop overfit handler)

ober

b8042a56f42967e50694ee97c0030e2ff3d59228

diff --git a/lib/semgrep/match/structural.sls b/lib/semgrep/match/structural.sls
index 9e9ae46..a56bd72 100644
--- a/lib/semgrep/match/structural.sls
+++ b/lib/semgrep/match/structural.sls
@@ -406,7 +406,8 @@
                      (char=? open close))))))
   (def (string-literal-node? n)
        (or (string=? (node-type n) "string")
-           (string=? (node-type n) "template_string")))
+           (string=? (node-type n) "template_string")
+           (string=? (node-type n) "string_literal")))
   (def (string-contains-substring? source needle)
        (let ([needle-len (string-length needle)]
              [len (string-length source)])
diff --git a/lib/semgrep/scan.sls b/lib/semgrep/scan.sls
index cc92e7c..33eb84d 100644
--- a/lib/semgrep/scan.sls
+++ b/lib/semgrep/scan.sls
@@ -24786,8 +24786,6 @@
           (scan-java-float-suffix-rule rule path source)]
          [(java-rule-id? rule "no-string-eqeq")
           (scan-java-string-eq-rule rule path source)]
-         [(java-rule-id? rule "no-direct-response-writer")
-          (scan-java-ruleid-next-line-rule rule path source)]
          [(or (java-rule-id? rule "metavariable-resolution-test")
               (java-rule-id? rule "insecure-crypto-usage")
               (java-rule-id? rule "test"))
diff --git a/src/semgrep/match/structural.ss b/src/semgrep/match/structural.ss
index 4d0feb9..f400df5 100644
--- a/src/semgrep/match/structural.ss
+++ b/src/semgrep/match/structural.ss
@@ -408,7 +408,8 @@
 
 (def (string-literal-node? n)
   (or (string=? (node-type n) "string")
-      (string=? (node-type n) "template_string")))
+      (string=? (node-type n) "template_string")
+      (string=? (node-type n) "string_literal")))
 
 (def (string-contains-substring? source needle)
   (let ([needle-len (string-length needle)]
diff --git a/src/semgrep/scan.ss b/src/semgrep/scan.ss
index 53cb845..fe34419 100644
--- a/src/semgrep/scan.ss
+++ b/src/semgrep/scan.ss
@@ -24886,8 +24886,6 @@
      (scan-java-float-suffix-rule rule path source)]
     [(java-rule-id? rule "no-string-eqeq")
      (scan-java-string-eq-rule rule path source)]
-    [(java-rule-id? rule "no-direct-response-writer")
-     (scan-java-ruleid-next-line-rule rule path source)]
     [(or (java-rule-id? rule "metavariable-resolution-test")
          (java-rule-id? rule "insecure-crypto-usage")
          (java-rule-id? rule "test"))