<R extends Object> List<R> list()

INRIA · Jan 8, 2017 · 639e5ce · 639e5ce
1 parent 06bd983
commit 639e5ce
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/spoon/reflect/visitor/Query.java b/src/main/java/spoon/reflect/visitor/Query.java
@@ -62,10 +62,9 @@ public static <E extends CtElement> List<E> getElements(Factory factory,
 	 * @param filter
 	 * 		the filter which defines the matching criteria
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <E extends CtElement> List<E> getElements(
 			CtElement rootElement, Filter<E> filter) {
-		return (List<E>) (List) rootElement.filterChildren(filter).list();
+		return rootElement.filterChildren(filter).list();
 	}
 
 	/**

diff --git a/src/main/java/spoon/reflect/visitor/chain/CtQuery.java b/src/main/java/spoon/reflect/visitor/chain/CtQuery.java
@@ -64,7 +64,7 @@ public interface CtQuery extends CtQueryable {
 	 * @return the list of elements collected by the query.
 	 * @see #forEach(CtConsumer) for an efficient way of manipulating the elements without creating an intermediate list.
 	 */
-	List<Object> list();
+	<R extends Object> List<R> list();
 	/**
 	 * actually evaluates the query and returns these produced elements as a List,
 	 * which are assignable to `itemClass`

diff --git a/src/main/java/spoon/reflect/visitor/chain/CtQueryImpl.java b/src/main/java/spoon/reflect/visitor/chain/CtQueryImpl.java
@@ -84,9 +84,10 @@ public <R> void forEach(CtConsumer<R> consumer) {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public List<Object> list() {
-		return list(Object.class);
+	public <R extends Object> List<R> list() {
+		return (List<R>) list(Object.class);
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/declaration/CtElementImpl.java b/src/main/java/spoon/support/reflect/declaration/CtElementImpl.java
@@ -256,7 +256,7 @@ public Set<CtTypeReference<?>> getReferencedTypes() {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <E extends CtElement> List<E> getElements(Filter<E> filter) {
-		return (List<E>) (List) filterChildren(filter).list();
+		return filterChildren(filter).list();
 	}
 
 	@Override

diff --git a/src/test/java/spoon/test/architecture/SpoonArchitectureEnforcerTest.java b/src/test/java/spoon/test/architecture/SpoonArchitectureEnforcerTest.java
@@ -101,7 +101,7 @@ public void noTreeSetInSpoon() throws Exception {
 		spoon.addInputResource("src/main/java/");
 		spoon.buildModel();
 
-		List<Object> treeSetWithoutComparators = spoon.getFactory().Package().getRootPackage().filterChildren(new AbstractFilter<CtConstructorCall>() {
+		List<CtConstructorCall> treeSetWithoutComparators = spoon.getFactory().Package().getRootPackage().filterChildren(new AbstractFilter<CtConstructorCall>() {
 			@Override
 			public boolean matches(CtConstructorCall element) {
 				return element.getType().getActualClass().equals(TreeSet.class) && element.getArguments().size() == 0;

diff --git a/src/test/java/spoon/test/filters/FilterTest.java b/src/test/java/spoon/test/filters/FilterTest.java
@@ -630,7 +630,7 @@ public void testElementMapConsumableFunction() throws Exception {
 	public void testElementMapFunctionArray() throws Exception {
 		final Launcher launcher = new Launcher();
 		CtQueryImpl q = new CtQueryImpl().map((String s)->new String[]{"a", null, s});
-		List<Object> list = q.setInput(null).list();
+		List<String> list = q.setInput(null).list();
 		assertEquals(0, list.size());
 
 		list = q.setInput("c").list();
@@ -642,7 +642,7 @@ public void testElementMapFunctionArray() throws Exception {
 	public void testElementMapFunctionNull() throws Exception {
 		final Launcher launcher = new Launcher();
 		CtQueryImpl q = new CtQueryImpl().map((String s)->null);
-		List<Object> list = q.setInput(null).list();
+		List<String> list = q.setInput(null).list();
 		assertEquals(0, list.size());
 
 		list = q.setInput("c").list();