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

Copy from IronPolyglot on 2024-04-17
iron-software · Apr 17, 2024 · fe3c661 · fe3c661
2 parents 6f59a8f + 7ae559c
commit fe3c661
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 15 deletions.
diff --git a/IronPdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Render_Converter.java b/IronPdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Render_Converter.java
@@ -39,6 +39,7 @@ static com.ironsoftware.ironpdf.internal.proto.ChromePdfRenderOptionsP toProto(
         proto.setZoom(Options.getZoom());
         proto.setCssMediaType(Render_Converter.toProto(Options.getCssMediaType()));
         proto.setJavascript(Utils_Util.nullGuard(Options.getJavascript()));
+        proto.setTimeout(Options.getTimeout());
         if (Options.getPaperSize() == PaperSize.Custom) {
             proto.setCustomPaperHeight(Options.getCustomPaperHeight());
             proto.setCustomPaperWidth(Options.getCustomPaperWidth());

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
@@ -144,7 +144,7 @@ public static void useIronPdfEngineDocker(int port){
     /**
      * The constant IRON_PDF_ENGINE_VERSION.
      */
-    public static final String IRON_PDF_ENGINE_VERSION = "2024.3.4";
+    public static final String IRON_PDF_ENGINE_VERSION = "2024.4.2";
 
     public static boolean singleProcess = false;
 

diff --git a/IronPdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Signature_Converter.java b/IronPdf/src/main/java/com/ironsoftware/ironpdf/internal/staticapi/Signature_Converter.java
@@ -28,8 +28,12 @@ static com.ironsoftware.ironpdf.internal.proto.PdfiumSignaturePermissionsP toPro
     static com.ironsoftware.ironpdf.internal.proto.PdfiumPdfSignatureP toProto(Signature input) {
         PdfiumPdfSignatureP.Builder proto = PdfiumPdfSignatureP.newBuilder();
         proto.setIndex(input.getInternalIndex());
-        proto.setPassword(input.getPassword());
-        proto.setTimestampUrl(input.getTimeStampUrl());
+        if(input.getPassword() != null){
+            proto.setPassword(input.getPassword());
+        }
+        if(input.getTimeStampUrl() != null){
+            proto.setTimestampUrl(input.getTimeStampUrl());
+        }
         return proto.build();
     }
 }
diff --git a/IronPdf/src/main/java/com/ironsoftware/ironpdf/render/ChromePdfRenderOptions.java b/IronPdf/src/main/java/com/ironsoftware/ironpdf/render/ChromePdfRenderOptions.java
@@ -99,6 +99,11 @@ public class ChromePdfRenderOptions implements Cloneable {
      */
     private TableOfContentsTypes tableOfContents = TableOfContentsTypes.None;
 
+    /**
+     * Render timeout in seconds. Default value is 60.
+     */
+    private int timeout = 60;
+
     /**
      * Is create pdf forms from html. Turns all Html forms elements into editable PDF forms.
      *
@@ -526,6 +531,20 @@ public void setWaitFor(WaitFor waitFor) {
         this.waitFor = waitFor;
     }
 
+    /**
+     * Gets render timeout in seconds. Default value is 60.
+     */
+    public int getTimeout() {
+        return timeout;
+    }
+
+    /**
+     * Sets render timeout in seconds. Default value is 60.
+     */
+    public void setTimeout(int timeout) {
+        this.timeout = timeout;
+    }
+
     /**
      * internal use
      */

diff --git a/IronPdf/src/main/java/com/ironsoftware/ironpdf/signature/SignatureManager.java b/IronPdf/src/main/java/com/ironsoftware/ironpdf/signature/SignatureManager.java
@@ -1,7 +1,6 @@
 package com.ironsoftware.ironpdf.signature;
 
 import com.ironsoftware.ironpdf.PdfDocument;
-import com.ironsoftware.ironpdf.bookmark.Bookmark;
 import com.ironsoftware.ironpdf.internal.staticapi.InternalPdfDocument;
 import com.ironsoftware.ironpdf.internal.staticapi.Signature_Api;
 
@@ -11,17 +10,16 @@
 
 
 /**
- * Class used to add , edit and remove bookmarks from a {@link PdfDocument} outline.
- * <p>Bookmarks are arranged and navigated in a parent/child node hierarchy, similar to an HTML DOM.</p>
- * <p> See: {@link PdfDocument#getBookmark()} </p>
- * <p> See: {@link Bookmark} </p>
+ * Class used to sign , get and signature from a {@link PdfDocument}.
+ * <p> See: {@link PdfDocument#getSignature()} </p>
+ * <p> See: {@link Signature} </p>
  */
 public class SignatureManager {
 
     private final InternalPdfDocument internalPdfDocument;
 
     /**
-     * Please get BookmarkManager by {@link PdfDocument#getBookmark()} instead.
+     * Please get SignatureManager by {@link PdfDocument#getSignature()} instead.
      *
      * @param internalPdfDocument the internal pdf document
      */
@@ -72,7 +70,7 @@ public boolean VerifyPdfSignatures(){
     }
 
     /**
-     *
+     * Removes all signature from the PDF document.
      */
     public void RemoveSignature(){
         internalPdfDocument.signatures = new ArrayList<>();

diff --git a/ironpdf-engine-pack/ironpdf-engine-linux-x64/pom.xml b/ironpdf-engine-pack/ironpdf-engine-linux-x64/pom.xml
@@ -108,7 +108,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>2024.3.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2024.4.2</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
@@ -108,7 +108,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>2024.3.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2024.4.2</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
@@ -108,7 +108,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>2024.3.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2024.4.2</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
@@ -108,7 +108,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>2024.3.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2024.4.2</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
@@ -108,7 +108,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>2024.3.4</ironpdf.engine.version>
+        <ironpdf.engine.version>2024.4.2</ironpdf.engine.version>
     </properties>
 
     <build>