Rename the LogMessageConstant classes and move them into a separate package

DEVSIX-5773

Author: nikitakovaliov92

src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpFilter.java

@@ -80,6 +80,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.canvas.parser.data.TextRenderInfo;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
 import com.itextpdf.pdfcleanup.exceptions.CleanupExceptionMessageConstant;
+import com.itextpdf.pdfcleanup.logs.CleanUpLogMessageConstant;
 import com.itextpdf.pdfcleanup.util.CleanUpHelperUtil;
 import com.itextpdf.pdfcleanup.util.CleanUpImageUtil;
 

src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessor.java

@@ -101,6 +101,7 @@ This file is part of the iText (R) project.
 import java.util.Set;
 import java.util.Stack;
 
+import com.itextpdf.pdfcleanup.logs.CleanUpLogMessageConstant;
 import com.itextpdf.pdfcleanup.util.CleanUpCsCompareUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/itextpdf/pdfcleanup/CleanUpLogMessageConstant.java renamed to src/main/java/com/itextpdf/pdfcleanup/logs/CleanUpLogMessageConstant.java

@@ -20,19 +20,28 @@ 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.pdfcleanup;
+package com.itextpdf.pdfcleanup.logs;
 
 public class CleanUpLogMessageConstant {
 
     /** The Constant CANNOT_OBTAIN_IMAGE_INFO_AFTER_FILTERING. */
     public static final String CANNOT_OBTAIN_IMAGE_INFO_AFTER_FILTERING = "Cannot obtain image info after filtering.";
+
     /** The Constant FAILED_TO_PROCESS_A_TRANSFORMATION_MATRIX. */
-    public static final String FAILED_TO_PROCESS_A_TRANSFORMATION_MATRIX = "Failed to process a transformation matrix which is noninvertible. Some content may be placed not as expected.";
+    public static final String FAILED_TO_PROCESS_A_TRANSFORMATION_MATRIX =
+            "Failed to process a transformation matrix which is noninvertible. Some content may be placed not as "
+                    + "expected.";
+
     /** The Constant IMAGE_MASK_CLEAN_UP_NOT_SUPPORTED. */
-    public static final String IMAGE_MASK_CLEAN_UP_NOT_SUPPORTED = "Partial clean up of transparent images with mask encoded with one of the following filters is not supported: JBIG2Decode, DCTDecode, JPXDecode. Image will become non-transparent.";
+    public static final String IMAGE_MASK_CLEAN_UP_NOT_SUPPORTED =
+            "Partial clean up of transparent images with mask encoded with one of the following filters is not "
+                    + "supported: JBIG2Decode, DCTDecode, JPXDecode. Image will become non-transparent.";
+
     /** The Constant REDACTION_OF_ANNOTATION_TYPE_WATERMARK_IS_NOT_SUPPORTED. */
-    public static final String REDACTION_OF_ANNOTATION_TYPE_WATERMARK_IS_NOT_SUPPORTED = "Redaction of annotation subtype /Watermark is not supported";
+    public static final String REDACTION_OF_ANNOTATION_TYPE_WATERMARK_IS_NOT_SUPPORTED =
+            "Redaction of annotation subtype /Watermark is not supported";
 
     private CleanUpLogMessageConstant() {
+        //Private constructor will prevent the instantiation of this class directly
     }
 }

src/main/java/com/itextpdf/pdfcleanup/util/CleanUpCsCompareUtil.java

@@ -26,7 +26,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.PdfObject;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
-import com.itextpdf.pdfcleanup.CleanUpLogMessageConstant;
+import com.itextpdf.pdfcleanup.logs.CleanUpLogMessageConstant;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;

src/test/java/com/itextpdf/pdfcleanup/BigDocumentCleanUpTest.java

@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.pdfcleanup;
 
