objectionary#2863 add PhDecorator abstract class to reduce code dupli…

…cation
c71n93 · Mar 8, 2024 · 0a6fa6f · 0a6fa6f
1 parent 31572d1
commit 0a6fa6f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 73 deletions.
diff --git a/eo-runtime/src/main/java/org/eolang/PhConst.java b/eo-runtime/src/main/java/org/eolang/PhConst.java
@@ -35,12 +35,7 @@
  * @since 0.16
  */
 @Versionized
-public final class PhConst implements Phi {
-
-    /**
-     * The origin being turned into a const.
-     */
-    private final Phi origin;
+public final class PhConst extends PhDecorator {
 
     /**
      * Cached attributes.
@@ -53,7 +48,7 @@ public final class PhConst implements Phi {
      * @param phi The origin
      */
     public PhConst(final Phi phi) {
-        this.origin = phi;
+        super(phi);
     }
 
     @Override

diff --git a/eo-runtime/src/main/java/org/eolang/PhDecorator.java b/eo-runtime/src/main/java/org/eolang/PhDecorator.java
@@ -0,0 +1,23 @@
+package org.eolang;
+
+public abstract class PhDecorator implements Phi{
+
+    /**
+     * The original.
+     */
+    protected final Phi origin;
+
+    PhDecorator(final Phi phi) {
+        this.origin = phi;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return this.origin.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.origin.hashCode();
+    }
+}
diff --git a/eo-runtime/src/main/java/org/eolang/PhImmovable.java b/eo-runtime/src/main/java/org/eolang/PhImmovable.java
@@ -30,30 +30,15 @@
  * @since 0.23
  */
 @Versionized
-final class PhImmovable implements Phi {
-
-    /**
-     * The original.
-     */
-    private final Phi origin;
+final class PhImmovable extends PhDecorator {
 
     /**
      * Ctor.
      *
      * @param phi The object
      */
     PhImmovable(final Phi phi) {
-        this.origin = phi;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        return this.origin.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return this.origin.hashCode();
+        super(phi);
     }
 
     @Override

diff --git a/eo-runtime/src/main/java/org/eolang/PhLocated.java b/eo-runtime/src/main/java/org/eolang/PhLocated.java
@@ -30,12 +30,7 @@
  * @since 0.21
  */
 @Versionized
-public final class PhLocated implements Phi {
-
-    /**
-     * The original.
-     */
-    private final Phi origin;
+public final class PhLocated extends PhDecorator {
 
     /**
      * The line number.
@@ -73,22 +68,12 @@ public PhLocated(final Phi phi, final int lne, final int pos) {
      * @checkstyle ParameterNumberCheck (5 lines)
      */
     public PhLocated(final Phi phi, final int lne, final int pos, final String loc) {
-        this.origin = phi;
+        super(phi);
         this.line = lne;
         this.position = pos;
         this.location = loc;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
-        return this.origin.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return this.origin.hashCode();
-    }
-
     @Override
     public String toString() {
         return String.format(

diff --git a/eo-runtime/src/main/java/org/eolang/PhLogged.java b/eo-runtime/src/main/java/org/eolang/PhLogged.java
@@ -33,20 +33,15 @@
  * @since 0.24
  */
 @Versionized
-public final class PhLogged implements Phi {
-
-    /**
-     * The origin being turned into a const.
-     */
-    private final Phi origin;
+public final class PhLogged extends PhDecorator {
 
     /**
      * Ctor.
      *
      * @param phi The origin
      */
     public PhLogged(final Phi phi) {
-        this.origin = phi;
+        super(phi);
     }
 
     @Override

diff --git a/eo-runtime/src/main/java/org/eolang/PhNamed.java b/eo-runtime/src/main/java/org/eolang/PhNamed.java
@@ -30,12 +30,7 @@
  * @since 0.17
  */
 @Versionized
-final class PhNamed implements Phi {
-
-    /**
-     * The original.
-     */
-    private final Phi origin;
+final class PhNamed extends PhDecorator {
 
     /**
      * The name.
@@ -49,7 +44,7 @@ final class PhNamed implements Phi {
      * @param txt The name
      */
     PhNamed(final Phi phi, final String txt) {
-        this.origin = phi;
+        super(phi);
         this.name = txt;
     }
 

diff --git a/eo-runtime/src/main/java/org/eolang/PhSafe.java b/eo-runtime/src/main/java/org/eolang/PhSafe.java
@@ -33,29 +33,13 @@
  * @since 0.26
  */
 @Versionized
-public final class PhSafe implements Phi {
-
-    /**
-     * The original.
-     */
-    private final Phi origin;
-
+public final class PhSafe extends PhDecorator {
     /**
      * Ctor.
      * @param phi The object
      */
     public PhSafe(final Phi phi) {
-        this.origin = phi;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        return this.origin.equals(obj);
-    }
-
-    @Override
-    public int hashCode() {
-        return this.origin.hashCode();
+        super(phi);
     }
 
     @Override