refactoring: remove deprecated elements from version 5.4.0 (#1135)

src/main/java/spoon/Launcher.java

@@ -30,7 +30,6 @@
 
 import spoon.SpoonModelBuilder.InputType;
 import spoon.compiler.Environment;
-import spoon.compiler.SpoonCompiler;
 import spoon.compiler.SpoonResource;
 import spoon.compiler.SpoonResourceHelper;
 import spoon.processing.Processor;
@@ -541,8 +540,8 @@ protected JSAPResult parseArgs() {
 	 * @param factory
 	 * 		the factory this compiler works on
 	 */
-	public SpoonCompiler createCompiler(Factory factory) {
-		SpoonCompiler comp = new JDTBasedSpoonCompiler(factory);
+	public SpoonModelBuilder createCompiler(Factory factory) {
+		SpoonModelBuilder comp = new JDTBasedSpoonCompiler(factory);
 		Environment env = getEnvironment();
 		// building
 		comp.setEncoding(getArguments().getString("encoding"));
@@ -565,8 +564,8 @@ public SpoonCompiler createCompiler(Factory factory) {
 		return comp;
 	}
 
-	public SpoonCompiler createCompiler(Factory factory, List<SpoonResource> inputSources) {
-		SpoonCompiler c = createCompiler(factory);
+	public SpoonModelBuilder createCompiler(Factory factory, List<SpoonResource> inputSources) {
+		SpoonModelBuilder c = createCompiler(factory);
 		c.addInputSources(inputSources);
 		return c;
 	}
@@ -583,16 +582,16 @@ public SpoonModelBuilder createCompiler(Factory factory, List<SpoonResource> inp
 	}
 
 	@Override
-	public SpoonCompiler createCompiler() {
+	public SpoonModelBuilder createCompiler() {
 		return createCompiler(factory);
 	}
 
 	/**
 	 * Creates a new Spoon Java compiler with a default factory and a list of
 	 * input sources.
 	 */
-	public SpoonCompiler createCompiler(List<SpoonResource> inputSources) {
-		SpoonCompiler c = createCompiler(factory);
+	public SpoonModelBuilder createCompiler(List<SpoonResource> inputSources) {
+		SpoonModelBuilder c = createCompiler(factory);
 		c.addInputSources(inputSources);
 		return c;
 	}

src/main/java/spoon/SpoonModelBuilder.java

@@ -109,10 +109,6 @@ interface InputType {
 	 */
 	boolean compile(InputType... types);
 
-	/** replaced by {@link #compile(InputType...)} */
-	@Deprecated
-	boolean compileInputSources();
-
 	/**
 	 * Takes a list of fully qualified name processors and instantiates them to process
 	 * the Java model.

src/main/java/spoon/compiler/Environment.java

@@ -239,12 +239,6 @@ void report(Processor<?> processor, Level level,
 	 */
 	void setSourceClasspath(String[] sourceClasspath);
 
-	/**
-	 * Use {@link #getInputClassLoader()}
-	 */
-	@Deprecated
-	ClassLoader getClassLoader();
-
 	/**
 	 * Sets the option "noclasspath", use with caution (see explanation below).
 	 *

src/main/java/spoon/compiler/SpoonResource.java

@@ -20,7 +20,7 @@
 
 /**
  * This interface defines generic resources that are used by
- * {@link SpoonCompiler} in the Java compilation process.
+ * {@link spoon.SpoonModelBuilder} in the Java compilation process.
  */
 public interface SpoonResource {
 

src/main/java/spoon/processing/ProcessingManager.java

@@ -23,8 +23,8 @@
 /**
  * The processing manager defines the API to process a program model of a given
  * {@link spoon.reflect.factory.Factory} with a set of processors. The program model has
- * been previously built using a {@link spoon.compiler.SpoonCompiler} - see
- * {@link spoon.compiler.SpoonCompiler#build()}. To use, add processors to
+ * been previously built using a {@link spoon.SpoonModelBuilder} - see
+ * {@link spoon.SpoonModelBuilder#build()}. To use, add processors to
  * the manager, and then call the {@code process} method. Also, the method
  * {@link spoon.processing.Processor#processingDone()} is up called.
  *

src/main/java/spoon/reflect/declaration/CtElement.java

@@ -19,7 +19,6 @@
 import spoon.processing.FactoryAccessor;
 import spoon.reflect.code.CtComment;
 import spoon.reflect.cu.SourcePosition;
-import spoon.reflect.reference.CtReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitable;
 import spoon.reflect.visitor.Filter;
@@ -170,15 +169,6 @@ <E extends CtElement> List<E> getAnnotatedChildren(
 	 */
 	<E extends CtElement> List<E> getElements(Filter<E> filter);
 
-	/**
-	 * @param filter
-	 * @return
-	 *
-	 * @deprecated use {@link #getElements(Filter)} instead.
-	 */
-	@Deprecated
-	<T extends CtReference> List<T> getReferences(Filter<T> filter);
-
 	/**
 	 * Sets the position of this element and all its children element. Note that
 	 * this information is used to feed the line numbers in the generated

src/main/java/spoon/reflect/declaration/CtTypeInformation.java

@@ -101,18 +101,6 @@ public interface CtTypeInformation {
 	 */
 	boolean isSubtypeOf(CtTypeReference<?> type);
 
-	/**
-	 * Returns <code>true</code> if this referenced type is assignable from an
-	 * instance of the given type.
-	 *
-	 * Deprecated on Nov 19, 2016
-	 * Reasons for deprecation:
-	 * 1) it has the opposite behavior of java.lang.Class.isAssignableFrom, this is very confusing
-	 * 2) we already have {@link #isSubtypeOf(CtTypeReference)}
-	 */
-	@Deprecated
-	boolean isAssignableFrom(CtTypeReference<?> type);
-
 	/**
 	 * Returns the class type directly extended by this class.
 	 *

src/main/java/spoon/reflect/factory/CoreFactory.java

@@ -379,14 +379,6 @@ public interface CoreFactory {
 	 */
 	<R> CtReturn<R> createReturn();
 
-	/**
-	 * Creates a source position.
-	 */
-	@Deprecated
-	SourcePosition createSourcePosition(
-			CompilationUnit compilationUnit,
-			int startDeclaration, int startSource, int end, int[] lineSeparatorPositions);
-
 	/**
 	 * Creates a source position.
 	 */

src/main/java/spoon/reflect/factory/Factory.java

@@ -659,12 +659,6 @@ public interface Factory {
 	 */
 	CompilationUnit createCompilationUnit();
 
-	/**
-	 *  @see CoreFactory#createSourcePosition(CompilationUnit,int,int,int,int[])
-	 */
-	@Deprecated
-	SourcePosition createSourcePosition(CompilationUnit compilationUnit, int startDeclaration, int startSource, int end, int[] lineSeparatorPositions);
-
 	/**
 	 *  @see CoreFactory#createSourcePosition(CompilationUnit,int,int,int[])
 	 */

src/main/java/spoon/reflect/factory/FactoryImpl.java

@@ -932,12 +932,6 @@ public CompilationUnit createCompilationUnit() {
 		return Core().createCompilationUnit();
 	}
 
-	@Deprecated
-	@Override
-	public SourcePosition createSourcePosition(CompilationUnit compilationUnit, int startDeclaration, int startSource, int end, int[] lineSeparatorPositions) {
-		return Core().createSourcePosition(compilationUnit, startDeclaration, startSource, end, lineSeparatorPositions);
-	}
-
 	@Override
 	public SourcePosition createSourcePosition(CompilationUnit compilationUnit, int startSource, int end, int[] lineSeparatorPositions) {
 		return Core().createSourcePosition(compilationUnit, startSource, end, lineSeparatorPositions);

src/main/java/spoon/support/DefaultCoreFactory.java

@@ -641,12 +641,6 @@ public void setMainFactory(Factory mainFactory) {
 		this.factory = mainFactory;
 	}
 
-	@Override
-	@Deprecated
-	public SourcePosition createSourcePosition(CompilationUnit compilationUnit, int startDeclaration, int startSource, int end, int[] lineSeparatorPositions) {
-		return new SourcePositionImpl(compilationUnit, startSource, end, lineSeparatorPositions);
-	}
-
 	@Override
 	public SourcePosition createSourcePosition(CompilationUnit compilationUnit, int startSource, int end, int[] lineSeparatorPositions) {
 		return new SourcePositionImpl(compilationUnit, startSource, end, lineSeparatorPositions);

src/main/java/spoon/support/QueueProcessingManager.java

@@ -76,7 +76,7 @@ public boolean addProcessor(Processor<?> p) {
 	@SuppressWarnings("unchecked")
 	public void addProcessor(String qualifiedName) {
 		try {
-			addProcessor((Class<? extends Processor<?>>) getFactory().getEnvironment().getClassLoader().loadClass(qualifiedName));
+			addProcessor((Class<? extends Processor<?>>) getFactory().getEnvironment().getInputClassLoader().loadClass(qualifiedName));
 		} catch (ClassNotFoundException e) {
 			throw new SpoonException("Unable to load processor \"" + qualifiedName + "\" - Check your classpath.", e);
 		}

src/main/java/spoon/support/RuntimeProcessingManager.java

@@ -76,7 +76,7 @@ public boolean addProcessor(Processor<?> p) {
 	@SuppressWarnings("unchecked")
 	public void addProcessor(String qualifiedName) {
 		try {
-			addProcessor((Class<? extends Processor<?>>) getFactory().getEnvironment().getClassLoader().loadClass(qualifiedName));
+			addProcessor((Class<? extends Processor<?>>) getFactory().getEnvironment().getInputClassLoader().loadClass(qualifiedName));
 		} catch (ClassNotFoundException e) {
 			factory.getEnvironment().report(null, Level.ERROR, "Unable to load processor \"" + qualifiedName + "\" - Check your classpath.");
 		}

src/main/java/spoon/support/StandardEnvironment.java

@@ -368,11 +368,6 @@ public ClassLoader getInputClassLoader() {
 		return inputClassloader;
 	}
 
-	@Override
-	public ClassLoader getClassLoader() {
-		return getInputClassLoader();
-	}
-
 	/**
 	 * Creates a URL class path from {@link Environment#getSourceClasspath()}
 	 */

src/main/java/spoon/support/compiler/SnippetCompilationHelper.java

@@ -16,8 +16,8 @@
  */
 package spoon.support.compiler;
 
+import spoon.SpoonModelBuilder;
 import spoon.compiler.ModelBuildingException;
-import spoon.compiler.SpoonCompiler;
 import spoon.reflect.code.CtBlock;
 import spoon.reflect.code.CtCodeSnippetExpression;
 import spoon.reflect.code.CtCodeSnippetStatement;
@@ -109,7 +109,7 @@ public static <T> CtExpression<T> compileExpression(
 
 	private static void build(Factory f, String contents) {
 		// Build contents
-		SpoonCompiler builder = new JDTSnippetCompiler(f, contents);
+		SpoonModelBuilder builder = new JDTSnippetCompiler(f, contents);
 		try {
 			builder.build();
 		} catch (Exception e) {

src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java

@@ -28,7 +28,6 @@
 import spoon.SpoonException;
 import spoon.compiler.Environment;
 import spoon.compiler.ModelBuildingException;
-import spoon.compiler.SpoonCompiler;
 import spoon.compiler.SpoonFile;
 import spoon.compiler.SpoonFolder;
 import spoon.compiler.SpoonResource;
@@ -71,7 +70,7 @@
  * Main class of Spoon to build the model.
  * Highly depends on {@link JDTBatchCompiler} for performing the job.
  */
-public class JDTBasedSpoonCompiler implements SpoonCompiler {
+public class JDTBasedSpoonCompiler implements spoon.SpoonModelBuilder {
 	protected INameEnvironment environment = null;
 	protected final List<CategorizedProblem> probs = new ArrayList<>();
 	protected final TreeBuilderRequestor requestor = new TreeBuilderRequestor(this);
@@ -620,11 +619,6 @@ protected Environment getEnvironment() {
 		return getFactory().getEnvironment();
 	}
 
-	@Override
-	public boolean compileInputSources() {
-		return compile(InputType.FILES);
-	}
-
 	@Override
 	public void addCompilationUnitFilter(final CompilationUnitFilter filter) {
 		compilationUnitFilters.add(filter);

src/main/java/spoon/support/reflect/declaration/CtElementImpl.java

@@ -273,10 +273,6 @@ public <P extends CtElement> CtQuery filterChildren(Filter<P> predicate) {
 		return factory.Query().createQuery(this).filterChildren(predicate);
 	}
 
-	public <T extends CtReference> List<T> getReferences(Filter<T> filter) {
-		return getElements(filter);
-	}
-
 	@Override
 	public CtElement getParent() throws ParentNotInitializedException {
 		if (parent == null) {

src/main/java/spoon/support/reflect/declaration/CtTypeImpl.java

@@ -538,11 +538,6 @@ public List<CtFieldReference<?>> getDeclaredFields() {
 		return fields;
 	}
 
-	@Override
-	public boolean isAssignableFrom(CtTypeReference<?> type) {
-		return isSubtypeOf(type);
-	}
-
 	@Override
 	public <M, C extends CtType<T>> C addMethod(CtMethod<M> method) {
 		if (method != null) {

src/main/java/spoon/support/reflect/declaration/CtTypeParameterImpl.java

@@ -237,11 +237,6 @@ public boolean isSubtypeOf(CtTypeReference<?> type) {
 		return false;
 	}
 
-	@Override
-	public boolean isAssignableFrom(CtTypeReference<?> type) {
-		return false;
-	}
-
 	@Override
 	@UnsettableProperty
 	public <M, C extends CtType<Object>> C addMethod(CtMethod<M> method) {

src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java

@@ -76,11 +76,6 @@ public <T extends CtTypeParameterReference> T setUpper(boolean upper) {
 		return (T) this;
 	}
 
-	@Override
-	public boolean isAssignableFrom(CtTypeReference<?> type) {
-		return false;
-	}
-
 	@Override
 	public boolean isGenerics() {
 		return true;

src/main/java/spoon/support/reflect/reference/CtTypeReferenceImpl.java

@@ -142,7 +142,7 @@ protected Class<T> findClass() {
 			// creating a classloader on the fly is not the most efficient
 			// but it decreases the amount of state to maintain
 			// since getActualClass is only used in rare cases, that's OK.
-			return (Class<T>) getFactory().getEnvironment().getClassLoader().loadClass(getQualifiedName());
+			return (Class<T>) getFactory().getEnvironment().getInputClassLoader().loadClass(getQualifiedName());
 		} catch (Throwable e) {
 			throw new SpoonClassNotFoundException("cannot load class: " + getQualifiedName(), e);
 		}
@@ -194,11 +194,6 @@ public String getQualifiedName() {
 		}
 	}
 
-	@Override
-	public boolean isAssignableFrom(CtTypeReference<?> type) {
-		return type != null && type.isSubtypeOf(this);
-	}
-
 	@Override
 	public boolean isPrimitive() {
 		return ("boolean".equals(getSimpleName()) || "byte".equals(getSimpleName()) || "double".equals(getSimpleName()) || "int".equals(getSimpleName()) || "short".equals(getSimpleName())

src/main/java/spoon/testing/AbstractAssert.java

@@ -84,14 +84,6 @@ public T withProcessor(String qualifiedName) {
 		return myself;
 	}
 
-	/**
-	 * @deprecated
-	 */
-	@Deprecated
-	public boolean equals(Object obj) {
-		throw new UnsupportedOperationException("\'equals\' is not supported...maybe you intended to call \'isEqualTo\'");
-	}
-
 	public int hashCode() {
 		return 1;
 	}