From d10a6b4ca0df39a5b5c5800745e598292fe0e681 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 3 Oct 2024 13:33:30 -0400
Subject: [PATCH 1/3] Remove unnecessary query

---
 .../ql/src/Language Abuse/EmptyStatement.java |  8 ----
 .../src/Language Abuse/EmptyStatement.qhelp   | 39 -------------------
 java/ql/src/Language Abuse/EmptyStatement.ql  | 19 ---------
 3 files changed, 66 deletions(-)
 delete mode 100644 java/ql/src/Language Abuse/EmptyStatement.java
 delete mode 100644 java/ql/src/Language Abuse/EmptyStatement.qhelp
 delete mode 100644 java/ql/src/Language Abuse/EmptyStatement.ql

diff --git a/java/ql/src/Language Abuse/EmptyStatement.java b/java/ql/src/Language Abuse/EmptyStatement.java
deleted file mode 100644
index 4f9b462a38fa..000000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.java	
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Cart {
-	// AVOID: Empty statement
-	List<Item> items = new ArrayList<Cart>();;
-	public void applyDiscount(float discount) {
-		// AVOID: Empty statement as loop body
-		for (int i = 0; i < items.size(); items.get(i++).applyDiscount(discount));
-	}
-}
\ No newline at end of file
diff --git a/java/ql/src/Language Abuse/EmptyStatement.qhelp b/java/ql/src/Language Abuse/EmptyStatement.qhelp
deleted file mode 100644
index 700bd488dfce..000000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.qhelp	
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>An <em>empty statement</em> is a single semicolon <code>;</code> that does not
-terminate another statement. Such a statement hinders readability and has no effect on its own.</p>
-
-</overview>
-<recommendation>
-
-<p>Avoid empty statements. If a loop is intended to have an empty body, it is better
-to mark that fact explicitly by using a pair of braces <code>{}</code> containing an explanatory comment
-for the body, rather than a single semicolon.</p>
-
-</recommendation>
-<example>
-
-<p>In the following example, there is an empty statement on line 3, where an additional semicolon is
-used. On line 6, the <code>for</code> statement has an empty body because the condition is
-immediately followed by a semicolon. In this case, it is better to include a pair of braces <code>{}</code> containing
-an explanatory comment for the body instead.
-
-</p><sample src="EmptyStatement.java" />
-
-</example>
-<references>
-
-
-<li>
-Help - Eclipse Platform:
-<a href="https://help.eclipse.org/2020-12/advanced/content.jsp?topic=/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-errors-warnings.htm">Java Compiler Errors/Warnings Preferences</a>.
-</li>
-
-
-</references>
-</qhelp>
diff --git a/java/ql/src/Language Abuse/EmptyStatement.ql b/java/ql/src/Language Abuse/EmptyStatement.ql
deleted file mode 100644
index 36f61b862ac9..000000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.ql	
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Empty statement
- * @description An empty statement hinders readability.
- * @kind problem
- * @problem.severity recommendation
- * @precision low
- * @id java/empty-statement
- * @tags maintainability
- *       useless-code
- */
-
-import java
-
-from EmptyStmt empty, string action
-where
-  if exists(LoopStmt l | l.getBody() = empty)
-  then action = "turned into '{}'"
-  else action = "deleted"
-select empty, "This empty statement should be " + action + "."

From e98db7fd20f7c64cb68ed315523bc8bc0594aac8 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 3 Oct 2024 17:28:59 -0400
Subject: [PATCH 2/3] Add changenote for query removal change

---
 java/ql/src/change-notes/2024-10-03-remove-java-query.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 java/ql/src/change-notes/2024-10-03-remove-java-query.md

diff --git a/java/ql/src/change-notes/2024-10-03-remove-java-query.md b/java/ql/src/change-notes/2024-10-03-remove-java-query.md
new file mode 100644
index 000000000000..efa7fa3504bf
--- /dev/null
+++ b/java/ql/src/change-notes/2024-10-03-remove-java-query.md
@@ -0,0 +1,4 @@
+---
+category: removedQuery
+---
+* Removed the `java/empty-statement` query that was subsumed by the `java/empty-block` query.
\ No newline at end of file

From df18891a2f7840a3d3a12caf41ff4dc43a049d11 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 3 Oct 2024 17:36:42 -0400
Subject: [PATCH 3/3] Fix changenote for query removal change

---
 java/ql/src/change-notes/2024-10-03-remove-java-query.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/src/change-notes/2024-10-03-remove-java-query.md b/java/ql/src/change-notes/2024-10-03-remove-java-query.md
index efa7fa3504bf..e9f3e4910cb5 100644
--- a/java/ql/src/change-notes/2024-10-03-remove-java-query.md
+++ b/java/ql/src/change-notes/2024-10-03-remove-java-query.md
@@ -1,4 +1,4 @@
 ---
-category: removedQuery
+category: minorAnalysis
 ---
 * Removed the `java/empty-statement` query that was subsumed by the `java/empty-block` query.
\ No newline at end of file