From 5f0a945ec3ddeae126de1df0e26e7cb2d0656f84 Mon Sep 17 00:00:00 2001 From: MartinWitt Date: Fri, 14 Jan 2022 18:37:48 +0100 Subject: [PATCH] refactor: Remove redundant supertypes (#4369) --- src/main/java/spoon/reflect/cu/position/NoSourcePosition.java | 3 +-- src/main/java/spoon/reflect/declaration/CtConstructor.java | 2 +- src/main/java/spoon/reflect/declaration/CtMethod.java | 2 +- .../spoon/reflect/visitor/filter/AbstractReferenceFilter.java | 3 +-- .../reflect/cu/position/BodyHolderSourcePositionImpl.java | 4 +--- .../reflect/cu/position/CompoundSourcePositionImpl.java | 4 +--- .../reflect/cu/position/DeclarationSourcePositionImpl.java | 4 +--- .../spoon/support/reflect/cu/position/SourcePositionImpl.java | 3 +-- .../java/spoon/support/reflect/declaration/CtElementImpl.java | 4 +--- 9 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/main/java/spoon/reflect/cu/position/NoSourcePosition.java b/src/main/java/spoon/reflect/cu/position/NoSourcePosition.java index 65071642bdd..0a64a4e1ea5 100644 --- a/src/main/java/spoon/reflect/cu/position/NoSourcePosition.java +++ b/src/main/java/spoon/reflect/cu/position/NoSourcePosition.java @@ -12,12 +12,11 @@ import spoon.support.reflect.cu.CompilationUnitImpl; import java.io.File; -import java.io.Serializable; /** * This class represents the position of a program element in a source file. */ -public class NoSourcePosition implements SourcePosition, Serializable { +public class NoSourcePosition implements SourcePosition { private static final long serialVersionUID = 1L; diff --git a/src/main/java/spoon/reflect/declaration/CtConstructor.java b/src/main/java/spoon/reflect/declaration/CtConstructor.java index 1e4e52baf0f..98aabea8970 100644 --- a/src/main/java/spoon/reflect/declaration/CtConstructor.java +++ b/src/main/java/spoon/reflect/declaration/CtConstructor.java @@ -17,7 +17,7 @@ /** * This element defines a constructor declaration. */ -public interface CtConstructor extends CtExecutable, CtTypeMember, CtFormalTypeDeclarer, CtShadowable { +public interface CtConstructor extends CtExecutable, CtFormalTypeDeclarer, CtShadowable { /** * Always returns "<init>". diff --git a/src/main/java/spoon/reflect/declaration/CtMethod.java b/src/main/java/spoon/reflect/declaration/CtMethod.java index a400850e822..5b962dbcd3a 100644 --- a/src/main/java/spoon/reflect/declaration/CtMethod.java +++ b/src/main/java/spoon/reflect/declaration/CtMethod.java @@ -19,7 +19,7 @@ /** * This element defines a method declaration. */ -public interface CtMethod extends CtExecutable, CtTypeMember, CtFormalTypeDeclarer, CtShadowable { +public interface CtMethod extends CtExecutable, CtFormalTypeDeclarer, CtShadowable { /** * @param superMethod to be checked method * @return true if this method overrides `superMethod`.
diff --git a/src/main/java/spoon/reflect/visitor/filter/AbstractReferenceFilter.java b/src/main/java/spoon/reflect/visitor/filter/AbstractReferenceFilter.java index d425995a87e..78ed59bfe14 100644 --- a/src/main/java/spoon/reflect/visitor/filter/AbstractReferenceFilter.java +++ b/src/main/java/spoon/reflect/visitor/filter/AbstractReferenceFilter.java @@ -8,7 +8,6 @@ package spoon.reflect.visitor.filter; import spoon.reflect.reference.CtReference; -import spoon.reflect.visitor.Filter; /** * This class defines an abstract reference filter that needs to be subclassed @@ -17,7 +16,7 @@ * @param * the type of the reference to be matched */ -public abstract class AbstractReferenceFilter extends AbstractFilter implements Filter { +public abstract class AbstractReferenceFilter extends AbstractFilter { /** * Creates a reference filter with the type of the potentially matching diff --git a/src/main/java/spoon/support/reflect/cu/position/BodyHolderSourcePositionImpl.java b/src/main/java/spoon/support/reflect/cu/position/BodyHolderSourcePositionImpl.java index cdc7d703c5f..807c2649dcb 100644 --- a/src/main/java/spoon/support/reflect/cu/position/BodyHolderSourcePositionImpl.java +++ b/src/main/java/spoon/support/reflect/cu/position/BodyHolderSourcePositionImpl.java @@ -10,14 +10,12 @@ import spoon.reflect.cu.CompilationUnit; import spoon.reflect.cu.position.BodyHolderSourcePosition; -import java.io.Serializable; - /** * This class represents the position of a Java program element in a source * file. */ public class BodyHolderSourcePositionImpl extends DeclarationSourcePositionImpl - implements BodyHolderSourcePosition, Serializable { + implements BodyHolderSourcePosition { private static final long serialVersionUID = 1L; private int bodyStart; diff --git a/src/main/java/spoon/support/reflect/cu/position/CompoundSourcePositionImpl.java b/src/main/java/spoon/support/reflect/cu/position/CompoundSourcePositionImpl.java index b7e88e926d1..ed36ec96f27 100644 --- a/src/main/java/spoon/support/reflect/cu/position/CompoundSourcePositionImpl.java +++ b/src/main/java/spoon/support/reflect/cu/position/CompoundSourcePositionImpl.java @@ -10,14 +10,12 @@ import spoon.reflect.cu.CompilationUnit; import spoon.reflect.cu.position.CompoundSourcePosition; -import java.io.Serializable; - /** * This class represents the position of a named Java program element in a source * file. */ public class CompoundSourcePositionImpl extends SourcePositionImpl - implements CompoundSourcePosition, Serializable { + implements CompoundSourcePosition { private static final long serialVersionUID = 1L; private int declarationSourceStart; diff --git a/src/main/java/spoon/support/reflect/cu/position/DeclarationSourcePositionImpl.java b/src/main/java/spoon/support/reflect/cu/position/DeclarationSourcePositionImpl.java index b747decc199..056088dfbb4 100644 --- a/src/main/java/spoon/support/reflect/cu/position/DeclarationSourcePositionImpl.java +++ b/src/main/java/spoon/support/reflect/cu/position/DeclarationSourcePositionImpl.java @@ -11,14 +11,12 @@ import spoon.reflect.cu.CompilationUnit; import spoon.reflect.cu.position.DeclarationSourcePosition; -import java.io.Serializable; - /** * This class represents the position of a Java program element in a source * file. */ public class DeclarationSourcePositionImpl extends CompoundSourcePositionImpl - implements DeclarationSourcePosition, Serializable, Cloneable { + implements DeclarationSourcePosition, Cloneable { private static final long serialVersionUID = 1L; private int modifierSourceEnd; diff --git a/src/main/java/spoon/support/reflect/cu/position/SourcePositionImpl.java b/src/main/java/spoon/support/reflect/cu/position/SourcePositionImpl.java index c05766f22d6..16d35d52199 100644 --- a/src/main/java/spoon/support/reflect/cu/position/SourcePositionImpl.java +++ b/src/main/java/spoon/support/reflect/cu/position/SourcePositionImpl.java @@ -15,14 +15,13 @@ import spoon.reflect.cu.position.NoSourcePosition; import java.io.File; -import java.io.Serializable; import java.util.Arrays; /** * This immutable class represents the position of a Java program element in a source * file. */ -public class SourcePositionImpl implements SourcePosition, Serializable { +public class SourcePositionImpl implements SourcePosition { private static final long serialVersionUID = 1L; diff --git a/src/main/java/spoon/support/reflect/declaration/CtElementImpl.java b/src/main/java/spoon/support/reflect/declaration/CtElementImpl.java index 7958577cf7f..a1829372f3a 100644 --- a/src/main/java/spoon/support/reflect/declaration/CtElementImpl.java +++ b/src/main/java/spoon/support/reflect/declaration/CtElementImpl.java @@ -53,8 +53,6 @@ import spoon.support.visitor.equals.CloneHelper; import spoon.support.visitor.equals.EqualsVisitor; import spoon.support.visitor.replace.ReplacementVisitor; - -import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -72,7 +70,7 @@ * Contains the default implementation of most CtElement methods. * */ -public abstract class CtElementImpl implements CtElement, Serializable { +public abstract class CtElementImpl implements CtElement { private static final long serialVersionUID = 1L; protected static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); public static final String ERROR_MESSAGE_TO_STRING = "Error in printing the node. One parent isn't initialized!";