Updated classutils

2023-08-05 13:24:21 -06:00 · 2023-08-05 13:24:21 -06:00 · ae08ff2c2f
parent 72b4c93206
commit ae08ff2c2f
7 changed files with 204 additions and 171 deletions
--- a/344
+++ b/344
@ -212,6 +212,115 @@
               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md

+     - ClassUtils - Class helpers and utilities for managing class hierarchies.
+       [The Apache Software License, Version 2.0]
+       https://git.dorkbox.com/dorkbox/ClassUtils
+       Copyright 2023
+         Dorkbox LLC
+
+       Extra license information
+         - TypeTools - A simple, zero-dependency library for working with types. Supports Java 1.6+ and Android.
+           [The Apache Software License, Version 2.0]
+           https://github.com/jhalterman/typetools
+           Copyright 2023
+             Jonathan Halterman and friends
+
+         - Kotlin - 
+           [The Apache Software License, Version 2.0]
+           https://github.com/JetBrains/kotlin
+           Copyright 2020
+             JetBrains s.r.o. and Kotlin Programming Language contributors
+           Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+           See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
+         - Collections - Collection types and utilities to enhance the default collections.
+           [The Apache Software License, Version 2.0]
+           https://git.dorkbox.com/dorkbox/Collections
+           Copyright 2023
+             Dorkbox LLC
+
+           Extra license information
+             - Bias, BinarySearch - 
+               [MIT License]
+               https://git.dorkbox.com/dorkbox/Collections
+               https://github.com/timboudreau/util
+               Copyright 2013
+                 Tim Boudreau
+
+             - ConcurrentEntry - 
+               [The Apache Software License, Version 2.0]
+               https://git.dorkbox.com/dorkbox/Collections
+               Copyright 2016
+                 bennidi
+                 dorkbox
+
+             - Collection Utilities (Array, ArrayMap, BooleanArray, ByteArray, CharArray, FloatArray, IdentityMap, IntArray, IntFloatMap, IntIntMap, IntMap, IntSet, LongArray, LongMap, ObjectFloatMap, ObjectIntMap, ObjectMap, ObjectSet, OrderedMap, OrderedSet) - 
+               [The Apache Software License, Version 2.0]
+               https://git.dorkbox.com/dorkbox/Collections
+               https://github.com/libgdx/libgdx/blob/master/gdx/src/com/badlogic/gdx/utils
+               Copyright 2011
+                 LibGDX
+                 Mario Zechner (badlogicgames@gmail.com)
+                 Nathan Sweet (nathan.sweet@gmail.com)
+
+             - Predicate - 
+               [The Apache Software License, Version 2.0]
+               https://git.dorkbox.com/dorkbox/Collections
+               https://github.com/libgdx/libgdx/blob/master/gdx/src/com/badlogic/gdx/utils
+               Copyright 2011
+                 LibGDX
+                 Mario Zechner (badlogicgames@gmail.com)
+                 Nathan Sweet (nathan.sweet@gmail.com)
+                 xoppa
+
+             - Select, QuickSelect - 
+               [The Apache Software License, Version 2.0]
+               https://git.dorkbox.com/dorkbox/Collections
+               https://github.com/libgdx/libgdx/blob/master/gdx/src/com/badlogic/gdx/utils
+               Copyright 2011
+                 LibGDX
+                 Mario Zechner (badlogicgames@gmail.com)
+                 Nathan Sweet (nathan.sweet@gmail.com)
+                 Jon Renner
+
+             - Kotlin - 
+               [The Apache Software License, Version 2.0]
+               https://github.com/JetBrains/kotlin
+               Copyright 2020
+                 JetBrains s.r.o. and Kotlin Programming Language contributors
+               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
+             - Updates - Software Update Management
+               [The Apache Software License, Version 2.0]
+               https://git.dorkbox.com/dorkbox/Updates
+               Copyright 2021
+                 Dorkbox LLC
+
+               Extra license information
+                 - Kotlin - 
+                   [The Apache Software License, Version 2.0]
+                   https://github.com/JetBrains/kotlin
+                   Copyright 2020
+                     JetBrains s.r.o. and Kotlin Programming Language contributors
+                   Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+                   See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
+         - Updates - Software Update Management
+           [The Apache Software License, Version 2.0]
+           https://git.dorkbox.com/dorkbox/Updates
+           Copyright 2021
+             Dorkbox LLC
+
+           Extra license information
+             - Kotlin - 
+               [The Apache Software License, Version 2.0]
+               https://github.com/JetBrains/kotlin
+               Copyright 2020
+                 JetBrains s.r.o. and Kotlin Programming Language contributors
+               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
     - Collections - Collection types and utilities to enhance the default collections.
       [The Apache Software License, Version 2.0]
       https://git.dorkbox.com/dorkbox/Collections
