From 23773a597ce7df1c9b74170a957585653794d61b Mon Sep 17 00:00:00 2001
From: Wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Tue, 19 Mar 2024 13:07:50 -0600
Subject: [PATCH] update coverage checker to ignore non-public classes

---
 .gitignore                                    |   1 +
 .idea/gradle.xml                              |   1 +
 .idea/workspace.xml                           | 105 ++++++++++--------
 .../jvmdg/coverage/CoverageChecker.java       |   1 +
 4 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2f40720..bf5f345e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
+.idea/
 .idea/modules.xml
 .idea/jarRepositories.xml
 .idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index aea162b4..f08f2b9a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 44330ef3..43eac2b2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="43d51f9c-2980-4450-a129-074bd2f63b31" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt" beforeDir="false" afterPath="$PROJECT_DIR$/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_ModuleLayer.java" beforeDir="false" afterPath="$PROJECT_DIR$/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_ModuleLayer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -90,28 +92,29 @@
     <option name="flattenPackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Gradle.JvmDowngrader [clean] (1).executor": "Run",
-    "Gradle.JvmDowngrader [coverageReport].executor": "Run",
-    "Gradle.JvmDowngrader [publishToMavenLocal].executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "ToolWindowRun.ShowToolbar": "false",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "master",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "/mnt/d422463e-6d7f-42b2-b45d-50ba56464d4b/Projects/Other People's Stuff/ktsmc",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "reference.settings.ide.settings.new.ui",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Gradle.JvmDowngrader [clean] (1).executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.JvmDowngrader [coverageReport].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.JvmDowngrader [publishToMavenLocal].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.JvmDowngrader:java-api [:java-api:CoverageChecker.main()].executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;ToolWindowRun.ShowToolbar&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/mnt/d422463e-6d7f-42b2-b45d-50ba56464d4b/Projects/Other People's Stuff/ktsmc&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.ide.settings.new.ui&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="xyz.wagyourtail.jvmdg.j11.stub.java_base" />
@@ -120,7 +123,20 @@
       <recent name="xyz.wagyourtail.jvmdg.j16.stub.java_logging" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.JvmDowngrader [publishToMavenLocal]">
+  <component name="RunManager" selected="Gradle.JvmDowngrader [coverageReport]">
+    <configuration name="CoverageChecker" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="xyz.wagyourtail.jvmdg.coverage.CoverageChecker" />
+      <module name="JvmDowngrader.java-api.coverage" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="xyz.wagyourtail.jvmdg.coverage.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="JvmDowngrader [clean] (1)" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -209,40 +225,19 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
-    <configuration name="JvmDowngrader [test]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value="test" />
-          </list>
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
-      <RunAsTest>false</RunAsTest>
-      <method v="2" />
-    </configuration>
     <list>
+      <item itemvalue="Application.CoverageChecker" />
       <item itemvalue="Gradle.JvmDowngrader [clean] (1)" />
       <item itemvalue="Gradle.JvmDowngrader [publishToMavenLocal]" />
       <item itemvalue="Gradle.JvmDowngrader [clean]" />
       <item itemvalue="Gradle.JvmDowngrader [coverageReport]" />
-      <item itemvalue="Gradle.JvmDowngrader [test]" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.JvmDowngrader [coverageReport]" />
+        <item itemvalue="Application.CoverageChecker" />
         <item itemvalue="Gradle.JvmDowngrader [publishToMavenLocal]" />
         <item itemvalue="Gradle.JvmDowngrader [clean] (1)" />
-        <item itemvalue="Gradle.JvmDowngrader [coverageReport]" />
         <item itemvalue="Gradle.JvmDowngrader [clean]" />
       </list>
     </recent_temporary>
@@ -270,10 +265,24 @@
       <option name="presentableId" value="Default" />
       <updated>1698391067066</updated>
       <workItem from="1698391068765" duration="15653000" />
+      <workItem from="1710196554758" duration="1256000" />
+      <workItem from="1710206488332" duration="899000" />
+      <workItem from="1710875037225" duration="165000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/xyz/wagyourtail/jvmdg/classloader/DowngradingClassLoader.java</url>
+          <line>52</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>
\ No newline at end of file
diff --git a/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java b/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java
index 58ee4b5f..a9296a08 100644
--- a/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java
+++ b/java-api/src/coverage/java/xyz/wagyourtail/jvmdg/coverage/CoverageChecker.java
@@ -168,6 +168,7 @@ public static void compare(List<Path> moduleHolders, Map<String, Pair<String, Cl
                         if (cn.name.startsWith("sun/")) {
                             if (!cn.name.equals("sun/misc/Unsafe")) return;
                         }
+                        if ((cn.access & (Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) == 0) return;
                         newClasses.put(cn.name, new Pair<>(modName, cn));
                         if (currentVersion.containsKey(cn.name)) {
                             // check to see what was "removed"