#1644 names simplified

yegor256 · Jul 15, 2022 · a890c71 · a890c71
1 parent ddb681e
commit a890c71
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 25 deletions.
diff --git a/src/main/java/org/cactoos/bytes/Base64Bytes.java b/src/main/java/org/cactoos/bytes/Base64Bytes.java
@@ -45,7 +45,7 @@ public final class Base64Bytes implements Bytes {
     private final Base64.Decoder decoder;
 
     /**
-     * Ctor uses a RFC4648 {@link java.util.Base64.Decoder}.
+     * Ctor uses a RFC4648 {@link Base64.Decoder}.
      *
      * @param origin Origin bytes
      */

diff --git a/src/main/java/org/cactoos/bytes/BytesBase64.java b/src/main/java/org/cactoos/bytes/BytesBase64.java
@@ -45,7 +45,7 @@ public final class BytesBase64 implements Bytes {
     private final Base64.Encoder encoder;
 
     /**
-     * Ctor uses a RFC4648 {@link java.util.Base64.Encoder}.
+     * Ctor uses a RFC4648 {@link Base64.Encoder}.
      *
      * @param origin Origin bytes.
      */

diff --git a/src/main/java/org/cactoos/bytes/IoCheckedBytes.java b/src/main/java/org/cactoos/bytes/IoCheckedBytes.java
@@ -30,7 +30,7 @@
 
 /**
  * Bytes that doesn't throw checked {@link Exception},
- * but only throws {@link java.io.IOException}.
+ * but only throws {@link IOException}.
  *
  * <p>There is no thread-safety guarantee.
  *

diff --git a/src/main/java/org/cactoos/collection/Immutable.java b/src/main/java/org/cactoos/collection/Immutable.java
@@ -34,7 +34,7 @@
  * @param <X> Type of source item
  * @since 1.16
  * @todo #898:30min Replace all the Collections.unmodifiableCollection
- *  with the {@link org.cactoos.collection.Immutable} from the cactoos codebase.
+ *  with the {@link Immutable} from the cactoos codebase.
  *  That should be done because Elegant Object principles are against static methods.
  */
 @SuppressWarnings(

diff --git a/src/main/java/org/cactoos/iterable/IterableOf.java b/src/main/java/org/cactoos/iterable/IterableOf.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.iterable;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Iterator;
 import org.cactoos.Fallback;
 import org.cactoos.Scalar;
@@ -84,7 +85,7 @@ public Iterator<X> iterator() {
     }
 
     @Override
-    @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("EQ_UNUSUAL")
+    @SuppressFBWarnings("EQ_UNUSUAL")
     @SuppressWarnings (value = "unchecked")
     public boolean equals(final Object other) {
         return new Unchecked<>(

diff --git a/src/main/java/org/cactoos/proc/ForEach.java b/src/main/java/org/cactoos/proc/ForEach.java
@@ -28,8 +28,8 @@
 import org.cactoos.scalar.And;
 
 /**
- * Executes a {@link org.cactoos.Proc} for each element of an
- * {@link java.lang.Iterable}
+ * Executes a {@link Proc} for each element of an
+ * {@link Iterable}
  *
  * <p>
  * This class can be effectively used to iterate through a collection, just like

diff --git a/src/main/java/org/cactoos/proc/ForEachInThreads.java b/src/main/java/org/cactoos/proc/ForEachInThreads.java
@@ -28,8 +28,8 @@
 import org.cactoos.scalar.AndInThreads;
 
 /**
- * Executes a {@link org.cactoos.Proc} in a new Thread for each element of an
- * {@link java.lang.Iterable}
+ * Executes a {@link Proc} in a new Thread for each element of an
+ * {@link Iterable}
  *
  * <p>
  * This class can be effectively used to iterate through a collection, just like

diff --git a/src/main/java/org/cactoos/proc/ForEachWithIndex.java b/src/main/java/org/cactoos/proc/ForEachWithIndex.java
@@ -28,8 +28,8 @@
 import org.cactoos.scalar.AndWithIndex;
 
 /**
- * Executes a {@link org.cactoos.BiProc} for each element of an
- * {@link java.lang.Iterable}
+ * Executes a {@link BiProc} for each element of an
+ * {@link Iterable}
  *
  * <p>
  * This class can be effectively used to iterate through a collection similar to how

diff --git a/src/main/java/org/cactoos/proc/IoCheckedProc.java b/src/main/java/org/cactoos/proc/IoCheckedProc.java
@@ -28,7 +28,7 @@
 
 /**
  * Proc that doesn't throw checked {@link Exception}, but
- * throws {@link java.io.IOException} instead.
+ * throws {@link IOException} instead.
  *
  * <p>There is no thread-safety guarantee.
  *

diff --git a/src/main/java/org/cactoos/scalar/Retry.java b/src/main/java/org/cactoos/scalar/Retry.java
@@ -81,7 +81,7 @@ public Retry(final Scalar<? extends T> scalar) {
     /**
      * Ctor.
      * @param scalar Scalar original
-     * @param wait The {@link java.time.Duration} to wait between attempts
+     * @param wait The {@link Duration} to wait between attempts
      */
     public Retry(final Scalar<? extends T> scalar, final Duration wait) {
         // @checkstyle MagicNumberCheck (1 line)
@@ -101,7 +101,7 @@ public Retry(final Scalar<? extends T> scalar, final int attempts) {
      * Ctor.
      * @param scalar Scalar original
      * @param attempts Maximum number of attempts
-     * @param wait The {@link java.time.Duration} to wait between attempts
+     * @param wait The {@link Duration} to wait between attempts
      */
     public Retry(final Scalar<? extends T> scalar, final int attempts,
         final Duration wait) {
@@ -122,7 +122,7 @@ public Retry(final Scalar<? extends T> scalar,
      * Ctor.
      * @param scalar Func original
      * @param exit Exit condition, returns TRUE if there is no reason to try
-     * @param wait The {@link java.time.Duration} to wait between attempts
+     * @param wait The {@link Duration} to wait between attempts
      */
     public Retry(final Scalar<? extends T> scalar,
         final Func<Integer, Boolean> exit, final Duration wait) {

diff --git a/src/main/java/org/cactoos/text/Replaced.java b/src/main/java/org/cactoos/text/Replaced.java
@@ -59,7 +59,7 @@ public Replaced(
      * Ctor.
      * <p>
      * The given {@link Pattern regex} is used to produce a
-     * {@link Pattern#matcher(java.lang.CharSequence) matcher} that will be
+     * {@link Pattern#matcher(CharSequence) matcher} that will be
      * transformed by {@code func} into a replacement string to replace each
      * {@link Matcher#find() matching} substring.
      * <p>

diff --git a/src/main/java/org/cactoos/text/TextOfScalar.java b/src/main/java/org/cactoos/text/TextOfScalar.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.text;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.cactoos.Scalar;
 import org.cactoos.Text;
 import org.cactoos.scalar.And;
@@ -68,7 +69,7 @@ public int hashCode() {
     }
 
     @Override
-    @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("EQ_UNUSUAL")
+    @SuppressFBWarnings("EQ_UNUSUAL")
     public boolean equals(final Object obj) {
         return new Unchecked<>(
             new Or(

diff --git a/src/main/java/org/cactoos/text/TextOfString.java b/src/main/java/org/cactoos/text/TextOfString.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.text;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.cactoos.Text;
 import org.cactoos.scalar.And;
 import org.cactoos.scalar.Or;
@@ -67,7 +68,7 @@ public int hashCode() {
     }
 
     @Override
-    @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("EQ_UNUSUAL")
+    @SuppressFBWarnings("EQ_UNUSUAL")
     public boolean equals(final Object obj) {
         return new Unchecked<>(
             new Or(

diff --git a/src/main/java/org/cactoos/text/UncheckedText.java b/src/main/java/org/cactoos/text/UncheckedText.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.text;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.cactoos.Func;
 import org.cactoos.Text;
 import org.cactoos.func.UncheckedFunc;
@@ -102,7 +103,7 @@ public String toString() {
     }
 
     @Override
-    @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("EQ_UNUSUAL")
+    @SuppressFBWarnings("EQ_UNUSUAL")
     public boolean equals(final Object obj) {
         return new Unchecked<>(
             new Or(

diff --git a/src/test/java/org/cactoos/bytes/Base64BytesTest.java b/src/test/java/org/cactoos/bytes/Base64BytesTest.java
@@ -30,7 +30,7 @@
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**
- * Test case for {@link org.cactoos.bytes.Base64Bytes}.
+ * Test case for {@link Base64Bytes}.
  *
  * @since 0.20.2
  * @checkstyle JavadocMethodCheck (500 lines)

diff --git a/src/test/java/org/cactoos/bytes/BytesBase64Test.java b/src/test/java/org/cactoos/bytes/BytesBase64Test.java
@@ -30,7 +30,7 @@
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**
- * Test case for {@link org.cactoos.bytes.BytesBase64}.
+ * Test case for {@link BytesBase64}.
  * @since 0.20.2
  * @checkstyle JavadocMethodCheck (500 lines)
  */

diff --git a/src/test/java/org/cactoos/io/GzipInputTest.java b/src/test/java/org/cactoos/io/GzipInputTest.java
@@ -37,7 +37,7 @@
 import org.llorllale.cactoos.matchers.IsText;
 
 /**
- * Test case for {@link org.cactoos.io.GzipInput}.
+ * Test case for {@link GzipInput}.
  * @since 0.29
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)

diff --git a/src/test/java/org/cactoos/io/GzipOutputTest.java b/src/test/java/org/cactoos/io/GzipOutputTest.java
@@ -41,7 +41,7 @@
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**
- * Test case for {@link org.cactoos.io.GzipOutput}.
+ * Test case for {@link GzipOutput}.
  * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  * @since 0.29

diff --git a/src/test/java/org/cactoos/iterator/MappedTest.java b/src/test/java/org/cactoos/iterator/MappedTest.java
@@ -32,7 +32,7 @@
 import org.llorllale.cactoos.matchers.Throws;
 
 /**
- * Tests for {@link org.cactoos.iterator.Mapped}.
+ * Tests for {@link Mapped}.
  *
  * @since 0.47
  */

diff --git a/src/test/java/org/cactoos/list/JoinedTest.java b/src/test/java/org/cactoos/list/JoinedTest.java
@@ -34,7 +34,7 @@
 import org.llorllale.cactoos.matchers.IsTrue;
 
 /**
- * Test case for {@link org.cactoos.list.Joined}.
+ * Test case for {@link Joined}.
  *
  * @since 0.20
  * @checkstyle JavadocMethodCheck (500 lines)