Properly handle java refs in traits returning traits

[ldk-java] / src / main / java / org / ldk / structs / Access.java

diff --git a/src/main/java/org/ldk/structs/Access.java b/src/main/java/org/ldk/structs/Access.java
index 36fc3626ee68b3343d28fe0eab2b2c62b535b664..7a9b89c03bc057e0ce8591b64b6b536a7ef48a41 100644 (file)
--- a/src/main/java/org/ldk/structs/Access.java
+++ b/src/main/java/org/ldk/structs/Access.java
@@ -1,19 +1,45 @@
 package org.ldk.structs;
 
 import org.ldk.impl.bindings;
-
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Access extends CommonBase {
-       Access(Object _dummy, long ptr) { super(ptr); }
-       public Access(bindings.LDKAccess arg) {
+       final bindings.LDKAccess bindings_instance;
+       Access(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }
+       private Access(bindings.LDKAccess arg) {
                super(bindings.LDKAccess_new(arg));
                this.ptrs_to.add(arg);
+               this.bindings_instance = arg;
        }
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
-               bindings.Access_free(ptr); super.finalize();
+               if (ptr != 0) { bindings.Access_free(ptr); } super.finalize();
+       }
+
+       public static interface AccessInterface {
+               Result_TxOutAccessErrorZ get_utxo(byte[] genesis_hash, long short_channel_id);
+       }
+       private static class LDKAccessHolder { Access held; }
+       public static Access new_impl(AccessInterface arg) {
+               final LDKAccessHolder impl_holder = new LDKAccessHolder();
+               impl_holder.held = new Access(new bindings.LDKAccess() {
+                       @Override public long get_utxo(byte[] genesis_hash, long short_channel_id) {
+                               Result_TxOutAccessErrorZ ret = arg.get_utxo(genesis_hash, short_channel_id);
+                               long result = ret != null ? ret.ptr : 0;
+                               ret.ptr = 0;
+                               return result;
+                       }
+               });
+               return impl_holder.held;
+       }
+       public Result_TxOutAccessErrorZ get_utxo(byte[] genesis_hash, long short_channel_id) {
+               long ret = bindings.Access_get_utxo(this.ptr, genesis_hash, short_channel_id);
+               Result_TxOutAccessErrorZ ret_hu_conv = Result_TxOutAccessErrorZ.constr_from_ptr(ret);
+               ret_hu_conv.ptrs_to.add(this);
+               return ret_hu_conv;
        }
 
-       // Skipped Access_get_utxo
 }