From 72bab18a5831f61d39a1b20c99e1ea096f6a1bf5 Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Thu, 20 Jul 2017 16:29:54 +0700 Subject: [PATCH] support min/max in stream api migration, rearrange tests --- .../BaseStreamApiMigration.java | 15 + .../FindExtremumMigration.java | 764 ++++++++++++++++++ .../OperationReductionMigration.java | 2 +- .../StreamApiMigrationInspection.java | 4 + .../streamMigration/TerminalBlock.java | 8 + .../afterCollectionsAddAllArray.java | 0 .../afterCollectionsAddAllPrimitive.java | 0 .../afterCollectionsAddAllVarArg.java | 0 .../beforeCollectionsAddAllArray.java | 0 .../beforeCollectionsAddAllPrimitive.java | 0 .../beforeCollectionsAddAllVarArg.java | 0 .../beforeCollectionsAddAllWrongLimit.java | 0 .../afterDistinctCollect.java | 0 .../afterDistinctCollectLimit.java | 0 .../afterSortedToArray.java | 0 .../{ => afterAllActions}/afterToArray.java | 0 .../afterToArrayAssignment.java | 0 .../afterToArrayCounted.java | 0 .../afterToArrayCountedBoxed.java | 0 .../afterToArrayCountedLength2D.java | 0 .../afterToArrayCountedLengthGeneric.java | 0 .../afterToArrayDeclaration.java | 0 .../afterToArrayGeneric.java | 0 .../afterToArrayHashSet.java | 0 .../afterToArrayLinkedHashSet.java | 0 .../afterToArrayReusedCollection.java | 0 .../afterToArraySorted.java | 0 .../afterToArrayTreeSet.java | 0 .../afterToArrayTwoDimensional.java | 0 .../beforeDistinctCollect.java | 0 .../beforeDistinctCollectLimit.java | 0 .../beforeDistinctCollectWrongItem.java | 0 .../beforeSortedToArray.java | 0 .../{ => afterAllActions}/beforeToArray.java | 0 .../beforeToArrayAssignment.java | 0 .../beforeToArrayCounted.java | 0 .../beforeToArrayCountedBoxed.java | 0 .../beforeToArrayCountedLength2D.java | 0 .../beforeToArrayCountedLengthGeneric.java | 0 .../beforeToArrayDeclaration.java | 0 ...eforeToArrayDeclarationCollectionUsed.java | 0 .../beforeToArrayGeneric.java | 0 .../beforeToArrayHashSet.java | 0 .../beforeToArrayIdentityHashSet.java | 0 .../beforeToArrayLinkedHashSet.java | 0 .../beforeToArrayReusedCollection.java | 0 .../beforeToArraySorted.java | 0 .../beforeToArrayTreeSet.java | 0 .../beforeToArrayTwoDimensional.java | 0 .../beforeToArrayWrongSize.java | 0 .../{ => allMatch}/afterAllMatch.java | 0 .../{ => allMatch}/afterAllMatchChain.java | 0 .../{ => allMatch}/afterAllMatchContinue.java | 0 .../afterAllMatchMethodRef.java | 0 .../{ => allMatch}/beforeAllMatch.java | 0 .../{ => allMatch}/beforeAllMatchChain.java | 0 .../beforeAllMatchContinue.java | 0 .../beforeAllMatchMethodRef.java | 0 .../{ => anyMatch}/afterAnyMatch.java | 0 .../afterAnyMatchArrayAssignment.java | 0 .../afterAnyMatchAssignment.java | 0 .../afterAnyMatchAssignmentBoolean.java | 0 ...fterAnyMatchAssignmentBooleanInverted.java | 0 .../afterAnyMatchAssignmentExtraCode.java | 0 .../afterAnyMatchAssignmentNonTrivial.java | 0 ...nyMatchAssignmentNonTrivialUnassigned.java | 0 .../afterAnyMatchAssignmentTryCatch.java | 0 .../afterAnyMatchAssignmentTryCatch2.java | 0 .../{ => anyMatch}/afterAnyMatchChain.java | 0 .../afterAnyMatchCompoundAssignment.java | 0 .../afterAnyMatchCustomReturn.java | 0 .../afterAnyMatchEnclosingIf.java | 0 .../afterAnyMatchEnclosingIfBlock.java | 0 .../afterAnyMatchEnclosingIfInterrupted.java | 0 .../{ => anyMatch}/afterAnyMatchExtends.java | 0 .../afterAnyMatchMethodCall.java | 0 .../afterAnyMatchPrimitive.java | 0 .../{ => anyMatch}/afterAnyMatchReturn.java | 0 .../afterAnyMatchUnreachableReturn.java | 0 .../{ => anyMatch}/afterAnyMatchVoid.java | 0 .../{ => anyMatch}/afterNestedAnyMatch.java | 0 .../{ => anyMatch}/beforeAnyMatch.java | 0 .../beforeAnyMatchArrayAssignment.java | 0 .../beforeAnyMatchAssignment.java | 0 .../beforeAnyMatchAssignmentBoolean.java | 0 ...foreAnyMatchAssignmentBooleanInverted.java | 0 .../beforeAnyMatchAssignmentExtraCode.java | 0 .../beforeAnyMatchAssignmentNonTrivial.java | 0 ...nyMatchAssignmentNonTrivialUnassigned.java | 0 .../beforeAnyMatchAssignmentTryCatch.java | 0 .../beforeAnyMatchAssignmentTryCatch2.java | 0 .../{ => anyMatch}/beforeAnyMatchChain.java | 0 .../beforeAnyMatchCompoundAssignment.java | 0 .../beforeAnyMatchCustomReturn.java | 0 .../beforeAnyMatchEnclosingIf.java | 0 .../beforeAnyMatchEnclosingIfBlock.java | 0 .../beforeAnyMatchEnclosingIfInterrupted.java | 0 .../{ => anyMatch}/beforeAnyMatchExtends.java | 0 .../{ => anyMatch}/beforeAnyMatchFloat.java | 0 .../beforeAnyMatchMethodCall.java | 0 .../beforeAnyMatchNonFinal.java | 0 .../beforeAnyMatchPrimitive.java | 0 .../beforeAnyMatchReferNonFinal.java | 0 .../{ => anyMatch}/beforeAnyMatchReturn.java | 0 .../beforeAnyMatchReturnDifferent.java | 0 .../beforeAnyMatchReturnInterrupted.java | 0 .../beforeAnyMatchUnreachableReturn.java | 0 .../{ => anyMatch}/beforeAnyMatchUsesVar.java | 0 .../{ => anyMatch}/beforeAnyMatchVoid.java | 0 .../{ => anyMatch}/beforeNestedAnyMatch.java | 0 .../beforeNestedAnyMatchFailed.java | 0 .../afterBufferedReaderCollect.java | 0 .../afterBufferedReaderCollectNestedOk.java | 0 .../afterBufferedReaderModifiedLine.java | 0 .../afterBufferedReaderSum.java | 0 .../beforeBufferedReaderCollect.java | 0 .../beforeBufferedReaderCollectNested.java | 0 .../beforeBufferedReaderCollectNestedOk.java | 0 ...foreBufferedReaderComplexModifiedLine.java | 0 .../beforeBufferedReaderModifiedLine.java | 0 .../beforeBufferedReaderSum.java | 0 .../beforeBufferedReaderSumLineReused.java | 0 .../{ => collect}/afterAddPrimitive.java | 0 .../afterArrayFilterCollect.java | 0 .../afterArrayListVariableType.java | 0 .../{ => collect}/afterCollectAnonymous.java | 0 .../{ => collect}/afterCollectArrayList.java | 0 .../afterCollectArrayListAndFilter.java | 0 .../afterCollectArrayListCollection.java | 0 .../afterCollectArrayListComment.java | 0 ...erCollectArrayListCompoundDeclaration.java | 0 .../afterCollectArrayListLambda.java | 0 ...CollectArrayListNonTrivialInitializer.java | 0 .../{ => collect}/afterCollectBoxed.java | 0 .../{ => collect}/afterCollectCast.java | 0 .../afterCollectContravariant.java | 0 .../afterCollectCustomConstructor.java | 0 .../{ => collect}/afterCollectGuava.java | 0 .../{ => collect}/afterCollectGuavaMap.java | 0 .../{ => collect}/afterCollectGuavaSet.java | 0 .../{ => collect}/afterCollectHashSet.java | 0 .../afterCollectHashSetFieldInitializer.java | 0 .../afterCollectInterrupted.java | 0 .../afterCollectInterruptedInLoop.java | 0 .../afterCollectInterruptedUpdated.java | 0 .../afterCollectInterruptedUsed.java | 0 .../{ => collect}/afterCollectLambda.java | 0 .../afterCollectLinkedHashSet.java | 0 .../afterCollectListSuperType.java | 0 .../{ => collect}/afterCollectNewList.java | 0 .../afterCollectNewListArray.java | 0 .../afterCollectNewListArrayInCall.java | 0 .../afterCollectNewTreeSetArray.java | 0 .../{ => collect}/afterCollectNulls.java | 0 .../afterCollectSelfCollection.java | 0 .../afterCollectSetParameter.java | 0 .../{ => collect}/afterCollectSorted.java | 0 .../afterCollectSortedNatural.java | 0 .../{ => collect}/afterCollectSupertype.java | 0 .../{ => collect}/afterCollectToMap.java | 0 .../{ => collect}/afterCollectToMapPut.java | 0 .../afterCollectToMapPutIfAbsent.java | 0 .../{ => collect}/afterCollectToObj.java | 0 .../afterCollectWithSameLambda.java | 0 .../afterGroupingByArrayList.java | 0 .../afterGroupingByCustomCollection.java | 0 .../afterGroupingByDownstream.java | 0 .../{ => collect}/afterGroupingBySimple.java | 0 .../{ => collect}/afterJoining.java | 0 .../{ => collect}/afterJoiningAssign.java | 0 .../{ => collect}/afterJoiningConcat.java | 0 .../{ => collect}/afterJoiningDelimited.java | 0 .../{ => collect}/afterJoiningInBrackets.java | 0 .../afterJoiningInitialValue.java | 0 .../{ => collect}/afterJoiningReused.java | 0 .../afterJoiningStringBuilderReused.java | 0 .../{ => collect}/afterJoiningUsingIndex.java | 0 .../{ => collect}/afterWildcardCollect.java | 0 .../{ => collect}/beforeAddPrimitive.java | 0 .../beforeArrayFilterCollect.java | 0 .../beforeArrayListVariableType.java | 0 .../{ => collect}/beforeCollectAnonymous.java | 0 .../{ => collect}/beforeCollectArrayList.java | 0 .../beforeCollectArrayListAndFilter.java | 0 .../beforeCollectArrayListCollection.java | 0 .../beforeCollectArrayListComment.java | 0 ...reCollectArrayListCompoundDeclaration.java | 0 .../beforeCollectArrayListLambda.java | 0 ...CollectArrayListNonTrivialInitializer.java | 0 .../{ => collect}/beforeCollectBoxed.java | 0 .../{ => collect}/beforeCollectCast.java | 0 .../beforeCollectContravariant.java | 0 .../beforeCollectCustomConstructor.java | 0 .../{ => collect}/beforeCollectGuava.java | 0 .../{ => collect}/beforeCollectGuavaMap.java | 0 .../beforeCollectGuavaNonEmpty.java | 0 .../{ => collect}/beforeCollectGuavaSet.java | 0 .../{ => collect}/beforeCollectHashSet.java | 0 .../beforeCollectHashSetFieldInitializer.java | 0 .../beforeCollectIdentityMap.java | 0 .../beforeCollectInterrupted.java | 0 .../beforeCollectInterruptedInLoop.java | 0 .../beforeCollectInterruptedUpdated.java | 0 .../beforeCollectInterruptedUsed.java | 0 .../beforeCollectInterruptedUsedFinal.java | 0 .../{ => collect}/beforeCollectLambda.java | 0 .../beforeCollectLinkedHashSet.java | 0 .../beforeCollectListSuperType.java | 0 .../{ => collect}/beforeCollectNewList.java | 0 .../beforeCollectNewListArray.java | 0 .../beforeCollectNewListArrayInCall.java | 0 .../beforeCollectNewTreeSetArray.java | 0 .../{ => collect}/beforeCollectNulls.java | 0 ...ollectQualifierDependsOnLoopParameter.java | 0 .../beforeCollectSelfCollection.java | 0 .../beforeCollectSetParameter.java | 0 .../{ => collect}/beforeCollectSorted.java | 0 .../beforeCollectSortedNatural.java | 0 .../{ => collect}/beforeCollectSupertype.java | 0 .../{ => collect}/beforeCollectToMap.java | 0 .../{ => collect}/beforeCollectToMapPut.java | 0 .../beforeCollectToMapPutIfAbsent.java | 0 .../beforeCollectToMapPutInvalid.java | 0 .../{ => collect}/beforeCollectToObj.java | 0 .../beforeCollectWithAnonymous.java | 0 .../beforeCollectWithLambda.java | 0 .../beforeCollectWithSameLambda.java | 0 .../beforeGroupingByArrayList.java | 0 .../beforeGroupingByCustomCollection.java | 0 .../beforeGroupingByDownstream.java | 0 .../{ => collect}/beforeGroupingBySimple.java | 0 .../{ => collect}/beforeJoining.java | 0 .../{ => collect}/beforeJoiningAssign.java | 0 .../{ => collect}/beforeJoiningConcat.java | 0 .../{ => collect}/beforeJoiningDelimited.java | 0 .../beforeJoiningDelimitedWrongBuilder.java | 0 .../beforeJoiningInBrackets.java | 0 .../beforeJoiningInitialValue.java | 0 .../{ => collect}/beforeJoiningReused.java | 0 .../beforeJoiningStringBuilderReused.java | 0 .../beforeJoiningUsingIndex.java | 0 .../{ => collect}/beforeWildcardCollect.java | 0 .../{ => continue}/afterContinue.java | 0 .../{ => continue}/afterContinueNegate.java | 0 .../afterContinueNegateFloat.java | 0 .../{ => continue}/afterContinueNested.java | 0 .../afterContinueNestedElse.java | 0 .../{ => continue}/afterContinueOr.java | 0 .../{ => continue}/beforeContinue.java | 0 .../{ => continue}/beforeContinueInside.java | 0 .../{ => continue}/beforeContinueNegate.java | 0 .../beforeContinueNegateFloat.java | 0 .../{ => continue}/beforeContinueNested.java | 0 .../beforeContinueNestedElse.java | 0 .../beforeContinueNestedLabel.java | 0 .../{ => continue}/beforeContinueOr.java | 0 .../{ => count}/afterCountArray.java | 0 .../{ => count}/afterCountInner.java | 0 .../{ => count}/afterCountOuter.java | 0 .../{ => count}/afterCountPrimitiveArray.java | 0 .../{ => count}/beforeCountArray.java | 0 .../{ => count}/beforeCountInner.java | 0 .../{ => count}/beforeCountOuter.java | 0 .../beforeCountPrimitiveArray.java | 0 .../{ => count}/beforeCountShortArray.java | 0 .../afterCollectionDependencyInFilter.java | 0 .../afterCollectionDependencyInFilter1.java | 0 .../afterCollectionDependencyInFilter2.java | 0 .../afterCollectionDependencyInFilter3.java | 0 .../afterCollectionDependencyInFilter4.java | 0 ...lterFlatMapCollectionFilterMapCollect.java | 0 .../afterFilterFlatMapMapFilterCollect.java | 0 .../afterFilterMapFlatMapArrayCollect.java | 0 .../afterFilterMapFlatMapArrayMapCollect.java | 0 .../{ => filter}/afterFilterMapForEach.java | 0 .../{ => filter}/afterFilterNoBraces.java | 0 .../afterNormalNestedFilters.java | 0 .../beforeCollectionDependencyInFilter.java | 0 .../beforeCollectionDependencyInFilter1.java | 0 .../beforeCollectionDependencyInFilter2.java | 0 .../beforeCollectionDependencyInFilter3.java | 0 .../beforeCollectionDependencyInFilter4.java | 0 ...lterFlatMapCollectionFilterMapCollect.java | 0 .../beforeFilterFlatMapMapFilterCollect.java | 0 .../beforeFilterMapFlatMapArrayCollect.java | 0 ...beforeFilterMapFlatMapArrayMapCollect.java | 0 .../{ => filter}/beforeFilterMapForEach.java | 0 .../{ => filter}/beforeFilterNoBraces.java | 0 .../beforeNormalNestedFilters.java | 0 .../{ => findFirst}/afterFindFirst.java | 0 .../{ => findFirst}/afterFindFirstArray.java | 0 .../afterFindFirstAssignment.java | 0 .../afterFindFirstAssignmentCast.java | 0 .../afterFindFirstAssignmentIntermediate.java | 0 .../afterFindFirstAssignmentInterrupted.java | 0 .../afterFindFirstAssignmentPrimitive.java | 0 ...dFirstAssignmentUsedInSameDeclaration.java | 0 .../afterFindFirstAssignmentWithLabel.java | 0 .../afterFindFirstBoolean.java | 0 .../{ => findFirst}/afterFindFirstCast.java | 0 .../{ => findFirst}/afterFindFirstEnum.java | 0 .../{ => findFirst}/afterFindFirstField.java | 0 .../afterFindFirstIfPresent.java | 0 .../afterFindFirstIfPresentWithReturn.java | 0 .../afterFindFirstOptional.java | 0 .../afterFindFirstOptionalFlatMap.java | 0 .../afterFindFirstOptionalType.java | 0 .../afterFindFirstOuterIf.java | 0 .../afterFindFirstPrimitive.java | 0 .../afterFindFirstReAssignment.java | 0 .../{ => findFirst}/afterFindFirstReturn.java | 0 .../afterFindFirstReturnUnreachable.java | 0 .../afterFindFirstRunnableTernary.java | 0 .../afterFindFirstStaticField.java | 0 .../afterFindFirstTernary.java | 0 .../afterFindFirstValueReused.java | 0 .../{ => findFirst}/beforeFindFirst.java | 0 .../{ => findFirst}/beforeFindFirstArray.java | 0 .../beforeFindFirstAssignment.java | 0 .../beforeFindFirstAssignmentCast.java | 0 ...beforeFindFirstAssignmentIntermediate.java | 0 .../beforeFindFirstAssignmentInterrupted.java | 0 .../beforeFindFirstAssignmentNested.java | 0 .../beforeFindFirstAssignmentPrimitive.java | 0 ...beforeFindFirstAssignmentPrimitiveMap.java | 0 ...dFirstAssignmentUsedInSameDeclaration.java | 0 .../beforeFindFirstAssignmentWithLabel.java | 0 .../beforeFindFirstBoolean.java | 0 .../{ => findFirst}/beforeFindFirstCall.java | 0 .../{ => findFirst}/beforeFindFirstCast.java | 0 .../{ => findFirst}/beforeFindFirstEnum.java | 0 .../{ => findFirst}/beforeFindFirstField.java | 0 .../beforeFindFirstFieldOther.java | 0 .../beforeFindFirstIfPresent.java | 0 ...beforeFindFirstIfPresentTwoStatements.java | 0 .../beforeFindFirstIfPresentWithReturn.java | 0 .../beforeFindFirstOptional.java | 0 .../beforeFindFirstOptionalFlatMap.java | 0 .../beforeFindFirstOptionalType.java | 0 .../beforeFindFirstOuterIf.java | 0 .../beforeFindFirstPrimitive.java | 0 .../beforeFindFirstPrimitiveNonTrivial.java | 0 .../beforeFindFirstReAssignment.java | 0 .../beforeFindFirstReturn.java | 0 .../beforeFindFirstReturnUnreachable.java | 0 .../beforeFindFirstRunnableTernary.java | 0 .../beforeFindFirstStaticField.java | 0 .../beforeFindFirstTernary.java | 0 .../beforeFindFirstUsedInBound.java | 0 .../beforeFindFirstValueReused.java | 0 .../afterFlatMapChangePrimitiveType.java | 0 .../{ => flatMap}/afterFlatMapForLoop.java | 0 .../{ => flatMap}/afterFlatten2DArray.java | 0 .../afterFlatten2DArrayPrimitive.java | 0 .../beforeFlatMapChangePrimitiveType.java | 0 .../{ => flatMap}/beforeFlatMapForLoop.java | 0 .../{ => flatMap}/beforeFlatten2DArray.java | 0 .../beforeFlatten2DArrayPrimitive.java | 0 .../{ => foreach}/afterForEachCast.java | 0 .../{ => foreach}/afterForeachMethodRef.java | 0 .../{ => foreach}/beforeForEachCast.java | 0 .../{ => foreach}/beforeForeachMethodRef.java | 0 .../{ => limit}/afterLimitCollect.java | 0 .../afterLimitCollectAddedOps.java | 0 .../afterLimitCollectInNestedLoop.java | 0 .../{ => limit}/afterLimitCount.java | 0 .../{ => limit}/afterLimitCountGreater.java | 0 .../{ => limit}/afterLimitCountPostfix.java | 0 .../{ => limit}/afterLimitCountPrefix.java | 0 .../{ => limit}/afterLimitFind.java | 0 .../{ => limit}/afterLimitIntermediate.java | 0 .../{ => limit}/afterRangeLimited.java | 0 .../{ => limit}/beforeLimitCollect.java | 0 .../beforeLimitCollectAddedOps.java | 0 .../beforeLimitCollectInNestedLoop.java | 0 .../beforeLimitCollectInOuterLoop.java | 0 .../{ => limit}/beforeLimitCollectSet.java | 0 .../beforeLimitCollectWrongCollection.java | 0 .../{ => limit}/beforeLimitCount.java | 0 .../{ => limit}/beforeLimitCountGreater.java | 0 .../{ => limit}/beforeLimitCountPostfix.java | 0 .../{ => limit}/beforeLimitCountPrefix.java | 0 .../{ => limit}/beforeLimitCountRef.java | 0 .../{ => limit}/beforeLimitFind.java | 0 .../{ => limit}/beforeLimitIntermediate.java | 0 .../{ => limit}/beforeRangeLimited.java | 0 .../minMax/afterMaxComparable.java | 34 + .../minMax/afterMaxComparableMaxAsArg.java | 41 + .../minMax/afterMaxComparator.java | 36 + .../minMax/afterMaxPrimitive.java | 9 + .../minMax/afterMaxPrimitiveNegated.java | 9 + .../minMax/afterMaxReference1.java | 32 + .../minMax/afterMaxReference2.java | 34 + .../minMax/afterMaxReference3.java | 34 + .../minMax/afterMaxReferenceField.java | 34 + .../minMax/afterMaxReferenceTmp.java | 34 + .../minMax/afterMaxReferenceTmpParens.java | 34 + .../afterMinInitialValueWithoutFilter.java | 9 + .../minMax/afterMinPrimitive.java | 9 + .../minMax/afterMinPrimitiveBoxing.java | 9 + .../minMax/afterMinPrimitiveMap.java | 9 + .../afterMinPrimitiveNonTrivialSelector.java | 9 + .../minMax/afterMinReference.java | 34 + ...rMinReferenceInitializerNotJustBefore.java | 33 + .../minMax/beforeMaxComparable.java | 41 + .../minMax/beforeMaxComparableMaxAsArg.java | 41 + .../minMax/beforeMaxComparator.java | 42 + .../minMax/beforeMaxPrimitive.java | 16 + .../minMax/beforeMaxPrimitiveNegated.java | 13 + ...beforeMaxPrimitiveNonCycleComparision.java | 17 + .../beforeMaxPrimitiveNonCycleVariable.java | 17 + .../minMax/beforeMaxReference1.java | 39 + .../minMax/beforeMaxReference2.java | 44 + .../minMax/beforeMaxReference3.java | 41 + .../minMax/beforeMaxReference4.java | 41 + .../minMax/beforeMaxReferenceField.java | 41 + .../minMax/beforeMaxReferenceShortMethod.java | 41 + .../minMax/beforeMaxReferenceTmp.java | 43 + .../minMax/beforeMaxReferenceTmpParens.java | 43 + .../beforeMinInitialValueWithoutFilter.java | 16 + .../minMax/beforeMinPrimitive.java | 16 + .../minMax/beforeMinPrimitiveBoxing.java | 16 + .../minMax/beforeMinPrimitiveMap.java | 16 + .../beforeMinPrimitiveNonTrivialSelector.java | 14 + .../minMax/beforeMinReference.java | 41 + ...eMinReferenceInitializerNotJustBefore.java | 39 + .../{ => noneMatch}/afterNoneMatch.java | 0 .../afterNoneMatchContinue.java | 0 .../{ => noneMatch}/beforeNoneMatch.java | 0 .../beforeNoneMatchContinue.java | 0 .../{ => other}/afterCastExpected.java | 0 .../{ => other}/afterCastInIterValue.java | 0 .../afterCompactFilterToMethodReference.java | 0 .../afterComputeIfAbsentChained.java | 0 .../afterComputeIfAbsentSimple.java | 0 .../{ => other}/afterDisableForArrays.java | 0 .../{ => other}/afterExplicitArray.java | 0 .../{ => other}/afterForLoop.java | 0 .../{ => other}/afterForLoopBoxed.java | 0 .../{ => other}/afterForLoopShortBound.java | 0 .../{ => other}/afterFromAsList.java | 0 .../{ => other}/afterFromEmptyList.java | 0 .../{ => other}/afterIncompleteNewCall.java | 0 .../{ => other}/afterMethodRef.java | 0 .../{ => other}/afterMissedBraces.java | 0 .../{ => other}/afterNormal.java | 0 .../{ => other}/afterNormalComments.java | 0 .../{ => other}/afterNormalNoBraces.java | 0 .../{ => other}/afterPrimitive.java | 0 .../{ => other}/afterPrimitiveArray.java | 0 .../{ => other}/afterTooLazyCalculation.java | 0 .../{ => other}/beforeBreakInside.java | 0 .../{ => other}/beforeCastExpected.java | 0 .../{ => other}/beforeCastInIterValue.java | 0 .../beforeCompactFilterToMethodReference.java | 0 .../beforeComputeIfAbsentChained.java | 0 .../beforeComputeIfAbsentSimple.java | 0 .../{ => other}/beforeDisableForArrays.java | 0 .../{ => other}/beforeExceptionIsThrown.java | 0 .../{ => other}/beforeExplicitArray.java | 0 .../{ => other}/beforeForLoop.java | 0 .../{ => other}/beforeForLoopBoxed.java | 0 .../{ => other}/beforeForLoopFloatBound.java | 0 .../{ => other}/beforeForLoopShortBound.java | 0 .../{ => other}/beforeForLoopUpdated.java | 0 .../{ => other}/beforeForLoopWrongBound.java | 0 .../beforeForLoopWrongIncrement.java | 0 .../beforeForLoopWrongInitializer.java | 0 .../{ => other}/beforeFromAsList.java | 0 .../{ => other}/beforeFromEmptyList.java | 0 .../{ => other}/beforeIfIncomplete.java | 0 .../{ => other}/beforeIncompleteLabel.java | 0 .../{ => other}/beforeIncompleteNewCall.java | 0 .../{ => other}/beforeIterable.java | 0 ...InitializedAndThusNotEffectivelyFinal.java | 0 .../{ => other}/beforeMethodRef.java | 0 .../{ => other}/beforeMissedBraces.java | 0 .../{ => other}/beforeNoFilter.java | 0 .../{ => other}/beforeNormal.java | 0 .../{ => other}/beforeNormalComments.java | 0 .../{ => other}/beforeNormalNoBraces.java | 0 .../beforeNotEffectivelyFinalVar.java | 0 .../{ => other}/beforePrimitive.java | 0 .../{ => other}/beforePrimitiveArray.java | 0 .../beforePrimitiveArrayWrongType.java | 0 .../{ => other}/beforeRangeReassigned.java | 0 .../beforeRangeReassignedNested.java | 0 .../{ => other}/beforeRawCollection.java | 0 .../beforeRawCollectionSubstitution.java | 0 .../{ => other}/beforeReturnInside.java | 0 .../{ => other}/beforeThrownCollect.java | 0 .../beforeThrownExceptionsNotMatched.java | 0 .../{ => other}/beforeTooLazyCalculation.java | 0 .../{ => reduce}/afterAnd.java | 0 .../{ => reduce}/afterAndHighestBit.java | 0 .../afterAndReplacingHexInitializer.java | 0 .../afterAndReplacingInitializer.java | 0 .../afterAndReplacingLongInitializer.java | 0 .../{ => reduce}/afterConjunction.java | 0 .../{ => reduce}/afterConjunctionBoxed.java | 0 .../{ => reduce}/afterDisjunction.java | 0 .../{ => reduce}/afterMultiply.java | 0 .../afterMultiplyComplexInitializer.java | 0 .../afterMultiplyConflictingVariable.java | 0 ...afterMultiplyNarrowingTypeInitializer.java | 0 .../afterMultiplyNotOneInitializer.java | 0 .../afterMultiplyWithMapping.java | 0 .../{ => reduce}/afterOr.java | 0 .../{ => reduce}/afterXor.java | 0 .../{ => reduce}/afterXorLong.java | 0 .../{ => reduce}/beforeAnd.java | 0 .../{ => reduce}/beforeAndHighestBit.java | 0 .../beforeAndReplacingHexInitializer.java | 0 .../beforeAndReplacingInitializer.java | 0 .../beforeAndReplacingLongInitializer.java | 0 .../{ => reduce}/beforeConjunction.java | 0 .../{ => reduce}/beforeConjunctionBoxed.java | 0 .../{ => reduce}/beforeDisjunction.java | 0 .../{ => reduce}/beforeMultiply.java | 0 .../beforeMultiplyComplexInitializer.java | 0 .../beforeMultiplyConflictingVariable.java | 0 ...eforeMultiplyNarrowingTypeInitializer.java | 0 .../beforeMultiplyNotOneInitializer.java | 0 .../beforeMultiplyWithMapping.java | 0 .../{ => reduce}/beforeOr.java | 0 .../{ => reduce}/beforeXor.java | 0 .../{ => reduce}/beforeXorLong.java | 0 .../{ => sum}/afterIntArraySum.java | 0 .../{ => sum}/afterIntFilterSum.java | 0 .../{ => sum}/afterIntSum.java | 0 .../{ => sum}/afterIntegerSum.java | 0 .../{ => sum}/afterSumArrayLength.java | 0 .../{ => sum}/afterSumArrayLengthNested.java | 0 .../{ => sum}/afterSumCollection.java | 0 .../{ => sum}/afterSumInterruptedUnused.java | 0 .../{ => sum}/afterSumInterruptedUsed.java | 0 .../{ => sum}/afterSumNarrowing.java | 0 .../{ => sum}/afterSumNarrowingParens.java | 0 .../{ => sum}/afterSumPrimitive.java | 0 .../{ => sum}/afterSumPromotion.java | 0 .../{ => sum}/beforeFloatSum.java | 0 .../{ => sum}/beforeIntArraySum.java | 0 .../{ => sum}/beforeIntFilterSum.java | 0 .../{ => sum}/beforeIntSum.java | 0 .../{ => sum}/beforeIntegerSum.java | 0 .../{ => sum}/beforeSumAccessOuterFor.java | 0 .../{ => sum}/beforeSumArrayLength.java | 0 .../{ => sum}/beforeSumArrayLengthFloat.java | 0 .../{ => sum}/beforeSumArrayLengthNested.java | 0 .../{ => sum}/beforeSumCollection.java | 0 .../{ => sum}/beforeSumInterruptedUnused.java | 0 .../{ => sum}/beforeSumInterruptedUsed.java | 0 .../{ => sum}/beforeSumNarrowing.java | 0 .../{ => sum}/beforeSumNarrowingParens.java | 0 .../{ => sum}/beforeSumPrimitive.java | 0 .../{ => sum}/beforeSumPromotion.java | 0 .../{ => takeWhile}/afterTakeWhileJava9.java | 0 .../{ => takeWhile}/beforeTakeWhile.java | 0 .../{ => takeWhile}/beforeTakeWhileJava9.java | 0 .../StreamApiMigrationInspectionTest.java | 193 ++++- .../siyeh/ig/psiutils/ExpressionUtils.java | 1 + 561 files changed, 2091 insertions(+), 17 deletions(-) create mode 100644 java/java-impl/src/com/intellij/codeInspection/streamMigration/FindExtremumMigration.java rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/afterCollectionsAddAllArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/afterCollectionsAddAllPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/afterCollectionsAddAllVarArg.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/beforeCollectionsAddAllArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/beforeCollectionsAddAllPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/beforeCollectionsAddAllVarArg.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => addAll}/beforeCollectionsAddAllWrongLimit.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterDistinctCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterDistinctCollectLimit.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterSortedToArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayCounted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayCountedBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayCountedLength2D.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayCountedLengthGeneric.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayDeclaration.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayGeneric.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayLinkedHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayReusedCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArraySorted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayTreeSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/afterToArrayTwoDimensional.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeDistinctCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeDistinctCollectLimit.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeDistinctCollectWrongItem.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeSortedToArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayCounted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayCountedBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayCountedLength2D.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayCountedLengthGeneric.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayDeclaration.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayDeclarationCollectionUsed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayGeneric.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayIdentityHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayLinkedHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayReusedCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArraySorted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayTreeSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayTwoDimensional.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => afterAllActions}/beforeToArrayWrongSize.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/afterAllMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/afterAllMatchChain.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/afterAllMatchContinue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/afterAllMatchMethodRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/beforeAllMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/beforeAllMatchChain.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/beforeAllMatchContinue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => allMatch}/beforeAllMatchMethodRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchArrayAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentBoolean.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentBooleanInverted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentExtraCode.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentNonTrivial.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentNonTrivialUnassigned.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentTryCatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchAssignmentTryCatch2.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchChain.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchCompoundAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchCustomReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchEnclosingIf.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchEnclosingIfBlock.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchEnclosingIfInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchExtends.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchMethodCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchUnreachableReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterAnyMatchVoid.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/afterNestedAnyMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchArrayAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentBoolean.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentBooleanInverted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentExtraCode.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentNonTrivial.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentNonTrivialUnassigned.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentTryCatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchAssignmentTryCatch2.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchChain.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchCompoundAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchCustomReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchEnclosingIf.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchEnclosingIfBlock.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchEnclosingIfInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchExtends.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchFloat.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchMethodCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchNonFinal.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchReferNonFinal.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchReturnDifferent.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchReturnInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchUnreachableReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchUsesVar.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeAnyMatchVoid.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeNestedAnyMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => anyMatch}/beforeNestedAnyMatchFailed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/afterBufferedReaderCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/afterBufferedReaderCollectNestedOk.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/afterBufferedReaderModifiedLine.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/afterBufferedReaderSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderCollectNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderCollectNestedOk.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderComplexModifiedLine.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderModifiedLine.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => bufferedReader}/beforeBufferedReaderSumLineReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterAddPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterArrayFilterCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterArrayListVariableType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectAnonymous.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayListAndFilter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayListCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayListComment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayListCompoundDeclaration.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayListLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectArrayListNonTrivialInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectContravariant.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectCustomConstructor.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectGuava.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectGuavaMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectGuavaSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectHashSetFieldInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectInterruptedInLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectInterruptedUpdated.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectInterruptedUsed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectLinkedHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectListSuperType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectNewList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectNewListArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectNewListArrayInCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectNewTreeSetArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectNulls.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectSelfCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectSetParameter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectSorted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectSortedNatural.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectSupertype.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectToMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectToMapPut.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectToMapPutIfAbsent.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectToObj.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterCollectWithSameLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterGroupingByArrayList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterGroupingByCustomCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterGroupingByDownstream.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterGroupingBySimple.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoining.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningAssign.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningConcat.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningDelimited.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningInBrackets.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningInitialValue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningStringBuilderReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterJoiningUsingIndex.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/afterWildcardCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeAddPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeArrayFilterCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeArrayListVariableType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectAnonymous.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayListAndFilter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayListCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayListComment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayListCompoundDeclaration.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayListLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectArrayListNonTrivialInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectContravariant.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectCustomConstructor.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectGuava.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectGuavaMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectGuavaNonEmpty.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectGuavaSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectHashSetFieldInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectIdentityMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectInterruptedInLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectInterruptedUpdated.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectInterruptedUsed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectInterruptedUsedFinal.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectLinkedHashSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectListSuperType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectNewList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectNewListArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectNewListArrayInCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectNewTreeSetArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectNulls.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectQualifierDependsOnLoopParameter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectSelfCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectSetParameter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectSorted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectSortedNatural.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectSupertype.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectToMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectToMapPut.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectToMapPutIfAbsent.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectToMapPutInvalid.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectToObj.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectWithAnonymous.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectWithLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeCollectWithSameLambda.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeGroupingByArrayList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeGroupingByCustomCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeGroupingByDownstream.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeGroupingBySimple.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoining.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningAssign.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningConcat.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningDelimited.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningDelimitedWrongBuilder.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningInBrackets.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningInitialValue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningStringBuilderReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeJoiningUsingIndex.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => collect}/beforeWildcardCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/afterContinue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/afterContinueNegate.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/afterContinueNegateFloat.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/afterContinueNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/afterContinueNestedElse.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/afterContinueOr.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueInside.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueNegate.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueNegateFloat.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueNestedElse.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueNestedLabel.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => continue}/beforeContinueOr.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/afterCountArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/afterCountInner.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/afterCountOuter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/afterCountPrimitiveArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/beforeCountArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/beforeCountInner.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/beforeCountOuter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/beforeCountPrimitiveArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => count}/beforeCountShortArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterCollectionDependencyInFilter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterCollectionDependencyInFilter1.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterCollectionDependencyInFilter2.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterCollectionDependencyInFilter3.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterCollectionDependencyInFilter4.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterFilterFlatMapCollectionFilterMapCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterFilterFlatMapMapFilterCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterFilterMapFlatMapArrayCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterFilterMapFlatMapArrayMapCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterFilterMapForEach.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterFilterNoBraces.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/afterNormalNestedFilters.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeCollectionDependencyInFilter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeCollectionDependencyInFilter1.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeCollectionDependencyInFilter2.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeCollectionDependencyInFilter3.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeCollectionDependencyInFilter4.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeFilterFlatMapCollectionFilterMapCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeFilterFlatMapMapFilterCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeFilterMapFlatMapArrayCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeFilterMapFlatMapArrayMapCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeFilterMapForEach.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeFilterNoBraces.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => filter}/beforeNormalNestedFilters.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirst.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignmentCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignmentIntermediate.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignmentInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignmentPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignmentUsedInSameDeclaration.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstAssignmentWithLabel.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstBoolean.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstEnum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstField.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstIfPresent.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstIfPresentWithReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstOptional.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstOptionalFlatMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstOptionalType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstOuterIf.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstReAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstReturnUnreachable.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstRunnableTernary.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstStaticField.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstTernary.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/afterFindFirstValueReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirst.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentIntermediate.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentInterrupted.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentPrimitiveMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentUsedInSameDeclaration.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstAssignmentWithLabel.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstBoolean.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstEnum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstField.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstFieldOther.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstIfPresent.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstIfPresentTwoStatements.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstIfPresentWithReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstOptional.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstOptionalFlatMap.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstOptionalType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstOuterIf.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstPrimitiveNonTrivial.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstReAssignment.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstReturn.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstReturnUnreachable.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstRunnableTernary.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstStaticField.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstTernary.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstUsedInBound.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => findFirst}/beforeFindFirstValueReused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/afterFlatMapChangePrimitiveType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/afterFlatMapForLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/afterFlatten2DArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/afterFlatten2DArrayPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/beforeFlatMapChangePrimitiveType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/beforeFlatMapForLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/beforeFlatten2DArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => flatMap}/beforeFlatten2DArrayPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => foreach}/afterForEachCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => foreach}/afterForeachMethodRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => foreach}/beforeForEachCast.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => foreach}/beforeForeachMethodRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCollectAddedOps.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCollectInNestedLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCount.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCountGreater.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCountPostfix.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitCountPrefix.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitFind.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterLimitIntermediate.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/afterRangeLimited.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCollectAddedOps.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCollectInNestedLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCollectInOuterLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCollectSet.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCollectWrongCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCount.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCountGreater.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCountPostfix.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCountPrefix.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitCountRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitFind.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeLimitIntermediate.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => limit}/beforeRangeLimited.java (100%) create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparable.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparableMaxAsArg.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparator.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitive.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitiveNegated.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference1.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference2.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference3.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceField.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmp.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmpParens.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinInitialValueWithoutFilter.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitive.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveBoxing.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveMap.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveNonTrivialSelector.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReference.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReferenceInitializerNotJustBefore.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparable.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparableMaxAsArg.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparator.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitive.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNegated.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleComparision.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleVariable.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference1.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference2.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference3.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference4.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceField.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceShortMethod.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmp.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmpParens.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinInitialValueWithoutFilter.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitive.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveBoxing.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveMap.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveNonTrivialSelector.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReference.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReferenceInitializerNotJustBefore.java rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => noneMatch}/afterNoneMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => noneMatch}/afterNoneMatchContinue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => noneMatch}/beforeNoneMatch.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => noneMatch}/beforeNoneMatchContinue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterCastExpected.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterCastInIterValue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterCompactFilterToMethodReference.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterComputeIfAbsentChained.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterComputeIfAbsentSimple.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterDisableForArrays.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterExplicitArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterForLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterForLoopBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterForLoopShortBound.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterFromAsList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterFromEmptyList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterIncompleteNewCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterMethodRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterMissedBraces.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterNormal.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterNormalComments.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterNormalNoBraces.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterPrimitiveArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/afterTooLazyCalculation.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeBreakInside.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeCastExpected.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeCastInIterValue.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeCompactFilterToMethodReference.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeComputeIfAbsentChained.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeComputeIfAbsentSimple.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeDisableForArrays.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeExceptionIsThrown.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeExplicitArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoop.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopFloatBound.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopShortBound.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopUpdated.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopWrongBound.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopWrongIncrement.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeForLoopWrongInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeFromAsList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeFromEmptyList.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeIfIncomplete.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeIncompleteLabel.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeIncompleteNewCall.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeIterable.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeMayBeNotInitializedAndThusNotEffectivelyFinal.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeMethodRef.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeMissedBraces.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeNoFilter.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeNormal.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeNormalComments.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeNormalNoBraces.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeNotEffectivelyFinalVar.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforePrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforePrimitiveArray.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforePrimitiveArrayWrongType.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeRangeReassigned.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeRangeReassignedNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeRawCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeRawCollectionSubstitution.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeReturnInside.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeThrownCollect.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeThrownExceptionsNotMatched.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => other}/beforeTooLazyCalculation.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterAnd.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterAndHighestBit.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterAndReplacingHexInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterAndReplacingInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterAndReplacingLongInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterConjunction.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterConjunctionBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterDisjunction.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterMultiply.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterMultiplyComplexInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterMultiplyConflictingVariable.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterMultiplyNarrowingTypeInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterMultiplyNotOneInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterMultiplyWithMapping.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterOr.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterXor.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/afterXorLong.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeAnd.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeAndHighestBit.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeAndReplacingHexInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeAndReplacingInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeAndReplacingLongInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeConjunction.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeConjunctionBoxed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeDisjunction.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeMultiply.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeMultiplyComplexInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeMultiplyConflictingVariable.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeMultiplyNarrowingTypeInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeMultiplyNotOneInitializer.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeMultiplyWithMapping.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeOr.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeXor.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => reduce}/beforeXorLong.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterIntArraySum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterIntFilterSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterIntSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterIntegerSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumArrayLength.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumArrayLengthNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumInterruptedUnused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumInterruptedUsed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumNarrowing.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumNarrowingParens.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/afterSumPromotion.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeFloatSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeIntArraySum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeIntFilterSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeIntSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeIntegerSum.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumAccessOuterFor.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumArrayLength.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumArrayLengthFloat.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumArrayLengthNested.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumCollection.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumInterruptedUnused.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumInterruptedUsed.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumNarrowing.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumNarrowingParens.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumPrimitive.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => sum}/beforeSumPromotion.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => takeWhile}/afterTakeWhileJava9.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => takeWhile}/beforeTakeWhile.java (100%) rename java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/{ => takeWhile}/beforeTakeWhileJava9.java (100%) diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java index ac53283837a6..46cba24a9d6b 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/BaseStreamApiMigration.java @@ -22,6 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.ig.psiutils.ControlFlowUtils; import com.siyeh.ig.psiutils.ControlFlowUtils.InitializerUsageStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author Tagir Valeev @@ -87,6 +88,20 @@ abstract class BaseStreamApiMigration { } } + + @Nullable + static PsiElement replaceWithFindExtremum(@NotNull PsiLoopStatement loopStatement, + @NotNull PsiVariable extremumHolder, + @NotNull String streamText, + @Nullable PsiVariable keyExtremum) { + restoreComments(loopStatement, loopStatement.getBody()); + if(keyExtremum != null) { + keyExtremum.delete(); + } + InitializerUsageStatus status = ControlFlowUtils.getInitializerUsageStatus(extremumHolder, loopStatement); + return replaceInitializer(loopStatement, extremumHolder, extremumHolder.getInitializer(), streamText, status); + } + static void restoreComments(PsiLoopStatement loopStatement, PsiStatement body) { final PsiElement parent = loopStatement.getParent(); for (PsiElement comment : PsiTreeUtil.findChildrenOfType(body, PsiComment.class)) { diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/FindExtremumMigration.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/FindExtremumMigration.java new file mode 100644 index 000000000000..cdc46ab0e98a --- /dev/null +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/FindExtremumMigration.java @@ -0,0 +1,764 @@ +/* + * Copyright 2000-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.codeInspection.streamMigration; + + +import com.intellij.openapi.project.Project; +import com.intellij.psi.*; +import com.intellij.psi.search.LocalSearchScope; +import com.intellij.psi.search.searches.ReferencesSearch; +import com.intellij.psi.tree.IElementType; +import com.intellij.psi.util.InheritanceUtil; +import com.siyeh.ig.psiutils.ControlFlowUtils; +import com.siyeh.ig.psiutils.EquivalenceChecker; +import com.siyeh.ig.psiutils.ExpressionUtils; +import com.siyeh.ig.psiutils.VariableAccessUtils; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +import static com.intellij.psi.util.PsiUtil.skipParenthesizedExprDown; +import static com.intellij.util.ObjectUtils.tryCast; + +class FindExtremumMigration extends BaseStreamApiMigration { + + private static final String MAX_OP = "max"; + private static final String MIN_OP = "min"; + private static final EquivalenceChecker ourEquivalence = EquivalenceChecker.getCanonicalPsiEquivalence(); + + protected FindExtremumMigration(boolean shouldWarn, String replacement) { + super(shouldWarn, replacement); + } + + @Override + PsiElement migrate(@NotNull Project project, @NotNull PsiStatement body, @NotNull TerminalBlock tb) { + ExtremumTerminal terminal = extract(tb, null); + if (terminal == null) return null; + return terminal.replace(); + } + + @Contract(pure = true) + @NotNull + static String getOperation(boolean isMax) { + return isMax ? MAX_OP : MIN_OP; + } + + @Nullable + static private String getComparingMethod(@NotNull PsiType type) { + if (type.equals(PsiType.INT)) return "comparingInt"; + if (type.equals(PsiType.DOUBLE)) return "comparingDouble"; + if (type.equals(PsiType.LONG)) return "comparingLong"; + if (InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_COMPARABLE)) return "comparing"; + return null; + } + + @Nullable + static private Object getNonFilterableInitialValue(@NotNull PsiType type, boolean isMax) { + if (type.equals(PsiType.INT)) { + return isMax ? Integer.MIN_VALUE : Integer.MAX_VALUE; + } + else if (type.equals(PsiType.LONG)) { + return isMax ? Long.MIN_VALUE : Long.MAX_VALUE; + } + else if (type.equals(PsiType.DOUBLE)) { + return isMax ? Double.MIN_VALUE : Double.MAX_VALUE; + } + return null; + } + + /** + * @param nonFinalVariables list of non final variables used in terminal block. If null checks are omitted (intended to be null when + * quick fix applied), empty array means that no non final variables are present in block and have different semantics + */ + @Nullable + static ExtremumTerminal extract(@NotNull TerminalBlock terminalBlock, @Nullable List nonFinalVariables) { + PsiStatement[] statements = terminalBlock.getStatements(); + StreamApiMigrationInspection.FilterOp filterOp = terminalBlock.getLastOperation(StreamApiMigrationInspection.FilterOp.class); + if (filterOp != null) { + TerminalBlock block = terminalBlock.withoutLastOperation(); + if (block != null) { + boolean negated = filterOp.isNegated(); + PsiExpression condition = filterOp.getExpression(); + ExtremumTerminal simpleRefCase = extractRefCase(condition, statements, block, + (nullCheckExpr, comparisonExpr, statements1, terminalBlock1, nonFinalVars, isNegated) -> SimpleRefExtremumTerminal + .extract(nullCheckExpr, comparisonExpr, statements1, terminalBlock1, + nonFinalVars), + nonFinalVariables, negated); + if (simpleRefCase != null) return simpleRefCase; + ExtremumTerminal primitiveCase = PrimitiveExtremumTerminal.extract(condition, statements, block, nonFinalVariables, negated); + if (primitiveCase != null) return primitiveCase; + ExtremumTerminal complexRefCase = extractRefCase(condition, statements, block, ComplexExtremumTerminal::extract, nonFinalVariables, + negated); + if (complexRefCase != null) return complexRefCase; + } + } + return extractIfElseCase(statements, terminalBlock, nonFinalVariables); + } + + //if(maxPerson == null) { + // maxPerson = current; + //} else if (maxPerson.getAge() < person.getAge()) { + // maxPerson = current; + //} + @Nullable + static private ExtremumTerminal extractIfElseCase(@NotNull PsiStatement[] statements, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVariables) { + if (statements.length != 1) return null; + PsiStatement statement = statements[0]; + PsiIfStatement ifStatement = tryCast(statement, PsiIfStatement.class); + if (ifStatement == null) return null; + PsiExpression thenCondition = ifStatement.getCondition(); + if (thenCondition == null) return null; + PsiStatement thenBranch = ControlFlowUtils.stripBraces(ifStatement.getThenBranch()); + PsiStatement elseBranch = ControlFlowUtils.stripBraces(ifStatement.getElseBranch()); + if (thenBranch == null || elseBranch == null) return null; + return extractIfElseCase(thenBranch, thenCondition, elseBranch, terminalBlock, nonFinalVariables); + } + + @Nullable + static private ExtremumTerminal extractIfElseCase(@NotNull PsiStatement thenBranch, + @NotNull PsiExpression thenCondition, + @NotNull PsiStatement elseBranch, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVariables) { + PsiIfStatement elseIfStatement = tryCast(elseBranch, PsiIfStatement.class); + if (elseIfStatement == null || elseIfStatement.getElseBranch() != null) return null; + PsiExpression elseIfCondition = elseIfStatement.getCondition(); + PsiStatement elseIf = ControlFlowUtils.stripBraces(elseIfStatement.getThenBranch()); + if (elseIf == null || elseIfCondition == null) return null; + ExtremumTerminal firstWay = + extractIfElseCase(thenBranch, thenCondition, elseIf, elseIfCondition, terminalBlock, nonFinalVariables); + if (firstWay != null) return firstWay; + return extractIfElseCase(elseIf, elseIfCondition, thenBranch, thenCondition, terminalBlock, nonFinalVariables); + } + + @Nullable + static private ExtremumTerminal extractIfElseCase(@NotNull PsiStatement nullCheckBranch, + @NotNull PsiExpression nullCheckExpr, + @NotNull PsiStatement comparisonBranch, + @NotNull PsiExpression comparisonExpr, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVariables) { + if (!ourEquivalence.statementsAreEquivalent(nullCheckBranch, comparisonBranch)) return null; + return SimpleRefExtremumTerminal + .extract(nullCheckExpr, comparisonExpr, new PsiStatement[]{comparisonBranch}, terminalBlock, nonFinalVariables); + } + + @Nullable + static private ExtremumTerminal extractRefCase(@NotNull PsiExpression condition, + @NotNull PsiStatement[] statements, + @NotNull TerminalBlock terminalBlock, + @NotNull Extractor extractor, + @Nullable List nonFinalVariables, + boolean isNegated) { + PsiBinaryExpression binaryExpression = tryCast(condition, PsiBinaryExpression.class); + if (binaryExpression == null) return null; + IElementType sign = binaryExpression.getOperationTokenType(); + PsiExpression lOperand = binaryExpression.getLOperand(); + PsiExpression rOperand = binaryExpression.getROperand(); + if (!sign.equals(JavaTokenType.OROR) || rOperand == null) return null; + return extractor.extractOriented(lOperand, rOperand, statements, terminalBlock, nonFinalVariables, isNegated); + } + + + static private boolean containsAnyVariable(@NotNull PsiExpression expression, @NotNull List variables) { + for (PsiVariable variable : variables) { + if (VariableAccessUtils.variableIsUsed(variable, expression)) return true; + } + return false; + } + + static private boolean mayChangeBeforeLoop(@NotNull PsiVariable variable, + @NotNull TerminalBlock terminalBlock) { + ControlFlowUtils.InitializerUsageStatus status = + ControlFlowUtils.getInitializerUsageStatus(variable, terminalBlock.getMainLoop()); + return status.equals(ControlFlowUtils.InitializerUsageStatus.UNKNOWN); + } + + @Nullable + static PsiVariable resolveVariableReference(@Nullable PsiExpression expression) { + PsiExpression nakedExpression = skipParenthesizedExprDown(expression); + PsiReferenceExpression referenceExpression = tryCast(nakedExpression, PsiReferenceExpression.class); + if (referenceExpression == null) return null; + PsiElement resolvedExpr = referenceExpression.resolve(); + PsiLocalVariable localVariable = tryCast(resolvedExpr, PsiLocalVariable.class); + if (localVariable != null) return localVariable; + return tryCast(resolvedExpr, PsiParameter.class); + } + + private static boolean equalShape(@NotNull PsiExpression first, + @NotNull PsiExpression second, + @NotNull String firstExprVarName, + @NotNull PsiVariable secondExprVariable) { + PsiExpression secondCopy = (PsiExpression)second.copy(); + for (PsiReference ref : ReferencesSearch.search(secondExprVariable, new LocalSearchScope(secondCopy))) { + if (ref instanceof PsiReferenceExpression) ExpressionUtils.bindReferenceTo((PsiReferenceExpression)ref, firstExprVarName); + } + return ourEquivalence.expressionsAreEquivalent(first, secondCopy); + } + + private static boolean hasKnownComparableType(@NotNull Comparison comparison, @Nullable PsiType type) { + return comparison.isExternalComparison() || (type != null && getComparingMethod(type) != null); + } + + interface ExtremumTerminal { + @Nullable + PsiElement replace(); + + boolean isMax(); + } + + @FunctionalInterface + interface Extractor { + /** + * @param nullCheckExpr expression where supposed to be null check + * @param comparisonExpr expression where supposed to be comparison + * @param statements statements inside loop that should contain assignment + * @param terminalBlock terminal block for this loop + * @param nonFinalVars list of non final variables used in this loop (without terminal block variable) + * @param isNegated whether the comparison is negated + */ + @Nullable + ExtremumTerminal extractOriented(@NotNull PsiExpression nullCheckExpr, + @NotNull PsiExpression comparisonExpr, + @NotNull PsiStatement[] statements, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVars, + boolean isNegated); + } + + //Person maxPerson = null; + //int maxAge = 0; + //for (Person person : personList) { + // if (maxPerson == null || maxAge < person.getAge()) { + // maxPerson = person; + // maxAge = person.getAge(); + // } + //} + private static class ComplexExtremumTerminal implements ExtremumTerminal { + private final boolean myMax; + private final @NotNull PsiVariable myExtremum; + private final @NotNull PsiVariable myExtremumKey; + private final @NotNull PsiExpression myExtremumKeyInitializer; + private final @NotNull PsiExpression myExtremumKeyExpr; + private final @NotNull TerminalBlock myTerminalBlock; + private final @Nullable PsiVariable myComparator; + + private ComplexExtremumTerminal(boolean max, + @NotNull PsiVariable extremum, + @NotNull PsiVariable extremumKey, + @NotNull PsiExpression extremumKeyInitializer, + @NotNull PsiExpression extremumKeyExpr, + @NotNull TerminalBlock block, + @Nullable PsiVariable comparator) { + myMax = max; + myExtremum = extremum; + myExtremumKey = extremumKey; + myExtremumKeyInitializer = extremumKeyInitializer; + myExtremumKeyExpr = extremumKeyExpr; + myTerminalBlock = block; + myComparator = comparator; + } + + + @Nullable + @Override + public PsiElement replace() { + PsiType loopVarExpressionType = myExtremumKeyExpr.getType(); + if (loopVarExpressionType == null) return null; + String method = getComparingMethod(loopVarExpressionType); + if (method == null) return null; + + String inFilterOperation = myMax ? ">=" : "<="; + PsiLoopStatement loop = myTerminalBlock.getMainLoop(); + PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(loop.getProject()); + String extremumInitializer = myExtremumKeyInitializer.getText(); + PsiExpression condition = + elementFactory.createExpressionFromText(myExtremumKeyExpr.getText() + inFilterOperation + extremumInitializer, loop); + TerminalBlock blockWithFilter = + myTerminalBlock.add(new StreamApiMigrationInspection.FilterOp(condition, myTerminalBlock.getVariable(), false)); + + String lambdaText = LambdaUtil.createLambda(myTerminalBlock.getVariable(), myExtremumKeyExpr); + String comparator; + if(myComparator == null) { + comparator = CommonClassNames.JAVA_UTIL_COMPARATOR + "." + method + "(" + lambdaText + ")"; + } else { + String comparatorName = myComparator.getName(); + if(comparatorName == null) return null; + comparator = comparatorName; + } + String stream = blockWithFilter.generate() + "." + getOperation(myMax) + "(" + comparator + ").orElse(null)"; + return replaceWithFindExtremum(myTerminalBlock.getMainLoop(), myExtremum, stream, myExtremumKey); + } + + @Override + public boolean isMax() { + return myMax; + } + + @Nullable + private static ComplexExtremumTerminal extract(@NotNull PsiExpression nullCheckExpr, + @NotNull PsiExpression comparisonExpr, + @NotNull PsiStatement[] statements, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVariables, + boolean isNegated) { + Comparison comparison = Comparison.extract(comparisonExpr, terminalBlock.getVariable(), isNegated); + if (comparison == null) return null; + + PsiBinaryExpression nullCheckBinary = tryCast(skipParenthesizedExprDown(nullCheckExpr), PsiBinaryExpression.class); + if (nullCheckBinary == null) return null; + PsiVariable extremumNullChecked = ExpressionUtils.getVariableFromNullComparison(nullCheckBinary, true); + + if (extremumNullChecked == null) return null; + ComplexAssignment assignment = ComplexAssignment.extract(statements, extremumNullChecked); + if (assignment == null) return null; + if (!assignment.getLoopVar().equals(terminalBlock.getVariable())) return null; + PsiVariable extremumKey = resolveVariableReference(comparison.getExtremumExpr()); + if (extremumKey == null) return null; + if (!extremumKey.equals(assignment.getExtremumKey())) return null; + PsiVariable extremum = assignment.getExtremum(); + if (mayChangeBeforeLoop(extremumKey, terminalBlock) || + mayChangeBeforeLoop(extremum, terminalBlock)) { + return null; + } + + PsiExpression loopVarExpr = comparison.getLoopVarExpr(); + if (!ourEquivalence.expressionsAreEquivalent(assignment.getLoopVarExpression(), loopVarExpr)) return null; + if (nonFinalVariables != null) { + if (containsAnyVariable(assignment.getLoopVarExpression(), nonFinalVariables)) return null; + } + PsiType loopVarExprType = loopVarExpr.getType(); + if (!hasKnownComparableType(comparison, loopVarExprType)) return null; + + PsiExpression extremumInitializer = extremum.getInitializer(); + PsiExpression extremumKeyInitializer = extremumKey.getInitializer(); + if (extremumInitializer == null || extremumKeyInitializer == null) return null; + if (!ExpressionUtils.isNullLiteral(extremumInitializer)) return null; + if (!ExpressionUtils.isEvaluatedAtCompileTime(extremumKeyInitializer)) return null; + return new ComplexExtremumTerminal(comparison.isMax(), extremum, extremumKey, extremumKeyInitializer, loopVarExpr, terminalBlock, + comparison.getComparator()); + } + + private static class ComplexAssignment { + private @NotNull final PsiVariable myExtremum; + private @NotNull final PsiVariable myExtremumKey; + private @NotNull final PsiVariable myLoopVar; // extremum = loopVar; + private @NotNull final PsiExpression myLoopVarExpression; + + private ComplexAssignment(@NotNull PsiVariable extremum, + @NotNull PsiVariable extremumKey, + @NotNull PsiVariable loopVar, + @NotNull PsiExpression loopVarExpression) { + myExtremum = extremum; + myExtremumKey = extremumKey; + myLoopVar = loopVar; + myLoopVarExpression = loopVarExpression; + } + + @NotNull + public PsiVariable getExtremum() { + return myExtremum; + } + + @NotNull + public PsiVariable getExtremumKey() { + return myExtremumKey; + } + + @NotNull + public PsiVariable getLoopVar() { + return myLoopVar; + } + + @NotNull + public PsiExpression getLoopVarExpression() { + return myLoopVarExpression; + } + + /** + * Intended to recognize: + * extremum = loopVar; // max = current; + * extremumKey = loopVarExpr; // maxAge = current.getAge(); + * + * @param statements statements that contains only complex assignment + * @param nullCheckedExtremum extremum that will be used to recognize extremum assignment + */ + @Nullable + private static ComplexAssignment extract(@NotNull PsiStatement[] statements, @NotNull PsiVariable nullCheckedExtremum) { + if (statements.length != 2) return null; + PsiStatement first = statements[0]; + PsiStatement second = statements[1]; + ComplexAssignment assignment = extract(first, second, nullCheckedExtremum); + if (assignment != null) return assignment; + return extract(second, first, nullCheckedExtremum); + } + + @Nullable + private static ComplexAssignment extract(@NotNull PsiStatement first, + @NotNull PsiStatement second, + @NotNull PsiVariable nullCheckedExtremum) { + PsiAssignmentExpression secondAssignment = ExpressionUtils.getAssignment(second); + if (secondAssignment == null) return null; + PsiVariable loopVar = resolveVariableReference(ExpressionUtils.getAssignmentTo(first, nullCheckedExtremum)); + PsiVariable extremumKey = resolveVariableReference(secondAssignment.getLExpression()); + PsiExpression loopVarExpr = secondAssignment.getRExpression(); + if (extremumKey == null || loopVar == null || loopVarExpr == null) return null; + return new ComplexAssignment(nullCheckedExtremum, extremumKey, loopVar, loopVarExpr); + } + } + } + + //if(max < anInt) { + //max = anInt; + //} + private static class PrimitiveExtremumTerminal implements ExtremumTerminal { + private final boolean myMax; + private final @NotNull TerminalBlock myTerminalBlock; + private final @NotNull PsiExpression myLoopVarExpression; + private final @NotNull PsiVariable myExtremum; + private final @NotNull PsiExpression myExtremumInitializer; + + private PrimitiveExtremumTerminal(boolean max, + @NotNull TerminalBlock block, + @NotNull PsiExpression loopVarExpression, + @NotNull PsiVariable extremum, + @NotNull PsiExpression extremumInitializer) { + myMax = max; + myTerminalBlock = block; + myLoopVarExpression = loopVarExpression; + myExtremum = extremum; + myExtremumInitializer = extremumInitializer; + } + + + @Nullable + @Override + public PsiElement replace() { + PsiVariable variable = myTerminalBlock.getVariable(); + String name = variable.getName(); + if (name == null) return null; + PsiType type = myExtremumInitializer.getType(); + if (type == null) return null; + Object initializerValue = ExpressionUtils.computeConstantExpression(myExtremumInitializer); + if (initializerValue == null) return null; + + TerminalBlock blockWithMap = myTerminalBlock + .add(new StreamApiMigrationInspection.MapOp(myLoopVarExpression, variable, myLoopVarExpression.getType())); + + + final TerminalBlock terminalBlock; + PsiType variableType = variable.getType(); + if(!variableType.equals(myExtremum.getType())) { + PsiElementFactory factory = JavaPsiFacade.getElementFactory(variable.getProject()); + PsiExpression variableExpr = factory.createExpressionFromText(name, variable); + terminalBlock = blockWithMap.add(new StreamApiMigrationInspection.MapOp(variableExpr, variable, type)); + } else { + terminalBlock = blockWithMap; + } + String inFilterOperation = myMax ? ">=" : "<="; + PsiLoopStatement loop = terminalBlock.getMainLoop(); + PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(loop.getProject()); + String extremumInitializer = myExtremumInitializer.getText(); + Object nonFilterableInitialValue = getNonFilterableInitialValue(type, myMax); + final TerminalBlock filteredTerminalBlock; + if (nonFilterableInitialValue != null && !nonFilterableInitialValue.equals(initializerValue)) { + PsiExpression condition = + elementFactory.createExpressionFromText(name + inFilterOperation + extremumInitializer, loop); + + filteredTerminalBlock = terminalBlock.add(new StreamApiMigrationInspection.FilterOp(condition, myTerminalBlock.getVariable(), false)); + } + else { + filteredTerminalBlock = terminalBlock; + } + + + String stream = filteredTerminalBlock.generate() + "." + getOperation(myMax) + "().orElse(" + extremumInitializer + ")"; + return replaceWithFindExtremum(loop, myExtremum, stream, null); + } + + + @Override + public boolean isMax() { + return myMax; + } + + + @Nullable + private static PrimitiveExtremumTerminal extract(@NotNull PsiExpression condition, + @NotNull PsiStatement[] statements, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVariables, + boolean isNegated) { + Comparison comparison = Comparison.extract(condition, terminalBlock.getVariable(), isNegated); + if (comparison == null || comparison.isExternalComparison()) return null; + if (statements.length != 1) return null; + PsiAssignmentExpression assignment = ExpressionUtils.getAssignment(statements[0]); + if (assignment == null) return null; + PsiVariable extremum = resolveVariableReference(assignment.getLExpression()); + if (extremum == null) return null; + PsiExpression assignmentLoopVarExpr = assignment.getRExpression(); + PsiExpression comparisonLoopVarExpr = comparison.getLoopVarExpr(); + if (!ourEquivalence.expressionsAreEquivalent(assignmentLoopVarExpr, comparisonLoopVarExpr)) return null; + PsiVariable comparisonExtremum = resolveVariableReference(comparison.getExtremumExpr()); + if (comparisonExtremum == null) return null; + if (!extremum.equals(comparisonExtremum)) return null; + if (mayChangeBeforeLoop(extremum, terminalBlock)) return null; + if (nonFinalVariables != null) { + if (containsAnyVariable(comparisonLoopVarExpr, nonFinalVariables)) return null; + } + PsiType loopVarExprType = comparisonLoopVarExpr.getType(); + if (!hasKnownComparableType(comparison, loopVarExprType)) return null; + + PsiExpression extremumInitializer = extremum.getInitializer(); + if (!ExpressionUtils.isEvaluatedAtCompileTime(extremumInitializer)) return null; + return new PrimitiveExtremumTerminal(comparison.isMax(), terminalBlock, comparisonLoopVarExpr, extremum, extremumInitializer + ); + } + } + + private static class SimpleRefExtremumTerminal implements ExtremumTerminal { + private final boolean myMax; + private final @NotNull TerminalBlock myTerminalBlock; + private final @NotNull PsiExpression myLoopVarExpression; + private final @NotNull PsiVariable myExtremum; + private final @Nullable PsiVariable myComparator; + + private SimpleRefExtremumTerminal(boolean max, + @NotNull TerminalBlock block, + @NotNull PsiExpression loopVarExpression, + @NotNull PsiVariable extremum, + @Nullable PsiVariable comparator) { + myMax = max; + myTerminalBlock = block; + myLoopVarExpression = loopVarExpression; + myExtremum = extremum; + myComparator = comparator; + } + + @Nullable + @Override + public PsiElement replace() { + PsiType loopVarExpressionType = myLoopVarExpression.getType(); + if (loopVarExpressionType == null) return null; + final String comparator; + if(myComparator == null) { + String method = getComparingMethod(loopVarExpressionType); + if (method == null) return null; + String lambdaText = LambdaUtil.createLambda(myTerminalBlock.getVariable(), myLoopVarExpression); + comparator = CommonClassNames.JAVA_UTIL_COMPARATOR + "." + method + "(" + lambdaText + ")"; + } else { + String comparatorName = myComparator.getName(); + if(comparatorName == null) return null; + comparator = comparatorName; + } + String stream = myTerminalBlock.generate() + "." + getOperation(myMax) + "(" + comparator + ").orElse(null)"; + return replaceWithFindExtremum(myTerminalBlock.getMainLoop(), myExtremum, stream, null); + } + + @Override + public boolean isMax() { + return myMax; + } + + + @Nullable + private static SimpleRefExtremumTerminal extract(@NotNull PsiExpression nullCheckExpr, + @NotNull PsiExpression comparisonExpr, + @NotNull PsiStatement[] statements, + @NotNull TerminalBlock terminalBlock, + @Nullable List nonFinalVars) { + PsiBinaryExpression nullCheckBinary = tryCast(nullCheckExpr, PsiBinaryExpression.class); + if (nullCheckBinary == null) return null; + PsiVariable nullCheckingVar = ExpressionUtils.getVariableFromNullComparison(nullCheckBinary, true); + if (nullCheckingVar == null) return null; + Comparison comparison = Comparison.extract(comparisonExpr, terminalBlock.getVariable(), false); + if (comparison == null) return null; + if (statements.length != 1) return null; + PsiAssignmentExpression assignment = ExpressionUtils.getAssignment(statements[0]); + if (assignment == null) return null; + PsiVariable extremum = resolveVariableReference(assignment.getLExpression()); + PsiVariable loopVariable = resolveVariableReference(assignment.getRExpression()); + if (extremum == null || loopVariable == null) return null; + if (nullCheckingVar != extremum) return null; + if (!loopVariable.equals(terminalBlock.getVariable())) return null; + + PsiExpression extremumExpr = comparison.getExtremumExpr(); + PsiExpression loopVarExpr = comparison.getLoopVarExpr(); + String name = extremum.getName(); + if (name == null) return null; + if (!equalShape(extremumExpr, loopVarExpr, name, terminalBlock.getVariable())) return null; + if (mayChangeBeforeLoop(extremum, terminalBlock)) return null; + if (nonFinalVars != null) { + if (nonFinalVars.size() != 1) return null; + if (!nonFinalVars.get(0).equals(extremum)) return null; + if (containsAnyVariable(loopVarExpr, nonFinalVars)) return null; + } + PsiType loopVarExprType = loopVarExpr.getType(); + if (!hasKnownComparableType(comparison, loopVarExprType)) return null; + + boolean max = comparison.isMax(); + + PsiExpression initializer = extremum.getInitializer(); + if (!ExpressionUtils.isNullLiteral(initializer)) return null; + return new SimpleRefExtremumTerminal(max, terminalBlock, loopVarExpr, extremum, comparison.getComparator()); + } + } + + private static class Comparison { + private final @NotNull PsiExpression myExtremumExpr; + private final @NotNull PsiExpression myLoopVarExpr; + private final boolean myIsMax; + private final @Nullable PsiVariable myComparator; + private final boolean myExternalComparison; + + private Comparison(@NotNull PsiExpression extremumExpr, + @NotNull PsiExpression loopVarExpr, + boolean max, + @Nullable PsiVariable comparator, + boolean externalComparison) { + myExtremumExpr = extremumExpr; + myLoopVarExpr = loopVarExpr; + myIsMax = max; + myComparator = comparator; + myExternalComparison = externalComparison; + } + + @NotNull + public PsiExpression getLoopVarExpr() { + return myLoopVarExpr; + } + + @NotNull + public PsiExpression getExtremumExpr() { + return myExtremumExpr; + } + + public boolean isMax() { + return myIsMax; + } + + @Nullable + public PsiVariable getComparator() { + return myComparator; + } + + public boolean isExternalComparison() { + return myExternalComparison; + } + + + @Nullable + static Comparison extract(@NotNull PsiExpression expression, @NotNull PsiVariable loopVariable, boolean isNegated) { + PsiBinaryExpression binaryExpression = tryCast(skipParenthesizedExprDown(expression), PsiBinaryExpression.class); + if (binaryExpression == null) return null; + IElementType sign = binaryExpression.getOperationSign().getTokenType(); + PsiExpression rOperand = binaryExpression.getROperand(); + if (rOperand == null) return null; + PsiExpression lOperand = binaryExpression.getLOperand(); + if (sign.equals(JavaTokenType.LT) || sign.equals(JavaTokenType.LE)) { + Comparison extract = extractComparatorLikeComparison(lOperand, rOperand, loopVariable, isNegated); + if (extract != null) return extract; + return extract(lOperand, rOperand, loopVariable, isNegated, null, false); + } + else if (sign.equals(JavaTokenType.GT) || sign.equals(JavaTokenType.GE)) { + Comparison extract = extractComparatorLikeComparison(lOperand, rOperand, loopVariable, !isNegated); + if (extract != null) return extract; + return extract(lOperand, rOperand, loopVariable, !isNegated, null, false); + } + return null; + } + + @Nullable + private static Comparison extractComparatorLikeComparison(@NotNull PsiExpression expression, + @NotNull PsiVariable loopVariable, + boolean isGreater) { + + PsiMethodCallExpression methodExpression = tryCast(expression, PsiMethodCallExpression.class); + if (methodExpression == null) return null; + PsiExpression qualifierExpression = methodExpression.getMethodExpression().getQualifierExpression(); + if (qualifierExpression == null) return null; + PsiMethod method = methodExpression.resolveMethod(); + if (method == null) return null; + String methodName = method.getName(); + PsiType qualifierType = qualifierExpression.getType(); + PsiExpressionList argumentList = methodExpression.getArgumentList(); + PsiExpression[] arguments = argumentList.getExpressions(); + if (arguments.length == 1) { + PsiExpression argument = arguments[0]; + + if (!methodName.equals("compareTo") || !InheritanceUtil.isInheritor(qualifierType, CommonClassNames.JAVA_LANG_COMPARABLE)) { + return null; + } + return extract(argument, qualifierExpression, loopVariable, isGreater, null, false); + } + else if (arguments.length == 2) { + PsiExpression firstArgument = arguments[0]; + PsiExpression secondArgument = arguments[1]; + if (!methodName.equals("compare") || !InheritanceUtil.isInheritor(qualifierType, CommonClassNames.JAVA_UTIL_COMPARATOR)) { + return null; + } + PsiVariable comparator = resolveVariableReference(qualifierExpression); + return extract(secondArgument, firstArgument, loopVariable, isGreater, comparator, true); + } + return null; + } + + @Nullable + private static Comparison extractComparatorLikeComparison(@NotNull PsiExpression lOperand, + @NotNull PsiExpression rOperand, + @NotNull PsiVariable loopVariable, + boolean isGreater) { + if (ExpressionUtils.isZero(lOperand)) { + return extractComparatorLikeComparison(rOperand, loopVariable, isGreater); + } + else if (ExpressionUtils.isZero(rOperand)) { + return extractComparatorLikeComparison(lOperand, loopVariable, !isGreater); + } + return null; + } + + + @Nullable + private static Comparison extract(@NotNull PsiExpression lOperand, + @NotNull PsiExpression rOperand, + @NotNull PsiVariable loopVariable, + boolean isGreater, + @Nullable PsiVariable comparator, + boolean externalComparison) { + final boolean max; + final PsiExpression extremumExpr; + final PsiExpression loopVarExpr; + if (ReferencesSearch.search(loopVariable, new LocalSearchScope(lOperand)).findFirst() != null) { + max = isGreater; + loopVarExpr = lOperand; + extremumExpr = rOperand; + } + else if (ReferencesSearch.search(loopVariable, new LocalSearchScope(rOperand)).findFirst() != null) { + max = !isGreater; + loopVarExpr = rOperand; + extremumExpr = lOperand; + } + else { + return null; + } + return new Comparison(extremumExpr, loopVarExpr, max, comparator, externalComparison); + } + } +} \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/OperationReductionMigration.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/OperationReductionMigration.java index 878a28ae96ba..01034b4c4592 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/OperationReductionMigration.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/OperationReductionMigration.java @@ -66,7 +66,7 @@ public class OperationReductionMigration extends BaseStreamApiMigration { PsiExpression initializer = var.getInitializer(); String identity = initializer != null && myReductionOperation.getInitializerExpressionRestriction().test(initializer) ? initializer.getText() - : myReductionOperation.myIdentity; + : myReductionOperation.getIdentity(); String stream = tb.add(new StreamApiMigrationInspection.MapOp(operand, tb.getVariable(), type)).generate() + String.format(Locale.ENGLISH, ".reduce(%s, (%s, %s) -> %s %s %s)", identity, leftOperand, rightOperand, leftOperand, diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java index c953acc8b324..f1477e2a5abe 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java @@ -493,6 +493,10 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo if (getAccumulatedVariable(tb, nonFinalVariables, SUM_OPERATION) != null) { return new SumMigration(true); } + FindExtremumMigration.ExtremumTerminal extremumTerminal = FindExtremumMigration.extract(tb, nonFinalVariables); + if(extremumTerminal != null) { + return new FindExtremumMigration(true, FindExtremumMigration.getOperation(extremumTerminal.isMax()) + "()"); + } for (OperationReductionMigration.ReductionOperation reductionOperation : OperationReductionMigration.OPERATIONS) { if (getAccumulatedVariable(tb, nonFinalVariables, reductionOperation) != null) { return new OperationReductionMigration(true, reductionOperation); diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/TerminalBlock.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/TerminalBlock.java index 4deaada7d342..b374178faaae 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/TerminalBlock.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/TerminalBlock.java @@ -375,6 +375,14 @@ class TerminalBlock { return myOperations[myOperations.length-1]; } + @Nullable + TerminalBlock withoutLastOperation() { + if(myOperations.length == 1) return null; + Operation[] operations = new Operation[myOperations.length - 1]; + System.arraycopy(myOperations, 0, operations, 0, operations.length); + return new TerminalBlock(operations, operations[operations.length - 1].getVariable(), myStatements); + } + @Nullable T getLastOperation(Class clazz) { return tryCast(getLastOperation(), clazz); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionsAddAllArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/afterCollectionsAddAllArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionsAddAllArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/afterCollectionsAddAllArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionsAddAllPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/afterCollectionsAddAllPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionsAddAllPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/afterCollectionsAddAllPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionsAddAllVarArg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/afterCollectionsAddAllVarArg.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionsAddAllVarArg.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/afterCollectionsAddAllVarArg.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllVarArg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllVarArg.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllVarArg.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllVarArg.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllWrongLimit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllWrongLimit.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionsAddAllWrongLimit.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/addAll/beforeCollectionsAddAllWrongLimit.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDistinctCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterDistinctCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDistinctCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterDistinctCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDistinctCollectLimit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterDistinctCollectLimit.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDistinctCollectLimit.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterDistinctCollectLimit.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSortedToArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterSortedToArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSortedToArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterSortedToArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCounted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCounted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCounted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCounted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCountedBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCountedBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCountedBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCountedBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCountedLength2D.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCountedLength2D.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCountedLength2D.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCountedLength2D.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCountedLengthGeneric.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCountedLengthGeneric.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayCountedLengthGeneric.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayCountedLengthGeneric.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayDeclaration.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayDeclaration.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayDeclaration.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayGeneric.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayGeneric.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayGeneric.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayGeneric.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayLinkedHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayLinkedHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayLinkedHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayLinkedHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayReusedCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayReusedCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayReusedCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayReusedCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArraySorted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArraySorted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArraySorted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArraySorted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayTreeSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayTreeSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayTreeSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayTreeSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayTwoDimensional.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayTwoDimensional.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterToArrayTwoDimensional.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/afterToArrayTwoDimensional.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDistinctCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeDistinctCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDistinctCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeDistinctCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDistinctCollectLimit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeDistinctCollectLimit.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDistinctCollectLimit.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeDistinctCollectLimit.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDistinctCollectWrongItem.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeDistinctCollectWrongItem.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDistinctCollectWrongItem.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeDistinctCollectWrongItem.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSortedToArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeSortedToArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSortedToArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeSortedToArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCounted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCounted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCounted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCounted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCountedBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCountedBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCountedBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCountedBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCountedLength2D.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCountedLength2D.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCountedLength2D.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCountedLength2D.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCountedLengthGeneric.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCountedLengthGeneric.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayCountedLengthGeneric.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayCountedLengthGeneric.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayDeclaration.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayDeclaration.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayDeclaration.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayDeclarationCollectionUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayDeclarationCollectionUsed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayDeclarationCollectionUsed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayDeclarationCollectionUsed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayGeneric.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayGeneric.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayGeneric.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayGeneric.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayIdentityHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayIdentityHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayIdentityHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayIdentityHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayLinkedHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayLinkedHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayLinkedHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayLinkedHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayReusedCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayReusedCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayReusedCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayReusedCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArraySorted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArraySorted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArraySorted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArraySorted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayTreeSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayTreeSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayTreeSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayTreeSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayTwoDimensional.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayTwoDimensional.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayTwoDimensional.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayTwoDimensional.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayWrongSize.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayWrongSize.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeToArrayWrongSize.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllActions/beforeToArrayWrongSize.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatchChain.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatchChain.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatchChain.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatchChain.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatchContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatchContinue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatchContinue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatchContinue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatchMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatchMethodRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAllMatchMethodRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/afterAllMatchMethodRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatchChain.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatchChain.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatchChain.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatchChain.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatchContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatchContinue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatchContinue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatchContinue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatchMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatchMethodRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAllMatchMethodRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/allMatch/beforeAllMatchMethodRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchArrayAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchArrayAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchArrayAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchArrayAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentBoolean.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentBoolean.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentBoolean.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentBoolean.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentBooleanInverted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentBooleanInverted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentBooleanInverted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentBooleanInverted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentExtraCode.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentExtraCode.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentExtraCode.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentExtraCode.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentNonTrivial.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentNonTrivial.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentNonTrivial.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentNonTrivial.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentNonTrivialUnassigned.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentNonTrivialUnassigned.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentNonTrivialUnassigned.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentNonTrivialUnassigned.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentTryCatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentTryCatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentTryCatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentTryCatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentTryCatch2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentTryCatch2.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchAssignmentTryCatch2.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchAssignmentTryCatch2.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchChain.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchChain.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchChain.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchChain.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchCompoundAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchCompoundAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchCompoundAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchCompoundAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchCustomReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchCustomReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchCustomReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchCustomReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchEnclosingIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIf.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchEnclosingIf.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIfBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchEnclosingIfBlock.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIfBlock.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchEnclosingIfBlock.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIfInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchEnclosingIfInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIfInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchEnclosingIfInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchExtends.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchExtends.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchExtends.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchExtends.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchMethodCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchMethodCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchMethodCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchMethodCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchUnreachableReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchUnreachableReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchUnreachableReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchUnreachableReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchVoid.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchVoid.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchVoid.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterAnyMatchVoid.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNestedAnyMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterNestedAnyMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNestedAnyMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/afterNestedAnyMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchArrayAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchArrayAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchArrayAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchArrayAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentBoolean.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentBoolean.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentBoolean.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentBoolean.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentBooleanInverted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentBooleanInverted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentBooleanInverted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentBooleanInverted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentExtraCode.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentExtraCode.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentExtraCode.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentExtraCode.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentNonTrivial.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentNonTrivial.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentNonTrivial.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentNonTrivial.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentNonTrivialUnassigned.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentNonTrivialUnassigned.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentNonTrivialUnassigned.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentNonTrivialUnassigned.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentTryCatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentTryCatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentTryCatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentTryCatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentTryCatch2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentTryCatch2.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchAssignmentTryCatch2.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchAssignmentTryCatch2.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchChain.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchChain.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchChain.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchChain.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchCompoundAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchCompoundAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchCompoundAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchCompoundAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchCustomReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchCustomReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchCustomReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchCustomReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchEnclosingIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIf.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchEnclosingIf.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIfBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchEnclosingIfBlock.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIfBlock.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchEnclosingIfBlock.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIfInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchEnclosingIfInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIfInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchEnclosingIfInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchExtends.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchExtends.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchExtends.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchExtends.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchFloat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchFloat.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchFloat.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchFloat.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchMethodCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchMethodCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchMethodCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchMethodCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchNonFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchNonFinal.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchNonFinal.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchNonFinal.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReferNonFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReferNonFinal.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReferNonFinal.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReferNonFinal.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReturnDifferent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReturnDifferent.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReturnDifferent.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReturnDifferent.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReturnInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReturnInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchReturnInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchReturnInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchUnreachableReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchUnreachableReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchUnreachableReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchUnreachableReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchUsesVar.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchUsesVar.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchUsesVar.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchUsesVar.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchVoid.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchVoid.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchVoid.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeAnyMatchVoid.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNestedAnyMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeNestedAnyMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNestedAnyMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeNestedAnyMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNestedAnyMatchFailed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeNestedAnyMatchFailed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNestedAnyMatchFailed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/anyMatch/beforeNestedAnyMatchFailed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderCollectNestedOk.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderCollectNestedOk.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderCollectNestedOk.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderCollectNestedOk.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderModifiedLine.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderModifiedLine.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderModifiedLine.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderModifiedLine.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterBufferedReaderSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderCollectNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollectNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderCollectNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollectNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderCollectNestedOk.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollectNestedOk.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderCollectNestedOk.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollectNestedOk.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderComplexModifiedLine.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderComplexModifiedLine.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderComplexModifiedLine.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderComplexModifiedLine.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderModifiedLine.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderModifiedLine.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderModifiedLine.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderModifiedLine.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderSumLineReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderSumLineReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBufferedReaderSumLineReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderSumLineReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAddPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterAddPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAddPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterAddPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterArrayFilterCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterArrayFilterCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterArrayFilterCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterArrayFilterCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterArrayListVariableType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterArrayListVariableType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterArrayListVariableType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterArrayListVariableType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectAnonymous.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectAnonymous.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectAnonymous.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectAnonymous.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListAndFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListAndFilter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListAndFilter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListAndFilter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListComment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListComment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListComment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListComment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCompoundDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListCompoundDeclaration.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCompoundDeclaration.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListCompoundDeclaration.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListNonTrivialInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListNonTrivialInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListNonTrivialInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectArrayListNonTrivialInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectContravariant.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectContravariant.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectContravariant.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectContravariant.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectCustomConstructor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectCustomConstructor.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectCustomConstructor.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectCustomConstructor.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectGuava.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectGuava.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectGuava.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectGuava.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectGuavaMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectGuavaMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectGuavaMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectGuavaMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectGuavaSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectGuavaSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectGuavaSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectGuavaSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectHashSetFieldInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectHashSetFieldInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectHashSetFieldInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectHashSetFieldInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterruptedInLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterruptedInLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterruptedInLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterruptedInLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterruptedUpdated.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterruptedUpdated.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterruptedUpdated.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterruptedUpdated.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterruptedUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterruptedUsed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectInterruptedUsed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectInterruptedUsed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectLinkedHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectLinkedHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectLinkedHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectLinkedHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectListSuperType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectListSuperType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectListSuperType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectListSuperType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewListArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewListArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewListArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewListArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewListArrayInCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewListArrayInCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewListArrayInCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewListArrayInCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewTreeSetArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewTreeSetArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNewTreeSetArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNewTreeSetArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNulls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNulls.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNulls.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectNulls.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSelfCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSelfCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSelfCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSelfCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSetParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSetParameter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSetParameter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSetParameter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSorted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSorted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSorted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSorted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSortedNatural.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSortedNatural.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSortedNatural.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSortedNatural.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSupertype.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSupertype.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSupertype.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectSupertype.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToMapPut.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToMapPut.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToMapPut.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToMapPut.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToMapPutIfAbsent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToMapPutIfAbsent.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToMapPutIfAbsent.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToMapPutIfAbsent.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToObj.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToObj.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectToObj.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectToObj.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectWithSameLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectWithSameLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectWithSameLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterCollectWithSameLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingByArrayList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingByArrayList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingByArrayList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingByArrayList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingByCustomCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingByCustomCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingByCustomCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingByCustomCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingByDownstream.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingByDownstream.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingByDownstream.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingByDownstream.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingBySimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingBySimple.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterGroupingBySimple.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterGroupingBySimple.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoining.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoining.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoining.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoining.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningAssign.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningAssign.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningAssign.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningAssign.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningConcat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningConcat.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningConcat.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningConcat.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningDelimited.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningDelimited.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningDelimited.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningDelimited.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningInBrackets.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningInBrackets.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningInBrackets.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningInBrackets.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningInitialValue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningInitialValue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningInitialValue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningInitialValue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningStringBuilderReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningStringBuilderReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningStringBuilderReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningStringBuilderReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningUsingIndex.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningUsingIndex.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterJoiningUsingIndex.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterJoiningUsingIndex.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterWildcardCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterWildcardCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterWildcardCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/afterWildcardCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAddPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeAddPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAddPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeAddPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeArrayFilterCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeArrayFilterCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeArrayFilterCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeArrayFilterCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeArrayListVariableType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeArrayListVariableType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeArrayListVariableType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeArrayListVariableType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectAnonymous.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectAnonymous.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectAnonymous.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectAnonymous.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListAndFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListAndFilter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListAndFilter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListAndFilter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListComment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListComment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListComment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListComment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCompoundDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListCompoundDeclaration.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCompoundDeclaration.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListCompoundDeclaration.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListNonTrivialInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListNonTrivialInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListNonTrivialInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectArrayListNonTrivialInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectContravariant.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectContravariant.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectContravariant.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectContravariant.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectCustomConstructor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectCustomConstructor.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectCustomConstructor.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectCustomConstructor.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuava.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuava.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuava.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuava.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuavaMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuavaMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuavaMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuavaMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuavaNonEmpty.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuavaNonEmpty.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuavaNonEmpty.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuavaNonEmpty.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuavaSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuavaSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectGuavaSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectGuavaSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectHashSetFieldInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectHashSetFieldInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectHashSetFieldInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectHashSetFieldInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectIdentityMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectIdentityMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectIdentityMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectIdentityMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedInLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedInLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedInLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedInLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedUpdated.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedUpdated.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedUpdated.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedUpdated.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedUsed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedUsed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedUsed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedUsedFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedUsedFinal.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectInterruptedUsedFinal.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectInterruptedUsedFinal.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectLinkedHashSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectLinkedHashSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectLinkedHashSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectLinkedHashSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectListSuperType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectListSuperType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectListSuperType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectListSuperType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewListArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewListArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewListArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewListArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewListArrayInCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewListArrayInCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewListArrayInCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewListArrayInCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewTreeSetArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewTreeSetArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNewTreeSetArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNewTreeSetArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNulls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNulls.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNulls.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectNulls.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectQualifierDependsOnLoopParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectQualifierDependsOnLoopParameter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectQualifierDependsOnLoopParameter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectQualifierDependsOnLoopParameter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSelfCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSelfCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSelfCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSelfCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSetParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSetParameter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSetParameter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSetParameter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSorted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSorted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSorted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSorted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSortedNatural.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSortedNatural.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSortedNatural.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSortedNatural.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSupertype.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSupertype.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSupertype.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectSupertype.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMapPut.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMapPut.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMapPut.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMapPut.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMapPutIfAbsent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMapPutIfAbsent.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMapPutIfAbsent.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMapPutIfAbsent.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMapPutInvalid.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMapPutInvalid.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToMapPutInvalid.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToMapPutInvalid.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToObj.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToObj.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectToObj.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectToObj.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectWithAnonymous.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectWithAnonymous.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectWithAnonymous.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectWithAnonymous.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectWithLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectWithLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectWithLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectWithLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectWithSameLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectWithSameLambda.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectWithSameLambda.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeCollectWithSameLambda.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingByArrayList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingByArrayList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingByArrayList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingByArrayList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingByCustomCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingByCustomCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingByCustomCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingByCustomCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingByDownstream.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingByDownstream.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingByDownstream.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingByDownstream.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingBySimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingBySimple.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeGroupingBySimple.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeGroupingBySimple.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoining.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoining.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoining.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoining.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningAssign.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningAssign.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningAssign.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningAssign.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningConcat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningConcat.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningConcat.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningConcat.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningDelimited.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningDelimited.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningDelimited.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningDelimited.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningDelimitedWrongBuilder.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningDelimitedWrongBuilder.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningDelimitedWrongBuilder.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningDelimitedWrongBuilder.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningInBrackets.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningInBrackets.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningInBrackets.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningInBrackets.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningInitialValue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningInitialValue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningInitialValue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningInitialValue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningStringBuilderReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningStringBuilderReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningStringBuilderReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningStringBuilderReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningUsingIndex.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningUsingIndex.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeJoiningUsingIndex.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeJoiningUsingIndex.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeWildcardCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeWildcardCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeWildcardCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/collect/beforeWildcardCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNegate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNegate.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNegate.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNegate.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNegateFloat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNegateFloat.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNegateFloat.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNegateFloat.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNestedElse.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNestedElse.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueNestedElse.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueNestedElse.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueOr.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueOr.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueOr.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterContinueOr.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueInside.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueInside.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueInside.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueInside.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNegate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNegate.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNegate.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNegate.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNegateFloat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNegateFloat.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNegateFloat.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNegateFloat.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNestedElse.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNestedElse.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNestedElse.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNestedElse.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNestedLabel.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNestedLabel.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueNestedLabel.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueNestedLabel.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueOr.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueOr.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeContinueOr.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeContinueOr.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountInner.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountInner.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountInner.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountInner.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountOuter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountOuter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountOuter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountOuter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountPrimitiveArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountPrimitiveArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCountPrimitiveArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/afterCountPrimitiveArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountInner.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountInner.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountInner.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountInner.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountOuter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountOuter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountOuter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountOuter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountPrimitiveArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountPrimitiveArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountPrimitiveArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountPrimitiveArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountShortArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountShortArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCountShortArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/count/beforeCountShortArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter1.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter1.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter1.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter2.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter2.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter2.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter3.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter3.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter3.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter4.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter4.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterCollectionDependencyInFilter4.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterFlatMapCollectionFilterMapCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterFlatMapCollectionFilterMapCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterFlatMapCollectionFilterMapCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterFlatMapCollectionFilterMapCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterFlatMapMapFilterCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterFlatMapMapFilterCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterFlatMapMapFilterCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterFlatMapMapFilterCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapFlatMapArrayCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterMapFlatMapArrayCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapFlatMapArrayCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterMapFlatMapArrayCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapFlatMapArrayMapCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterMapFlatMapArrayMapCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapFlatMapArrayMapCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterMapFlatMapArrayMapCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapForEach.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterMapForEach.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapForEach.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterMapForEach.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterNoBraces.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterNoBraces.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterNoBraces.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterNoBraces.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormalNestedFilters.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterNormalNestedFilters.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormalNestedFilters.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterNormalNestedFilters.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter1.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter1.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter1.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter2.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter2.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter2.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter3.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter3.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter3.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter4.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectionDependencyInFilter4.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeCollectionDependencyInFilter4.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterFlatMapCollectionFilterMapCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterFlatMapCollectionFilterMapCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterFlatMapCollectionFilterMapCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterFlatMapCollectionFilterMapCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterFlatMapMapFilterCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterFlatMapMapFilterCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterFlatMapMapFilterCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterFlatMapMapFilterCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapFlatMapArrayCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterMapFlatMapArrayCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapFlatMapArrayCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterMapFlatMapArrayCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapFlatMapArrayMapCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterMapFlatMapArrayMapCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapFlatMapArrayMapCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterMapFlatMapArrayMapCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapForEach.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterMapForEach.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapForEach.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterMapForEach.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterNoBraces.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterNoBraces.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterNoBraces.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeFilterNoBraces.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormalNestedFilters.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeNormalNestedFilters.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormalNestedFilters.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/beforeNormalNestedFilters.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirst.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirst.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirst.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirst.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentIntermediate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentIntermediate.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentIntermediate.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentIntermediate.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentUsedInSameDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentUsedInSameDeclaration.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentUsedInSameDeclaration.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentUsedInSameDeclaration.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentWithLabel.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentWithLabel.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstAssignmentWithLabel.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstAssignmentWithLabel.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstBoolean.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstBoolean.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstBoolean.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstBoolean.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstEnum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstEnum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstEnum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstEnum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstField.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstField.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstField.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstField.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstIfPresent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstIfPresent.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstIfPresent.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstIfPresent.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstIfPresentWithReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstIfPresentWithReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstIfPresentWithReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstIfPresentWithReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOptional.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOptional.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOptional.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOptional.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOptionalFlatMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOptionalFlatMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOptionalFlatMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOptionalFlatMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOptionalType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOptionalType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOptionalType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOptionalType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOuterIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOuterIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstOuterIf.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstOuterIf.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstReAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstReAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstReAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstReAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstReturnUnreachable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstReturnUnreachable.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstReturnUnreachable.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstReturnUnreachable.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstRunnableTernary.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstRunnableTernary.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstRunnableTernary.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstRunnableTernary.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstStaticField.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstStaticField.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstStaticField.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstStaticField.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstTernary.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstTernary.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstTernary.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstTernary.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstValueReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstValueReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstValueReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/afterFindFirstValueReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirst.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirst.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirst.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirst.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentIntermediate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentIntermediate.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentIntermediate.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentIntermediate.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentInterrupted.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentInterrupted.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentInterrupted.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentInterrupted.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentPrimitiveMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentPrimitiveMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentPrimitiveMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentPrimitiveMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentUsedInSameDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentUsedInSameDeclaration.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentUsedInSameDeclaration.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentUsedInSameDeclaration.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentWithLabel.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentWithLabel.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstAssignmentWithLabel.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstAssignmentWithLabel.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstBoolean.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstBoolean.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstBoolean.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstBoolean.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstEnum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstEnum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstEnum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstEnum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstField.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstField.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstField.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstField.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstFieldOther.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstFieldOther.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstFieldOther.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstFieldOther.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstIfPresent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstIfPresent.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstIfPresent.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstIfPresent.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstIfPresentTwoStatements.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstIfPresentTwoStatements.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstIfPresentTwoStatements.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstIfPresentTwoStatements.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstIfPresentWithReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstIfPresentWithReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstIfPresentWithReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstIfPresentWithReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOptional.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOptional.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOptional.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOptional.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOptionalFlatMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOptionalFlatMap.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOptionalFlatMap.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOptionalFlatMap.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOptionalType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOptionalType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOptionalType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOptionalType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOuterIf.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOuterIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstOuterIf.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstOuterIf.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstPrimitiveNonTrivial.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstPrimitiveNonTrivial.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstPrimitiveNonTrivial.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstPrimitiveNonTrivial.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstReAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstReAssignment.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstReAssignment.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstReAssignment.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstReturn.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstReturn.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstReturn.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstReturn.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstReturnUnreachable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstReturnUnreachable.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstReturnUnreachable.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstReturnUnreachable.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstRunnableTernary.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstRunnableTernary.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstRunnableTernary.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstRunnableTernary.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstStaticField.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstStaticField.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstStaticField.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstStaticField.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstTernary.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstTernary.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstTernary.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstTernary.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstUsedInBound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstUsedInBound.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstUsedInBound.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstUsedInBound.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstValueReused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstValueReused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstValueReused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/findFirst/beforeFindFirstValueReused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatMapChangePrimitiveType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatMapChangePrimitiveType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatMapChangePrimitiveType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatMapChangePrimitiveType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatMapForLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatMapForLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatMapForLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatMapForLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatten2DArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatten2DArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatten2DArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatten2DArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatten2DArrayPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatten2DArrayPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFlatten2DArrayPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/afterFlatten2DArrayPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatMapChangePrimitiveType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatMapChangePrimitiveType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatMapChangePrimitiveType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatMapChangePrimitiveType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatMapForLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatMapForLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatMapForLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatMapForLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatten2DArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatten2DArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatten2DArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatten2DArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatten2DArrayPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatten2DArrayPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFlatten2DArrayPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/flatMap/beforeFlatten2DArrayPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForEachCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/afterForEachCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForEachCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/afterForEachCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForeachMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/afterForeachMethodRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForeachMethodRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/afterForeachMethodRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForEachCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/beforeForEachCast.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForEachCast.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/beforeForEachCast.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForeachMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/beforeForeachMethodRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForeachMethodRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/foreach/beforeForeachMethodRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCollectAddedOps.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCollectAddedOps.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCollectAddedOps.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCollectAddedOps.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCollectInNestedLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCollectInNestedLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCollectInNestedLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCollectInNestedLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCount.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCount.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCount.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCount.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountGreater.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCountGreater.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountGreater.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCountGreater.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountPostfix.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCountPostfix.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountPostfix.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCountPostfix.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountPrefix.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCountPrefix.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountPrefix.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitCountPrefix.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitFind.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitFind.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitFind.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitFind.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitIntermediate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitIntermediate.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitIntermediate.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitIntermediate.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterRangeLimited.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterRangeLimited.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterRangeLimited.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterRangeLimited.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectAddedOps.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectAddedOps.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectAddedOps.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectAddedOps.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectInNestedLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectInNestedLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectInNestedLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectInNestedLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectInOuterLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectInOuterLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectInOuterLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectInOuterLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectSet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectSet.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectSet.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectSet.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectWrongCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectWrongCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCollectWrongCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCollectWrongCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCount.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCount.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCount.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCount.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountGreater.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountGreater.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountGreater.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountGreater.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountPostfix.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountPostfix.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountPostfix.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountPostfix.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountPrefix.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountPrefix.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountPrefix.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountPrefix.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitCountRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitFind.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitFind.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitFind.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitFind.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitIntermediate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitIntermediate.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitIntermediate.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitIntermediate.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRangeLimited.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeRangeLimited.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRangeLimited.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeRangeLimited.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparable.java new file mode 100644 index 000000000000..6269b15ea43c --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparable.java @@ -0,0 +1,34 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).max(Comparator.comparing(Person::getName)).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparableMaxAsArg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparableMaxAsArg.java new file mode 100644 index 000000000000..8c3df0b76ffb --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparableMaxAsArg.java @@ -0,0 +1,41 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || p.getName().compareTo(maxPerson.getName()) < 0) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparator.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparator.java new file mode 100644 index 000000000000..5d110312c0d5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxComparator.java @@ -0,0 +1,36 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson; + Comparator personComparator = Comparator.comparingInt(Person::getAge); + maxPerson = personList.stream().filter(p -> p.getAge() > 13).max(personComparator).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitive.java new file mode 100644 index 000000000000..e95360866377 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitive.java @@ -0,0 +1,9 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int max = Arrays.stream(ints).filter(anInt -> anInt < 10).filter(anInt -> anInt >= 0).max().orElse(0); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitiveNegated.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitiveNegated.java new file mode 100644 index 000000000000..7e0a64b37ed1 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxPrimitiveNegated.java @@ -0,0 +1,9 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int max = Arrays.stream(ints).max().orElse(Integer.MIN_VALUE); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference1.java new file mode 100644 index 000000000000..3f94126247df --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference1.java @@ -0,0 +1,32 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).max(Comparator.comparingInt(Person::getAge)).orElse(null); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference2.java new file mode 100644 index 000000000000..35e4495bf19f --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference2.java @@ -0,0 +1,34 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).max(Comparator.comparingInt(Person::getAge)).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference3.java new file mode 100644 index 000000000000..35e4495bf19f --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReference3.java @@ -0,0 +1,34 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).max(Comparator.comparingInt(Person::getAge)).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceField.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceField.java new file mode 100644 index 000000000000..3681b02f6c80 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceField.java @@ -0,0 +1,34 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).max(Comparator.comparingInt(p -> p.age)).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmp.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmp.java new file mode 100644 index 000000000000..4d0ea8ccf7fe --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmp.java @@ -0,0 +1,34 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).filter(p -> p.getAge() >= 0).max(Comparator.comparingInt(Person::getAge)).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmpParens.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmpParens.java new file mode 100644 index 000000000000..4d0ea8ccf7fe --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMaxReferenceTmpParens.java @@ -0,0 +1,34 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = personList.stream().filter(p -> p.getAge() > 13).filter(p -> p.getAge() >= 0).max(Comparator.comparingInt(Person::getAge)).orElse(null); + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinInitialValueWithoutFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinInitialValueWithoutFilter.java new file mode 100644 index 000000000000..ddfff0416b55 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinInitialValueWithoutFilter.java @@ -0,0 +1,9 @@ +// "Replace with max()" "true" + +import java.util.*; + +class Main { + public void work(long[] ints) { + long max = Arrays.stream(ints).filter(anInt -> anInt < 10).max().orElse(Long.MIN_VALUE); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitive.java new file mode 100644 index 000000000000..e4f443700d16 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitive.java @@ -0,0 +1,9 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int min = Arrays.stream(ints).filter(anInt -> anInt < 10).filter(anInt -> anInt <= 0).min().orElse(0); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveBoxing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveBoxing.java new file mode 100644 index 000000000000..2700306629e5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveBoxing.java @@ -0,0 +1,9 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + public void work(Integer[] ints) { + int min = Arrays.stream(ints).filter(anInt -> anInt < 10).mapToInt(anInt -> anInt).filter(anInt -> anInt <= 0).min().orElse(0); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveMap.java new file mode 100644 index 000000000000..8277d1570d3d --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveMap.java @@ -0,0 +1,9 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int min = Arrays.stream(ints).filter(anInt -> anInt < 10).map(anInt -> anInt + 2343).filter(anInt -> anInt <= 0).min().orElse(0); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveNonTrivialSelector.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveNonTrivialSelector.java new file mode 100644 index 000000000000..d1ee2cdebb20 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinPrimitiveNonTrivialSelector.java @@ -0,0 +1,9 @@ +// "Replace with min()" "true" + +import java.util.Arrays; + +public class Main { + public void work(int[] ints) { + int min = Arrays.stream(ints).filter(anInt -> anInt < 10).map(anInt -> anInt + anInt * 2 - 10).filter(anInt -> anInt <= 0).min().orElse(0); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReference.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReference.java new file mode 100644 index 000000000000..6e7d045a3768 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReference.java @@ -0,0 +1,34 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person minPerson = personList.stream().filter(p -> p.getAge() > 13).min(Comparator.comparingInt(Person::getAge)).orElse(null); + + return minPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReferenceInitializerNotJustBefore.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReferenceInitializerNotJustBefore.java new file mode 100644 index 000000000000..605b41d220b9 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/afterMinReferenceInitializerNotJustBefore.java @@ -0,0 +1,33 @@ +// "Replace with min()" "true" + +import java.util.*; + +class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + Person minPerson; + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + minPerson = personList.stream().filter(p -> p.getAge() > 13).min(Comparator.comparingInt(Person::getAge)).orElse(null); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparable.java new file mode 100644 index 000000000000..c420415ca67f --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparable.java @@ -0,0 +1,41 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || maxPerson.getName().compareTo(p.getName()) < 0) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparableMaxAsArg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparableMaxAsArg.java new file mode 100644 index 000000000000..f8e664ba34a2 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparableMaxAsArg.java @@ -0,0 +1,41 @@ +// "Replace with max()" "false" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || p.getName().compareTo(maxPerson.getName()) < 0) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparator.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparator.java new file mode 100644 index 000000000000..fcfc63b81cc3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxComparator.java @@ -0,0 +1,42 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + Comparator personComparator = Comparator.comparingInt(Person::getAge); + for(Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || personComparator.compare(maxPerson, p) < 0) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitive.java new file mode 100644 index 000000000000..4b90197bc970 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitive.java @@ -0,0 +1,16 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int max = 0; + for (int anInt : ints) { + if(anInt < 10) { + if(max < anInt) { + max = anInt; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNegated.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNegated.java new file mode 100644 index 000000000000..192c87e99ed3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNegated.java @@ -0,0 +1,13 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int max = Integer.MIN_VALUE; + for (int i : ints) { + if(i < max) continue; + max = i; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleComparision.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleComparision.java new file mode 100644 index 000000000000..afa5c4c21a66 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleComparision.java @@ -0,0 +1,17 @@ +// "Replace with max()" "false" + +import java.util.*; + +public class Main { + public void max(int[] ints) { + int another; + int max = 0; + for (int anInt : ints) { + if(anInt < 10) { + if(max < another) { + max = anInt; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleVariable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleVariable.java new file mode 100644 index 000000000000..841e83056f40 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxPrimitiveNonCycleVariable.java @@ -0,0 +1,17 @@ +// "Replace with max()" "false" + +import java.util.*; + +public class Main { + public void max(int[] ints) { + int another = 1; + int max = 0; + for (int anInt : ints) { + if(anInt < 10) { + if(max < another) { + max = another; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference1.java new file mode 100644 index 000000000000..7678e2a63708 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference1.java @@ -0,0 +1,39 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || maxPerson.getAge() < p.getAge()) { + maxPerson = p; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference2.java new file mode 100644 index 000000000000..30d4c101ddbf --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference2.java @@ -0,0 +1,44 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null) { + maxPerson = p; + } + else if (maxPerson.getAge() < p.getAge()) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference3.java new file mode 100644 index 000000000000..5bdcc6abb1c7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference3.java @@ -0,0 +1,41 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || p.getAge() > maxPerson.getAge()) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference4.java new file mode 100644 index 000000000000..e8f11be2891e --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReference4.java @@ -0,0 +1,41 @@ +// "Replace with max()" "false" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (p.getAge() > maxPerson.getAge() || maxPerson == null) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceField.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceField.java new file mode 100644 index 000000000000..6bdee6f2db9b --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceField.java @@ -0,0 +1,41 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || p.age > maxPerson.age) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceShortMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceShortMethod.java new file mode 100644 index 000000000000..fdc21e6b629d --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceShortMethod.java @@ -0,0 +1,41 @@ +// "Replace with max()" "false" + +import java.util.*; + +public class Main { + static class Person { + String name; + short age; + + public String getName() { + return name; + } + + public short getAge() { + return age; + } + + public Person(String name, short age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (p.getAge() > maxPerson.getAge() || maxPerson == null) { + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmp.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmp.java new file mode 100644 index 000000000000..76be73d2c984 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmp.java @@ -0,0 +1,43 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + int maxAge = 0; + for (Person p : personList) { + if(p.getAge() > 13) { + if (maxPerson == null || maxAge < p.getAge()) { + maxAge = p.getAge() + maxPerson = p; + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmpParens.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmpParens.java new file mode 100644 index 000000000000..eab765fb2d77 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMaxReferenceTmpParens.java @@ -0,0 +1,43 @@ +// "Replace with max()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person max() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person maxPerson = null; + int maxAge = 0; + for (Person p : personList) { + if(p.getAge() > 13) { + if (((maxPerson) == null) || ((maxAge < p.getAge()))) { + maxAge = (p.getAge()); + maxPerson = (p); + } + } + } + + return maxPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinInitialValueWithoutFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinInitialValueWithoutFilter.java new file mode 100644 index 000000000000..0176f7821dfe --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinInitialValueWithoutFilter.java @@ -0,0 +1,16 @@ +// "Replace with max()" "true" + +import java.util.*; + +class Main { + public void work(long[] ints) { + long max = Long.MIN_VALUE; + for (long anInt : ints) { + if(anInt < 10) { + if(max < anInt) { + max = anInt; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitive.java new file mode 100644 index 000000000000..f8499ba73721 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitive.java @@ -0,0 +1,16 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int min = 0; + for (int anInt : ints) { + if(anInt < 10) { + if(min > anInt) { + min = anInt; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveBoxing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveBoxing.java new file mode 100644 index 000000000000..9aca5b1a2c00 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveBoxing.java @@ -0,0 +1,16 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + public void work(Integer[] ints) { + int min = 0; + for (Integer anInt : ints) { + if(anInt < 10) { + if(min > anInt) { + min = anInt; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveMap.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveMap.java new file mode 100644 index 000000000000..2bea80e7c9a8 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveMap.java @@ -0,0 +1,16 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + public void work(int[] ints) { + int min = 0; + for (int anInt : ints) { + if(anInt < 10) { + if(min > anInt + 2343) { + min = anInt + 2343; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveNonTrivialSelector.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveNonTrivialSelector.java new file mode 100644 index 000000000000..925de4b9cdcb --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinPrimitiveNonTrivialSelector.java @@ -0,0 +1,14 @@ +// "Replace with min()" "true" + +public class Main { + public void work(int[] ints) { + int min = 0; + for ( int anInt :ints){ + if (anInt < 10) { + if (min > anInt + anInt * 2 - 10) { + min = anInt + anInt * 2 - 10; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReference.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReference.java new file mode 100644 index 000000000000..8a5265dbccf5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReference.java @@ -0,0 +1,41 @@ +// "Replace with min()" "true" + +import java.util.*; + +public class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + Person minPerson = null; + for (Person p : personList) { + if(p.getAge() > 13) { + if (minPerson == null || minPerson.getAge() > p.getAge()) { + minPerson = p; + } + } + } + + return minPerson; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReferenceInitializerNotJustBefore.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReferenceInitializerNotJustBefore.java new file mode 100644 index 000000000000..33af9219a9be --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/minMax/beforeMinReferenceInitializerNotJustBefore.java @@ -0,0 +1,39 @@ +// "Replace with min()" "true" + +import java.util.*; + +class Main { + static class Person { + String name; + int age; + + public String getName() { + return name; + } + + public int getAge() { + return age; + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + } + + public Person work() { + Person minPerson = null; + List personList = Arrays.asList( + new Person("Roman", 21), + new Person("James", 25), + new Person("Kelly", 12) + ); + for (Person p : personList) { + if(p.getAge() > 13) { + if (minPerson == null || minPerson.getAge() > p.getAge()) { + minPerson = p; + } + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNoneMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/afterNoneMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNoneMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/afterNoneMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNoneMatchContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/afterNoneMatchContinue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNoneMatchContinue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/afterNoneMatchContinue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNoneMatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/beforeNoneMatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNoneMatch.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/beforeNoneMatch.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNoneMatchContinue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/beforeNoneMatchContinue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNoneMatchContinue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/noneMatch/beforeNoneMatchContinue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCastExpected.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterCastExpected.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCastExpected.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterCastExpected.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCastInIterValue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterCastInIterValue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCastInIterValue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterCastInIterValue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCompactFilterToMethodReference.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterCompactFilterToMethodReference.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCompactFilterToMethodReference.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterCompactFilterToMethodReference.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterComputeIfAbsentChained.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterComputeIfAbsentChained.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterComputeIfAbsentChained.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterComputeIfAbsentChained.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterComputeIfAbsentSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterComputeIfAbsentSimple.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterComputeIfAbsentSimple.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterComputeIfAbsentSimple.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDisableForArrays.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterDisableForArrays.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDisableForArrays.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterDisableForArrays.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterExplicitArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterExplicitArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterExplicitArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterExplicitArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterForLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterForLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForLoopBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterForLoopBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForLoopBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterForLoopBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForLoopShortBound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterForLoopShortBound.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterForLoopShortBound.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterForLoopShortBound.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFromAsList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterFromAsList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFromAsList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterFromAsList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFromEmptyList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterFromEmptyList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFromEmptyList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterFromEmptyList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIncompleteNewCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterIncompleteNewCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIncompleteNewCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterIncompleteNewCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterMethodRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMethodRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterMethodRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMissedBraces.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterMissedBraces.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMissedBraces.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterMissedBraces.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterNormal.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormal.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterNormal.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormalComments.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterNormalComments.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormalComments.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterNormalComments.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormalNoBraces.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterNormalNoBraces.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterNormalNoBraces.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterNormalNoBraces.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterPrimitiveArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterPrimitiveArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterPrimitiveArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterPrimitiveArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterTooLazyCalculation.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterTooLazyCalculation.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterTooLazyCalculation.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/afterTooLazyCalculation.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBreakInside.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeBreakInside.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeBreakInside.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeBreakInside.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCastExpected.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeCastExpected.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCastExpected.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeCastExpected.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCastInIterValue.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeCastInIterValue.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCastInIterValue.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeCastInIterValue.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCompactFilterToMethodReference.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeCompactFilterToMethodReference.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCompactFilterToMethodReference.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeCompactFilterToMethodReference.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeComputeIfAbsentChained.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeComputeIfAbsentChained.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeComputeIfAbsentChained.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeComputeIfAbsentChained.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeComputeIfAbsentSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeComputeIfAbsentSimple.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeComputeIfAbsentSimple.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeComputeIfAbsentSimple.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDisableForArrays.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeDisableForArrays.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDisableForArrays.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeDisableForArrays.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeExceptionIsThrown.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeExceptionIsThrown.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeExceptionIsThrown.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeExceptionIsThrown.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeExplicitArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeExplicitArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeExplicitArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeExplicitArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoop.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoop.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoop.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoop.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopFloatBound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopFloatBound.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopFloatBound.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopFloatBound.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopShortBound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopShortBound.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopShortBound.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopShortBound.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopUpdated.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopUpdated.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopUpdated.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopUpdated.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopWrongBound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopWrongBound.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopWrongBound.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopWrongBound.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopWrongIncrement.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopWrongIncrement.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopWrongIncrement.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopWrongIncrement.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopWrongInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopWrongInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeForLoopWrongInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeForLoopWrongInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFromAsList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeFromAsList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFromAsList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeFromAsList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFromEmptyList.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeFromEmptyList.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFromEmptyList.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeFromEmptyList.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIfIncomplete.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIfIncomplete.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIfIncomplete.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIfIncomplete.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIncompleteLabel.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIncompleteLabel.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIncompleteLabel.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIncompleteLabel.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIncompleteNewCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIncompleteNewCall.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIncompleteNewCall.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIncompleteNewCall.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIterable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIterable.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIterable.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeIterable.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMayBeNotInitializedAndThusNotEffectivelyFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeMayBeNotInitializedAndThusNotEffectivelyFinal.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMayBeNotInitializedAndThusNotEffectivelyFinal.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeMayBeNotInitializedAndThusNotEffectivelyFinal.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeMethodRef.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMethodRef.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeMethodRef.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMissedBraces.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeMissedBraces.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMissedBraces.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeMissedBraces.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNoFilter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNoFilter.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNoFilter.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNoFilter.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNormal.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormal.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNormal.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormalComments.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNormalComments.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormalComments.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNormalComments.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormalNoBraces.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNormalNoBraces.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNormalNoBraces.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNormalNoBraces.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNotEffectivelyFinalVar.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNotEffectivelyFinalVar.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeNotEffectivelyFinalVar.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeNotEffectivelyFinalVar.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforePrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforePrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitiveArray.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforePrimitiveArray.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitiveArray.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforePrimitiveArray.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitiveArrayWrongType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforePrimitiveArrayWrongType.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitiveArrayWrongType.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforePrimitiveArrayWrongType.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRangeReassigned.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRangeReassigned.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRangeReassigned.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRangeReassigned.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRangeReassignedNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRangeReassignedNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRangeReassignedNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRangeReassignedNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRawCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRawCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRawCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRawCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRawCollectionSubstitution.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRawCollectionSubstitution.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeRawCollectionSubstitution.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeRawCollectionSubstitution.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeReturnInside.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeReturnInside.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeReturnInside.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeReturnInside.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeThrownCollect.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeThrownCollect.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeThrownCollect.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeThrownCollect.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeThrownExceptionsNotMatched.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeThrownExceptionsNotMatched.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeThrownExceptionsNotMatched.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeThrownExceptionsNotMatched.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeTooLazyCalculation.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeTooLazyCalculation.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeTooLazyCalculation.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/other/beforeTooLazyCalculation.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnd.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAnd.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnd.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAnd.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndHighestBit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndHighestBit.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndHighestBit.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndHighestBit.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndReplacingHexInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndReplacingHexInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndReplacingHexInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndReplacingHexInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndReplacingInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndReplacingInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndReplacingInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndReplacingInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndReplacingLongInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndReplacingLongInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAndReplacingLongInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterAndReplacingLongInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterConjunction.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterConjunction.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterConjunction.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterConjunction.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterConjunctionBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterConjunctionBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterConjunctionBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterConjunctionBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDisjunction.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterDisjunction.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterDisjunction.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterDisjunction.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiply.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiply.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiply.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiply.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyComplexInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyComplexInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyComplexInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyComplexInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyConflictingVariable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyConflictingVariable.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyConflictingVariable.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyConflictingVariable.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyNarrowingTypeInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyNarrowingTypeInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyNarrowingTypeInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyNarrowingTypeInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyNotOneInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyNotOneInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyNotOneInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyNotOneInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyWithMapping.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyWithMapping.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMultiplyWithMapping.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterMultiplyWithMapping.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterOr.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterOr.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterOr.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterOr.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterXor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterXor.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterXor.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterXor.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterXorLong.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterXorLong.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterXorLong.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/afterXorLong.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnd.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAnd.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnd.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAnd.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndHighestBit.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndHighestBit.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndHighestBit.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndHighestBit.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndReplacingHexInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndReplacingHexInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndReplacingHexInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndReplacingHexInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndReplacingInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndReplacingInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndReplacingInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndReplacingInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndReplacingLongInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndReplacingLongInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAndReplacingLongInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeAndReplacingLongInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeConjunction.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeConjunction.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeConjunction.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeConjunction.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeConjunctionBoxed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeConjunctionBoxed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeConjunctionBoxed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeConjunctionBoxed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDisjunction.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeDisjunction.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeDisjunction.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeDisjunction.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiply.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiply.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiply.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiply.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyComplexInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyComplexInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyComplexInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyComplexInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyConflictingVariable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyConflictingVariable.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyConflictingVariable.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyConflictingVariable.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyNarrowingTypeInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyNarrowingTypeInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyNarrowingTypeInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyNarrowingTypeInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyNotOneInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyNotOneInitializer.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyNotOneInitializer.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyNotOneInitializer.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyWithMapping.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyWithMapping.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMultiplyWithMapping.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeMultiplyWithMapping.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeOr.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeOr.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeOr.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeOr.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeXor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeXor.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeXor.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeXor.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeXorLong.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeXorLong.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeXorLong.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/reduce/beforeXorLong.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntArraySum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntArraySum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntArraySum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntArraySum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntFilterSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntFilterSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntFilterSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntFilterSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntegerSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntegerSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterIntegerSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterIntegerSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumArrayLength.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumArrayLength.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumArrayLength.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumArrayLength.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumArrayLengthNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumArrayLengthNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumArrayLengthNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumArrayLengthNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumInterruptedUnused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumInterruptedUnused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumInterruptedUnused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumInterruptedUnused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumInterruptedUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumInterruptedUsed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumInterruptedUsed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumInterruptedUsed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumNarrowing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumNarrowing.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumNarrowing.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumNarrowing.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumNarrowingParens.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumNarrowingParens.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumNarrowingParens.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumNarrowingParens.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumPromotion.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumPromotion.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterSumPromotion.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/afterSumPromotion.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFloatSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeFloatSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFloatSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeFloatSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntArraySum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntArraySum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntArraySum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntArraySum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntFilterSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntFilterSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntFilterSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntFilterSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntegerSum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntegerSum.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeIntegerSum.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeIntegerSum.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumAccessOuterFor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumAccessOuterFor.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumAccessOuterFor.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumAccessOuterFor.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumArrayLength.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumArrayLength.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumArrayLength.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumArrayLength.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumArrayLengthFloat.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumArrayLengthFloat.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumArrayLengthFloat.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumArrayLengthFloat.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumArrayLengthNested.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumArrayLengthNested.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumArrayLengthNested.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumArrayLengthNested.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumCollection.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumCollection.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumCollection.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumInterruptedUnused.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumInterruptedUnused.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumInterruptedUnused.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumInterruptedUnused.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumInterruptedUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumInterruptedUsed.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumInterruptedUsed.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumInterruptedUsed.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumNarrowing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumNarrowing.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumNarrowing.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumNarrowing.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumNarrowingParens.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumNarrowingParens.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumNarrowingParens.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumNarrowingParens.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumPrimitive.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumPrimitive.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumPrimitive.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumPrimitive.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumPromotion.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumPromotion.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeSumPromotion.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/sum/beforeSumPromotion.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterTakeWhileJava9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/afterTakeWhileJava9.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterTakeWhileJava9.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/afterTakeWhileJava9.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeTakeWhile.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhile.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeTakeWhile.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhile.java diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeTakeWhileJava9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhileJava9.java similarity index 100% rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeTakeWhileJava9.java rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/takeWhile/beforeTakeWhileJava9.java diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java index d80b0de30228..f13ba1b840bd 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/StreamApiMigrationInspectionTest.java @@ -15,33 +15,194 @@ */ package com.intellij.java.codeInsight.daemon.quickFix; + import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.streamMigration.StreamApiMigrationInspection; import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NotNull; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +@RunWith(Suite.class) +@Suite.SuiteClasses({ + StreamApiMigrationInspectionTest.AddAllTest.class, + StreamApiMigrationInspectionTest.AfterAllActionsTest.class, + StreamApiMigrationInspectionTest.AllMatchTest.class, + StreamApiMigrationInspectionTest.AnyMatchTest.class, + StreamApiMigrationInspectionTest.BufferedReaderTest.class, + StreamApiMigrationInspectionTest.CollectTest.class, + StreamApiMigrationInspectionTest.ContinueTest.class, + StreamApiMigrationInspectionTest.CountTest.class, + StreamApiMigrationInspectionTest.FilterTest.class, + StreamApiMigrationInspectionTest.FindFirstTest.class, + StreamApiMigrationInspectionTest.FlatMapFirstTest.class, + StreamApiMigrationInspectionTest.ForeachFirstTest.class, + StreamApiMigrationInspectionTest.LimitTest.class, + StreamApiMigrationInspectionTest.MinMaxTest.class, + StreamApiMigrationInspectionTest.NoneMatchTest.class, + StreamApiMigrationInspectionTest.OtherTest.class, + StreamApiMigrationInspectionTest.ReductionTest.class, + StreamApiMigrationInspectionTest.SumTest.class, + StreamApiMigrationInspectionTest.TakeWhileTest.class, +}) +public class StreamApiMigrationInspectionTest { + public static abstract class StreamApiMigrationInspectionBaseTest extends LightQuickFixParameterizedTestCase { + @NotNull + @Override + protected LocalInspectionTool[] configureLocalInspectionTools() { + StreamApiMigrationInspection inspection = new StreamApiMigrationInspection(); + inspection.SUGGEST_FOREACH = true; + return new LocalInspectionTool[]{ + inspection + }; + } -public class StreamApiMigrationInspectionTest extends LightQuickFixParameterizedTestCase { - @NotNull - @Override - protected LocalInspectionTool[] configureLocalInspectionTools() { - StreamApiMigrationInspection inspection = new StreamApiMigrationInspection(); - inspection.SUGGEST_FOREACH = true; - return new LocalInspectionTool[]{ - inspection - }; + @Override + protected LanguageLevel getDefaultLanguageLevel() { + return LanguageLevel.JDK_1_8; + } + + public void test() throws Exception { doAllTests(); } + + abstract String getFolder(); + + @Override + protected String getBasePath() { + return "/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/" + getFolder(); + } } - @Override - protected LanguageLevel getDefaultLanguageLevel() { - return LanguageLevel.JDK_1_8; + public static class AddAllTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "addAll"; + } } - public void test() throws Exception { doAllTests(); } + public static class AfterAllActionsTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "afterAllActions"; + } + } - @Override - protected String getBasePath() { - return "/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration"; + public static class AllMatchTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "allMatch"; + } + } + + public static class AnyMatchTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "anyMatch"; + } + } + + public static class BufferedReaderTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "bufferedReader"; + } + } + + public static class CollectTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "collect"; + } + } + + public static class ContinueTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "continue"; + } + } + + public static class CountTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "count"; + } + } + + public static class FilterTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "filter"; + } + } + + public static class FindFirstTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "findFirst"; + } + } + + public static class FlatMapFirstTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "flatMap"; + } + } + + public static class ForeachFirstTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "foreach"; + } + } + + public static class LimitTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "limit"; + } + } + + public static class MinMaxTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "minMax"; + } + } + + public static class NoneMatchTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "noneMatch"; + } + } + + public static class OtherTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "other"; + } + } + + public static class ReductionTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "reduce"; + } + } + + public static class SumTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "sum"; + } + } + + public static class TakeWhileTest extends StreamApiMigrationInspectionBaseTest { + @Override + String getFolder() { + return "takeWhile"; + } } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java index 61a5c9c02f5e..a692c2511412 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java @@ -762,6 +762,7 @@ public class ExpressionUtils { * @return extracted assignment or null if assignment is not found or assignment is compound */ @Contract("null -> null") + @Nullable public static PsiAssignmentExpression getAssignment(PsiElement element) { if(element instanceof PsiExpressionStatement) { element = ((PsiExpressionStatement)element).getExpression();