#71 versions up

jcabi · Jan 22, 2016 · b1a2591 · b1a2591
1 parent e260465
commit b1a2591
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     <parent>
         <groupId>com.jcabi</groupId>
         <artifactId>jcabi</artifactId>
-        <version>1.18</version>
+        <version>1.20.1</version>
     </parent>
     <artifactId>jcabi-log</artifactId>
     <version>1.0-SNAPSHOT</version>

diff --git a/src/main/java/com/jcabi/log/ObjectDecor.java b/src/main/java/com/jcabi/log/ObjectDecor.java
@@ -63,10 +63,7 @@ final class ObjectDecor implements Formattable {
         this.object = obj;
     }
 
-    /**
-     * {@inheritDoc}
-     * @checkstyle ParameterNumber (4 lines)
-     */
+    // @checkstyle ParameterNumber (4 lines)
     @Override
     public void formatTo(final Formatter formatter, final int flags,
         final int width, final int precision) {
@@ -104,7 +101,7 @@ private static final class ArrayFormatAction
          * Constructor.
          * @param arr Array to format
          */
-        ArrayFormatAction(final Object[] arr) {
+        ArrayFormatAction(final Object... arr) {
             this.array = Arrays.copyOf(arr, arr.length);
         }
 

diff --git a/src/main/java/com/jcabi/log/PreFormatter.java b/src/main/java/com/jcabi/log/PreFormatter.java
@@ -104,7 +104,7 @@ public Object[] getArguments() {
      * @param fmt The formatting string
      * @param args The list of arguments
      */
-    private void process(final String fmt, final Object[] args) {
+    private void process(final String fmt, final Object... args) {
         this.arguments = new CopyOnWriteArrayList<Object>();
         final StringBuffer buf = new StringBuffer();
         final Matcher matcher = PATTERN.matcher(fmt);

diff --git a/src/main/java/com/jcabi/log/TextDecor.java b/src/main/java/com/jcabi/log/TextDecor.java
@@ -88,18 +88,17 @@ public void formatTo(final Formatter formatter, final int flags,
      * @param text The text to prettify
      * @return The result
      */
+    @SuppressWarnings("PMD.ConsecutiveAppendsShouldReuse")
     private static String pretty(final String text) {
         final String result;
         if (text.length() < TextDecor.MAX) {
             result = text;
         } else {
             final int skip = text.length() - TextDecor.MAX;
-            final StringBuilder output = new StringBuilder()
-                .append(text.substring(0, (text.length() - skip) / 2))
-                // @checkstyle MultipleStringLiterals (1 line)
-                .append("..")
-                .append(skip)
-                .append("..");
+            final StringBuilder output = new StringBuilder(text.length());
+            output.append(text.substring(0, (text.length() - skip) / 2));
+            // @checkstyle MultipleStringLiterals (1 line)
+            output.append("..").append(Integer.toString(skip)).append("..");
             output.append(
                 text.substring(text.length() - TextDecor.MAX + output.length())
             );

diff --git a/src/test/java/com/jcabi/log/DomDecorTest.java b/src/test/java/com/jcabi/log/DomDecorTest.java
@@ -35,6 +35,7 @@
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.mockito.hamcrest.MockitoHamcrest;
 import org.w3c.dom.Document;
 
 /**
@@ -58,7 +59,7 @@ public void convertsDocumentToText() throws Exception {
         final Formatter fmt = new Formatter(dest);
         decor.formatTo(fmt, 0, 0, 0);
         Mockito.verify(dest).append(
-            Mockito.argThat(Matchers.containsString("<root/>"))
+            MockitoHamcrest.argThat(Matchers.containsString("<root/>"))
         );
     }
 

diff --git a/src/test/java/com/jcabi/log/ExceptionDecorTest.java b/src/test/java/com/jcabi/log/ExceptionDecorTest.java
@@ -35,6 +35,7 @@
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.mockito.hamcrest.MockitoHamcrest;
 
 /**
  * Test case for {@link ExceptionDecor}.
@@ -54,7 +55,7 @@ public void convertsExceptionToText() throws Exception {
         final Formatter fmt = new Formatter(dest);
         decor.formatTo(fmt, 0, 0, 0);
         Mockito.verify(dest).append(
-            Mockito.argThat(
+            MockitoHamcrest.argThat(
                 Matchers.allOf(
                     Matchers.containsString(
                         "java.io.IOException: ouch!"