@ -285,6 +394,84 @@
               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md

+     - JNA - Native JNA extensions for Linux, MacOS, and Windows, Java 1.8+
+       [The Apache Software License, Version 2.0]
+       https://git.dorkbox.com/dorkbox/JNA
+       Copyright 2023
+         Dorkbox LLC
+
+       Extra license information
+         - SLF4J - Simple facade or abstraction for various logging frameworks
+           [MIT License]
+           https://www.slf4j.org
+           Copyright 2023
+             QOS.ch
+
+         - Kotlin - 
+           [The Apache Software License, Version 2.0]
+           https://github.com/JetBrains/kotlin
+           Copyright 2020
+             JetBrains s.r.o. and Kotlin Programming Language contributors
+           Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+           See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
+         - JNA - Simplified native library access for Java.
+           [The Apache Software License, Version 2.0]
+           https://github.com/twall/jna
+           Copyright 2023
+             Timothy Wall
+
+         - JNA-Platform - Mappings for a number of commonly used platform functions
+           [The Apache Software License, Version 2.0]
+           https://github.com/twall/jna
+           Copyright 2023
+             Timothy Wall
+
+         - OS - Information about the system, Java runtime, OS, Window Manager, and Desktop Environment.
+           [The Apache Software License, Version 2.0]
+           https://git.dorkbox.com/dorkbox/OS
+           Copyright 2023
+             Dorkbox LLC
+
+           Extra license information
+             - Kotlin - 
+               [The Apache Software License, Version 2.0]
+               https://github.com/JetBrains/kotlin
+               Copyright 2020
+                 JetBrains s.r.o. and Kotlin Programming Language contributors
+               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
+             - Updates - Software Update Management
+               [The Apache Software License, Version 2.0]
+               https://git.dorkbox.com/dorkbox/Updates
+               Copyright 2021
+                 Dorkbox LLC
+
+               Extra license information
+                 - Kotlin - 
+                   [The Apache Software License, Version 2.0]
+                   https://github.com/JetBrains/kotlin
+                   Copyright 2020
+                     JetBrains s.r.o. and Kotlin Programming Language contributors
+                   Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+                   See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
+         - Updates - Software Update Management
+           [The Apache Software License, Version 2.0]
+           https://git.dorkbox.com/dorkbox/Updates
+           Copyright 2021
+             Dorkbox LLC
+
+           Extra license information
+             - Kotlin - 
+               [The Apache Software License, Version 2.0]
+               https://github.com/JetBrains/kotlin
+               Copyright 2020
+                 JetBrains s.r.o. and Kotlin Programming Language contributors
+               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
+               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
+
     - MinLog - Drop-in replacement for MinLog to log through SLF4j.
       [BSD 3-Clause License]
       https://git.dorkbox.com/dorkbox/MinLog-SLF4J
@ -1300,12 +1487,6 @@
             The Netty Project
             Contributors. See source NOTICE

-         - TypeTools - A simple, zero-dependency library for working with types. Supports Java 1.6+ and Android.
-           [The Apache Software License, Version 2.0]
-           https://github.com/jhalterman/typetools
-           Copyright 2023
-             Jonathan Halterman and friends
-
         - Kotlin - 
           [The Apache Software License, Version 2.0]
           https://github.com/JetBrains/kotlin
@ -1320,79 +1501,6 @@
           Copyright 2023
             JetBrains s.r.o.

