Update java PrintAST query for deterministic results

Update the query implementation, documentation, and expected test
results for the java tools PrintAST query in order to fix a problem
where Entry nodes were non-deterministically ordered, especially
between MacOS and Linux test environments.

Author: data-douser

server/ql/java/tools/src/PrintCFG/PrintCFG.md

@@ -2,11 +2,13 @@
 
 Produces a representation of a file's Control Flow Graph (CFG) for specified source files.
 
+_NOTE:_ `PrintCFG` query runs may produce extremely verbose query results, even for a small (test) codebase, because the CFG includes many nodes and edges to represent relationships within the standard library.
+
 ## Overview
 
 The Control Flow Graph represents the order in which statements and expressions are executed in a program. Each node in the graph represents a control-flow element (statement or expression), and edges represent possible execution paths between them.
 
-This query outputs all CFG nodes and their successor relationships for Java code, which is useful for understanding program execution flow, debugging control flow issues, and analyzing code paths.
+This query outputs CFG nodes and their successor relationships for Java code, excluding Entry and Exit nodes whose ordering is non-deterministic across CodeQL CLI versions and platforms. This is useful for understanding program execution flow, debugging control flow issues, and analyzing code paths.
 
 ## Use Cases
 

server/ql/java/tools/src/PrintCFG/PrintCFG.ql

@@ -10,26 +10,27 @@ import java
 import semmle.code.java.ControlFlowGraph
 
 /**
- * Holds if the node is an exit-related CFG node.
+ * Holds if the node is an entry- or exit-related CFG node.
  * These nodes are excluded from the output because their ordering
- * is non-deterministic across CodeQL CLI versions.
+ * is non-deterministic across CodeQL CLI versions and platforms.
  */
-private predicate isExitNode(ControlFlowNode node) {
-  node.toString().matches("%Exit")
+private predicate isEntryOrExitNode(ControlFlowNode node) {
+  node.toString().matches("%Exit") or
+  node.toString() = "Entry"
 }
 
 /**
  * Configuration for PrintCFG that outputs all CFG nodes and edges,
- * excluding exit nodes for deterministic output.
+ * excluding entry/exit nodes for deterministic output.
  */
 query predicate nodes(ControlFlowNode node, string property, string value) {
   property = "semmle.label" and
   value = node.toString() and
-  not isExitNode(node)
+  not isEntryOrExitNode(node)
 }
 
 query predicate edges(ControlFlowNode pred, ControlFlowNode succ) {
   pred.getASuccessor() = succ and
-  not isExitNode(pred) and
-  not isExitNode(succ)
+  not isEntryOrExitNode(pred) and
+  not isEntryOrExitNode(succ)
 }

server/ql/java/tools/test/PrintCFG/PrintCFG.expected

@@ -1,13 +1,4 @@
 Example1.java:
-#    3| Entry
-#-----|  -> { ... }
-
-#    5| Entry
-#-----|  -> { ... }
-
-#   18| Entry
-#-----|  -> { ... }
-
 #    3| { ... }
 #-----|  -> Before super(...)