Move exception classes to exceptions package

DEVSIX-5741

Author: Ee-gorka

pdfocr-api/src/main/java/com/itextpdf/pdfocr/OcrPdfCreator.java

@@ -57,6 +57,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.font.FontProvider;
 import com.itextpdf.layout.properties.TextAlignment;
 import com.itextpdf.pdfa.PdfADocument;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 import com.itextpdf.pdfocr.statistics.PdfOcrOutputType;
 import com.itextpdf.pdfocr.statistics.PdfOcrOutputTypeStatisticsEvent;
 

pdfocr-api/src/main/java/com/itextpdf/pdfocr/PdfCreatorUtil.java

@@ -30,7 +30,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.source.RandomAccessFileOrArray;
 import com.itextpdf.io.source.RandomAccessSourceFactory;
 import com.itextpdf.commons.utils.MessageFormatUtil;
-import com.itextpdf.io.util.UrlUtil;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.Paragraph;
@@ -39,10 +38,10 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.layout.LayoutResult;
 import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.layout.renderer.ParagraphRenderer;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -201,7 +200,7 @@ static List<ImageData> getImageData(final File inputImage, IImageRotationHandler
                 }
                 images.add(imageData);
             }
-        } catch (IOException | com.itextpdf.io.IOException e) {
+        } catch (IOException | com.itextpdf.io.exceptions.IOException e) {
             LOGGER.error(MessageFormatUtil.format(
                     PdfOcrLogMessageConstant.CANNOT_READ_INPUT_IMAGE,
                     e.getMessage()));

…va/com/itextpdf/pdfocr/OcrException.java …tpdf/pdfocr/exceptions/OcrException.javapdfocr-api/src/main/java/com/itextpdf/pdfocr/OcrException.java renamed to pdfocr-api/src/main/java/com/itextpdf/pdfocr/exceptions/OcrException.java pdfocr-api/src/main/java/com/itextpdf/pdfocr/OcrException.java renamed to pdfocr-api/src/main/java/com/itextpdf/pdfocr/exceptions/OcrException.java

@@ -20,8 +20,9 @@ This file is part of the iText (R) project.
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.itextpdf.pdfocr;
+package com.itextpdf.pdfocr.exceptions;
 
+import com.itextpdf.commons.exceptions.ITextException;
 import com.itextpdf.commons.utils.MessageFormatUtil;
 
 import java.util.Arrays;
@@ -30,7 +31,7 @@ This file is part of the iText (R) project.
 /**
  * Exception class for custom exceptions.
  */
-public class OcrException extends RuntimeException {
+public class OcrException extends ITextException {
 
     public static final String CANNOT_READ_INPUT_IMAGE =
             "Cannot read input image";

pdfocr-api/src/main/java/com/itextpdf/pdfocr/statistics/PdfOcrOutputTypeStatisticsAggregator.java

@@ -25,7 +25,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.commons.actions.AbstractStatisticsAggregator;
 import com.itextpdf.commons.actions.AbstractStatisticsEvent;
 import com.itextpdf.commons.utils.MapUtil;
-import com.itextpdf.pdfocr.OcrException;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 
 import java.util.Collections;
 import java.util.HashMap;

pdfocr-api/src/main/java/com/itextpdf/pdfocr/statistics/PdfOcrOutputTypeStatisticsEvent.java

@@ -25,7 +25,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.commons.actions.AbstractStatisticsAggregator;
 import com.itextpdf.commons.actions.AbstractStatisticsEvent;
 import com.itextpdf.commons.actions.data.ProductData;
-import com.itextpdf.pdfocr.OcrException;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 
 import java.util.Collections;
 import java.util.List;

pdfocr-api/src/test/java/com/itextpdf/pdfocr/PdfA3uTest.java

@@ -22,18 +22,16 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.pdfocr;
 
-import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.commons.utils.MessageFormatUtil;
 import com.itextpdf.kernel.colors.DeviceCmyk;
 import com.itextpdf.kernel.colors.DeviceRgb;
 import com.itextpdf.kernel.font.PdfFont;
-import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.pdf.PdfAConformanceLevel;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.layout.font.FontProvider;
-import com.itextpdf.layout.font.FontSelector;
-import com.itextpdf.pdfa.PdfAConformanceException;
+import com.itextpdf.pdfa.exceptions.PdfAConformanceException;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 import com.itextpdf.pdfocr.helpers.ExtractionStrategy;
 import com.itextpdf.pdfocr.helpers.PdfHelper;
 import com.itextpdf.test.ExtendedITextTest;
@@ -48,7 +46,6 @@ This file is part of the iText (R) project.
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
-import org.verapdf.gf.model.factory.fonts.FontFactory;
 
 @Category(IntegrationTest.class)
 public class PdfA3uTest extends ExtendedITextTest {
@@ -75,7 +72,7 @@ public void testPdfA3uWithNullIntent() throws IOException {
     @Test
     public void testIncompatibleOutputIntentAndFontColorSpaceException()
             throws IOException {
-        junitExpectedException.expect(com.itextpdf.kernel.PdfException.class);
+        junitExpectedException.expect(com.itextpdf.kernel.exceptions.PdfException.class);
         junitExpectedException.expectMessage(PdfAConformanceException.DEVICECMYK_MAY_BE_USED_ONLY_IF_THE_FILE_HAS_A_CMYK_PDFA_OUTPUT_INTENT_OR_DEFAULTCMYK_IN_USAGE_CONTEXT);
 
         String testName = "testIncompatibleOutputIntentAndFontColorSpaceException";

pdfocr-api/src/test/java/com/itextpdf/pdfocr/PdfCreatorUtilTest.java

@@ -27,6 +27,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.image.JpegImageData;
 import com.itextpdf.io.image.TiffImageData;
 import com.itextpdf.commons.utils.MessageFormatUtil;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 import com.itextpdf.pdfocr.helpers.PdfHelper;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;

pdfocr-api/src/test/java/com/itextpdf/pdfocr/PdfFontTest.java

@@ -28,6 +28,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.colors.DeviceRgb;
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.layout.font.FontProvider;
+import com.itextpdf.pdfocr.exceptions.OcrException;
 import com.itextpdf.pdfocr.helpers.ExtractionStrategy;
 import com.itextpdf.pdfocr.helpers.PdfHelper;
 import com.itextpdf.test.ExtendedITextTest;

pdfocr-api/src/test/java/com/itextpdf/pdfocr/PdfInputImageTest.java

@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.pdfocr;
 
+import com.itextpdf.pdfocr.exceptions.OcrException;
 import com.itextpdf.pdfocr.helpers.PdfHelper;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;

pdfocr-tesseract4/src/main/java/com/itextpdf/pdfocr/tesseract4/AbstractTesseract4OcrEngine.java

@@ -36,6 +36,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.pdfocr.statistics.PdfOcrOutputType;
 import com.itextpdf.pdfocr.tesseract4.actions.data.PdfOcrTesseract4ProductData;
 import com.itextpdf.pdfocr.tesseract4.actions.events.PdfOcrTesseract4ProductEvent;
+import com.itextpdf.pdfocr.tesseract4.exceptions.Tesseract4OcrException;
 
 import java.io.File;
 import java.io.IOException;