-         - Collections - Collection types and utilities to enhance the default collections.
-           [The Apache Software License, Version 2.0]
-           https://git.dorkbox.com/dorkbox/Collections
-           Copyright 2023
-             Dorkbox LLC
-
-           Extra license information
-             - Bias, BinarySearch - 
-               [MIT License]
-               https://git.dorkbox.com/dorkbox/Collections
-               https://github.com/timboudreau/util
-               Copyright 2013
-                 Tim Boudreau
-
-             - ConcurrentEntry - 
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/Collections
-               Copyright 2016
-                 bennidi
-                 dorkbox
-
-             - Collection Utilities (Array, ArrayMap, BooleanArray, ByteArray, CharArray, FloatArray, IdentityMap, IntArray, IntFloatMap, IntIntMap, IntMap, IntSet, LongArray, LongMap, ObjectFloatMap, ObjectIntMap, ObjectMap, ObjectSet, OrderedMap, OrderedSet) - 
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/Collections
-               https://github.com/libgdx/libgdx/blob/master/gdx/src/com/badlogic/gdx/utils
-               Copyright 2011
-                 LibGDX
-                 Mario Zechner (badlogicgames@gmail.com)
-                 Nathan Sweet (nathan.sweet@gmail.com)
-
-             - Predicate - 
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/Collections
-               https://github.com/libgdx/libgdx/blob/master/gdx/src/com/badlogic/gdx/utils
-               Copyright 2011
-                 LibGDX
-                 Mario Zechner (badlogicgames@gmail.com)
-                 Nathan Sweet (nathan.sweet@gmail.com)
-                 xoppa
-
-             - Select, QuickSelect - 
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/Collections
-               https://github.com/libgdx/libgdx/blob/master/gdx/src/com/badlogic/gdx/utils
-               Copyright 2011
-                 LibGDX
-                 Mario Zechner (badlogicgames@gmail.com)
-                 Nathan Sweet (nathan.sweet@gmail.com)
-                 Jon Renner
-
-             - Kotlin - 
-               [The Apache Software License, Version 2.0]
-               https://github.com/JetBrains/kotlin
-               Copyright 2020
-                 JetBrains s.r.o. and Kotlin Programming Language contributors
-               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
-               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
-
-             - Updates - Software Update Management
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/Updates
-               Copyright 2021
-                 Dorkbox LLC
-
-               Extra license information
-                 - Kotlin - 
-                   [The Apache Software License, Version 2.0]
-                   https://github.com/JetBrains/kotlin
-                   Copyright 2020
-                     JetBrains s.r.o. and Kotlin Programming Language contributors
-                   Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
-                   See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
-
         - Executor - Shell, JVM, and SSH command execution on Linux, MacOS, or Windows for Java 8+
           [The Apache Software License, Version 2.0]
           https://git.dorkbox.com/dorkbox/Executor
@ -1531,81 +1639,3 @@
                 JetBrains s.r.o. and Kotlin Programming Language contributors
               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
