Add support for including private classes, methods, fields.

Author: Dirbaio

java-spaghetti-gen/src/config.rs

@@ -90,7 +90,7 @@ pub struct DocPattern {
     pub argument_seperator: String,
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Deserialize, Default)]
 pub struct Rule {
     /// What java class(es) to match against.  This takes the form of a simple prefix to a JNI path with no wildcards.
     ///
@@ -105,6 +105,13 @@ pub struct Rule {
     #[serde(default)]
     pub include: Option<bool>,
 
+    #[serde(default)]
+    pub include_private_classes: Option<bool>,
+    #[serde(default)]
+    pub include_private_methods: Option<bool>,
+    #[serde(default)]
+    pub include_private_fields: Option<bool>,
+
     #[serde(default)]
     pub proxy: Option<bool>,
 
@@ -115,6 +122,10 @@ pub struct Rule {
 #[derive(Debug, Clone)]
 pub struct ClassConfig<'a> {
     pub include: bool,
+
+    pub include_private_classes: bool,
+    pub include_private_methods: bool,
+    pub include_private_fields: bool,
     pub proxy: bool,
     pub doc_pattern: Option<&'a DocPattern>,
 }
@@ -150,12 +161,7 @@ impl Config {
             serde_yaml::from_str(buffer).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
 
         if config.rules.is_empty() {
-            config.rules.push(Rule {
-                prefix: "".to_string(),
-                include: Some(true),
-                doc_pattern: None,
-                proxy: None,
-            })
+            config.rules.push(Rule::default())
         }
 
         config.output = resolve_file(&config.output, dir);
@@ -199,6 +205,9 @@ impl Config {
     pub fn resolve_class(&self, class: &str) -> ClassConfig<'_> {
         let mut res = ClassConfig {
             include: false,
+            include_private_classes: false,
+            include_private_methods: false,
+            include_private_fields: false,
             proxy: false,
             doc_pattern: None,
         };
@@ -208,6 +217,15 @@ impl Config {
                 if let Some(include) = r.include {
                     res.include = include;
                 }
+                if let Some(include_private_classes) = r.include_private_classes {
+                    res.include_private_classes = include_private_classes;
+                }
+                if let Some(include_private_methods) = r.include_private_methods {
+                    res.include_private_methods = include_private_methods;
+                }
+                if let Some(include_private_fields) = r.include_private_fields {
+                    res.include_private_fields = include_private_fields;
+                }
                 if let Some(proxy) = r.proxy {
                     res.proxy = proxy;
                 }

java-spaghetti-gen/src/emit_rust/class_proxy.rs

@@ -20,7 +20,6 @@ impl Class {
         let mut out = TokenStream::new();
         let mut contents = TokenStream::new();
 
-        let visibility = if self.java.is_public() { quote!(pub) } else { quote!() };
         let rust_name = format_ident!("{}", &self.rust.struct_name);
 
         let object = context
@@ -137,7 +136,7 @@ impl Class {
         let native_name = format_ident!("{native_name}");
 
         out.extend(quote!(
-            #visibility trait #rust_proxy_name: ::std::marker::Send + ::std::marker::Sync + 'static {
+            pub trait #rust_proxy_name: ::std::marker::Send + ::std::marker::Sync + 'static {
                 #trait_methods
             }
 

java-spaghetti-gen/src/emit_rust/classes.rs

@@ -99,15 +99,19 @@ impl Class {
             "class"
         };
 
-        let visibility = if self.java.is_public() { quote!(pub) } else { quote!() };
+        let visibility = if self.java.is_public() || cc.include_private_classes {
+            quote!(pub)
+        } else {
+            quote!()
+        };
         let attributes = match self.java.deprecated() {
             true => quote!(#[deprecated] ),
             false => quote!(),
         };
 
         let docs = match KnownDocsUrl::from_class(&cc, self.java.path()) {
-            Some(url) => format!("{visibility} {keyword} {url}"),
-            None => format!("{visibility} {keyword} {}", self.java.path().as_str()),
+            Some(url) => format!("{keyword} {url}"),
+            None => format!("{keyword} {}", self.java.path().as_str()),
         };
 
         let rust_name = format_ident!("{}", &self.rust.struct_name);
@@ -124,7 +128,7 @@ impl Class {
         out.extend(quote!(
             #[doc = #docs]
             #attributes
-            #visibility enum #rust_name {}
+            pub enum #rust_name {}
 
             #referencetype_impl
 
@@ -177,13 +181,13 @@ impl Class {
             .java
             .methods()
             .map(|m| Method::new(&self.java, m))
-            .filter(|m| m.java.is_public() && !m.java.is_bridge())
+            .filter(|m| (m.java.is_public() || cc.include_private_methods) && !m.java.is_bridge())
             .collect();
         let mut fields: Vec<Field> = self
             .java
             .fields()
             .map(|f| Field::new(&self.java, f))
-            .filter(|f| f.java.is_public())
+            .filter(|f| f.java.is_public() || cc.include_private_fields)
             .collect();
 
         self.resolve_collisions(&mut methods, &fields)?;

java-spaghetti-gen/src/emit_rust/fields.rs

@@ -29,10 +29,6 @@ impl<'a> Field<'a> {
     pub fn emit(&self, context: &Context, cc: &ClassConfig, mod_: &str) -> anyhow::Result<TokenStream> {
         let mut emit_reject_reasons = Vec::new();
 
-        if !self.java.is_public() {
-            emit_reject_reasons.push("Non-public field");
-        }
-
         let descriptor = &self.java.descriptor();
 
         let rust_set_type = emit_rust_type(

java-spaghetti-gen/src/emit_rust/methods.rs

@@ -53,9 +53,6 @@ impl<'a> Method<'a> {
             self.java.name().to_owned()
         };
 
-        if !self.java.is_public() {
-            emit_reject_reasons.push("Non-public method");
-        }
         if self.java.is_bridge() {
             emit_reject_reasons.push("Bridge method - type erasure");
         }
@@ -117,7 +114,6 @@ impl<'a> Method<'a> {
 
         let mut out = TokenStream::new();
 
-        let access = if self.java.is_public() { quote!(pub) } else { quote!() };
         let attributes = if self.java.deprecated() {
             quote!(#[deprecated])
         } else {
@@ -157,7 +153,7 @@ impl<'a> Method<'a> {
         out.extend(quote!(
             #[doc = #docs]
             #attributes
-            #access fn #method_name<'env>(#params_decl) -> ::std::result::Result<#ret_decl, ::java_spaghetti::Local<'env, #throwable>> {
+            pub fn #method_name<'env>(#params_decl) -> ::std::result::Result<#ret_decl, ::java_spaghetti::Local<'env, #throwable>> {
                 static __METHOD: ::std::sync::OnceLock<::java_spaghetti::JMethodID> = ::std::sync::OnceLock::new();
                 unsafe {
                     let __jni_args = [#params_array];