Remove duplicate array instance methods

Author: dlunch

jvm/src/array_class_instance.rs

@@ -1,59 +1,15 @@
 use alloc::{boxed::Box, vec::Vec};
 
-use crate::{Result, class_definition::ClassDefinition, class_instance::ClassInstance, field::Field, value::JavaValue};
+use crate::{Result, class_instance::ClassInstance, value::JavaValue};
 
-#[async_trait::async_trait]
 pub trait ArrayClassInstance: ClassInstance {
-    fn class_definition(&self) -> Box<dyn ClassDefinition>;
-    fn destroy(self: Box<Self>);
-    fn identity(&self) -> usize;
-    fn shallow_clone(&self) -> Result<Box<dyn ClassInstance>>;
-    fn equals(&self, other: &dyn ClassInstance) -> Result<bool>;
     fn store(&mut self, offset: usize, values: Box<[JavaValue]>) -> Result<()>;
     fn load(&self, offset: usize, count: usize) -> Result<Vec<JavaValue>>;
     fn raw_buffer(&self) -> Result<Box<dyn ArrayRawBuffer>>;
     fn raw_buffer_mut(&mut self) -> Result<Box<dyn ArrayRawBufferMut>>;
     fn length(&self) -> usize;
 }
 
-#[async_trait::async_trait]
-impl<T: ArrayClassInstance> ClassInstance for T {
-    fn destroy(self: Box<Self>) {
-        ArrayClassInstance::destroy(self)
-    }
-
-    fn identity(&self) -> usize {
-        ArrayClassInstance::identity(self)
-    }
-
-    fn shallow_clone(&self) -> Result<Box<dyn ClassInstance>> {
-        ArrayClassInstance::shallow_clone(self)
-    }
-
-    fn class_definition(&self) -> Box<dyn ClassDefinition> {
-        ArrayClassInstance::class_definition(self)
-    }
-
-    fn equals(&self, other: &dyn ClassInstance) -> Result<bool> {
-        ArrayClassInstance::equals(self, other)
-    }
-    fn as_array_instance(&self) -> Option<&dyn ArrayClassInstance> {
-        Some(self)
-    }
-
-    fn as_array_instance_mut(&mut self) -> Option<&mut dyn ArrayClassInstance> {
-        Some(self)
-    }
-
-    fn get_field(&self, _field: &dyn Field) -> Result<JavaValue> {
-        panic!("Array classes do not have fields")
-    }
-
-    fn put_field(&mut self, _field: &dyn Field, _value: JavaValue) -> Result<()> {
-        panic!("Array classes do not have fields")
-    }
-}
-
 pub trait ArrayRawBuffer: Send {
     fn read(&self, offset: usize, buffer: &mut [u8]) -> Result<()>;
 }

jvm/src/jvm.rs

@@ -15,7 +15,7 @@ use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags};
 
 use crate::{
     Result,
-    array_class_instance::{ArrayClassInstance, ArrayRawBuffer, ArrayRawBufferMut},
+    array_class_instance::{ArrayRawBuffer, ArrayRawBufferMut},
     class_definition::ClassDefinition,
     class_instance::ClassInstance,
     class_loader::{
@@ -451,7 +451,7 @@ impl Jvm {
         let array = array.as_array_instance();
 
         if let Some(array) = array {
-            let class = ArrayClassInstance::class_definition(array);
+            let class = array.class_definition();
 
             let type_name = &class.name()[1..]; // TODO can we store JavaType on class?
 

jvm_rust/src/array_class_instance.rs

@@ -6,7 +6,9 @@ use core::{
 
 use parking_lot::RwLock;
 
-use jvm::{ArrayClassDefinition, ArrayClassInstance, ArrayRawBuffer, ArrayRawBufferMut, ClassDefinition, ClassInstance, JavaType, JavaValue, Result};
+use jvm::{
+    ArrayClassDefinition, ArrayClassInstance, ArrayRawBuffer, ArrayRawBufferMut, ClassDefinition, ClassInstance, Field, JavaType, JavaValue, Result,
+};
 
 use crate::array_class_definition::ArrayClassDefinitionImpl;
 
@@ -112,7 +114,9 @@ impl ArrayClassInstanceImpl {
 }
 
 #[async_trait::async_trait]
-impl ArrayClassInstance for ArrayClassInstanceImpl {
+impl ClassInstance for ArrayClassInstanceImpl {
+    fn destroy(self: Box<Self>) {}
+
     fn identity(&self) -> usize {
         Arc::as_ptr(&self.inner) as usize
     }
@@ -132,8 +136,6 @@ impl ArrayClassInstance for ArrayClassInstanceImpl {
         self.inner.class.clone()
     }
 
-    fn destroy(self: Box<Self>) {}
-
     fn equals(&self, other: &dyn ClassInstance) -> Result<bool> {
         let other = other.as_any().downcast_ref::<ArrayClassInstanceImpl>();
         if other.is_none() {
@@ -144,6 +146,24 @@ impl ArrayClassInstance for ArrayClassInstanceImpl {
         Ok(Arc::ptr_eq(&self.inner, &other.inner))
     }
 
+    fn as_array_instance(&self) -> Option<&dyn ArrayClassInstance> {
+        Some(self)
+    }
+
+    fn as_array_instance_mut(&mut self) -> Option<&mut dyn ArrayClassInstance> {
+        Some(self)
+    }
+
+    fn get_field(&self, _field: &dyn Field) -> Result<JavaValue> {
+        panic!("Array classes do not have fields")
+    }
+
+    fn put_field(&mut self, _field: &dyn Field, _value: JavaValue) -> Result<()> {
+        panic!("Array classes do not have fields")
+    }
+}
+
+impl ArrayClassInstance for ArrayClassInstanceImpl {
     fn store(&mut self, offset: usize, values: Box<[JavaValue]>) -> Result<()> {
         match &mut *self.inner.elements.write() {
             ArrayElements::Primitive(x) => {