refactor: Start supporting Java in addition to Kotlin.

Author: iphydf

BUILD.bazel

@@ -1,5 +1,5 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
+load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//tools/project:build_defs.bzl", "project")
@@ -96,3 +96,15 @@ kt_jvm_test(
         "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
     ],
 )
+
+java_test(
+    name = "ToxCoreJavaTest",
+    size = "small",
+    srcs = ["src/test/java/im/tox/tox4j/core/ToxCoreJavaTest.java"],
+    jvm_flags = ["-Djava.library.path=jvm-toxcore-c"],
+    test_class = "im.tox.tox4j.core.ToxCoreJavaTest",
+    deps = [
+        ":jvm-toxcore-c",
+        "@maven//:junit_junit",
+    ],
+)

src/main/java/im/tox/tox4j/core/ToxCore.kt

@@ -31,7 +31,7 @@ interface ToxCore : Closeable {
    *
    * @return a byte array containing the serialised tox instance.
    */
-  val getSavedata: ByteArray
+  val savedata: ByteArray
 
   /**
    * Create a new [[ToxCore]] instance with different options. The implementation may choose to
@@ -43,7 +43,7 @@ interface ToxCore : Closeable {
    * instance will operate correctly.
    *
    * If the [[ToxOptions.saveData]] field is not empty, this function will load the Tox instance
-   * from a byte array previously filled by [[getSavedata]].
+   * from a byte array previously filled by [[savedata]].
    *
    * If loading failed or succeeded only partially, an exception will be thrown.
    *
@@ -78,6 +78,8 @@ interface ToxCore : Closeable {
    */
   // @Throws(ToxBootstrapException::class)
   fun bootstrap(address: String, port: Port, publicKey: ToxPublicKey): Unit
+  fun bootstrap(address: String, port: Int, publicKey: ByteArray): Unit =
+      bootstrap(address, Port(port.toUShort()), ToxPublicKey(publicKey))
 
   /**
    * Connect to a TCP relay to forward traffic.
@@ -91,14 +93,17 @@ interface ToxCore : Closeable {
    */
   // @Throws(ToxBootstrapException::class)
   fun addTcpRelay(address: String, port: Port, publicKey: ToxPublicKey): Unit
+  fun addTcpRelay(address: String, port: Int, publicKey: ByteArray): Unit =
+      addTcpRelay(address, Port(port.toUShort()), ToxPublicKey(publicKey))
 
   /**
    * Get the UDP port this instance is bound to.
    *
    * @return a port number between 1 and 65535.
    */
   // @Throws(ToxGetPortException::class)
-  val getUdpPort: Port
+  val udpPort: Port
+  fun getUdpPort(): Int = udpPort.value.toInt()
 
   /**
    * Return the TCP port this Tox instance is bound to. This is only relevant if the instance is
@@ -107,20 +112,22 @@ interface ToxCore : Closeable {
    * @return a port number between 1 and 65535.
    */
   // @Throws(ToxGetPortException::class)
-  val getTcpPort: Port
+  val tcpPort: Port
+  fun getTcpPort(): Int = tcpPort.value.toInt()
 
   /**
    * Writes the temporary DHT public key of this instance to a byte array.
    *
    * This can be used in combination with an externally accessible IP address and the bound port
-   * (from [[getUdpPort]]}) to run a temporary bootstrap node.
+   * (from [[udpPort]]}) to run a temporary bootstrap node.
    *
    * Be aware that every time a new instance is created, the DHT public key changes, meaning this
    * cannot be used to run a permanent bootstrap node.
    *
    * @return a byte array of size [[ToxCoreConstants.PublicKeySize]]
    */
-  val getDhtId: ToxPublicKey
+  val dhtId: ToxPublicKey
+  fun getDhtId(): ByteArray = dhtId.value
 
   /**
    * Get the time in milliseconds until [[iterate]] should be called again for optimal performance.
@@ -141,27 +148,24 @@ interface ToxCore : Closeable {
    *
    * @return a byte array of size [[ToxCoreConstants.PublicKeySize]]
    */
-  val getPublicKey: ToxPublicKey
+  val publicKey: ToxPublicKey
+  fun getPublicKey(): ByteArray = publicKey.value
 
   /**
    * Copy the Tox Secret Key from the Tox object.
    *
    * @return a byte array of size [[ToxCoreConstants.SecretKeySize]]
    */
-  val getSecretKey: ToxSecretKey
+  val secretKey: ToxSecretKey
+  fun getSecretKey(): ByteArray = secretKey.value
 
   /**
-   * Set the 4-byte nospam part of the address.
+   * The 4-byte nospam part of the address.
    *
    * Setting the nospam makes it impossible for others to send us friend requests that contained the
    * old nospam number.
-   *
-   * @param nospam the new nospam number.
    */
-  fun setNospam(nospam: Int): Unit
-
-  /** Get our current nospam number. */
-  val getNospam: Int
+  var nospam: Int
 
   /**
    * Get our current tox address to give to friends.
@@ -175,43 +179,28 @@ interface ToxCore : Closeable {
    *
    * @return a byte array of size [[ToxCoreConstants.AddressSize]]
    */
-  val getAddress: ToxFriendAddress
+  val address: ToxFriendAddress
 
   /**
-   * Set the nickname for the Tox client.
+   * The nickname for the Tox client.
    *
    * Cannot be longer than [[ToxCoreConstants.MaxNameLength]] bytes. Can be empty (zero-length).
-   *
-   * @param name A byte array containing the new nickname..
    */
   // @Throws(ToxSetInfoException::class)
-  fun setName(name: ToxNickname): Unit
-
-  /** Get our own nickname. */
-  val getName: ToxNickname
+  var name: ToxNickname
 
   /**
-   * Set our status message.
+   * Our status message.
    *
    * Cannot be longer than [[ToxCoreConstants.MaxStatusMessageLength]] bytes.
-   *
-   * @param message the status message to set.
    */
   // @Throws(ToxSetInfoException::class)
-  fun setStatusMessage(message: ToxStatusMessage): Unit
-
-  /** Gets our own status message. May be null if the status message was empty. */
-  val getStatusMessage: ToxStatusMessage
+  var statusMessage: ToxStatusMessage
 
   /**
-   * Set our status.
-   *
-   * @param status status to set.
+   * Our status.
    */
-  fun setStatus(status: ToxUserStatus): Unit
-
-  /** Get our status. */
-  val getStatus: ToxUserStatus
+  var status: ToxUserStatus
 
   /**
    * Add a friend to the friend list and send a friend request.
@@ -240,6 +229,8 @@ interface ToxCore : Closeable {
    */
   // @Throws(ToxFriendAddException::class, IllegalArgumentException::class)
   fun addFriend(address: ToxFriendAddress, message: ToxFriendRequestMessage): ToxFriendNumber
+  fun addFriend(address: ByteArray, message: ByteArray): Int =
+      addFriend(ToxFriendAddress(address), ToxFriendRequestMessage(message)).value
 
   /**
    * Add a friend without sending a friend request.
@@ -257,6 +248,8 @@ interface ToxCore : Closeable {
    */
   // @Throws(ToxFriendAddException::class, IllegalArgumentException::class)
   fun addFriendNorequest(publicKey: ToxPublicKey): ToxFriendNumber
+  fun addFriendNorequest(publicKey: ByteArray): Int =
+      addFriendNorequest(ToxPublicKey(publicKey)).value
 
   /**
    * Remove a friend from the friend list.
@@ -308,7 +301,7 @@ interface ToxCore : Closeable {
    * @return an array containing the currently valid friend numbers, the empty int array if there
    *   are no friends.
    */
-  val getFriendList: IntArray
+  val friendList: IntArray
 
   /**
    * Get an array of [[ToxFriendNumber]] objects with the same values as [[getFriendList]].
@@ -317,8 +310,8 @@ interface ToxCore : Closeable {
    *
    * @return [[getFriendList]] mapped to [[ToxFriendNumber]].
    */
-  val getFriendNumbers: List<ToxFriendNumber>
-    get() = getFriendList.map { ToxFriendNumber(it) }
+  val friendNumbers: List<ToxFriendNumber>
+    get() = friendList.map { ToxFriendNumber(it) }
 
   /**
    * Tell friend number whether or not we are currently typing.
@@ -347,7 +340,7 @@ interface ToxCore : Closeable {
    * incremented by 1 each time a message is sent. If [[Int.MaxValue]] messages were sent, the next
    * message ID is [[Int.MinValue]].
    *
-   * Message IDs are not stored in the array returned by [[getSavedata]].
+   * Message IDs are not stored in the array returned by [[savedata]].
    *
    * @param friendNumber The friend number of the friend to send the message to.
    * @param messageType Message type (normal, action, ...).

src/main/java/im/tox/tox4j/core/callbacks/FriendConnectionStatusCallback.kt

@@ -20,4 +20,10 @@ interface FriendConnectionStatusCallback<ToxCoreState> {
       connectionStatus: ToxConnection,
       state: ToxCoreState
   ): ToxCoreState = state
+
+  fun friendConnectionStatus(
+      friendNumber: Int,
+      connectionStatus: ToxConnection,
+      state: ToxCoreState
+  ): ToxCoreState = friendConnectionStatus(ToxFriendNumber(friendNumber), connectionStatus, state)
 }

src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventAdapter.kt

@@ -1,3 +1,3 @@
 package im.tox.tox4j.core.callbacks
 
-class ToxCoreEventAdapter<ToxCoreState> : ToxCoreEventListener<ToxCoreState>
+abstract class ToxCoreEventAdapter<ToxCoreState> : ToxCoreEventListener<ToxCoreState>

src/main/java/im/tox/tox4j/core/options/ToxOptions.kt

@@ -42,4 +42,8 @@ final data class ToxOptions(
     val tcpPort: UShort = ToxCoreConstants.DefaultTcpPort,
     val saveData: SaveDataOptions.Type = SaveDataOptions.None,
     val fatalErrors: Boolean = true,
-)
+) {
+    companion object {
+        val defaultInstance = ToxOptions()
+    }
+}

src/main/java/im/tox/tox4j/impl/jni/ToxCoreEventDispatch.kt

@@ -103,7 +103,7 @@ object ToxCoreEventDispatch {
           state,
           { next, ev ->
             handler.friendConnectionStatus(
-                ToxFriendNumber(ev.getFriendNumber()), convert(ev.getConnectionStatus()), next)
+                ev.getFriendNumber(), convert(ev.getConnectionStatus()), next)
           })
 
   private fun <S> dispatchFriendTyping(

src/main/java/im/tox/tox4j/impl/jni/ToxCoreImpl.kt

@@ -9,7 +9,7 @@ import im.tox.tox4j.core.exceptions.*
 import im.tox.tox4j.core.options.ToxOptions
 
 /**
- * Initialises the new Tox instance with an optional save-data received from [[getSavedata]].
+ * Initialises the new Tox instance with an optional save-data received from [[savedata]].
  *
  * @param options Connection options object with optional save-data.
  */
@@ -50,16 +50,16 @@ final class ToxCoreImpl(val options: ToxOptions) : ToxCore {
     ToxCoreJni.toxAddTcpRelay(instanceNumber, address, port.value.toInt(), publicKey.value)
   }
 
-  override val getSavedata: ByteArray
+  override val savedata: ByteArray
     get() = ToxCoreJni.toxGetSavedata(instanceNumber)
 
-  override val getUdpPort: Port
+  override val udpPort: Port
     get() = Port(ToxCoreJni.toxSelfGetUdpPort(instanceNumber).toUShort())
 
-  override val getTcpPort: Port
+  override val tcpPort: Port
     get() = Port(ToxCoreJni.toxSelfGetTcpPort(instanceNumber).toUShort())
 
-  override val getDhtId: ToxPublicKey
+  override val dhtId: ToxPublicKey
     get() = ToxPublicKey(ToxCoreJni.toxSelfGetDhtId(instanceNumber))
 
   override val iterationInterval: Int
@@ -68,38 +68,30 @@ final class ToxCoreImpl(val options: ToxOptions) : ToxCore {
   override fun <S> iterate(handler: ToxCoreEventListener<S>, state: S): S =
       ToxCoreEventDispatch.dispatch(handler, ToxCoreJni.toxIterate(instanceNumber), state)
 
-  override val getPublicKey: ToxPublicKey
+  override val publicKey: ToxPublicKey
     get() = ToxPublicKey(ToxCoreJni.toxSelfGetPublicKey(instanceNumber))
 
-  override val getSecretKey: ToxSecretKey
+  override val secretKey: ToxSecretKey
     get() = ToxSecretKey(ToxCoreJni.toxSelfGetSecretKey(instanceNumber))
 
-  override fun setNospam(nospam: Int): Unit = ToxCoreJni.toxSelfSetNospam(instanceNumber, nospam)
-
-  override val getNospam: Int
+  override var nospam: Int
     get() = ToxCoreJni.toxSelfGetNospam(instanceNumber)
+    set(value) = ToxCoreJni.toxSelfSetNospam(instanceNumber, value)
 
-  override val getAddress: ToxFriendAddress
+  override val address: ToxFriendAddress
     get() = ToxFriendAddress(ToxCoreJni.toxSelfGetAddress(instanceNumber))
 
-  override fun setName(name: ToxNickname): Unit =
-      ToxCoreJni.toxSelfSetName(instanceNumber, name.value)
-
-  override val getName: ToxNickname
+  override var name: ToxNickname
     get() = ToxNickname(ToxCoreJni.toxSelfGetName(instanceNumber))
+    set(value) = ToxCoreJni.toxSelfSetName(instanceNumber, value.value)
 
-  override fun setStatusMessage(message: ToxStatusMessage): Unit {
-    ToxCoreJni.toxSelfSetStatusMessage(instanceNumber, message.value)
-  }
-
-  override val getStatusMessage: ToxStatusMessage
+  override var statusMessage: ToxStatusMessage
     get() = ToxStatusMessage(ToxCoreJni.toxSelfGetStatusMessage(instanceNumber))
+    set(value) = ToxCoreJni.toxSelfSetStatusMessage(instanceNumber, value.value)
 
-  override fun setStatus(status: ToxUserStatus): Unit =
-      ToxCoreJni.toxSelfSetStatus(instanceNumber, status.ordinal)
-
-  override val getStatus: ToxUserStatus
+  override var status: ToxUserStatus
     get() = ToxUserStatus.values()[ToxCoreJni.toxSelfGetStatus(instanceNumber)]
+    set(value) = ToxCoreJni.toxSelfSetStatus(instanceNumber, value.ordinal)
 
   override fun addFriend(
       address: ToxFriendAddress,
@@ -126,7 +118,7 @@ final class ToxCoreImpl(val options: ToxOptions) : ToxCore {
   override fun friendExists(friendNumber: ToxFriendNumber): Boolean =
       ToxCoreJni.toxFriendExists(instanceNumber, friendNumber.value)
 
-  override val getFriendList: IntArray
+  override val friendList: IntArray
     get() = ToxCoreJni.toxSelfGetFriendList(instanceNumber)
 
   override fun setTyping(friendNumber: ToxFriendNumber, typing: Boolean): Unit =