Skip to content

Commit 5b45cde

Browse files
introfogintrofog
committed
Replace using FileIn\OutputStream constrcutor with more affective methods from FileUtil
DEVSIX-8299
1 parent b9b9067 commit 5b45cde

File tree

136 files changed

+1204
-1158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1204
-1158
lines changed

‎forms/src/main/java/com/itextpdf/forms/fields/PdfButtonFormField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ This file is part of the iText (R) project.
2323
package com.itextpdf.forms.fields;
2424

2525
import com.itextpdf.commons.utils.Base64;
26+
import com.itextpdf.commons.utils.FileUtil;
2627
import com.itextpdf.forms.logs.FormsLogMessageConstants;
2728
import com.itextpdf.io.util.StreamUtil;
2829
import com.itextpdf.kernel.pdf.PdfDictionary;
@@ -31,7 +32,6 @@ This file is part of the iText (R) project.
3132
import com.itextpdf.kernel.pdf.annot.PdfWidgetAnnotation;
3233
import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
3334

34-
import java.io.FileInputStream;
3535
import java.io.IOException;
3636
import java.io.InputStream;
3737
import org.slf4j.Logger;
@@ -209,7 +209,7 @@ public PdfButtonFormField setRadiosInUnison(boolean radiosInUnison) {
209209
* @throws IOException if provided path to the image is not correct
210210
*/
211211
public PdfButtonFormField setImage(String image) throws IOException {
212-
InputStream is = new FileInputStream(image);
212+
InputStream is = FileUtil.getInputStreamForFile(image);
213213
String str = Base64.encodeBytes(StreamUtil.inputStreamToArray(is));
214214
return (PdfButtonFormField) setValue(str);
215215
}

‎forms/src/main/java/com/itextpdf/forms/xfa/XfaForm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.forms.xfa;
2424

25+
import com.itextpdf.commons.utils.FileUtil;
2526
import com.itextpdf.forms.PdfAcroForm;
2627
import com.itextpdf.forms.fields.PdfFormCreator;
2728
import com.itextpdf.kernel.exceptions.PdfException;
@@ -40,7 +41,6 @@ This file is part of the iText (R) project.
4041
import java.io.ByteArrayInputStream;
4142
import java.io.ByteArrayOutputStream;
4243
import java.io.File;
43-
import java.io.FileInputStream;
4444
import java.io.IOException;
4545
import java.io.InputStream;
4646
import java.nio.charset.StandardCharsets;
@@ -450,7 +450,7 @@ public void fillXfaForm(File file) throws IOException {
450450
* @throws java.io.IOException if any I/O issue occurs on the {@link InputSource}
451451
*/
452452
public void fillXfaForm(File file, boolean readOnly) throws IOException {
453-
fillXfaForm(new FileInputStream(file), readOnly);
453+
fillXfaForm(FileUtil.getInputStreamForFile(file), readOnly);
454454
}
455455

456456
/**

‎forms/src/main/java/com/itextpdf/forms/xfdf/XfdfObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.forms.xfdf;
2424

25+
import com.itextpdf.commons.utils.FileUtil;
2526
import com.itextpdf.kernel.pdf.PdfDocument;
2627

2728
import java.io.FileOutputStream;
@@ -182,7 +183,7 @@ public void mergeToPdf(PdfDocument pdfDocument, String pdfDocumentName) {
182183
* @throws ParserConfigurationException if there is an error while writing info into xnl format.
183184
*/
184185
public void writeToFile(String filename) throws IOException, TransformerException, ParserConfigurationException {
185-
try (OutputStream os = new FileOutputStream(filename)) {
186+
try (OutputStream os = FileUtil.getFileOutputStream(filename)) {
186187
writeToFile(os);
187188
}
188189
}

‎forms/src/test/java/com/itextpdf/forms/XfdfReaderTest.java

Lines changed: 156 additions & 158 deletions
Large diffs are not rendered by default.

‎forms/src/test/java/com/itextpdf/forms/XfdfWriterTest.java

Lines changed: 57 additions & 57 deletions
Large diffs are not rendered by default.

‎forms/src/test/java/com/itextpdf/forms/form/element/ButtonColorTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.forms.form.element;
2424

25+
import com.itextpdf.commons.utils.FileUtil;
2526
import com.itextpdf.kernel.colors.Color;
2627
import com.itextpdf.kernel.colors.ColorConstants;
2728
import com.itextpdf.kernel.pdf.PdfDocument;
@@ -72,7 +73,7 @@ public void buttonsWithoutColorTest() throws IOException, InterruptedException {
7273
}
7374

7475
private static void drawButtons(String outPdf, String cmpPdf, Color color) throws IOException, InterruptedException {
75-
try (PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new FileOutputStream(outPdf)));
76+
try (PdfDocument pdfDocument = new PdfDocument(new PdfWriter(FileUtil.getFileOutputStream(outPdf)));
7677
Document document = new Document(pdfDocument)) {
7778

7879
Button button = new Button("button");

‎forms/src/test/java/com/itextpdf/forms/form/element/ButtonTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.forms.form.element;
2424

25+
import com.itextpdf.commons.utils.FileUtil;
2526
import com.itextpdf.forms.PdfAcroForm;
2627
import com.itextpdf.forms.fields.PdfButtonFormField;
2728
import com.itextpdf.forms.fields.PdfFormAnnotation;
@@ -56,7 +57,6 @@ This file is part of the iText (R) project.
5657
import com.itextpdf.test.ExtendedITextTest;
5758
import com.itextpdf.test.annotations.type.IntegrationTest;
5859

59-
import java.io.FileInputStream;
6060
import java.io.IOException;
6161
import org.junit.Assert;
6262
import org.junit.BeforeClass;
@@ -221,7 +221,7 @@ public void addButtonInTwoWaysTest() throws IOException, InterruptedException {
221221
formButton.setProperty(Property.WIDTH, UnitValue.createPointValue(100));
222222
formButton.setProperty(Property.HEIGHT, UnitValue.createPointValue(100));
223223
formButton.add(new Image(new PdfImageXObject(ImageDataFactory.create(
224-
StreamUtil.inputStreamToArray(new FileInputStream(imagePath)))))
224+
StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile(imagePath)))))
225225
.setWidth(98).setHeight(98));
226226
formButton.setFontColor(ColorConstants.BLUE);
227227
formButton.setBackgroundColor(ColorConstants.YELLOW);

‎forms/src/test/java/com/itextpdf/forms/xfa/XFAFormTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.forms.xfa;
2424

25+
import com.itextpdf.commons.utils.FileUtil;
2526
import com.itextpdf.forms.PdfAcroForm;
2627
import com.itextpdf.forms.fields.PdfFormCreator;
2728
import com.itextpdf.kernel.pdf.PdfDocument;
@@ -32,7 +33,6 @@ This file is part of the iText (R) project.
3233
import com.itextpdf.test.ExtendedITextTest;
3334
import com.itextpdf.test.annotations.type.IntegrationTest;
3435

35-
import java.io.FileInputStream;
3636
import java.io.IOException;
3737
import org.junit.Assert;
3838
import org.junit.BeforeClass;
@@ -86,7 +86,7 @@ public void createXFAFormTest() throws IOException, InterruptedException {
8686
String cmpFileName = sourceFolder + "cmp_createXFAFormTest.pdf";
8787

8888
PdfDocument doc = new PdfDocument(new PdfWriter(outFileName));
89-
XfaForm xfa = new XfaForm(new FileInputStream(XML));
89+
XfaForm xfa = new XfaForm(FileUtil.getInputStreamForFile(XML));
9090
xfa.write(doc);
9191
doc.addNewPage();
9292
doc.close();

‎io/src/main/java/com/itextpdf/io/source/RandomAccessSourceFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.io.source;
2424

25+
import com.itextpdf.commons.utils.FileUtil;
26+
import com.itextpdf.commons.utils.MessageFormatUtil;
2527
import com.itextpdf.io.exceptions.IoExceptionMessageConstant;
2628
import com.itextpdf.io.util.ResourceUtil;
2729
import com.itextpdf.io.util.StreamUtil;
28-
import com.itextpdf.commons.utils.MessageFormatUtil;
2930

3031
import java.io.File;
31-
import java.io.FileInputStream;
3232
import java.io.InputStream;
3333
import java.io.RandomAccessFile;
3434
import java.net.URL;
@@ -195,7 +195,7 @@ public IRandomAccessSource createBestSource(String filename) throws java.io.IOEx
195195
}
196196

197197
if (forceRead){
198-
return createByReadingToMemory(new FileInputStream(filename));
198+
return createByReadingToMemory(FileUtil.getInputStreamForFile(filename));
199199
}
200200

201201
String openMode = exclusivelyLockFile ? "rw" : "r";

‎io/src/test/java/com/itextpdf/io/font/otf/GlyphLineTest.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,19 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.io.font.otf;
2424

25-
import com.itextpdf.io.font.PdfEncodings;
25+
import com.itextpdf.commons.utils.FileUtil;
2626
import com.itextpdf.io.font.TrueTypeFont;
2727
import com.itextpdf.io.util.StreamUtil;
2828
import com.itextpdf.test.ExtendedITextTest;
2929
import com.itextpdf.test.annotations.type.UnitTest;
3030

31-
import java.io.FileNotFoundException;
32-
import org.junit.Assert;
33-
import org.junit.Test;
34-
import org.junit.experimental.categories.Category;
35-
36-
import java.io.FileInputStream;
3731
import java.io.IOException;
3832
import java.util.ArrayList;
3933
import java.util.Arrays;
4034
import java.util.List;
35+
import org.junit.Assert;
36+
import org.junit.Test;
37+
import org.junit.experimental.categories.Category;
4138

4239
@Category(UnitTest.class)
4340
public class GlyphLineTest extends ExtendedITextTest {
@@ -70,7 +67,7 @@ public void testEquals() {
7067

7168
@Test
7269
public void testOtherLinesAddition() throws IOException {
73-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
70+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
7471
TrueTypeFont font = new TrueTypeFont(ttf);
7572

7673
GlyphLine containerLine = new GlyphLine(constructGlyphListFromString("Viva France!", font));
@@ -94,7 +91,7 @@ public void testOtherLinesAddition() throws IOException {
9491

9592
@Test
9693
public void testAdditionWithActualText() throws IOException {
97-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
94+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
9895
TrueTypeFont font = new TrueTypeFont(ttf);
9996

10097
List<Glyph> glyphs = constructGlyphListFromString("Viva France!", font);
@@ -116,7 +113,7 @@ public void testAdditionWithActualText() throws IOException {
116113

117114
@Test
118115
public void testOtherLinesWithActualTextAddition() throws IOException {
119-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
116+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
120117
TrueTypeFont font = new TrueTypeFont(ttf);
121118

122119
GlyphLine containerLine = new GlyphLine(constructGlyphListFromString("France", font));
@@ -137,7 +134,7 @@ public void testOtherLinesWithActualTextAddition() throws IOException {
137134

138135
@Test
139136
public void testOtherLinesWithActualTextAddition02() throws IOException {
140-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
137+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
141138
TrueTypeFont font = new TrueTypeFont(ttf);
142139

143140
GlyphLine containerLine = new GlyphLine(constructGlyphListFromString("France", font));
@@ -163,7 +160,7 @@ public void testOtherLinesWithActualTextAddition02() throws IOException {
163160

164161
@Test
165162
public void testContentReplacingWithNullActualText() throws IOException {
166-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
163+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
167164
TrueTypeFont font = new TrueTypeFont(ttf);
168165

169166
GlyphLine lineToBeReplaced = new GlyphLine(constructGlyphListFromString("Byelorussia", font));
@@ -181,7 +178,7 @@ public void testActualTextForSubstitutedGlyphProcessingInSubstituteOneToMany01()
181178
String expectedActualTextForFirstGlyph = "0";
182179
String expectedActualTextForSecondGlyph = "A";
183180

184-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
181+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
185182
TrueTypeFont font = new TrueTypeFont(ttf);
186183

187184
// no actual text for the second glyph is set - it should be created during substitution
@@ -203,7 +200,7 @@ public void testActualTextForSubstitutedGlyphProcessingInSubstituteOneToMany01()
203200
public void testActualTextForSubstitutedGlyphProcessingInSubstituteOneToMany02() throws IOException {
204201
String expectedActualTextForFirstGlyph = "A";
205202

206-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
203+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
207204
TrueTypeFont font = new TrueTypeFont(ttf);
208205

209206
GlyphLine line = new GlyphLine(constructGlyphListFromString("A", font));
@@ -219,7 +216,7 @@ public void testActualTextForSubstitutedGlyphProcessingInSubstituteOneToMany02()
219216

220217
@Test
221218
public void testActualTextForSubstitutedGlyphProcessingInSubstituteOneToMany03() throws IOException {
222-
byte[] ttf = StreamUtil.inputStreamToArray(new FileInputStream("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
219+
byte[] ttf = StreamUtil.inputStreamToArray(FileUtil.getInputStreamForFile("./src/test/resources/com/itextpdf/io/font/otf/FreeSans.ttf"));
223220
TrueTypeFont font = new TrueTypeFont(ttf);
224221

225222
// no actual text is set

0 commit comments

Comments
 (0)