-
-     - JNA - Native JNA extensions for Linux, MacOS, and Windows, Java 1.8+
-       [The Apache Software License, Version 2.0]
-       https://git.dorkbox.com/dorkbox/JNA
-       Copyright 2023
-         Dorkbox LLC
-
-       Extra license information
-         - SLF4J - Simple facade or abstraction for various logging frameworks
-           [MIT License]
-           https://www.slf4j.org
-           Copyright 2023
-             QOS.ch
-
-         - Kotlin - 
-           [The Apache Software License, Version 2.0]
-           https://github.com/JetBrains/kotlin
-           Copyright 2020
-             JetBrains s.r.o. and Kotlin Programming Language contributors
-           Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
-           See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
-
-         - JNA - Simplified native library access for Java.
-           [The Apache Software License, Version 2.0]
-           https://github.com/twall/jna
-           Copyright 2023
-             Timothy Wall
-
-         - JNA-Platform - Mappings for a number of commonly used platform functions
-           [The Apache Software License, Version 2.0]
-           https://github.com/twall/jna
-           Copyright 2023
-             Timothy Wall
-
-         - OS - Information about the system, Java runtime, OS, Window Manager, and Desktop Environment.
-           [The Apache Software License, Version 2.0]
-           https://git.dorkbox.com/dorkbox/OS
-           Copyright 2023
-             Dorkbox LLC
-
-           Extra license information
-             - Kotlin - 
-               [The Apache Software License, Version 2.0]
-               https://github.com/JetBrains/kotlin
-               Copyright 2020
-                 JetBrains s.r.o. and Kotlin Programming Language contributors
-               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
-               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
-
-             - Updates - Software Update Management
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/Updates
-               Copyright 2021
-                 Dorkbox LLC
-
-               Extra license information
-                 - Kotlin - 
-                   [The Apache Software License, Version 2.0]
-                   https://github.com/JetBrains/kotlin
-                   Copyright 2020
-                     JetBrains s.r.o. and Kotlin Programming Language contributors
-                   Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
-                   See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
-
-         - Updates - Software Update Management
-           [The Apache Software License, Version 2.0]
-           https://git.dorkbox.com/dorkbox/Updates
-           Copyright 2021
-             Dorkbox LLC
-
-           Extra license information
-             - Kotlin - 
-               [The Apache Software License, Version 2.0]
-               https://github.com/JetBrains/kotlin
-               Copyright 2020
-                 JetBrains s.r.o. and Kotlin Programming Language contributors
-               Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
-               See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -167,7 +167,9 @@ dependencies {

    // https://github.com/dorkbox
    api("com.dorkbox:ByteUtilities:1.12")
+    api("com.dorkbox:ClassUtils:1.1")
    api("com.dorkbox:Collections:2.2")
+    api("com.dorkbox:JNA:1.0")
    api("com.dorkbox:MinLog:2.5")
    api("com.dorkbox:NetworkDNS:2.10")
    api("com.dorkbox:NetworkUtils:2.22")
@ -175,13 +177,12 @@ dependencies {
    api("com.dorkbox:Serializers:2.9")
    api("com.dorkbox:Storage:1.5")
    api("com.dorkbox:Updates:1.1")
-    api("com.dorkbox:Utilities:1.43")
+    api("com.dorkbox:Utilities:1.44")
+

-    
    // how we bypass using reflection/jpms to access fields for java17+
    api("org.javassist:javassist:3.29.2-GA")

-    api("com.dorkbox:JNA:1.0")

    val jnaVersion = "5.12.1"
    api("net.java.dev.jna:jna-jpms:${jnaVersion}")
--- a/src/dorkbox/network/connection/ListenerManager.kt
+++ b/src/dorkbox/network/connection/ListenerManager.kt
@ -15,11 +15,11 @@
 */
 package dorkbox.network.connection

+import dorkbox.classUtil.ClassHelper
+import dorkbox.classUtil.ClassHierarchy
 import dorkbox.collections.IdentityMap
 import dorkbox.network.ipFilter.IpFilterRule
 import dorkbox.os.OS
-import dorkbox.util.classes.ClassHelper
-import dorkbox.util.classes.ClassHierarchy
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import mu.KLogger
@ -329,7 +329,7 @@ internal class ListenerManager<CONNECTION: Connection>(private val logger: KLogg
                    newMessageArray[0] = func
                }

-                tempMap.put(messageClass, newMessageArray)
+                tempMap.put(messageClass!!, newMessageArray)
                onMessageMap = tempMap
            } else {
                throw IllegalArgumentException("Unable to add incompatible types! Detected connection/message classes: $connectionClass, $messageClass")
--- a/src/dorkbox/network/rmi/RmiManagerConnections.kt
+++ b/src/dorkbox/network/rmi/RmiManagerConnections.kt
@ -15,6 +15,7 @@
 */
 package dorkbox.network.rmi

+import dorkbox.classUtil.ClassHelper
 import dorkbox.network.connection.Connection
 import dorkbox.network.connection.ListenerManager
 import dorkbox.network.connection.ListenerManager.Companion.cleanStackTrace
@ -24,7 +25,6 @@ import dorkbox.network.rmi.messages.ConnectionObjectCreateResponse
 import dorkbox.network.rmi.messages.ConnectionObjectDeleteRequest
 import dorkbox.network.rmi.messages.ConnectionObjectDeleteResponse
 import dorkbox.network.serialization.Serialization
-import dorkbox.util.classes.ClassHelper
 import mu.KLogger

 class RmiManagerConnections<CONNECTION: Connection> internal constructor(
@ -85,7 +85,7 @@ class RmiManagerConnections<CONNECTION: Connection> internal constructor(
        val rmi = connection.rmi as RmiSupportConnection<CONNECTION>

        val callback = rmi.removeCallback(callbackId)
-        val interfaceClass = ClassHelper.getGenericParameterAsClassForSuperClass(RemoteObjectCallback::class.java, callback.javaClass, 0)
+        val interfaceClass = ClassHelper.getGenericParameterAsClassForSuperClass(RemoteObjectCallback::class.java, callback.javaClass, 0) ?: callback.javaClass

        // create the client-side proxy object, if possible.  This MUST be an object that is saved for the connection
        val proxyObject = rmi.getProxyObject(false, connection, rmiId, interfaceClass)
--- a/src/dorkbox/network/rmi/RmiSupportConnection.kt
+++ b/src/dorkbox/network/rmi/RmiSupportConnection.kt
@ -16,13 +16,13 @@

 package dorkbox.network.rmi

+import dorkbox.classUtil.ClassHelper
 import dorkbox.collections.LockFreeIntMap
 import dorkbox.network.connection.Connection
 import dorkbox.network.connection.ListenerManager.Companion.cleanStackTrace
 import dorkbox.network.rmi.messages.ConnectionObjectCreateRequest
 import dorkbox.network.rmi.messages.ConnectionObjectDeleteRequest
 import dorkbox.network.serialization.Serialization
-import dorkbox.util.classes.ClassHelper
 import mu.KLogger

 /**
@ -147,7 +147,7 @@ class RmiSupportConnection<CONNECTION: Connection> internal constructor(
     * @see RemoteObject
     */
    suspend fun <Iface> create(vararg objectParameters: Any?, callback: suspend Iface.() -> Unit) {
-        val iFaceClass = ClassHelper.getGenericParameterAsClassForSuperClass(Function1::class.java, callback.javaClass, 0)
+        val iFaceClass = ClassHelper.getGenericParameterAsClassForSuperClass(Function1::class.java, callback.javaClass, 0) ?: callback.javaClass
        val kryoId = serialization.getKryoIdForRmiClient(iFaceClass)

        @Suppress("UNCHECKED_CAST")
@ -172,7 +172,7 @@ class RmiSupportConnection<CONNECTION: Connection> internal constructor(
     * @see RemoteObject
     */
    suspend fun <Iface> create(callback: suspend Iface.() -> Unit) {
-        val iFaceClass = ClassHelper.getGenericParameterAsClassForSuperClass(Function1::class.java, callback.javaClass, 0)
+        val iFaceClass = ClassHelper.getGenericParameterAsClassForSuperClass(Function1::class.java, callback.javaClass, 0) ?: callback.javaClass
        val kryoId = serialization.getKryoIdForRmiClient(iFaceClass)

        createRemoteObject(connection, kryoId, null, callback)
--- a/src/dorkbox/network/rmi/RmiUtils.kt
+++ b/src/dorkbox/network/rmi/RmiUtils.kt
@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dorkbox, llc
+ * Copyright 2023 dorkbox, llc
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -18,8 +18,8 @@ package dorkbox.network.rmi
 import com.esotericsoftware.kryo.Kryo
 import com.esotericsoftware.kryo.Serializer
 import com.esotericsoftware.reflectasm.MethodAccess
+import dorkbox.classUtil.ClassHelper
 import dorkbox.network.connection.Connection
-import dorkbox.util.classes.ClassHelper
 import mu.KLogger
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
@ -578,7 +578,8 @@ object RmiUtils {
        // step 2: starting at newEndIndex -> 0, find the start of reflection information (we are java11+ ONLY, so this is easy)
        for (i in newEndIndex downTo 0) {
            // this will be either JAVA reflection or ReflectASM reflection
-            val stackModule = stackTrace[i].moduleName
+            val stackTraceElement: StackTraceElement = stackTrace[i]
+            val stackModule = stackTraceElement.moduleName
            if (stackModule == "java.base") {
                newEndIndex--
            } else {
--- a/src9/module-info.java
+++ b/src9/module-info.java
@ -13,6 +13,7 @@ module dorkbox.network {
    exports dorkbox.network.serialization;

    requires transitive dorkbox.bytes;
+    requires transitive dorkbox.classUtils;
    requires transitive dorkbox.collections;
    requires transitive dorkbox.dns;
    requires transitive dorkbox.updates;