From f5f64971f32e837d127527bc318559bcbe37e42f Mon Sep 17 00:00:00 2001
From: slhafzjw <slhafzjw@slhaf.work>
Date: Tue, 10 Mar 2026 14:48:14 +0800
Subject: [PATCH] refactor(ContextBlock): return dom nodes directly

---
 .../modules/core/CommunicationProducer.java    | 18 ++----------------
 .../runtime/interaction/flow/ContextBlock.kt   |  4 ++--
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java
index c616233b..a6e925cd 100644
--- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java
+++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java
@@ -22,9 +22,7 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -166,8 +164,7 @@ public class CommunicationProducer extends AbstractAgentModule.Running<PartnerRu
             contextBlocks.stream()
                     .sorted(Comparator.comparingInt(ContextBlock::getPriority))
                     .map(ContextBlock::encodeToXml)
-                    .forEach(blockXml -> {
-                        Element blockElement = parseElement(blockXml);
+                    .forEach(blockElement -> {
                         root.appendChild(document.importNode(blockElement, true));
                     });
 
@@ -236,17 +233,6 @@ public class CommunicationProducer extends AbstractAgentModule.Running<PartnerRu
         parent.appendChild(element);
     }
 
-    private Element parseElement(String xml) {
-        try {
-            Document parsedDocument = DocumentBuilderFactory.newInstance()
-                    .newDocumentBuilder()
-                    .parse(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
-            return parsedDocument.getDocumentElement();
-        } catch (Exception e) {
-            throw new IllegalStateException("解析 ContextBlock XML 失败", e);
-        }
-    }
-
     private void appendSupplyBlocks(Document document, Element inputRoot, List<ContextBlock> contextBlocks) {
         Map<String, List<ContextBlock>> groupedBlocks = filterContextBlocks(contextBlocks, ContextBlock.Type.SUPPLY).stream()
                 .collect(Collectors.groupingBy(
@@ -259,7 +245,7 @@ public class CommunicationProducer extends AbstractAgentModule.Running<PartnerRu
             Element groupElement = document.createElement(entry.getKey());
             inputRoot.appendChild(groupElement);
             for (ContextBlock block : entry.getValue()) {
-                Element blockElement = parseElement(block.encodeToXml());
+                Element blockElement = block.encodeToXml();
                 groupElement.appendChild(document.importNode(blockElement, true));
             }
         }
diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/ContextBlock.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/ContextBlock.kt
index 6b7326ae..5a8cb5c8 100644
--- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/ContextBlock.kt
+++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/ContextBlock.kt
@@ -22,7 +22,7 @@ abstract class ContextBlock {
         SUPPLY
     }
 
-    fun encodeToXml(): String {
+    fun encodeToXml(): Element {
         val document = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder()
             .newDocument()
@@ -33,7 +33,7 @@ abstract class ContextBlock {
 
         fillXml(document, root)
 
-        return document.toXmlString()
+        return root
     }
 
     protected abstract fun fillXml(document: Document, root: Element)