Bytes type and coverall test fixture (#16)

* Passing tests, coverall generation working Still need to complete coverall tests * Checkpointing because I don't want to lose it * Finished all coverall tests * rogue println
IronCoreLabs · Jul 11, 2024 · cd4eb0e · cd4eb0e
1 parent ea9f460
commit cd4eb0e
Show file tree

Hide file tree

Showing 19 changed files with 847 additions and 128 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,7 @@ uniffi-example-custom-types = { git = "https://github.com/mozilla/uniffi-rs.git"
 uniffi-example-futures = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
 uniffi-example-geometry = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
 uniffi-example-rondpoint = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
+uniffi-fixture-coverall = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
 uniffi-fixture-futures = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
 uniffi-fixture-time = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
 uniffi_testing = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
diff --git a/src/gen_java/mod.rs b/src/gen_java/mod.rs
@@ -522,7 +522,7 @@ impl AsCodeType for Type {
             Type::Float64 => Box::new(primitives::Float64CodeType),
             Type::Boolean => Box::new(primitives::BooleanCodeType),
             Type::String => Box::new(primitives::StringCodeType),
-            Type::Bytes => unimplemented!(), //Box::new(primitives::BytesCodeType),
+            Type::Bytes => Box::new(primitives::BytesCodeType),
 
             Type::Timestamp => Box::new(miscellany::TimestampCodeType),
             Type::Duration => Box::new(miscellany::DurationCodeType),

diff --git a/src/gen_java/primitives.rs b/src/gen_java/primitives.rs
@@ -75,6 +75,22 @@ macro_rules! impl_code_type_for_primitive {
     };
 }
 
+#[derive(Debug)]
+pub struct BytesCodeType;
+impl CodeType for BytesCodeType {
+    fn type_label(&self, _ci: &ComponentInterface) -> String {
+        "byte[]".to_string()
+    }
+
+    fn canonical_name(&self) -> String {
+        "ByteArray".to_string()
+    }
+
+    fn literal(&self, literal: &Literal, ci: &ComponentInterface) -> String {
+        render_literal(&literal, ci)
+    }
+}
+
 impl_code_type_for_primitive!(BooleanCodeType, "Boolean");
 impl_code_type_for_primitive!(StringCodeType, "String");
 impl_code_type_for_primitive!(Int8CodeType, "Byte");

diff --git a/src/templates/ByteArrayHelper.java b/src/templates/ByteArrayHelper.java
@@ -0,0 +1,26 @@
+package {{ config.package_name() }};
+
+import java.nio.ByteBuffer;
+
+public enum FfiConverterByteArray implements FfiConverterRustBuffer<byte[]>{
+  INSTANCE;
+
+    @Override
+    public byte[] read(ByteBuffer buf) {
+        int len = buf.getInt();
+        byte[] byteArr = new byte[len];
+        buf.get(byteArr);
+        return byteArr;
+    }
+
+    @Override
+    public long allocationSize(byte[] value) {
+        return 4L + (long)value.length;
+    }
+
+    @Override
+    public void write(byte[] value, ByteBuffer buf) {
+        buf.putInt(value.length);
+        buf.put(value);
+    }
+}
diff --git a/src/templates/CallbackInterfaceImpl.java b/src/templates/CallbackInterfaceImpl.java
@@ -3,9 +3,13 @@
 package {{ config.package_name() }};
 
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Callable;
 import java.util.function.Function;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import java.util.List;
+import com.sun.jna.*;
+import com.sun.jna.ptr.*;
 
 {%- let trait_impl=format!("UniffiCallbackInterface{}", name) %}
 
@@ -45,19 +49,20 @@ public static class {{ inner_method_class }} implements {{ ffi_callback.name()|f
             {%- endif -%}
         ) {
             var uniffiObj = {{ ffi_converter_name }}.INSTANCE.handleMap.get(uniffiHandle);
-            Supplier<{% if meth.is_async() %}{{ meth|async_return_type(ci) }}{% else %}{% match meth.return_type() %}{% when Some(return_type)%}{{ return_type|type_name(ci)}}{% when None %}Void{% endmatch %}{% endif %}> makeCall = () -> {
-                return uniffiObj.{{ meth.name()|fn_name() }}(
+            {% if !meth.is_async() && meth.throws_type().is_some() %}Callable{% else %}Supplier{%endif%}<{% if meth.is_async() %}{{ meth|async_return_type(ci) }}{% else %}{% match meth.return_type() %}{% when Some(return_type)%}{{ return_type|type_name(ci)}}{% when None %}Void{% endmatch %}{% endif %}> makeCall = () -> {
+                {% if meth.return_type().is_some() || meth.is_async() %}return {% endif %}uniffiObj.{{ meth.name()|fn_name() }}(
                     {%- for arg in meth.arguments() %}
                     {{ arg|lift_fn }}({{ arg.name()|var_name }}){% if !loop.last %},{% endif %}
                     {%- endfor %}
                 );
+                {% if meth.return_type().is_none() && !meth.is_async() %}return null;{% endif %}
             };
             {%- if !meth.is_async() %}
             {%- match meth.return_type() %}
             {%- when Some(return_type) %}
-            var writeReturn = ({{ return_type|type_name(ci) }} value) -> { uniffiOutReturn.setValue({{ return_type|lower_fn }}(value)); };
+            Consumer<{{ return_type|type_name(ci)}}> writeReturn = ({{ return_type|type_name(ci) }} value) -> { uniffiOutReturn.setValue({{ return_type|lower_fn }}(value)); };
             {%- when None %}
-            var writeReturn = () -> {};
+            Consumer<Void> writeReturn = (nothing) -> {};
             {%- endmatch %}
 
             {%- match meth.throws_type() %}
@@ -68,8 +73,9 @@ public static class {{ inner_method_class }} implements {{ ffi_callback.name()|f
                 uniffiCallStatus,
                 makeCall,
                 writeReturn,
-                ({{error_type|type_name(ci) }} e) -> { {{ error_type|lower_fn }}(e) }
-            )
+                ({{error_type|type_name(ci) }} e) -> { return {{ error_type|lower_fn }}(e); },
+                {{error_type|type_name(ci)}}.class
+            );
             {%- endmatch %}
 
             {%- else %}

diff --git a/src/templates/EnumTemplate.java b/src/templates/EnumTemplate.java
@@ -57,37 +57,34 @@ public void write({{ type_name }} value, ByteBuffer buf) {
 {% else %}
 
 {%- call java::docstring(e, 0) %}
-public sealed interface {{ type_name }}{% if contains_object_references %} extends Disposable {% endif %} {
+public sealed interface {{ type_name }}{% if contains_object_references %} extends AutoCloseable {% endif %} {
   {% for variant in e.variants() -%}
   {%- call java::docstring(variant, 4) %}
   {% if !variant.has_fields() -%}
-  record {{ variant|type_name(ci)}}() implements {{ type_name }} {}
+  record {{ variant|type_name(ci)}}() implements {{ type_name }} {
+    {% if contains_object_references %}
+    @Override
+    public void close() {
+      // Nothing to destroy
+    }
+    {% endif %}
+  }
   {% else -%}
   record {{ variant|type_name(ci)}}(
     {%- for field in variant.fields()  -%}
     {%- call java::docstring(field, 8) %}
     {{ field|type_name(ci)}} {% call java::field_name(field, loop.index) %}{% if loop.last %}{% else %}, {% endif %}
     {%- endfor -%}
-  ) implements {{ type_name }} {}
-  {%- endif %}
-  {% endfor %}
-
-  {% if contains_object_references %}
-  @Override
-  void destroy() {
-    switch (this) {
-      {%- for variant in e.variants() %}
-      case {{ type_name }}.{{ variant|type_name(ci)}} -> {
-        {%- if variant.has_fields() %}
-        {% call java::destroy_fields(variant) %}
-        {% else -%}
-        // Nothing to destroy
-        {%- endif %}
-      }
-      {%- endfor %}
+  ) implements {{ type_name }} {
+    {% if contains_object_references %}
+    @Override
+    public void close() {
+      {% call java::destroy_fields(variant) %}
     }
+    {% endif %}
   }
-  {% endif %}
+  {%- endif %}
+  {% endfor %}
 }
 
 package {{ config.package_name() }};

diff --git a/src/templates/ErrorTemplate.java b/src/templates/ErrorTemplate.java
@@ -13,7 +13,7 @@ public class {{ type_name }} extends Exception {
 
     {% for variant in e.variants() -%}
     {%- call java::docstring(variant, 4) %}
-    public static class {{ variant|error_variant_name }} extends {{ type_name }}{% if contains_object_references %}, Disposable{% endif %} {
+    public static class {{ variant|error_variant_name }} extends {{ type_name }}{% if contains_object_references %}, AutoCloseable{% endif %} {
       public {{ variant|error_variant_name }}(String message) {
         super(message);
       }
@@ -32,7 +32,7 @@ public class {{ type_name }} extends Exception {
     {% for variant in e.variants() -%}
     {%- call java::docstring(variant, 4) %}
     {%- let variant_name = variant|error_variant_name %}
-    public static class {{ variant_name }} extends {{ type_name }}{% if contains_object_references %}, Disposable{% endif %} {
+    public static class {{ variant_name }} extends {{ type_name }}{% if contains_object_references %}, AutoCloseable{% endif %} {
       {% for field in variant.fields() -%}
       {%- call java::docstring(field, 8) %}
       {{ field|type_name(ci) }} {{ field.name()|var_name }};
@@ -43,7 +43,15 @@ public static class {{ variant_name }} extends {{ type_name }}{% if contains_obj
         {{ field|type_name(ci)}} {{ field.name()|var_name }}{% if loop.last %}{% else %}, {% endif %}
         {%- endfor -%}
       ) {
-        super("{%- for field in variant.fields() %}{{ field.name()|var_name|unquote }}=${ {{field.name()|var_name }} }{% if !loop.last %}, {% endif %}{% endfor %}");
+        super(new StringBuilder()
+        {%- for field in variant.fields() %}
+        .append("{{ field.name()|var_name|unquote }}=")
+        .append({{field.name()|var_name }})
+        {% if !loop.last %}
+        .append(", ")
+        {% endif %}
+        {% endfor %}
+        .toString());
         {% for field in variant.fields() -%}
         this.{{ field.name()|var_name }} = {{ field.name()|var_name }};
         {% endfor -%}   
@@ -57,7 +65,7 @@ public static class {{ variant_name }} extends {{ type_name }}{% if contains_obj
 
       {% if contains_object_references %}
       @Override
-      void destroy() {
+      void close() {
         {%- if variant.has_fields() %}
         {% call java::destroy_fields(variant) %}
         {% else -%}