polyxml 0.33.12__tar.gz → 0.34.0__tar.gz

{polyxml-0.33.12 → polyxml-0.34.0}/Cargo.lock

@@ -608,7 +608,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml"
-version = "0.33.12"
+version = "0.34.0"
 dependencies = [
  "criterion",
  "heck",
@@ -629,14 +629,14 @@ dependencies = [
 
 [[package]]
 name = "polyxml-c"
-version = "0.33.12"
+version = "0.34.0"
 dependencies = [
  "polyxml",
 ]
 
 [[package]]
 name = "polyxml-cli"
-version = "0.33.12"
+version = "0.34.0"
 dependencies = [
  "clap",
  "glob",
@@ -650,7 +650,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-js"
-version = "0.33.12"
+version = "0.34.0"
 dependencies = [
  "napi",
  "napi-build",
@@ -660,7 +660,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-python"
-version = "0.33.12"
+version = "0.34.0"
 dependencies = [
  "lexical-core",
  "polyxml",
@@ -670,7 +670,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-wasm"
-version = "0.33.12"
+version = "0.34.0"
 dependencies = [
  "polyxml",
  "quick-xml",

{polyxml-0.33.12 → polyxml-0.34.0}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/polyxml-core", "crates/polyxml-python"]
 
 [workspace.package]
-version = "0.33.12"
+version = "0.34.0"
 edition = "2021"
 rust-version = "1.80"
 license = "MIT"

{polyxml-0.33.12 → polyxml-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyxml
-Version: 0.33.12
+Version: 0.34.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{polyxml-0.33.12 → polyxml-0.34.0}/crates/polyxml-core/src/codegen/java/mod.rs

@@ -24,6 +24,8 @@ pub enum JavaBackend {
     Standard,
     /// Jackson-annotated records for Spring Boot / enterprise JSON+XML binding.
     Jackson,
+    /// Jackson 3 annotations for Spring Boot 4 JSON+XML binding.
+    Jackson3,
 }
 
 impl JavaBackend {
@@ -31,12 +33,13 @@ impl JavaBackend {
         match s.to_lowercase().trim() {
             "standard" | "std" | "default" => Some(Self::Standard),
             "jackson" | "spring" | "spring-boot" | "enterprise" => Some(Self::Jackson),
+            "jackson3" | "jackson-3" | "jackson_3" | "spring-boot-4" => Some(Self::Jackson3),
             _ => None,
         }
     }
 
     pub fn is_jackson(self) -> bool {
-        matches!(self, Self::Jackson)
+        matches!(self, Self::Jackson | Self::Jackson3)
     }
 }
 
@@ -365,7 +368,11 @@ impl JavaCodegen {
         if self.options.backend.is_jackson() {
             out.push('\n');
             out.push_str("import com.fasterxml.jackson.annotation.*;\n");
-            out.push_str("import com.fasterxml.jackson.dataformat.xml.annotation.*;\n");
+            if self.options.backend == JavaBackend::Jackson3 {
+                out.push_str("import tools.jackson.dataformat.xml.annotation.*;\n");
+            } else {
+                out.push_str("import com.fasterxml.jackson.dataformat.xml.annotation.*;\n");
+            }
         }
 
         out.push('\n');
@@ -445,6 +452,7 @@ impl JavaCodegen {
         let jackson = self.options.backend.is_jackson();
 
         // Jackson class-level annotations
+        self.emit_jackson_property_order(out, s, ir, indent);
         if jackson {
             let _ = writeln!(out, "{}@JsonIgnoreProperties(ignoreUnknown = true)", indent);
             let _ = writeln!(out, "{}@JsonInclude(JsonInclude.Include.NON_EMPTY)", indent);
@@ -488,10 +496,14 @@ impl JavaCodegen {
                     .as_deref()
                     .map(|ns| format!(", namespace = {:?}", ns))
                     .unwrap_or_default();
-                annotations.push(format!(
-                    "@JacksonXmlProperty(localName = {:?}, isAttribute = {}{})",
-                    field.xml_name, is_attr, ns_part
-                ));
+                if field.kind == crate::ir::FieldKind::Text {
+                    annotations.push("@JacksonXmlText".to_string());
+                } else {
+                    annotations.push(format!(
+                        "@JacksonXmlProperty(localName = {:?}, isAttribute = {}{})",
+                        field.xml_name, is_attr, ns_part
+                    ));
+                }
 
                 // List fields: @JacksonXmlElementWrapper(useWrapping = false)
                 if is_list {

{polyxml-0.33.12 → polyxml-0.34.0}/crates/polyxml-core/src/codegen/java/models.rs

@@ -3,6 +3,25 @@ use crate::codegen::flatten_fields;
 use crate::ir::{FieldDef, FieldKind};
 
 impl JavaCodegen {
+    pub(super) fn emit_jackson_property_order(
+        &self,
+        out: &mut String,
+        s: &StructDef,
+        ir: &SchemaIR,
+        indent: &str,
+    ) {
+        if self.options.backend == JavaBackend::Jackson3 {
+            // Jackson 3 sorts properties alphabetically by default. XML
+            // sequences must instead retain the schema's declaration order.
+            let names = flatten_fields(s, ir)
+                .into_iter()
+                .map(|field| format!("{:?}", field.xml_name))
+                .collect::<Vec<_>>()
+                .join(", ");
+            let _ = writeln!(out, "{indent}@JsonPropertyOrder({{{names}}})");
+        }
+    }
+
     pub(super) fn emit_value_class(
         &self,
         out: &mut String,
@@ -141,6 +160,7 @@ impl JavaCodegen {
         if let Some(doc) = &s.documentation {
             self.emit_docstring(out, doc, indent);
         }
+        self.emit_jackson_property_order(out, s, ir, indent);
         if self.options.backend.is_jackson() {
             let _ = writeln!(out, "{indent}@JsonIgnoreProperties(ignoreUnknown = true)\n{indent}@JsonInclude(JsonInclude.Include.NON_NULL)\n{indent}@JacksonXmlRootElement(localName = {:?}, namespace = {:?})", s.qname.local, s.qname.namespace.as_deref().unwrap_or(""));
             // Bind the explicitly annotated fields only; avoids duplicate XML properties after bean name normalization.

{polyxml-0.33.12 → polyxml-0.34.0}/crates/polyxml-core/tests/test_java_codegen.rs

@@ -1101,3 +1101,50 @@ public class Main {
         String::from_utf8_lossy(&result.stderr)
     );
 }
+
+#[test]
+fn jackson3_preserves_core_annotations_and_maps_record_text() {
+    use polyxml::schema_parser::XsdParser;
+    let ir = XsdParser::new()
+        .parse_str(include_str!("../../../tests/java-spring/schema.xsd"))
+        .unwrap();
+    for records in [false, true] {
+        let sources = JavaCodegen::new(JavaOptions {
+            backend: JavaBackend::Jackson3,
+            use_records: records,
+            emit_builder: true,
+            bean_validation: true,
+            ..Default::default()
+        })
+        .generate_files(&ir);
+        let amount = sources
+            .iter()
+            .find(|(name, _)| name == "Amount.java")
+            .unwrap()
+            .1
+            .as_str();
+        assert!(amount.contains("import com.fasterxml.jackson.annotation.*;"));
+        assert!(amount.contains("import tools.jackson.dataformat.xml.annotation.*;"));
+        assert!(!amount.contains("import com.fasterxml.jackson.dataformat"));
+        assert!(amount.contains("@JacksonXmlText"));
+        assert!(amount.contains("@NotNull"));
+        assert!(amount.contains("AmountBuilder"));
+        assert!(amount.contains("@JsonPropertyOrder({\"value\", \"currency\"})"));
+    }
+    for alias in [
+        "jackson3",
+        "jackson-3",
+        "jackson_3",
+        "spring-boot-4",
+        " JACKSON3 ",
+    ] {
+        assert_eq!(
+            JavaBackend::from_str_loose(alias),
+            Some(JavaBackend::Jackson3)
+        );
+    }
+    assert_eq!(
+        JavaBackend::from_str_loose("spring-boot"),
+        Some(JavaBackend::Jackson)
+    );
+}

{polyxml-0.33.12 → polyxml-0.34.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "polyxml"
-version = "0.33.12"
+version = "0.34.0"
 description = "High-performance, polyglot XML data-binding engine built in Rust"
 authors = [
     { name = "Bailey Nguyen", email = "bailey.tan.nguyen@gmail.com" }