Merge branch 'master' into 813

yegor256 · May 10, 2018 · 78eb2f8 · 78eb2f8
2 parents 9c35316 + 635ff72
commit 78eb2f8
Show file tree

Hide file tree

Showing 520 changed files with 530 additions and 1,631 deletions.
diff --git a/pom.xml b/pom.xml
@@ -82,11 +82,6 @@ The MIT License (MIT)
     </site>
   </distributionManagement>
   <dependencies>
-    <!--
-      @todo #720:30min When https://github.com/teamed/qulice/issues/877 is
-       fixed upgrade qulice dependency to the one that contains the fix
-       and fix any issues in the project that result from this upgrade.
-    -->
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
@@ -138,7 +133,7 @@ The MIT License (MIT)
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.17.1</version>
+            <version>0.17.3</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>checkstyle:/src/site/resources/.*</exclude>

diff --git a/src/main/java/org/cactoos/BiFunc.java b/src/main/java/org/cactoos/BiFunc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @param <Z> Type of output
@@ -54,8 +52,6 @@ public interface BiFunc<X, Y, Z> {
     /**
      * BiFunc check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <X> Type of input
      * @param <Y> Type of input
      * @param <Z> Type of output

diff --git a/src/main/java/org/cactoos/BiProc.java b/src/main/java/org/cactoos/BiProc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of input
  * @since 0.20

diff --git a/src/main/java/org/cactoos/Bytes.java b/src/main/java/org/cactoos/Bytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -30,8 +30,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see org.cactoos.io.BytesOf
  * @since 0.1
  */
@@ -47,8 +45,6 @@ public interface Bytes {
     /**
      * Bytes check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.11
      */
     final class NoNulls implements Bytes {

diff --git a/src/main/java/org/cactoos/Func.java b/src/main/java/org/cactoos/Func.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -39,8 +39,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @param <Y> Type of output
  * @see org.cactoos.func.StickyFunc
@@ -61,8 +59,6 @@ public interface Func<X, Y> {
     /**
      * Func check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <X> Type of input
      * @param <Y> Type of output
      * @since 0.10

diff --git a/src/main/java/org/cactoos/Input.java b/src/main/java/org/cactoos/Input.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -43,9 +43,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @author Fabricio Cabral (fabriciofx@gmail.com)
- * @version $Id$
  * @see org.cactoos.io.InputOf
  * @since 0.1
  */
@@ -61,8 +58,6 @@ public interface Input {
     /**
      * Input check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.10
      */
     final class NoNulls implements Input {

diff --git a/src/main/java/org/cactoos/Output.java b/src/main/java/org/cactoos/Output.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -50,8 +50,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see OutputTo
  * @since 0.1
  */
@@ -67,8 +65,6 @@ public interface Output {
     /**
      * Output check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.10
      */
     final class NoNulls implements Output {

diff --git a/src/main/java/org/cactoos/Proc.java b/src/main/java/org/cactoos/Proc.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -33,8 +33,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of input
  * @see org.cactoos.func.FuncOf
  * @since 0.1
@@ -51,8 +49,6 @@ public interface Proc<X> {
     /**
      * Proc check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <X> Type of input
      * @since 0.11
      */

diff --git a/src/main/java/org/cactoos/Scalar.java b/src/main/java/org/cactoos/Scalar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -41,8 +41,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> Type of result
  * @see StickyScalar
  * @see UncheckedScalar
@@ -61,8 +59,6 @@ public interface Scalar<T> {
     /**
      * Scalar check for no nulls.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @param <T> Type of result
      * @since 0.11
      */

diff --git a/src/main/java/org/cactoos/Text.java b/src/main/java/org/cactoos/Text.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @see org.cactoos.text.TextOf
  * @since 0.1
  */
@@ -53,8 +51,6 @@ public interface Text {
      *
      * <p>There is no thread-safety guarantee.
      *
-     * @author Fabricio Cabral (fabriciofx@gmail.com)
-     * @version $Id$
      * @since 0.11
      */
     final class NoNulls implements Text {

diff --git a/src/main/java/org/cactoos/bytes/Base64Bytes.java b/src/main/java/org/cactoos/bytes/Base64Bytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Decodes all origin bytes using the Base64 encoding scheme.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class Base64Bytes implements Bytes {

diff --git a/src/main/java/org/cactoos/bytes/BytesBase64.java b/src/main/java/org/cactoos/bytes/BytesBase64.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
 /**
  * Encodes all origin bytes using the Base64 encoding scheme.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 public final class BytesBase64 implements Bytes {

diff --git a/src/main/java/org/cactoos/bytes/HexBytes.java b/src/main/java/org/cactoos/bytes/HexBytes.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -35,8 +35,6 @@
 /**
  * Decodes origin {@link Text} using the hexadecimal encoding scheme.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @since 0.30
  * @checkstyle MagicNumberCheck (500 lines)
  */

diff --git a/src/main/java/org/cactoos/bytes/package-info.java b/src/main/java/org/cactoos/bytes/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -25,8 +25,6 @@
 /**
  * Bytes.
  *
- * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
- * @version $Id$
  * @since 0.20.2
  */
 package org.cactoos.bytes;
diff --git a/src/main/java/org/cactoos/collection/CollectionEnvelope.java b/src/main/java/org/cactoos/collection/CollectionEnvelope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Element type
  * @since 0.23
  * @checkstyle AbstractClassNameCheck (500 lines)

diff --git a/src/main/java/org/cactoos/collection/CollectionNoNulls.java b/src/main/java/org/cactoos/collection/CollectionNoNulls.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.</p>
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Element type
  * @since 0.27
  */

diff --git a/src/main/java/org/cactoos/collection/CollectionOf.java b/src/main/java/org/cactoos/collection/CollectionOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -40,8 +40,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <T> List type
  * @see StickyCollection
  * @since 0.1

diff --git a/src/main/java/org/cactoos/collection/Filtered.java b/src/main/java/org/cactoos/collection/Filtered.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -32,8 +32,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Vseslav Sekorin (vssekorin@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @since 1.16
  */

diff --git a/src/main/java/org/cactoos/collection/HeadOf.java b/src/main/java/org/cactoos/collection/HeadOf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -31,8 +31,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Alexander Menshikov (sharplermc@gmail.com)
- * @version $Id$
  * @param <T> Type of source item
  * @since 0.29
  */

diff --git a/src/main/java/org/cactoos/collection/Joined.java b/src/main/java/org/cactoos/collection/Joined.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -28,8 +28,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Mykola Yashchenko (vkont4@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @since 1.16
  */

diff --git a/src/main/java/org/cactoos/collection/Mapped.java b/src/main/java/org/cactoos/collection/Mapped.java
@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2017-2018 Yegor Bugayenko
@@ -34,8 +34,6 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @author Yegor Bugayenko (yegor256@gmail.com)
- * @version $Id$
  * @param <X> Type of source item
  * @param <Y> Type of target item
  * @since 0.14