[RELEASE] iText 9.4.0

Author: iText-CI

barcodes/pom.xml

@@ -5,14 +5,22 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>9.3.0</version>
+    <version>9.4.0</version>
   </parent>
 
   <artifactId>barcodes</artifactId>
 
   <name>iText - barcodes</name>
   <url>https://itextpdf.com/</url>
 
+  <properties>
+    <sharpen.phase>install</sharpen.phase>
+    <sharpen.projectName>barcodes</sharpen.projectName>
+    <sharpen.cSharpTargetFolder>./../../../sharp/itextcore</sharpen.cSharpTargetFolder>
+    <sharpen.cSharpSourceCodeDestination>itext/itext.barcodes</sharpen.cSharpSourceCodeDestination>
+    <sharpen.cSharpTestCodeDestination>itext.tests/itext.barcodes.tests</sharpen.cSharpTestCodeDestination>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.itextpdf</groupId>
@@ -37,47 +45,4 @@
       </resource>
     </resources>
   </build>
-
-  <profiles>
-    <profile>
-      <id>with-sharpen</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>sharpen</groupId>
-            <artifactId>sharpen-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>install</phase>
-                <goals>
-                  <goal>sharpen</goal>
-                </goals>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>sharpen</groupId>
-                <artifactId>standard-framework-mapping</artifactId>
-                <version>1.0-SNAPSHOT</version>
-              </dependency>
-            </dependencies>
-            <configuration>
-              <projectName>barcodes</projectName>
-              <cSharpTargetFolder>./../../../sharp/itextcore</cSharpTargetFolder>
-              <cSharpSourceCodeDestination>itext/itext.barcodes</cSharpSourceCodeDestination>
-              <cSharpTestCodeDestination>itext.tests/itext.barcodes.tests</cSharpTestCodeDestination>
-              <buildDotnet>${sharpen.builddotnet}</buildDotnet>
-              <showDiff>${sharpen.showdiff}</showDiff>
-              <sourceCodeFiles>
-                <file>**/src/main/java/**/*.java</file>
-              </sourceCodeFiles>
-              <testCodeFiles>
-                <file>**/src/test/java/**/*.java</file>
-              </testCodeFiles>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java

