diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt index 92778073232..7fb1cea8628 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt @@ -43,7 +43,7 @@ class LazyJavaAnnotations(c: LazyJavaResolverContextWithTypes, val annotationOwn [suppress("UNCHECKED_CAST")] // any iterator can be cast to MutableIterator override fun iterator(): MutableIterator - = annotationOwner.getAnnotations().iterator().map { annotationDescriptors(it) }.filterNotNull() as MutableIterator + = annotationOwner.getAnnotations().stream().map { annotationDescriptors(it) }.filterNotNull().iterator() as MutableIterator override fun isEmpty() = iterator().hasNext() } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt index f9196ee0ebe..a4c92bd9144 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -196,7 +196,7 @@ class LazyJavaClassDescriptor( listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType()) } else - supertypes.iterator() + supertypes.stream() .map { supertype -> c.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes()) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index 4c2f7eed70f..4db4e6cde8f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -61,7 +61,7 @@ public abstract class LazyJavaMemberScope( -> val methods = memberIndex().findMethodsByName(name) val functions = LinkedHashSet( - methods.iterator() + methods.stream() // values() and valueOf() are added manually, see LazyJavaClassDescriptor::getClassObjectDescriptor() .filter{ m -> !DescriptorResolverUtils.shouldBeInEnumClassObject(m) } .flatMap { @@ -69,9 +69,9 @@ public abstract class LazyJavaMemberScope( val function = resolveMethodToFunctionDescriptor(m, true) val samAdapter = resolveSamAdapter(function) if (samAdapter != null) - listOf(function, samAdapter).iterator() + listOf(function, samAdapter).stream() else - listOf(function).iterator() + listOf(function).stream() }.toList()) if (_containingDeclaration is JavaPackageFragmentDescriptor) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt index a2061ca7cc3..7a689cc46a3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt @@ -90,7 +90,7 @@ public class LazyPackageFragmentScopeForJavaPackage( override fun computeMemberIndex(): MemberIndex = computeMemberIndexForSamConstructors(EMPTY_MEMBER_INDEX) override fun getAllClassNames(): Collection { - return jPackage.getClasses().iterator() + return jPackage.getClasses().stream() .filter { c -> c.getOriginKind() != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS } .map { c -> c.getName() }.toList() } @@ -126,7 +126,7 @@ public class LazyPackageFragmentScopeForJavaClass( // We do not filter by hasStaticMembers() because it's slow (e.g. it triggers light class generation), // and there's no harm in having some names in the result that can not be resolved - override fun getSubPackages(): Collection = jClass.getInnerClasses().iterator() + override fun getSubPackages(): Collection = jClass.getInnerClasses().stream() .filter { c -> c.isStatic() } .map { c -> c.getFqName().sure("Nested class has no fqName: $c}") }.toList() } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt index 92d6f451218..c76ce7ab31a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt @@ -55,8 +55,8 @@ open class ClassMemberIndex(val jClass: JavaClass, filter: (JavaMember) -> Boole !DescriptorResolverUtils.isObjectMethodInInterface(m) } - private val methods = jClass.getMethods().iterator().filter(methodFilter).groupBy { m -> m.getName() } - private val fields = jClass.getFields().iterator().filter(memberFilter).valuesToMap { m -> m.getName() } + private val methods = jClass.getMethods().stream().filter(methodFilter).groupBy { m -> m.getName() } + private val fields = jClass.getFields().stream().filter(memberFilter).valuesToMap { m -> m.getName() } override fun findMethodsByName(name: Name): Collection { return methods[name] ?: listOf() @@ -65,5 +65,5 @@ open class ClassMemberIndex(val jClass: JavaClass, filter: (JavaMember) -> Boole override fun getAllMethodNames(): Collection = jClass.getAllMethods().iterator().filter(methodFilter).map { m -> m.getName() }.toList() override fun findFieldByName(name: Name): JavaField? = fields[name] - override fun getAllFieldNames() = jClass.getAllFields().iterator().filter(memberFilter).map { m -> m.getName() }.toList() + override fun getAllFieldNames() = jClass.getAllFields().stream().filter(memberFilter).map { m -> m.getName() }.toList() } \ No newline at end of file diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt b/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt index 001b34c465e..921fd681d5f 100644 --- a/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt +++ b/core/util.runtime/src/org/jetbrains/jet/utils/collections.kt @@ -19,8 +19,7 @@ package org.jetbrains.jet.utils import java.util.LinkedHashMap import java.util.ArrayList -[deprecated("use streams instead")] -public fun Iterator.valuesToMap(key: (V) -> K): Map { +public fun Stream.valuesToMap(key: (V) -> K): Map { val map = LinkedHashMap() for (v in this) { map[key(v)] = v @@ -28,8 +27,7 @@ public fun Iterator.valuesToMap(key: (V) -> K): Map { return map } -[deprecated("use streams instead")] -public fun Iterator.keysToMap(value: (K) -> V): Map { +public fun Stream.keysToMap(value: (K) -> V): Map { val map = LinkedHashMap() for (k in this) { map[k] = value(k) @@ -37,8 +35,7 @@ public fun Iterator.keysToMap(value: (K) -> V): Map { return map } -[deprecated("use streams instead")] -public fun Iterator.keysToMapExceptNulls(value: (K) -> V?): Map { +public fun Stream.keysToMapExceptNulls(value: (K) -> V?): Map { val map = LinkedHashMap() for (k in this) { val v = value(k) diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt index f321a062a47..54670bde6c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt @@ -57,7 +57,7 @@ class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : H } return javaTreeStructures - .iterator() + .stream() .map (::buildChildrenByTreeStructure) .reduce { (a, b) -> ContainerUtil.union(a.toSet(), b.toSet()).copyToArray() } } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index b2700e86ae1..0bdccda2597 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -265,7 +265,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio } getTransaction()!!.getElementListener(oldDeclaration).elementMoved(newDeclaration) - for ((oldElement, newElement) in oldLightElements.iterator() zip newDeclaration.toLightElements().iterator()) { + for ((oldElement, newElement) in oldLightElements.stream() zip newDeclaration.toLightElements().stream()) { oldToNewElementsMapping[oldElement] = newElement } } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index 0e1e9a7ebf7..90f1d3052ff 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -105,7 +105,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { return searchInfo } - fun findUsagesByJavaProcessor(elements: Iterator, insideDeleted: Condition): Condition = + fun findUsagesByJavaProcessor(elements: Stream, insideDeleted: Condition): Condition = elements .map { element -> findUsagesByJavaProcessor(element, true)?.getInsideDeletedCondition() } .filterNotNull() @@ -114,7 +114,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { fun findUsagesByJavaProcessor(jetDeclaration: JetDeclaration): NonCodeUsageSearchInfo { return NonCodeUsageSearchInfo( findUsagesByJavaProcessor( - jetDeclaration.toLightElements().iterator(), + jetDeclaration.toLightElements().stream(), getIgnoranceCondition() ), jetDeclaration @@ -123,7 +123,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { fun findKotlinDeclarationUsages(declaration: JetDeclaration): NonCodeUsageSearchInfo { ReferencesSearch.search(declaration, declaration.getUseScope()) - .iterator() + .stream() .filterNot { reference -> getIgnoranceCondition().value(reference.getElement()) } .mapTo(usages) { reference -> reference.getElement().getParentByType(javaClass())?.let { importDirective -> @@ -214,7 +214,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { if (declarationDescriptor !is CallableMemberDescriptor) return null return declarationDescriptor.getOverriddenDescriptors() - .iterator() + .stream() .filter { overridenDescriptor -> overridenDescriptor.getModality() == Modality.ABSTRACT } .mapTo(ArrayList()) { overridenDescriptor -> JetBundle.message( diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt index c776c20ad3a..1e3ed7d7c58 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt @@ -64,7 +64,7 @@ fun PsiElement.removeOverrideModifier() { fun PsiMethod.cleanUpOverrides() { val superMethods = findSuperMethods(true) for (overridingMethod in OverridingMethodsSearch.search(this, true).findAll()) { - val currentSuperMethods = overridingMethod.findSuperMethods(true).iterator() + superMethods.iterator() + val currentSuperMethods = overridingMethod.findSuperMethods(true).stream() + superMethods.stream() if (currentSuperMethods.all { superMethod -> superMethod.unwrapped == unwrapped }) { overridingMethod.unwrapped?.removeOverrideModifier() } diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt index fd3fa90a2db..91c8b741294 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt @@ -46,7 +46,7 @@ public open class KotlinDirectInheritorsSearcher() : QueryExecutorBase JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(candidate)} .filterNotNull() .filter { candidate -> candidate.isInheritor(baseClass, false) }