PMD

src/main/java/net/ranides/assira/collection/ArrayUtils.java

@@ -22,7 +22,7 @@ import net.ranides.assira.math.HashHelper;
  * Operacje na tablicach.
  * @author ranides
  */
-@SuppressWarnings({"PMD.ShortVar", "PMD.AvoidArrayLoops", "PMD.TooManyPublicMethods"})
+@SuppressWarnings({"PMD.ShortVar", "PMD.AvoidArrayLoops", "PMD.TooManyPublicMethods", "PMD.ExcessiveClassLength"})
 public final class ArrayUtils {
 
     private ArrayUtils() { }

src/main/java/net/ranides/assira/config/ConfigService.java

@@ -7,10 +7,8 @@
 
 package net.ranides.assira.config;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.ServiceLoader;
-import java.util.WeakHashMap;
 import net.ranides.assira.collection.map.Cache;
 
 /**

src/main/java/net/ranides/assira/generic/PrivilegedActions.java

@@ -13,7 +13,7 @@ import java.security.PrivilegedAction;
  *
  * @author ranides
  */
-public class PrivilegedActions {
+public final class PrivilegedActions {
     
     private PrivilegedActions() {
         // utility class

src/main/java/net/ranides/assira/text/PrintFormatter.java

@@ -35,7 +35,8 @@ public class PrintFormatter {
     public String format(String format, Object... arguments) {
         return compile(format).format(arguments);
     }
-    
+
+    @SuppressWarnings({"PMD.NPathComplexity", "PMD.CyclomaticComplexity"})
     public PrintPattern compile(String format) {
         if( cache.containsKey(format)) {
             return cache.get(format);

src/main/java/net/ranides/assira/text/PrintFunction.java

@@ -19,7 +19,7 @@ public interface PrintFunction {
 
     int estimate(PrintParams params, Object[] values);
     
-    public static class PrintNumberFP implements PrintFunction {
+    class PrintNumberFP implements PrintFunction {
         
         public static final PrintNumberFP INSTANCE = new PrintNumberFP();
 
@@ -43,10 +43,11 @@ public interface PrintFunction {
         
     }
     
-    public static class PrintNumberDec implements PrintFunction {
+    class PrintNumberDec implements PrintFunction {
         
         public static final PrintNumberDec INSTANCE = new PrintNumberDec();
-        
+
+        @SuppressWarnings("PMD.NPathComplexity")
         static void apply(Appendable target, PrintParams params, String text, boolean negative) throws IOException {
             int dpadd = (params.width()-text.length());
             if( params.flags().contains(PrintFlags.SIGN_PADDING) || negative ) {
@@ -93,7 +94,7 @@ public interface PrintFunction {
         
     }
     
-    public static class PrintString implements PrintFunction {
+    class PrintString implements PrintFunction {
         
         public static final PrintString INSTANCE = new PrintString();
         

src/main/java/net/ranides/assira/text/PrintParams.java

@@ -31,6 +31,14 @@ public abstract class PrintParams {
         USER_PARAMS,
     }
     
+    /**
+     * group(1) - index$
+     * group(2) - flags
+     * group(3) - width
+     * group(4) - .precision
+     */
+    private static final Pattern CLASSIC = Pattern.compile("([0-9]+\\$)?([^1-9]+)?([1-9][0-9]*)?(\\.[1-9][0-9]*)?");
+    
     private final String params;
     
     public final String params() {
@@ -52,7 +60,7 @@ public abstract class PrintParams {
     }
     
     public static PrintParams make(String params, int index) {
-        Matcher hit = UserParams.CLASSIC.matcher(params);
+        Matcher hit = CLASSIC.matcher(params);
         if(hit.matches()) {
             return new ClassicParams(hit, index);
         } else {
@@ -62,14 +70,6 @@ public abstract class PrintParams {
     
     private static class UserParams extends PrintParams {
         
-        /**
-         * group(1) - index$
-         * group(2) - flags
-         * group(3) - width
-         * group(4) - .precision
-         */
-        private static Pattern CLASSIC = Pattern.compile("([0-9]+\\$)?([^1-9]+)?([1-9][0-9]*)?(\\.[1-9][0-9]*)?");
-        
         private static final Set<PrintFlags> FLAGS = EnumSet.of(PrintFlags.USER_PARAMS);
         
         private final int index;
@@ -159,7 +159,6 @@ public abstract class PrintParams {
             if( value==null ) {
                 return target;
             }
-            boolean aligned = false;
             for(int i=0, n=value.length(); i<n; i++) {
                 switch(value.charAt(i)) {
                     case '+': 
@@ -170,7 +169,6 @@ public abstract class PrintParams {
                         break;
                     case '-': 
                         target.add(PrintFlags.ALIGN_LEFT); 
-                        aligned=true; 
                         break;
                     case '#': 
                         target.add(PrintFlags.ALTERNATE); 

src/main/java/net/ranides/assira/text/PrintPattern.java

@@ -17,6 +17,7 @@ public class PrintPattern {
     
     private final Token[] tokens;
 
+    @SuppressWarnings("PMD.ArrayIsStoredDirectly")
     PrintPattern(Token[] tokens) {
         this.tokens = tokens;
     }

src/main/java/net/ranides/assira/text/StringLoader.java

@@ -10,7 +10,6 @@ package net.ranides.assira.text;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;

src/main/java/net/ranides/assira/time/LazyInvoker.java

@@ -7,7 +7,6 @@
 package net.ranides.assira.time;
 
 import java.util.TimerTask;
-import javax.swing.SwingUtilities;
 
 /**
  * Użycie:

src/main/java/net/ranides/assira/trace/MultiException.java

@@ -11,7 +11,6 @@ import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-import net.ranides.assira.collection.ArrayUtils;
 
 /**
  *

src/test/java/net/ranides/assira/generic/PrivilegedActionsTest.java

@@ -6,8 +6,6 @@
  */
 package net.ranides.assira.generic;
 
-import java.security.PrivilegedAction;
-import net.ranides.assira.text.LexicalCast;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

src/test/java/net/ranides/assira/text/LexicalCastTest.java

@@ -21,6 +21,7 @@ import static org.junit.Assert.*;
  *
  * @author ranides
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class LexicalCastTest extends SimpleBenchmark {
     
     public LexicalCastTest() {

src/test/java/net/ranides/assira/text/PrintFormatterTest.java

@@ -13,6 +13,7 @@ import java.util.Map;
 import net.ranides.assira.trace.LoggerUtils;
 
 import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  *
@@ -20,22 +21,32 @@ import org.junit.Test;
  */
 public class PrintFormatterTest {
     
-    private static final class F implements PrintFunction {
-        @Override
-        public void apply(Appendable target, PrintParams params, Object[] values) throws IOException {
-            System.out.printf(
-                "F(%s / %s / %s / %s) = %s\n", 
-                params.flags(), params.padder(), params.width(), params.precision(), values[params.index()]
-            );
-            target.append("F");
-        }
-        @Override
-        public int estimate(PrintParams params, Object[] values) {
-            return Math.max(4, params.width());
-        }
+    private final PrintFormatter formatter;
+    
+    public PrintFormatterTest() {
+        LoggerUtils.resetLogger4j(true);
+        
+        Map<Character, PrintFunction> map = new HashMap<Character, PrintFunction>();
+        map.put('s', PrintFunction.PrintString.INSTANCE);
+        map.put('d', PrintFunction.PrintNumberDec.INSTANCE);
+        map.put('f', PrintFunction.PrintNumberFP.INSTANCE);
+        map.put('t', new PrintText());
+        
+        formatter = new PrintFormatter(map);
+    }
+
+    @Test
+    public void testCompile() {
+        
+        PrintPattern pattern = formatter.compile("Hello %-'.8s :> %% ! %3$07.2f :) %f %1$d");
+        
+        assertEquals("Hello world... :> %% ! 0019.65 :) 3.141593 14", pattern.format("world", 14, 3.1415926, 19.6451));
+        
+        assertEquals("ŹREBIĘ zjada ćmę", formatter.format("%ut zjada %lt", "ŹrEbIę", "ĆmĘ"));
+
     }
     
-    private static final class S implements PrintFunction {
+    private static final class PrintText implements PrintFunction {
 
         @Override
         public void apply(Appendable target, PrintParams params, Object[] values) throws IOException {
@@ -57,28 +68,4 @@ public class PrintFormatterTest {
         }
         
     }
-    
-    private final PrintFormatter formatter;
-    
-    public PrintFormatterTest() {
-        LoggerUtils.resetLogger4j(true);
-        
-        Map<Character, PrintFunction> map = new HashMap<Character, PrintFunction>();
-        map.put('s', PrintFunction.PrintString.INSTANCE);
-        map.put('d', PrintFunction.PrintNumberDec.INSTANCE);
-        map.put('f', PrintFunction.PrintNumberFP.INSTANCE);
-        map.put('t', new S());
-        
-        formatter = new PrintFormatter(map);
-    }
-
-    @Test
-    public void testCompile() {
-        
-        PrintPattern pattern = formatter.compile("Hello %-'.8s :> %% ! %3$07.2f :) %f %1$d");
-        
-        System.out.println( pattern.format("world", 14, 3.1415926, 19.6451) );
-        
-        System.out.println( formatter.format("%ut zjada %lt", "ŹrEbIę", "ĆmĘ") );
-    }
 }