@@ -299,7 +299,7 @@ public static String getHumanReadableUCCEAN(String code) {
                 if (code.length() < k)
                     break;
                 int subcode = Integer.parseInt(code.substring(0, k));
-                n = ais.containsKey(subcode) ? (int)ais.get(subcode) : 0;
+                n = (int) ais.getOrDefault(subcode, 0);
                 if (n != 0) {
                     idlen = k;
                     break;
@@ -679,7 +679,7 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
     public void setCode(String code) {
         if (getCodeType() == Barcode128.CODE128_UCC && code.startsWith("(")) {
             int idx = 0;
-            StringBuilder ret = new StringBuilder("");
+            StringBuilder ret = new StringBuilder();
             while (idx >= 0) {
                 int end = code.indexOf(')', idx);
                 if (end < 0) {
@@ -694,7 +694,7 @@ public void setCode(String code) {
                 if (len == 0) {
                     throw new IllegalArgumentException("AI not found");
                 }
-                sai = Integer.valueOf(ai).toString();
+                sai = Integer.toString(ai);
                 if (sai.length() == 1) {
                     sai = "0" + sai;
                 }
@@ -884,7 +884,7 @@ static boolean isNextDigits(String text, int textIndex, int numDigits) {
      * @return the packed digits, two digits per character
      */
     static String getPackedRawDigits(String text, int textIndex, int numDigits) {
-        StringBuilder out = new StringBuilder("");
+        StringBuilder out = new StringBuilder();
         int start = textIndex;
         while (numDigits > 0) {
             if (text.charAt(textIndex) == FNC1) {
@@ -897,6 +897,7 @@ static String getPackedRawDigits(String text, int textIndex, int numDigits) {
             int c2 = text.charAt(textIndex++) - '0';
             out.append((char) (c1 * 10 + c2));
         }
-        return (char) (textIndex - start) + out.toString();
+        out.insert(0, (char) (textIndex - start));
+        return out.toString();
     }
 }

barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java

@@ -173,7 +173,7 @@ public static byte[] getBarsCode39(String text) {
      * @return the escaped text
      */
     public static String getCode39Ex(String text) {
-        StringBuilder out = new StringBuilder("");
+        StringBuilder out = new StringBuilder();
         for (int k = 0; k < text.length(); ++k) {
             char c = text.charAt(k);
             if (c > 127) {

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java

@@ -335,7 +335,7 @@ public int setCode(String text) {
         try {
             t = text.getBytes(encoding);
         } catch (UnsupportedEncodingException exc) {
-            throw new IllegalArgumentException("text has to be encoded in iso-8859-1");
+            throw new IllegalArgumentException("text has to be encoded in iso-8859-1", exc);
         }
         return setCode(t, 0, t.length);
     }
@@ -1090,18 +1090,15 @@ private int C40OrTextEncodation(byte[] text, int textOffset, int textLength, byt
                             requiredCapacityForC40orText += 2;
                         }
                         requiredCapacityForC40orText += basic.indexOf((char) c) >= 0 ? 1 : 2;
-                        if (c > 127)
-                            requiredCapacityForASCII += 2;
-                        else {
-                            if (j > 0 && isDigit(c) && isDigit(text[textOffset - j + 1] & 0xff)) {
-                                requiredCapacityForC40orText += basic.indexOf((char) text[textOffset - j + 1]) >= 0 ? 1 : 2;
-                                j--;
-                                dataOffsetNew = requiredCapacityForASCII + 1;
-                            }
-                            requiredCapacityForASCII++;
+                        if (j > 0 && isDigit(c) && isDigit(text[textOffset - j + 1] & 0xff)) {
+                            requiredCapacityForC40orText += basic.indexOf((char) text[textOffset - j + 1]) >= 0 ? 1 : 2;
+                            j--;
+                            dataOffsetNew = requiredCapacityForASCII + 1;
                         }
-                        if (j == 1)
+                        requiredCapacityForASCII++;
+                        if (j == 1) {
                             dataOffsetNew = requiredCapacityForASCII;
+                        }
                     }
                     addLatch = (unlatch < 0) || ((dataOffset - requiredCapacityForASCII) != unlatch);
                     if (requiredCapacityForC40orText % 3 == 0 &&
@@ -1113,8 +1110,9 @@ private int C40OrTextEncodation(byte[] text, int textOffset, int textLength, byt
                         dataLength += addLatch ? dataOffsetNew : dataOffsetNew + 1;
                         break;
                     }
-                    if (isDigit(text[textOffset - i] & 0xff) && isDigit(text[textOffset - i + 1] & 0xff))
+                    if (isDigit(text[textOffset - i] & 0xff) && isDigit(text[textOffset - i + 1] & 0xff)) {
                         i--;
+                    }
                 }
             }
         } else if (symbolIndex != -1) {

barcodes/src/main/java/com/itextpdf/barcodes/BarcodePDF417.java

@@ -1375,7 +1375,10 @@ protected static int maxPossibleErrorLevel(int remain) {
 
     /**
      * Prints the segments to standard output.
+     *
+     * @deprecated Test method for printing a segment list to std out, to be removed
      */
+    @Deprecated
     protected void dumpList() {
         if (segmentList.size() == 0)
             return;
@@ -1388,7 +1391,7 @@ protected void dumpList() {
                 if (c[j] == '\r')
                     c[j] = '\n';
             }
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append(v.getType());
             sb.append(c);
             System.out.println(sb.toString());
@@ -1636,7 +1639,7 @@ private void macroCodes() {
     }
 
     private void append(int in, int len) {
-        StringBuffer sb = new StringBuffer(len + 1);
+        StringBuilder sb = new StringBuilder(len + 1);
         sb.append(Integer.toString(in));
         for (int i = sb.length(); i < len; i++) {
             sb.insert(0, "0");

barcodes/src/main/java/com/itextpdf/barcodes/exceptions/WriterException.java

@@ -30,6 +30,8 @@ This file is part of the iText (R) project.
  */
 public final class WriterException extends ITextException {
 
+    private static final long serialVersionUID = -9185997341735096449L;
+
 
     /**
      * Creates a WriterException.
@@ -46,5 +48,15 @@ public WriterException() {
     public WriterException(String message) {
         super(message);
     }
+
+    /**
+     * Creates a WriterException with a specified detail message and a cause.
+     *
+     * @param message the detail message, which provides additional information about the exception
+     * @param cause the cause of the exception
+     */
+    public WriterException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
 

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitArray.java

@@ -159,7 +159,7 @@ private static int[] makeArray(int size) {
     }
 
     public String toString() {
-        StringBuffer result = new StringBuffer(size);
+        StringBuilder result = new StringBuilder(size);
         for (int i = 0; i < size; i++) {
             if ((i & 0x07) == 0) {
                 result.append(' ');

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitMatrix.java

@@ -172,7 +172,7 @@ public int getDimension() {
     }
 
     public String toString() {
-        StringBuffer result = new StringBuffer(height * (width + 1));
+        StringBuilder result = new StringBuilder(height * (width + 1));
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
                 result.append(get(x, y) ? "X " : "  ");

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitVector.java

@@ -158,7 +158,7 @@ public void xor(BitVector other) {
      * @return String representation of the bitvector
      */
     public String toString() {
-        StringBuffer result = new StringBuffer(sizeInBits);
+        StringBuilder result = new StringBuilder(sizeInBits);
         for (int i = 0; i < sizeInBits; ++i) {
             if (at(i) == 0) {
                 result.append('0');

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/ByteMatrix.java

@@ -110,7 +110,7 @@ public void clear(byte value) {
      * @return String representation
      */
     public String toString() {
-        StringBuffer result = new StringBuffer(2 * width * height + 2);
+        StringBuilder result = new StringBuilder(2 * width * height + 2);
         for (int y = 0; y < height; ++y) {
             for (int x = 0; x < width; ++x) {
                 switch (bytes[y][x]) {