Add SimpleTimeZone

Author: dlunch

java_runtime/src/classes/java/util.rs

@@ -12,6 +12,7 @@ mod gregorian_calendar;
 mod hashtable;
 mod properties;
 mod random;
+mod simple_time_zone;
 mod stack;
 mod time_zone;
 mod timer;
@@ -22,6 +23,6 @@ mod vector;
 pub use self::{
     abstract_collection::AbstractCollection, abstract_list::AbstractList, calendar::Calendar, date::Date, dictionary::Dictionary,
     empty_stack_exception::EmptyStackException, enumeration::Enumeration, gregorian_calendar::GregorianCalendar, hashtable::Hashtable,
-    properties::Properties, random::Random, stack::Stack, time_zone::TimeZone, timer::Timer, timer_task::TimerTask, timer_thread::TimerThread,
-    vector::Vector,
+    properties::Properties, random::Random, simple_time_zone::SimpleTimeZone, stack::Stack, time_zone::TimeZone, timer::Timer, timer_task::TimerTask,
+    timer_thread::TimerThread, vector::Vector,
 };

java_runtime/src/classes/java/util/simple_time_zone.rs

@@ -0,0 +1,29 @@
+use alloc::vec;
+
+use java_class_proto::JavaMethodProto;
+use jvm::{ClassInstanceRef, Jvm, Result};
+
+use crate::{RuntimeClassProto, RuntimeContext, classes::java::lang::String};
+
+// class java.util.SimpleTimeZone
+pub struct SimpleTimeZone;
+
+impl SimpleTimeZone {
+    pub fn as_proto() -> RuntimeClassProto {
+        RuntimeClassProto {
+            name: "java/util/SimpleTimeZone",
+            parent_class: Some("java/util/TimeZone"),
+            interfaces: vec![],
+            methods: vec![JavaMethodProto::new("<init>", "(Ljava/lang/String;)V", Self::init, Default::default())],
+            fields: vec![],
+        }
+    }
+
+    async fn init(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>, id: ClassInstanceRef<String>) -> Result<()> {
+        tracing::debug!("java.util.SimpleTimeZone::<init>({this:?}, {id:?})");
+
+        let _: () = jvm.invoke_special(&this, "java/lang/Object", "<init>", "()V", ()).await?;
+
+        Ok(())
+    }
+}

java_runtime/src/classes/java/util/time_zone.rs

@@ -37,9 +37,9 @@ impl TimeZone {
     }
 
     async fn get_time_zone(jvm: &Jvm, _: &mut RuntimeContext, id: ClassInstanceRef<String>) -> Result<ClassInstanceRef<Self>> {
-        tracing::warn!("stub java.util.TimeZone::getTimeZone({id:?})");
+        tracing::debug!("java.util.TimeZone::getTimeZone({id:?})");
 
-        let result = jvm.new_class("java/util/TimeZone", "()V", ()).await?;
+        let result = jvm.new_class("java/util/SimpleTimeZone", "(Ljava/lang/String;)V", (id,)).await?;
 
         Ok(result.into())
     }

java_runtime/src/loader.rs

@@ -74,6 +74,7 @@ pub fn get_runtime_class_proto(name: &str) -> Option<RuntimeClassProto> {
         crate::classes::java::util::Hashtable::as_proto(),
         crate::classes::java::util::Properties::as_proto(),
         crate::classes::java::util::Random::as_proto(),
+        crate::classes::java::util::SimpleTimeZone::as_proto(),
         crate::classes::java::util::Stack::as_proto(),
         crate::classes::java::util::Timer::as_proto(),
         crate::classes::java::util::TimerTask::as_proto(),

java_runtime/tests/classes/java/util/mod.rs

@@ -4,6 +4,7 @@ mod test_hashtable;
 mod test_random;
 mod test_stack;
 mod test_timer;
+mod test_timezone;
 mod test_url;
 mod test_vector;
 mod zip;

java_runtime/tests/classes/java/util/test_timezone.rs

@@ -0,0 +1,18 @@
+use java_runtime::classes::java::util::TimeZone;
+use jvm::{ClassInstanceRef, Result, runtime::JavaLangString};
+
+use test_utils::test_jvm;
+
+#[tokio::test]
+async fn test_timezone() -> Result<()> {
+    let jvm = test_jvm().await?;
+
+    let id = JavaLangString::from_rust_string(&jvm, "UTC").await?;
+    let timezone: ClassInstanceRef<TimeZone> = jvm
+        .invoke_static("java/util/TimeZone", "getTimeZone", "(Ljava/lang/String;)Ljava/util/TimeZone;", (id,))
+        .await?;
+
+    assert!(!timezone.is_null());
+
+    Ok(())
+}