Merge pull request #65 from iron-software/automate-merge-code

chaknith-ironsoftware · web-flow · commit 7b83c24b7a91 · 2025-10-09T15:01:07.000+07:00
Copy from IronPolyglot on 2025-10-09
diff --git a/IronPdfEngine.ProtoFiles/iron_pdf_service.proto b/IronPdfEngine.ProtoFiles/iron_pdf_service.proto
@@ -24,6 +24,7 @@ import "pdfium_text.proto";
 import "pdfium_image.proto";
 import "pdfium_stamp.proto";
 import "pdfium_font.proto";
+import "qpdf.proto";
 import "cleaner.proto";
 
 option java_package = "com.ironsoftware.ironpdf.internal.proto";
@@ -52,6 +53,13 @@ service IronPdfService {
   //CHROME_StampHtml
   rpc Chrome_Stamp_ApplyStamp(stream ChromeApplyStampRequestStreamP) returns(EmptyResultP){}
 
+  ////////////////////QPDF////////////////////
+
+  // QPdf_Linearization
+  rpc QPdf_Linearization_IsLinearized(stream QPdfIsLinearizedRequestStreamP) returns (BooleanResultP) {}
+  rpc QPdf_Linearization_SaveAsLinearized(QPdfSaveAsLinearizedRequestP) returns (stream BytesResultStreamP) {}
+  rpc QPdf_Linearization_SaveAsLinearizedFromBytes(stream QPdfSaveAsLinearizedFromBytesRequestStreamP) returns (stream BytesResultStreamP) {}
+
   ///////////////////PDFIUM///////////////////
 
   //PDFIUM_Annotation
diff --git a/IronPdfEngine.ProtoFiles/pdfium_bookmarks.proto b/IronPdfEngine.ProtoFiles/pdfium_bookmarks.proto
@@ -16,12 +16,15 @@ message PdfiumBookmarkDescriptorP {
   string text = 1;
   int32 page_index = 2;
   string hierarchy = 3;
+  string item_id = 4;
+  string parent_item_id = 5;
 }
 message PdfiumBookmarkP {
   int32 page_index = 2;
   string text = 3;
   optional string parent_text = 4;
   optional string previous_text = 5;
+  string item_id = 6;
 }
 
 message PdfiumInsertBookmarkRequestP {
@@ -30,6 +33,8 @@ message PdfiumInsertBookmarkRequestP {
   string text = 3;
   optional string parent_text = 4;
   optional string previous_text = 5;
+  string item_id = 6;
+  optional PdfiumBookmarkP parent = 7;
 }
 message PdfiumRemoveBookmarksRequestP {
   PdfDocumentP document = 1;
diff --git a/IronPdfEngine.ProtoFiles/qpdf.proto b/IronPdfEngine.ProtoFiles/qpdf.proto
@@ -0,0 +1,35 @@
+syntax = "proto3";
+package ironpdfengineproto;
+import "basic.proto";
+
+option java_package = "com.ironsoftware.ironpdf.internal.proto";
+option java_multiple_files = true;
+
+message QPdfIsLinearizedRequestStreamP {
+  oneof request {
+    InfoP info = 1;
+    bytes pdf_bytes_chunk = 2;
+  }
+  message InfoP {
+    string password = 1;
+  }
+}
+
+message QPdfSaveAsLinearizedRequestP {
+  PdfDocumentP document = 1;
+  string output_path = 2;
+  string password = 3;
+}
+
+message QPdfSaveAsLinearizedFromBytesRequestStreamP {
+  oneof request {
+    InfoP info = 1;
+    bytes pdf_bytes_chunk = 2;
+  }
+
+  message InfoP {
+    string output_path = 1;
+    string password = 2;
+  }
+}
+
diff --git a/ironpdf-cloud/patch/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Setting_Api.java b/ironpdf-cloud/patch/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Setting_Api.java
@@ -19,7 +19,7 @@ public final class Setting_Api {
 
     public static IronPdfEngineConnection connectionMode = IronPdfEngineConnection.configure().withOfficialCloud();
 
-    public static final String IRON_PDF_ENGINE_VERSION = "2025.9.4";
+    public static final String IRON_PDF_ENGINE_VERSION = "2025.10.8";
 
     public static int ironPdfEngineTimeout = 120;
 
diff --git a/ironpdf-engine-pack/ironpdf-engine-linux-x64/pom.xml b/ironpdf-engine-pack/ironpdf-engine-linux-x64/pom.xml
@@ -107,7 +107,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ironpdf.engine.version>2025.9.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2025.10.8</ironpdf.engine.version>
     </properties>
 
     <build>
diff --git a/ironpdf-engine-pack/ironpdf-engine-macos-arm64/pom.xml b/ironpdf-engine-pack/ironpdf-engine-macos-arm64/pom.xml
@@ -107,7 +107,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ironpdf.engine.version>2025.9.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2025.10.8</ironpdf.engine.version>
     </properties>
 
     <build>
diff --git a/ironpdf-engine-pack/ironpdf-engine-macos-x64/pom.xml b/ironpdf-engine-pack/ironpdf-engine-macos-x64/pom.xml
@@ -107,7 +107,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ironpdf.engine.version>2025.9.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2025.10.8</ironpdf.engine.version>
     </properties>
 
     <build>
diff --git a/ironpdf-engine-pack/ironpdf-engine-windows-x64/pom.xml b/ironpdf-engine-pack/ironpdf-engine-windows-x64/pom.xml
@@ -107,7 +107,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ironpdf.engine.version>2025.9.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2025.10.8</ironpdf.engine.version>
     </properties>
 
     <build>
diff --git a/ironpdf-engine-pack/ironpdf-engine-windows-x86/pom.xml b/ironpdf-engine-pack/ironpdf-engine-windows-x86/pom.xml
@@ -107,7 +107,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ironpdf.engine.version>2025.9.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2025.10.8</ironpdf.engine.version>
     </properties>
 
     <build>
diff --git a/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/BookmarkDescriptor.java b/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/BookmarkDescriptor.java
@@ -4,6 +4,8 @@ public class BookmarkDescriptor {
     private String hierarchy;
     private int pageIndex;
     private String text;
+    private String itemId;
+    private String parentItemId;
 
     // Getter and Setter for Hierarchy
     public String getHierarchy() {
@@ -27,14 +29,34 @@ public void setPageIndex(int pageIndex) {
     public String getText() {
         return text;
     }
-
+    
     public void setText(String text) {
         this.text = text;
     }
+    
+    // Getter and Setter for Item ID
+    public String getItemId() {
+        return itemId;
+    }
+    
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+    
+    // Getter and Setter for Parent Item ID
+    public String getParentItemId() {
+        return parentItemId;
+    }
+
+    public void setParentItemId(String parentItemId) {
+        this.parentItemId = parentItemId;
+    }
 
-    public BookmarkDescriptor(String hierarchy, int pageIndex, String text) {
+    public BookmarkDescriptor(String hierarchy, int pageIndex, String text, String itemId, String parentItemId) {
         this.hierarchy = hierarchy;
         this.pageIndex = pageIndex;
         this.text = text;
+        this.itemId = itemId;
+        this.parentItemId = parentItemId;
     }
 }
diff --git a/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Bookmark_Api.java b/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Bookmark_Api.java
@@ -5,6 +5,8 @@
 import com.ironsoftware.ironpdf.internal.proto.PdfiumGetBookmarksDescriptorRequestP;
 import com.ironsoftware.ironpdf.internal.proto.PdfiumGetBookmarksDescriptorResultP;
 import com.ironsoftware.ironpdf.internal.proto.PdfiumInsertBookmarkRequestP;
+import com.ironsoftware.ironpdf.internal.proto.PdfiumBookmarkP;
+import com.ironsoftware.ironpdf.internal.proto.PdfiumBookmarkDescriptorP;
 
 import java.util.List;
 
@@ -23,19 +25,8 @@ public final class Bookmark_Api {
      * @return A flattened list of all bookmarks in this collection and all of their children
      */
     public static List<Bookmark> getBookmarks(InternalPdfDocument internalPdfDocument) {
-
-        RpcClient client = Access.ensureConnection();
-
-        PdfiumGetBookmarksDescriptorRequestP.Builder request = PdfiumGetBookmarksDescriptorRequestP.newBuilder();
-        request.setDocument(internalPdfDocument.remoteDocument);
-        PdfiumGetBookmarksDescriptorResultP result = client.GetBlockingStub("getBookmarks").pdfiumBookmarkGetBookmarksDescriptor(
-                request.build());
-
-        if (result.getResultOrExceptionCase() == PdfiumGetBookmarksDescriptorResultP.ResultOrExceptionCase.EXCEPTION) {
-            throw fromProto(result.getException());
-        }
-
-        return Bookmark_Converter.fromProto(result.getResult());
+        PdfiumGetBookmarksDescriptorResultP dres = getBookmarkDescriptors(internalPdfDocument);
+        return Bookmark_Converter.fromProto(dres.getResult());
     }
 
     /**
@@ -68,6 +59,7 @@ public static void insertBookmark(InternalPdfDocument internalPdfDocument, int p
         request.setDocument(internalPdfDocument.remoteDocument);
         request.setPageIndex(pageIndex);
         request.setText(text);
+
         if (parentText != null) {
             request.setParentText(parentText);
         }
@@ -76,6 +68,38 @@ public static void insertBookmark(InternalPdfDocument internalPdfDocument, int p
             request.setPreviousText(previousText);
         }
 
+        // Resolve parent by ID if we have a parentText
+        String parentId = null;
+        if (parentText != null && !parentText.isEmpty()) {
+            PdfiumGetBookmarksDescriptorResultP dres = getBookmarkDescriptors(internalPdfDocument);
+            parentId = dres.getResult().getBookmarkDescriptorsList().stream()
+                .filter(p -> parentText.equals(p.getText()))
+                .sorted((a,b) -> Integer.compare(depth(a.getHierarchy()), depth(b.getHierarchy())))
+                .map(com.ironsoftware.ironpdf.internal.proto.PdfiumBookmarkDescriptorP::getItemId)
+                .filter(id -> id != null && !id.isEmpty())
+                .findFirst()
+                .orElse(null);
+        }
+
+        PdfiumBookmarkP.Builder parent = PdfiumBookmarkP.newBuilder();
+
+        if (parentId != null && !parentId.isEmpty()) {
+            // Use ID path when available, but keep text as fallback
+            parent.setItemId(parentId);
+            if (parentText != null && !parentText.isEmpty()) {
+                parent.setText(parentText);
+            }
+        } else if (parentText != null && !parentText.isEmpty()) {
+            // Fallback to text when no id yet
+            parent.setText(parentText);
+            request.setParentText(parentText);
+        } else {
+            // Top-level insert: present but empty parent
+            request.clearParentText();
+        }
+
+        request.setParent(parent.build());
+
         EmptyResultP res = client.GetBlockingStub("insertBookmark").pdfiumBookmarkInsertBookmark(
                 request.build());
         Utils_Util.handleEmptyResult(res);
@@ -92,4 +116,38 @@ public static void insertBookmarkAtStart(InternalPdfDocument internalPdfDocument
                                              String text) {
         insertBookmark(internalPdfDocument, pageIndex, text, null, null);
     }
+
+    /**
+     * Fetches bookmark descriptors from the PDF document
+     *
+     * @param internalPdfDocument the internal pdf document
+     * @return the bookmark descriptors result
+     */
+    private static PdfiumGetBookmarksDescriptorResultP getBookmarkDescriptors(InternalPdfDocument internalPdfDocument) {
+        RpcClient client = Access.ensureConnection();
+
+        PdfiumGetBookmarksDescriptorRequestP.Builder request = PdfiumGetBookmarksDescriptorRequestP.newBuilder();
+        request.setDocument(internalPdfDocument.remoteDocument);
+        PdfiumGetBookmarksDescriptorResultP result = client.GetBlockingStub("getBookmarks")
+                .pdfiumBookmarkGetBookmarksDescriptor(request.build());
+
+        if (result.getResultOrExceptionCase() == PdfiumGetBookmarksDescriptorResultP.ResultOrExceptionCase.EXCEPTION) {
+            throw fromProto(result.getException());
+        }
+
+        return result;
+    }
+
+    // Helper: count non-empty segments in \A\B\C (depth = 3)
+    private static int depth(String h) {
+        if (h == null || h.isEmpty()) return 0;
+        int d = 0, i = 0, n = h.length();
+        while (i < n) {
+            while (i < n && h.charAt(i) == '\\') i++;
+            int start = i;
+            while (i < n && h.charAt(i) != '\\') i++;
+            if (i > start) d++;
+        }
+        return d;
+    }
 }
diff --git a/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Bookmark_Converter.java b/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Bookmark_Converter.java
@@ -20,9 +20,13 @@ static List<Bookmark> fromProto(PdfiumBookmarkDescriptorCollectionP proto) {
     }
 
     static BookmarkDescriptor fromProto(com.ironsoftware.ironpdf.internal.proto.PdfiumBookmarkDescriptorP proto) {
-        return new BookmarkDescriptor(proto.getHierarchy(),
-                proto.getPageIndex(),
-                proto.getText());
+        return new BookmarkDescriptor(
+            proto.getHierarchy(),
+            proto.getPageIndex(),
+            proto.getText(),
+            proto.getItemId(),
+            proto.getParentItemId()
+        );
     }
 
     public static List<Bookmark> convertDescriptorsToBookmarks(List<BookmarkDescriptor> descriptors) {
diff --git a/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Setting_Api.java b/ironpdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Setting_Api.java
@@ -19,7 +19,7 @@ public final class Setting_Api {
 
     public static IronPdfEngineConnection connectionMode = IronPdfEngineConnection.configure().withSubprocess();
 
-    public static final String IRON_PDF_ENGINE_VERSION = "2025.9.4";
+    public static final String IRON_PDF_ENGINE_VERSION = "2025.10.8";
 
     public static int ironPdfEngineTimeout = 120;
 
diff --git a/ironpdf/src/test/java/com/ironsoftware/ironpdf/internal/staticapi/bookmark/BookmarkApiTests.java b/ironpdf/src/test/java/com/ironsoftware/ironpdf/internal/staticapi/bookmark/BookmarkApiTests.java
@@ -24,12 +24,12 @@ public final void GetBookmarksTest() throws IOException {
     public final void InsertBookmarkTest() throws IOException {
         InternalPdfDocument doc = PdfDocument_Api.fromFile(getTestFile("/Data/empty.pdf"));
         Bookmark_Api.insertBookmarkAtStart(doc, 0, "B1");
-//        Bookmark_Api.insertBookmarkAsFirstChild(doc, 0, "B2", "B1");
+        
         Bookmark_Api.insertBookmarkAsFirstChild(doc, 0, "B3", "B1");
-
         Bookmark_Api.insertBookmark(doc, 0, "B4", "B1", "B3");
         Bookmark_Api.insertBookmark(doc, 0, "B2", "B1", "B4");
         Bookmark_Api.insertBookmarkAtStart(doc, 0, "B5");
+
         List<Bookmark> bookmarkCollection = Bookmark_Api.getBookmarks(doc);
 
         Assertions.assertEquals("B5", bookmarkCollection.get(0).getText());
