Java: remove predicates from NegativeSummarizedCallable

Jami Cogswell · Jami Cogswell · commit 0b2f2a3f8889 · 2022-12-08T23:46:55.000-05:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -261,28 +261,9 @@ module Public {
     NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
 
     /**
-     *  Holds if the negative summary is auto generated and not manually generated.
+     *  Holds if the negative summary is auto generated.
      */
-    predicate isAutoGenerated() {
-      negativeSummaryElement(this, true) and
-      not negativeSummaryElement(this, false)
-    } // ! okay to adjust this to "and not manually generated"? Will that mess up anything that currently uses this?
-
-    /**
-     * Holds if the summary is manually generated and not auto generated.
-     */
-    predicate isManuallyGenerated() {
-      negativeSummaryElement(this, false) and
-      not negativeSummaryElement(this, true)
-    }
-
-    /**
-     * Holds if the summary is both auto generated and manually generated.
-     */
-    predicate isBothAutoAndManuallyGenerated() {
-      negativeSummaryElement(this, true) and
-      negativeSummaryElement(this, false)
-    }
+    predicate isAutoGenerated() { negativeSummaryElement(this, true) }
   }
 }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -261,28 +261,9 @@ module Public {
     NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
 
     /**
-     *  Holds if the negative summary is auto generated and not manually generated.
+     *  Holds if the negative summary is auto generated.
      */
-    predicate isAutoGenerated() {
-      negativeSummaryElement(this, true) and
-      not negativeSummaryElement(this, false)
-    } // ! okay to adjust this to "and not manually generated"? Will that mess up anything that currently uses this?
-
-    /**
-     * Holds if the summary is manually generated and not auto generated.
-     */
-    predicate isManuallyGenerated() {
-      negativeSummaryElement(this, false) and
-      not negativeSummaryElement(this, true)
-    }
-
-    /**
-     * Holds if the summary is both auto generated and manually generated.
-     */
-    predicate isBothAutoAndManuallyGenerated() {
-      negativeSummaryElement(this, true) and
-      negativeSummaryElement(this, false)
-    }
+    predicate isAutoGenerated() { negativeSummaryElement(this, true) }
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -261,28 +261,9 @@ module Public {
     NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
 
     /**
-     *  Holds if the negative summary is auto generated and not manually generated.
+     *  Holds if the negative summary is auto generated.
      */
-    predicate isAutoGenerated() {
-      negativeSummaryElement(this, true) and
-      not negativeSummaryElement(this, false)
-    } // ! okay to adjust this to "and not manually generated"? Will that mess up anything that currently uses this?
-
-    /**
-     * Holds if the summary is manually generated and not auto generated.
-     */
-    predicate isManuallyGenerated() {
-      negativeSummaryElement(this, false) and
-      not negativeSummaryElement(this, true)
-    }
-
-    /**
-     * Holds if the summary is both auto generated and manually generated.
-     */
-    predicate isBothAutoAndManuallyGenerated() {
-      negativeSummaryElement(this, true) and
-      negativeSummaryElement(this, false)
-    }
+    predicate isAutoGenerated() { negativeSummaryElement(this, true) }
   }
 }
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
@@ -261,28 +261,9 @@ module Public {
     NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
 
     /**
-     *  Holds if the negative summary is auto generated and not manually generated.
+     *  Holds if the negative summary is auto generated.
      */
-    predicate isAutoGenerated() {
-      negativeSummaryElement(this, true) and
-      not negativeSummaryElement(this, false)
-    } // ! okay to adjust this to "and not manually generated"? Will that mess up anything that currently uses this?
-
-    /**
-     * Holds if the summary is manually generated and not auto generated.
-     */
-    predicate isManuallyGenerated() {
-      negativeSummaryElement(this, false) and
-      not negativeSummaryElement(this, true)
-    }
-
-    /**
-     * Holds if the summary is both auto generated and manually generated.
-     */
-    predicate isBothAutoAndManuallyGenerated() {
-      negativeSummaryElement(this, true) and
-      negativeSummaryElement(this, false)
-    }
+    predicate isAutoGenerated() { negativeSummaryElement(this, true) }
   }
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
@@ -261,28 +261,9 @@ module Public {
     NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
 
     /**
-     *  Holds if the negative summary is auto generated and not manually generated.
+     *  Holds if the negative summary is auto generated.
      */
-    predicate isAutoGenerated() {
-      negativeSummaryElement(this, true) and
-      not negativeSummaryElement(this, false)
-    } // ! okay to adjust this to "and not manually generated"? Will that mess up anything that currently uses this?
-
-    /**
-     * Holds if the summary is manually generated and not auto generated.
-     */
-    predicate isManuallyGenerated() {
-      negativeSummaryElement(this, false) and
-      not negativeSummaryElement(this, true)
-    }
-
-    /**
-     * Holds if the summary is both auto generated and manually generated.
-     */
-    predicate isBothAutoAndManuallyGenerated() {
-      negativeSummaryElement(this, true) and
-      negativeSummaryElement(this, false)
-    }
+    predicate isAutoGenerated() { negativeSummaryElement(this, true) }
   }
 }
 
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
@@ -261,28 +261,9 @@ module Public {
     NegativeSummarizedCallable() { negativeSummaryElement(this, _) }
 
     /**
-     *  Holds if the negative summary is auto generated and not manually generated.
+     *  Holds if the negative summary is auto generated.
      */
-    predicate isAutoGenerated() {
-      negativeSummaryElement(this, true) and
-      not negativeSummaryElement(this, false)
-    } // ! okay to adjust this to "and not manually generated"? Will that mess up anything that currently uses this?
-
-    /**
-     * Holds if the summary is manually generated and not auto generated.
-     */
-    predicate isManuallyGenerated() {
-      negativeSummaryElement(this, false) and
-      not negativeSummaryElement(this, true)
-    }
-
-    /**
-     * Holds if the summary is both auto generated and manually generated.
-     */
-    predicate isBothAutoAndManuallyGenerated() {
-      negativeSummaryElement(this, true) and
-      negativeSummaryElement(this, false)
-    }
+    predicate isAutoGenerated() { negativeSummaryElement(this, true) }
   }
 }
 
