diff --git a/pom.xml b/pom.xml index 668e0523..1466ea2f 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.jcabi jcabi - 1.18 + 1.20.1 jcabi-log 1.0-SNAPSHOT diff --git a/src/main/java/com/jcabi/log/ObjectDecor.java b/src/main/java/com/jcabi/log/ObjectDecor.java index 125b663f..aff0b3ff 100644 --- 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 index e40f12d1..9d4a914e 100644 --- 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(); 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 index a889502b..307370af 100644 --- 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 index 85dbd1bb..54561cc6 100644 --- 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("")) + MockitoHamcrest.argThat(Matchers.containsString("")) ); } diff --git a/src/test/java/com/jcabi/log/ExceptionDecorTest.java b/src/test/java/com/jcabi/log/ExceptionDecorTest.java index 0e38e933..73e8bb4a 100644 --- 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!"