Fix scala.collection.convert.JavaCollectionWrappers

Author: nicolasstucki

project/MiMaFilters.scala

@@ -86,7 +86,6 @@ object MiMaFilters {
         ProblemFilters.exclude[FinalMethodProblem]("scala.io.Source.NoPositioner"),
         ProblemFilters.exclude[FinalMethodProblem]("scala.io.Source.RelaxedPosition"),
         ProblemFilters.exclude[FinalMethodProblem]("scala.io.Source.RelaxedPositioner"),
-        ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.convert.JavaCollectionWrappers#*.empty"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.RedBlackTree#EqualsIterator.nextResult"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.SortedMapOps.coll"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.TreeMap.empty"),
@@ -102,7 +101,6 @@ object MiMaFilters {
         ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.collection.immutable.SortedMapOps.coll"),
       ) ++
       Seq( // DirectMissingMethodProblem
-        "scala.collection.convert.JavaCollectionWrappers#*.iterableFactory", "scala.collection.convert.JavaCollectionWrappers#*.mapFactory", "scala.collection.convert.JavaCollectionWrappers#IteratorWrapper.remove",
         "scala.collection.immutable.ArraySeq#*.elemTag",
         "scala.collection.immutable.HashCollisionSetNode.copy",
         "scala.collection.immutable.MapKeyValueTupleHashIterator.next",
@@ -158,9 +156,6 @@ object MiMaFilters {
         ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.collection.mutable.ArrayBuilder#ofUnit.addAll"),
 
         // Non-categorized
-        ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.convert.JavaCollectionWrappers#JConcurrentMapWrapper.empty"),
-        ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.convert.JavaCollectionWrappers#JMapWrapper.empty"),
-        ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.convert.JavaCollectionWrappers#JPropertiesWrapper.empty"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.RedBlackTree#EqualsIterator.nextResult"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.immutable.SortedMapOps.coll"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.collection.mutable.LinkedHashMap.newBuilder"),

project/TastyMiMaFilters.scala

@@ -112,16 +112,12 @@ object TastyMiMaFilters {
     ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.StringContext.parts"),
 
     // Problem: Inferred result type of non-private member differs
-    ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.convert.JavaCollectionWrappers.*.iterableFactory"),
-    ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.convert.JavaCollectionWrappers.*.empty"),
-    ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.convert.JavaCollectionWrappers.*.mapFactory"),
     ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.math.Big*.underlying"),
     ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.immutable.TreeSet.sortedIterableFactory"),
     ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.View.*PartitionMapped.iterator"),
     ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.concurrent.duration.FiniteDuration.unary_-"),
-    ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.convert.JavaCollectionWrappers.IteratorWrapper.remove"),
-    ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.convert.JavaCollectionWrappers.IterableWrapperTrait.iterator"),
     ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.util.matching.Regex.MatchIterator.replacementData"),
+    ProblemMatcher.make(ProblemKind.MissingTermMember, "scala.collection.convert.JavaCollectionWrappers.IterableWrapperTrait.iterator"),
 
     // Problem: implicit class (method should not be final)
     ProblemMatcher.make(ProblemKind.FinalMember, "scala.collection.convert.*.*"),

stdlib-bootstrapped/src/scala/collection/convert/JavaCollectionWrappers.scala

@@ -33,7 +33,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
     def next() = underlying.next()
     def hasMoreElements = underlying.hasNext
     def nextElement() = underlying.next()
-    override def remove() = throw new UnsupportedOperationException
+    override def remove(): Nothing = throw new UnsupportedOperationException
   }
 
   @SerialVersionUID(3L)
@@ -64,7 +64,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
       with StrictOptimizedIterableOps[A, Iterable, Iterable[A]]
       with Serializable {
     def iterator = underlying.iterator.asScala
-    override def iterableFactory = mutable.ArrayBuffer
+    override def iterableFactory: mutable.ArrayBuffer.type = mutable.ArrayBuffer
     override def isEmpty: Boolean = !underlying.iterator().hasNext
   }
 
@@ -77,7 +77,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
     override def size = underlying.size
     override def knownSize: Int = if (underlying.isEmpty) 0 else super.knownSize
     override def isEmpty = underlying.isEmpty
-    override def iterableFactory = mutable.ArrayBuffer
+    override def iterableFactory: mutable.ArrayBuffer.type = mutable.ArrayBuffer
   }
 
   @SerialVersionUID(3L)
@@ -134,7 +134,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
       this
     }
     def remove(from: Int, n: Int): Unit = underlying.subList(from, from+n).clear()
-    override def iterableFactory = mutable.ArrayBuffer
+    override def iterableFactory: mutable.ArrayBuffer.type = mutable.ArrayBuffer
     override def subtractOne(elem: A): this.type = { underlying.remove(elem.asInstanceOf[AnyRef]); this }
   }
 
@@ -417,7 +417,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
 
     override def isEmpty: Boolean = underlying.isEmpty
     override def knownSize: Int = if (underlying.isEmpty) 0 else super.knownSize
-    override def empty = new JMapWrapper(new ju.HashMap[K, V])
+    override def empty: JMapWrapper[K, V] = new JMapWrapper(new ju.HashMap[K, V])
   }
 
   @SerialVersionUID(3L)
@@ -464,7 +464,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
 
     override def isEmpty: Boolean = underlying.isEmpty
     override def knownSize: Int = if (underlying.isEmpty) 0 else super.knownSize
-    override def empty = new JConcurrentMapWrapper(new juc.ConcurrentHashMap[K, V])
+    override def empty: JConcurrentMapWrapper[K, V] = new JConcurrentMapWrapper(new juc.ConcurrentHashMap[K, V])
 
     def putIfAbsent(k: K, v: V): Option[V] = Option(underlying.putIfAbsent(k, v))
 
@@ -543,7 +543,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
 
     override def clear() = iterator.foreach(entry => underlying.remove(entry._1))
 
-    override def mapFactory = mutable.HashMap
+    override def mapFactory: mutable.HashMap.type = mutable.HashMap
   }
 
   @SerialVersionUID(3L)
@@ -588,7 +588,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
 
     override def clear() = underlying.clear()
 
-    override def empty = new JPropertiesWrapper(new ju.Properties)
+    override def empty: JPropertiesWrapper = new JPropertiesWrapper(new ju.Properties)
 
     def getProperty(key: String) = underlying.getProperty(key)
 
@@ -598,7 +598,7 @@ private[collection] object JavaCollectionWrappers extends Serializable {
     def setProperty(key: String, value: String) =
       underlying.setProperty(key, value)
 
-    override def mapFactory = mutable.HashMap
+    override def mapFactory: mutable.HashMap.type = mutable.HashMap
   }
 
   /** Thrown when certain Map operations attempt to put a null value. */