qulice-maven-plugin up to 0.23.0 #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

uchitsa wants to merge 99 commits into jcabi:master from uchitsa:qulice-maven-plugin-0.23.0

.rultor.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ release: @@
         [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
         mvn versions:set "-DnewVersion=${tag}" --batch-mode
         git commit -am "${tag}"
-        export MAVEN_OPTS="--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED"
+        export MAVEN_OPTS="--add-opens java.base/java.util=ALL-UNNAMED \
+        --add-opens java.base/java.lang.reflect=ALL-UNNAMED"
         mvn clean deploy -Pqulice,sonatype,jcabi -B -e -s ../settings.xml
         mvn clean site-deploy -Psite -B -e -s ../settings.xml

pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -135,7 +135,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE. @@
               <plugin>
                 <groupId>com.qulice</groupId>
                 <artifactId>qulice-maven-plugin</artifactId>
-                <version>0.22.0</version>
+                <version>0.23.0</version>
                 <configuration>
                   <excludes combine.children="append">
                     <exclude>findbugs:.*</exclude>
@@ Expand Down @@

src/it/it-decoloring/src/test/java/com/jcabi/log/MulticolorLayoutIntegrationTest.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ void disablesDefaultColor() { @@
             Mockito.doReturn(Level.DEBUG).when(event).getLevel();
             Mockito.doReturn("no color").when(event).getRenderedMessage();
             MatcherAssert.assertThat(
+                "should equal to '[\\u001B[2;37mDEBUG\\u001B[m] \\u001B[2;37mno color\\u001B[m'",
                 StringEscapeUtils.escapeJava(layout.format(event)),
                 Matchers.equalTo(
                     "[\\u001B[2;37mDEBUG\\u001B[m] \\u001B[2;37mno color\\u001B[m"
@@ Expand All / @@ -80,6 +81,7 @@ void disablesDefaultColor() { @@
             );
             try {
                 MatcherAssert.assertThat(
+                    "should equal to '[DEBUG] no color'",
                     StringEscapeUtils.escapeJava(layout.format(event)),
                     Matchers.equalTo(
                         "[DEBUG] no color"
@@ Expand All / @@ -105,6 +107,7 @@ void disablesOverridenDefaultColor() { @@
             Mockito.doReturn(Level.DEBUG).when(event).getLevel();
             Mockito.doReturn("no colour text").when(event).getRenderedMessage();
             MatcherAssert.assertThat(
+                "should equal to '[DEBUG] no color'",
                 StringEscapeUtils.escapeJava(layout.format(event)),
                 Matchers.equalTo(
                     "[\\u001B[2;10mDEBUG\\u001B[m] no colour text"
@@ Expand All / @@ -116,6 +119,7 @@ void disablesOverridenDefaultColor() { @@
             );
             try {
                 MatcherAssert.assertThat(
+                    "should equal to '[DEBUG] no colour text'",
                     StringEscapeUtils.escapeJava(layout.format(event)),
                     Matchers.equalTo(
                         "[DEBUG] no colour text"
@@ Expand All / @@ -141,6 +145,7 @@ void disablesConstantColor() { @@
             Mockito.doReturn(Level.DEBUG).when(event).getLevel();
             Mockito.doReturn("no color text").when(event).getRenderedMessage();
             MatcherAssert.assertThat(
+                "should equal to '[\\u001B[34mDEBUG\\u001B[m] \\u001B[34mno color text\\u001B[m'",
                 StringEscapeUtils.escapeJava(layout.format(event)),
                 Matchers.equalTo(
                     "[\\u001B[34mDEBUG\\u001B[m] \\u001B[34mno color text\\u001B[m"
@@ Expand All / @@ -152,6 +157,7 @@ void disablesConstantColor() { @@
             );
             try {
                 MatcherAssert.assertThat(
+                    "should equal to '[DEBUG] no color text'",
                     StringEscapeUtils.escapeJava(layout.format(event)),
                     Matchers.equalTo(
                         "[DEBUG] no color text"
@@ Expand All / @@ -177,6 +183,7 @@ void disablesOverridenConstantColor() { @@
             Mockito.doReturn(Level.DEBUG).when(event).getLevel();
             Mockito.doReturn("test").when(event).getRenderedMessage();
             MatcherAssert.assertThat(
+                "should equal to '[\\u001B[12mDEBUG\\u001B[m] \\u001B[12mtest\\u001B[m'",
                 StringEscapeUtils.escapeJava(layout.format(event)),
                 Matchers.equalTo(
                     "[\\u001B[12mDEBUG\\u001B[m] \\u001B[12mtest\\u001B[m"
@@ Expand All / @@ -188,6 +195,7 @@ void disablesOverridenConstantColor() { @@
             );
             try {
                 MatcherAssert.assertThat(
+                    "should equals to '[DEBUG] test'",
                     StringEscapeUtils.escapeJava(layout.format(event)),
                     Matchers.equalTo(
                         "[DEBUG] test"
@@ Expand Down @@

src/main/java/com/jcabi/log/DomDecor.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ @@
     import java.util.Formatter;
     import javax.xml.transform.OutputKeys;
     import javax.xml.transform.Transformer;
-    import javax.xml.transform.TransformerConfigurationException;
     import javax.xml.transform.TransformerException;
     import javax.xml.transform.TransformerFactory;
     import javax.xml.transform.dom.DOMSource;
@@ Expand Down @@

src/main/java/com/jcabi/log/Logger.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -460,6 +460,7 @@ public static SupplierLogger withSupplier() { @@
          * @throws IllegalAccessException If some problem
          * @checkstyle ThrowsCountCheck (4 lines)
          */
+        @SuppressWarnings("PMD.AvoidAccessibilityAlteration")
         private static void setFinalStatic(final Field field, final Object value)
             throws NoSuchFieldException, IllegalAccessException {
             field.setAccessible(true);
@@ Expand Down @@

src/main/java/com/jcabi/log/MulticolorLayout.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -71,10 +71,10 @@ @@
      *  &lt;groupId&gt;com.jcabi&lt;/groupId&gt;
      *  &lt;artifactId&gt;jcabi-log&lt;/artifactId&gt;
      * &lt;/dependency&gt;</pre>
-     * @since 0.1.10
      * @see <a href="http://en.wikipedia.org/wiki/ANSI_escape_code">ANSI escape code</a>
      * @see <a href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html">PatternLayout from LOG4J</a>
      * @see <a href="http://www.jcabi.com/jcabi-log/multicolor.html">How to use with Maven</a>
+     * @since 0.1.10
      */
     @SuppressWarnings("PMD.NonStaticInitializer")
     public final class MulticolorLayout extends EnhancedPatternLayout {
@@ Expand Down @@

src/main/java/com/jcabi/log/ObjectDecor.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -95,11 +95,12 @@ private static final class ArrayFormatAction @@
             @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
             public String run() {
                 final StringBuilder builder = new StringBuilder("[");
-                final Formatter formatter = new Formatter(builder);
-                for (final Object obj : this.array) {
-                    new ObjectDecor(obj).formatTo(formatter, 0, 0, 0);
-                    // @checkstyle MultipleStringLiteralsCheck (1 line)
-                    builder.append(", ");
+                try (Formatter formatter = new Formatter(builder)) {
+                    for (final Object obj : this.array) {
+                        new ObjectDecor(obj).formatTo(formatter, 0, 0, 0);
+                        // @checkstyle MultipleStringLiteralsCheck (1 line)
+                        builder.append(", ");
+                    }
                 }
                 builder.replace(builder.length() - 2, builder.length(), "]");
                 return builder.toString();
@@ Expand Down @@

src/main/java/com/jcabi/log/PreFormatter.java

-Original file line number
+Diff line change
@@ Expand Up @@
                     ++pos;
                 }
             }
-            if (pos < args.length) {
+            this.validateArgumentCount(pos, args.length);
+            matcher.appendTail(buf);
+            this.format = buf.toString();
+        }
+        private void validateArgumentCount(final int pos, final int count) {
+            if (pos < count) {
                 throw new IllegalArgumentException(
                     String.format(
                         "There are %d parameter(s) but only %d format argument(s) were provided.",
-                        args.length,
+                        count,
                         pos
                     )
                 );
             }
-            matcher.appendTail(buf);
-            this.format = buf.toString();
         }
     }

src/main/java/com/jcabi/log/VerboseCallable.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -50,9 +50,9 @@ @@
      *
      * <p>This class is thread-safe.
      *
-     * @since 0.16
      * @param <T> Type of result
      * @see VerboseThreads
+     * @since 0.16
      * @link <a href="http://www.ibm.com/developerworks/java/library/j-jtp05236/index.html">Java theory and practice: Dealing with InterruptedException</a>
      */
     @SuppressWarnings("PMD.DoNotUseThreads")
@@ Expand Down @@

src/main/java/com/jcabi/log/VerboseProcess.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -213,7 +213,7 @@ public VerboseProcess.Result waitFor() throws InterruptedException {
  
            final ByteArrayOutputStream stdout = new ByteArrayOutputStream();

            final ByteArrayOutputStream stderr = new ByteArrayOutputStream();

            this.launchMonitors(done, stdout, stderr);

            int code = 0;

            final int code;

            try {

                code = this.process.waitFor();

            } finally {

    @@ -384,22 +384,6 @@ private Thread monitor(final InputStream input,
  
            return thread;

        }

        /**

         * Close quietly.

         * @param res Resource to close

         */

        private static void close(final Closeable res) {

            try {

                res.close();

            } catch (final IOException ex) {

                Logger.error(

                    VerboseProcess.class,

                    "Failed to close resource: %[exception]s",

                    ex

                );

            }

        }

        /**

         * Stream monitor.

         *

    @@ -444,54 +428,48 @@ private static final class Monitor implements Callable<Void> {
  
            @Override

            public Void call() throws Exception {

                final BufferedReader reader = new BufferedReader(

                try (BufferedReader reader = new BufferedReader(

                    Channels.newReader(

                        Channels.newChannel(this.input),

                        VerboseProcess.UTF_8

                    )

                );

                try {

                    final BufferedWriter writer = new BufferedWriter(

                    ));

                    BufferedWriter writer = new BufferedWriter(

                        new OutputStreamWriter(this.output, VerboseProcess.UTF_8)

                    );

                    try {

                        while (true) {

                            if (Thread.interrupted()) {

                                Logger.debug(

                                    VerboseProcess.class,

                                    "Explicitly interrupting read from buffer"

                                );

                                break;

                            }

                            final String line = reader.readLine();

                            if (line == null) {

                                break;

                            }

                            Logger.log(

                                this.level, VerboseProcess.class,

                                ">> %s", line

                     )

                ) {

                    while (true) {

                        if (Thread.interrupted()) {

                            Logger.debug(

                                VerboseProcess.class,

                                "Explicitly interrupting read from buffer"

                            );

                            writer.write(line);

                            writer.newLine();

                            break;

                        }

                    } catch (final ClosedByInterruptException ex) {

                        Thread.interrupted();

                        Logger.debug(

                            VerboseProcess.class,

                            "Monitor is interrupted in the expected way"

                        );

                    } catch (final IOException ex) {

                        Logger.error(

                            VerboseProcess.class,

                            "Error reading from process stream: %[exception]s",

                            ex

                        final String line = reader.readLine();

                        if (line == null) {

                            break;

                        }

                        Logger.log(

                            this.level, VerboseProcess.class,

                            ">> %s", line

                        );

                    } finally {

                        VerboseProcess.close(writer);

                        this.done.countDown();

                        writer.write(line);

                        writer.newLine();

                    }

                } catch (final ClosedByInterruptException ex) {

                    Thread.interrupted();

                    Logger.debug(

                        VerboseProcess.class,

                        "Monitor is interrupted in the expected way"

                    );

                } catch (final IOException ex) {

                    Logger.error(

                        VerboseProcess.class,

                        "Error reading from process stream: %[exception]s",

                        ex

                    );

                } finally {

                    VerboseProcess.close(reader);

                    this.done.countDown();

                }

                return null;

            }

src/main/java/com/jcabi/log/VerboseRunnable.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -49,8 +49,8 @@ @@
      *
      * <p>This class is thread-safe.
      *
-     * @since 0.1.3
      * @see VerboseThreads
+     * @since 0.1.3
      * @link <a href="http://www.ibm.com/developerworks/java/library/j-jtp05236/index.html">Java theory and practice: Dealing with InterruptedException</a>
      */
     @SuppressWarnings("PMD.DoNotUseThreads")
@@ Expand Down @@

src/main/java/com/jcabi/log/VerboseThreads.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -76,17 +76,11 @@
  
     *

     * <p>This class is thread-safe.

     *

     * @since 0.1.2

     * @see VerboseRunnable

     * @since 0.1.2

     */

    @SuppressWarnings("PMD.DoNotUseThreads")

    public final class VerboseThreads implements ThreadFactory {

        /**

         * Thread group.

         */

        private final transient ThreadGroup group;

        /**

         * Prefix to use.

         */

    @@ -146,32 +140,28 @@ public VerboseThreads(final Class<?> type) {
  
         * Detailed constructor.

         * @param pfx Prefix for thread names

         * @param dmn Threads should be daemons?

         * @param prt Default priority for all threads

         * @param prt Default prt for all threads

         */

        public VerboseThreads(final String pfx, final boolean dmn,

            final int prt) {

        public VerboseThreads(final String pfx, final boolean dmn, final int prt) {

            this.prefix = pfx;

            this.daemon = dmn;

            this.priority = prt;

            this.group = new VerboseThreads.Group(pfx);

            this.number = new AtomicInteger(1);

        }

        @Override

        public Thread newThread(final Runnable runnable) {

        public Thread newThread(final Runnable rnbl) {

            final Thread thread = new Thread(

                this.group,

                new VerboseThreads.Wrap(runnable)

            );

            thread.setName(

                String.format(

                    "%s-%d",

                    this.prefix,

                    this.number.getAndIncrement()

                )

                rnbl,

                String.format("%s-%d", this.prefix, this.number.getAndIncrement())

            );

            thread.setDaemon(this.daemon);

            thread.setPriority(this.priority);

            thread.setUncaughtExceptionHandler(

                (t, e) -> Logger.warn(

                    this,

                    String.format("Thread %s threw an exception: %s", t.getName(), e.toString())

            ));

            return thread;

        }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qulice-maven-plugin up to 0.23.0 #206

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

qulice-maven-plugin up to 0.23.0 #206

Are you sure you want to change the base?

Uh oh!

qulice-maven-plugin up to 0.23.0 #206

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!