-import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
@@ -85,7 +85,7 @@ public void bigUntaggedDocument() throws IOException, InterruptedException {
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.CREATED_ROOT_TAG_HAS_MAPPING))
+    @LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.CREATED_ROOT_TAG_HAS_MAPPING))
     public void bigTaggedDocument() throws IOException, InterruptedException {
         String input = inputPath + "chapter8_Interactive_features.pdf";
         String output = outputPath + "bigTaggedDocument.pdf";

src/test/java/com/itextpdf/pdfcleanup/CleanUpAnnotationTest.java

@@ -49,6 +49,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.pdfcleanup.logs.CleanUpLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;

src/test/java/com/itextpdf/pdfcleanup/CleanUpCsCompareUtilTest.java

@@ -26,6 +26,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfNumber;
 import com.itextpdf.kernel.pdf.PdfStream;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
+import com.itextpdf.pdfcleanup.logs.CleanUpLogMessageConstant;
 import com.itextpdf.pdfcleanup.util.CleanUpCsCompareUtil;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;

src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpToolTest.java

@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.pdfcleanup;
 
-import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.exceptions.PdfException;
 import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.geom.PageSize;
@@ -57,6 +57,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.pdfcleanup.autosweep.CompositeCleanupStrategy;
 import com.itextpdf.pdfcleanup.autosweep.RegexBasedCleanupStrategy;
 import com.itextpdf.pdfcleanup.exceptions.CleanupExceptionMessageConstant;
+import com.itextpdf.pdfcleanup.logs.CleanUpLogMessageConstant;
 import com.itextpdf.pdfcleanup.util.CleanUpImagesCompareTool;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
@@ -778,7 +779,7 @@ public void cleanUpTestFontColor() throws IOException, InterruptedException {
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.PDF_REFERS_TO_NOT_EXISTING_PROPERTY_DICTIONARY))
+    @LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.PDF_REFERS_TO_NOT_EXISTING_PROPERTY_DICTIONARY))
     public void noPropertiesInResourcesTest() throws IOException, InterruptedException {
         String fileName = "noPropertiesInResourcesTest";
         String input = INPUT_PATH + fileName + ".pdf";
@@ -791,7 +792,7 @@ public void noPropertiesInResourcesTest() throws IOException, InterruptedExcepti
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.PDF_REFERS_TO_NOT_EXISTING_PROPERTY_DICTIONARY))
+    @LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.PDF_REFERS_TO_NOT_EXISTING_PROPERTY_DICTIONARY))
     public void incorrectBDCToBMCTest() throws IOException, InterruptedException {
         String fileName = "incorrectBDCToBMCTest";
         String input = INPUT_PATH + fileName + ".pdf";

src/test/java/com/itextpdf/pdfcleanup/PdfCleanUpToolWithInlineImagesTest.java

@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.pdfcleanup;
 
 
-import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
@@ -76,7 +76,7 @@ public static void before() {
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = LogMessageConstant.IMAGE_SIZE_CANNOT_BE_MORE_4KB)
+            @LogMessage(messageTemplate = IoLogMessageConstant.IMAGE_SIZE_CANNOT_BE_MORE_4KB)
     })
     public void cleanUpTest28() throws IOException, InterruptedException {
         String input = inputPath + "inlineImages.pdf";
@@ -101,7 +101,7 @@ public void cleanUpTest29() throws IOException, InterruptedException {
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = LogMessageConstant.IMAGE_SIZE_CANNOT_BE_MORE_4KB)
+            @LogMessage(messageTemplate = IoLogMessageConstant.IMAGE_SIZE_CANNOT_BE_MORE_4KB)
     })
     public void cleanUpTest31() throws IOException, InterruptedException {
         String input = inputPath + "inlineImageCleanup.pdf";

src/test/java/com/itextpdf/pdfcleanup/text/CleanUpTextTest.java

@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.pdfcleanup.text;
 
-import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
@@ -74,8 +74,8 @@ public static void before() {
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = LogMessageConstant.FONT_DICTIONARY_WITH_NO_FONT_DESCRIPTOR),
-            @LogMessage(messageTemplate = LogMessageConstant.FONT_DICTIONARY_WITH_NO_WIDTHS)})
+            @LogMessage(messageTemplate = IoLogMessageConstant.FONT_DICTIONARY_WITH_NO_FONT_DESCRIPTOR),
+            @LogMessage(messageTemplate = IoLogMessageConstant.FONT_DICTIONARY_WITH_NO_WIDTHS)})
     public void cleanZeroWidthTextInvalidFont() throws IOException, InterruptedException {
         String input = inputPath + "cleanZeroWidthTextInvalidFont.pdf";
         String output = outputPath + "cleanZeroWidthTextInvalidFont.pdf";