190: don't use iterable extensions

Task-Url: http://github.com/LorenzoBettini/edelta/issues/190
LorenzoBettini · Jun 5, 2020 · a42c768 · a42c768
1 parent 20d0c90
commit a42c768
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/edelta.parent/edelta/src/edelta/compiler/EdeltaCompilerUtil.java b/edelta.parent/edelta/src/edelta/compiler/EdeltaCompilerUtil.java
@@ -1,12 +1,12 @@
 package edelta.compiler;
 
-import static org.eclipse.xtext.xbase.lib.CollectionLiterals.newArrayList;
-import static org.eclipse.xtext.xbase.lib.IterableExtensions.filterNull;
-import static org.eclipse.xtext.xbase.lib.IterableExtensions.toList;
+import static java.util.stream.Collectors.toList;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.emf.ecore.EPackage;
 
@@ -55,7 +55,12 @@ public <T extends Object> T buildMethodToCallForEcoreReference(final EdeltaEcore
 			ecoreReferenceInformationHelper.getOrComputeInformation(e);
 		return function.apply(
 			"get" + info.getType(),
-			toList(filterNull(newArrayList(
-				info.getEPackageName(), info.getEClassifierName(), info.getENamedElementName()))));
+			Stream.of(
+				info.getEPackageName(),
+				info.getEClassifierName(),
+				info.getENamedElementName())
+			.filter(Objects::nonNull)
+			.collect(toList())
+		);
 	}
 }