Use try-with-resources in HtmlConverter

Author: LodrKumquat

src/main/java/com/itextpdf/html2pdf/HtmlConverter.java

@@ -164,7 +164,10 @@ public static void convertToPdf(File htmlFile, File pdfFile, ConverterProperties
         } else if (converterProperties.getBaseUri() == null) {
             converterProperties = new ConverterProperties(converterProperties).setBaseUri(FileUtil.getParentDirectory(htmlFile.getAbsolutePath()) + File.separator);
         }
-        convertToPdf(new FileInputStream(htmlFile.getAbsolutePath()), new FileOutputStream(pdfFile.getAbsolutePath()), converterProperties);
+        try (FileInputStream fileInputStream = new FileInputStream(htmlFile.getAbsolutePath());
+             FileOutputStream fileOutputStream = new FileOutputStream(pdfFile.getAbsolutePath())) {
+            convertToPdf(fileInputStream, fileOutputStream, converterProperties);
+        }
     }
 
     /**

src/test/java/com/itextpdf/html2pdf/ResourceResolverTest.java

@@ -69,64 +69,17 @@ public static void beforeClass() {
         createOrClearDestinationFolder(destinationFolder);
     }
 
-    @Test
-    public void resourceResolverTest01() throws IOException, InterruptedException {
-        String baseUri = sourceFolder + "resourceResolverTest01.html";
-        String outPdf = destinationFolder + "resourceResolverTest01.pdf";
-        String cmpPdf = sourceFolder + "cmp_resourceResolverTest01.pdf";
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "resourceResolverTest01.html"), new FileOutputStream(outPdf), new ConverterProperties().setBaseUri(baseUri));
-        Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, destinationFolder, "diff01_"));
-    }
-
-    @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI),
-            @LogMessage(messageTemplate = LogMessageConstant.UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE),
-            @LogMessage(messageTemplate = LogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER)})
-    public void resourceResolverTest02() throws IOException, InterruptedException {
-        String baseUri = "/folderInDiskRoot";
-        String outPdf = destinationFolder + "resourceResolverTest02.pdf";
-        String cmpPdf = sourceFolder + "cmp_resourceResolverTest02.pdf";
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "resourceResolverTest01.html"), new FileOutputStream(outPdf), new ConverterProperties().setBaseUri(baseUri));
-        Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, destinationFolder, "diff02_"));
-    }
-
     @Test
     public void resourceResolverTest03() throws IOException, InterruptedException {
         String baseUri = sourceFolder + "res";
         String outPdf = destinationFolder + "resourceResolverTest03.pdf";
         String cmpPdf = sourceFolder + "cmp_resourceResolverTest03.pdf";
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "resourceResolverTest03.html"), new FileOutputStream(outPdf), new ConverterProperties().setBaseUri(baseUri));
+        try (FileInputStream fileInputStream = new FileInputStream(sourceFolder + "resourceResolverTest03.html");
+             FileOutputStream fileOutputStream = new FileOutputStream(outPdf)) {
+            HtmlConverter.convertToPdf(fileInputStream, fileOutputStream, new ConverterProperties().setBaseUri(baseUri));
+        }
         Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, destinationFolder, "diff03_"));
     }
-
-    @Test
-    public void resourceResolverTest04() throws IOException, InterruptedException {
-        String invalidBaseUri = Paths.get("").toAbsolutePath().toString() + "/src/test/resources/com/itextpdf/html2pdf/ResourceResolverTest/" + "res";
-        String outPdf = destinationFolder + "resourceResolverTest04.pdf";
-        String cmpPdf = sourceFolder + "cmp_resourceResolverTest04.pdf";
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "resourceResolverTest03.html"), new FileOutputStream(outPdf), new ConverterProperties().setBaseUri(invalidBaseUri));
-        Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, destinationFolder, "diff04_"));
-    }
-
-    @Test
-    public void resourceResolverTest05() throws IOException, InterruptedException {
-        // It is important to put a trailing slash in the end: if you specify base URI via absolute URI string,
-        // you need to follow URI standards, in which a path without trailing slash is referring to a file.
-        String baseUri = Paths.get("").toUri() + "src/test/resources/com/itextpdf/html2pdf/ResourceResolverTest/res/";
-        String outPdf = destinationFolder + "resourceResolverTest05.pdf";
-        String cmpPdf = sourceFolder + "cmp_resourceResolverTest05.pdf";
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "resourceResolverTest03.html"), new FileOutputStream(outPdf), new ConverterProperties().setBaseUri(baseUri));
-        Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, destinationFolder, "diff05_"));
-    }
-
-    @Test
-    public void resourceResolverTest06() throws IOException, InterruptedException {
-        String outPdf = destinationFolder + "resourceResolverTest06.pdf";
-        String cmpPdf = sourceFolder + "cmp_resourceResolverTest06.pdf";
-        HtmlConverter.convertToPdf(new File(sourceFolder + "resourceResolverTest01.html"), new File(outPdf));
-        Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, destinationFolder, "diff06_"));
-    }
-
     @Test
     public void resourceResolverTest07() throws IOException, InterruptedException {
         String outPdf = destinationFolder + "resourceResolverTest07.pdf";

src/test/java/com/itextpdf/html2pdf/css/FloatTest.java

@@ -490,7 +490,9 @@ public void responsiveIText() throws IOException, InterruptedException {
                 mediaDescription.setWidth((float)pxWidth);
                 converterProperties.setMediaDeviceDescription(mediaDescription);
             }
-            HtmlConverter.convertToPdf(new FileInputStream(htmlSource), pdfDoc, converterProperties);
+            try (FileInputStream fileInputStream = new FileInputStream(htmlSource)) {
+                HtmlConverter.convertToPdf(fileInputStream, pdfDoc, converterProperties);
+            }
             pdfDoc.close();
         }
 

src/test/java/com/itextpdf/html2pdf/element/AbbrTest.java

@@ -96,7 +96,9 @@ public void abbrTest05() throws IOException, InterruptedException {
     private void runAbbrTest(String testName) throws IOException, InterruptedException {
         PdfDocument document = new PdfDocument(new PdfWriter(destinationFolder + testName + ".pdf"));
         document.setTagged();
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + testName + ".html"), document);
+        try (FileInputStream fileInputStream = new FileInputStream(sourceFolder + testName + ".html")) {
+            HtmlConverter.convertToPdf(fileInputStream, document);
+        }
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + testName + ".pdf", sourceFolder + "cmp_" + testName + ".pdf", destinationFolder, "diff_" + testName));
     }
 }

src/test/java/com/itextpdf/html2pdf/element/LinkTest.java

@@ -76,7 +76,9 @@ public void linkTest01() throws IOException, InterruptedException {
         System.out.println("html: file:///" + UrlUtil.toNormalizedURI(sourceFolder + "linkTest01.html").getPath() + "\n");
         PdfDocument outDoc = new PdfDocument(new PdfWriter(destinationFolder + "linkTest01.pdf"));
         outDoc.setTagged();
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "linkTest01.html"), outDoc);
+        try (FileInputStream fileInputStream = new FileInputStream(sourceFolder + "linkTest01.html")) {
+            HtmlConverter.convertToPdf(fileInputStream, outDoc);
+        }
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "linkTest01.pdf", sourceFolder + "cmp_linkTest01.pdf", destinationFolder, "diff01_"));
     }
 
@@ -115,23 +117,19 @@ public void linkTest06() throws IOException, InterruptedException {
     public void linkTest07() throws IOException, InterruptedException {
         PdfDocument outDoc = new PdfDocument(new PdfWriter(destinationFolder + "linkTest07.pdf"));
         outDoc.setTagged();
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "linkTest07.html"), outDoc);
+        try (FileInputStream fileInputStream = new FileInputStream(sourceFolder + "linkTest07.html")) {
+            HtmlConverter.convertToPdf(fileInputStream, outDoc);
+        }
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "linkTest07.pdf", sourceFolder + "cmp_linkTest07.pdf", destinationFolder, "diff07_"));
     }
 
-    @Test
-    public void linkTest08() throws IOException, InterruptedException {
-        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationFolder + "linkTest08.pdf"));
-        pdfDocument.setTagged();
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "linkTest08.html"), pdfDocument, new ConverterProperties().setBaseUri(sourceFolder));
-        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "linkTest08.pdf", sourceFolder + "cmp_linkTest08.pdf", destinationFolder, "diff08_"));
-    }
-
     @Test
     public void linkTest09() throws IOException, InterruptedException {
         PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationFolder + "linkTest09.pdf"));
         pdfDocument.setTagged();
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "linkTest09.html"), pdfDocument, new ConverterProperties().setBaseUri(sourceFolder));
+        try (FileInputStream fileInputStream = new FileInputStream(sourceFolder + "linkTest09.html")) {
+            HtmlConverter.convertToPdf(fileInputStream, pdfDocument, new ConverterProperties().setBaseUri(sourceFolder));
+        }
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "linkTest09.pdf", sourceFolder + "cmp_linkTest09.pdf", destinationFolder, "diff09_"));
     }
 }

src/test/java/com/itextpdf/html2pdf/element/ListTest.java

@@ -170,9 +170,11 @@ public void listTest17() throws IOException, InterruptedException {
     public void listToPdfaTest() throws IOException, InterruptedException {
         InputStream is = new FileInputStream(sourceFolder + "sRGB Color Space Profile.icm");
         PdfADocument pdfADocument = new PdfADocument(new PdfWriter(destinationFolder + "listToPdfa.pdf"), PdfAConformanceLevel.PDF_A_1B, new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", is));
-        HtmlConverter.convertToPdf(new FileInputStream(sourceFolder + "listToPdfa.html"), pdfADocument, new ConverterProperties()
-                        .setMediaDeviceDescription(new MediaDeviceDescription(MediaType.PRINT))
-                        .setFontProvider(new DefaultFontProvider(false, true, false)));
+        try (FileInputStream fileInputStream = new FileInputStream(sourceFolder + "listToPdfa.html")) {
+            HtmlConverter.convertToPdf(fileInputStream, pdfADocument, new ConverterProperties()
+                    .setMediaDeviceDescription(new MediaDeviceDescription(MediaType.PRINT))
+                    .setFontProvider(new DefaultFontProvider(false, true, false)));
+        }
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + "listToPdfa.pdf", sourceFolder + "cmp_listToPdfa.pdf", destinationFolder, "diff99_"));
     }