fix few more issues for Qodana

Author: SingingBush

barcode4j/src/main/java/org/krysalis/barcode4j/impl/code128/EAN128Bean.java

@@ -41,7 +41,7 @@ public class EAN128Bean extends Code128Bean {
 
     private ChecksumMode checksumMode = ChecksumMode.CP_AUTO;
     private String template = null;
-    private char groupSeparator = DEFAULT_GROUP_SEPARATOR; //GroupSeperator not Code128LogicImpl.FNC_1;
+    private char groupSeparator = DEFAULT_GROUP_SEPARATOR;
     private char checkDigitMarker = DEFAULT_CHECK_DIGIT_MARKER;
     private boolean omitBrackets = false;
 

barcode4j/src/main/java/org/krysalis/barcode4j/impl/code128/EAN128LogicImpl.java

@@ -29,18 +29,17 @@
  *
  * @author Dietmar Bürkle, Jeremias Maerki (generateBarcodeLogic)
  */
-public class EAN128LogicImpl { //extends Code128LogicImpl{
+public class EAN128LogicImpl {
     private static final byte MAX_LENGTH = 48; // Max according to EAN128 specification.
 
-    private static final byte TYPENumTestCheckDigit = 4;
-    private static final byte TYPENumReplaceCheckDigit = 5;
-    private static final byte TYPENumAddCheckDigit = 6;
+//    private static final byte TYPENumTestCheckDigit = 4;
+//    private static final byte TYPENumReplaceCheckDigit = 5;
+//    private static final byte TYPENumAddCheckDigit = 6;
 
 
     private EAN128AI[] ais = null;
 
-    //GroupSeparator not Code128LogicImpl.FNC_1;
-    private char groupSeparator = EAN128Bean.DEFAULT_GROUP_SEPARATOR;
+    private char groupSeparator;
 
     private char checkDigitMarker = EAN128Bean.DEFAULT_CHECK_DIGIT_MARKER;
     private boolean omitBrackets = false;
@@ -54,15 +53,14 @@ public class EAN128LogicImpl { //extends Code128LogicImpl{
     private boolean checksumADD = true;
     private boolean checksumCHECK = true;
 
-    public EAN128LogicImpl(ChecksumMode mode, String template, char fnc1) {
+    public EAN128LogicImpl(ChecksumMode mode, String template, char groupSeparator) {
         setChecksumMode(mode);
         setTemplate(template);
-        this.groupSeparator = fnc1;
+        this.groupSeparator = groupSeparator;
     }
 
     public EAN128LogicImpl(ChecksumMode mode, String template) {
-        setChecksumMode(mode);
-        setTemplate(template);
+        this(mode, template, EAN128Bean.DEFAULT_GROUP_SEPARATOR);
     }
 
     protected void setMessage(@Nullable String msg) {
@@ -117,8 +115,8 @@ public void generateBarcodeLogic(ClassicBarcodeLogicHandler logic, String msg) {
 
         final Code128LogicImpl c128 = new Code128LogicImpl();
         logic.startBarcode(msg, getHumanReadableMsg());
-        for (int i = 0; i < encodedMsg.length; i++) {
-            c128.encodeChar(logic, encodedMsg[i]);
+        for (int i : encodedMsg) {
+            c128.encodeChar(logic, i);
         }
 
         //Calculate checksum
@@ -283,22 +281,20 @@ private boolean isGroupSeparator(char ch) {
     private void checkType(@NotNull EAN128AI ai, byte idx, @NotNull String msg, int start, int end, int cdStart) {
         byte type = ai.type[idx];
         if (type == EAN128AI.TYPEError) {
-            throw getException("This AI is not allowed by configuration! ("
-                + ai.toString() + ")");
-
+            throw getException("This AI is not allowed by configuration! (" + ai.toString() + ")");
         } else if (type == EAN128AI.TYPEAlpha) {
             for (int i = end - 1; i >= start; i--) {
                 if (msg.charAt(i) > 128 || Character.isDigit(msg.charAt(i))) {
-                    throw getException("Character \'" + msg.charAt(i)
-                            + "\' must be a valid ASCII byte but not number!",
+                    throw getException("Character '" + msg.charAt(i)
+                            + "' must be a valid ASCII byte but not number!",
                             msg.substring(start, i));
                 }
             }
         } else if (type == EAN128AI.TYPEAlphaNum) {
             for (int i = end - 1; i >= start; i--) {
                 if (msg.charAt(i) > 128) {
-                    throw getException("Character \'" + msg.charAt(i)
-                            + "\' must be a valid ASCII byte!",
+                    throw getException("Character '" + msg.charAt(i)
+                            + "' must be a valid ASCII byte!",
                             msg.substring(start, i));
                 }
             }
@@ -310,16 +306,16 @@ private void checkType(@NotNull EAN128AI ai, byte idx, @NotNull String msg, int
                     cd2 = cd1;
                 }
                 if (cd1 != cd2) {
-                    throw getException("Checkdigit is wrong! Correct is " + cd1 + " but I found " + cd2 + "!");
+                    throw getException("Check digit is wrong! Correct is " + cd1 + " but I found " + cd2 + "!");
                 }
                 humanReadableMsg.append(cd1);
                 code128Msg.append(cd1);
                 return;
             }
             for (int i = end - 1; i >= start; i--) {
                 if (!Character.isDigit(msg.charAt(i))) {
-                    throw getException("Character \'" + msg.charAt(i)
-                        + "\' must be a Digit!",
+                    throw getException("Character '" + msg.charAt(i)
+                        + "' must be a Digit!",
                         msg.substring(start, i));
                 }
             }
@@ -363,7 +359,7 @@ private IllegalArgumentException getException(String text, @Nullable String msgO
         if (msgOk == null) {
             msgOk = "";
         }
-        if (humanReadableMsg.length() > 1 || msgOk.length() > 0) {
+        if (humanReadableMsg.length() > 1 || !msgOk.isEmpty()) {
             text = text + " Accepted start of Message: \""
                 + humanReadableMsg.toString() + msgOk + "\"";
         }

barcode4j/src/main/java/org/krysalis/barcode4j/impl/int2of5/Interleaved2Of5LogicImpl.java

@@ -110,8 +110,7 @@ public static boolean validateChecksum(String msg) {
     private int widthAt(char ch, int index) {
         if (Character.isDigit(ch)) {
             int digit = Character.digit(ch, 10);
-            int width = CHARSET[digit][index];
-            return width;
+            return CHARSET[digit][index];
         } else {
             throw new IllegalArgumentException("Invalid character '" + ch
                     + " (" + Character.getNumericValue(ch)
@@ -226,4 +225,4 @@ public void generateBarcodeLogic(ClassicBarcodeLogicHandler logic, String msg) {
         logic.endBarcode();
     }
 
-}
+}

barcode4j/src/main/java/org/krysalis/barcode4j/impl/pdf417/PDF417LogicImpl.java

@@ -216,17 +216,16 @@ public static void generateBarcodeLogic(TwoDimBarcodeLogicHandler logic,
                             + msg.length() + " bytes)");
         }
 
-        StringBuffer sb = new StringBuffer(n);
+        final StringBuilder sb = new StringBuilder(n);
         sb.append((char)n);
         sb.append(highLevel);
         for (int i = 0; i < pad; i++) {
             sb.append((char)900); //PAD characters
         }
-        String dataCodewords = sb.toString();
+        final String dataCodewords = sb.toString();
 
         //3. step: Error correction
-        String ec = PDF417ErrorCorrection.generateErrorCorrection(
-                dataCodewords, errorCorrectionLevel);
+        final String ec = PDF417ErrorCorrection.generateErrorCorrection(dataCodewords, errorCorrectionLevel);
         String fullCodewords = dataCodewords + ec;
 
         //4. step: low-level encoding

barcode4j/src/main/java/org/krysalis/barcode4j/impl/postnet/POSTNETLogicImpl.java

@@ -114,7 +114,7 @@ public static boolean isIgnoredChar(char c) {
      * @return the message but without ignored characters
      */
     public static String removeIgnoredCharacters(final String msg) {
-        StringBuffer sb = new StringBuffer(msg.length());
+        final StringBuilder sb = new StringBuilder(msg.length());
         for (int i = 0; i < msg.length(); i++) {
             final char ch = msg.charAt(i);
             if (!isValidChar(ch)) {
@@ -130,8 +130,7 @@ public static String removeIgnoredCharacters(final String msg) {
     private int heightAt(char ch, int index) {
         int chidx = Character.digit(ch, 10);
         if (chidx >= 0) {
-            int height = CHARSET[chidx][index];
-            return height;
+            return CHARSET[chidx][index];
         } else {
             throw new IllegalArgumentException("Invalid character: " + ch);
         }