avoid deprecated function interfaces (#710)

* avoid deprecated function interfaces

* more changes

* mima

Author: pjfanning

http-caching/src/main/java/org/apache/pekko/http/caching/javadsl/Cache.java

@@ -15,8 +15,8 @@
 
 import org.apache.pekko.annotation.ApiMayChange;
 import org.apache.pekko.annotation.DoNotInherit;
-import org.apache.pekko.japi.Creator;
-import org.apache.pekko.japi.Procedure;
+import org.apache.pekko.japi.function.Creator;
+import org.apache.pekko.japi.function.Procedure;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

http-caching/src/main/mima-filters/2.0.x.backwards.excludes/switch-functional-interfaces.excludes

@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+# Change to pekko.util.function Functional Interfaces
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.http.caching.javadsl.Cache.getFuture")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.http.caching.javadsl.Cache.getOrFulfil")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.http.caching.javadsl.Cache.getOrCreateStrict")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("org.apache.pekko.http.caching.javadsl.Cache.getFuture")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("org.apache.pekko.http.caching.javadsl.Cache.getOrFulfil")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("org.apache.pekko.http.caching.javadsl.Cache.getOrCreateStrict")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.http.caching.scaladsl.Cache.getFuture")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.http.caching.scaladsl.Cache.getOrFulfil")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.http.caching.scaladsl.Cache.getOrCreateStrict")

http-caching/src/main/scala/org/apache/pekko/http/caching/LfuCache.scala

@@ -16,19 +16,18 @@ package org.apache.pekko.http.caching
 import java.util.concurrent.{ CompletableFuture, Executor, TimeUnit }
 import java.util.function.BiFunction
 
-import org.apache.pekko
-import pekko.actor.ActorSystem
-import pekko.annotation.{ ApiMayChange, InternalApi }
-
 import scala.collection.JavaConverters._
 import scala.concurrent.duration.Duration
 import scala.concurrent.{ ExecutionContext, Future }
+
 import com.github.benmanes.caffeine.cache.{ AsyncCache, Caffeine }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.annotation.{ ApiMayChange, InternalApi }
 import pekko.http.caching.LfuCache.toJavaMappingFunction
 import pekko.http.caching.scaladsl.Cache
 import pekko.http.impl.util.JavaMapping.Implicits._
 import pekko.http.caching.CacheJavaMapping.Implicits._
-
 import pekko.util.FutureConverters._
 import pekko.util.FunctionConverters._
 

http-caching/src/main/scala/org/apache/pekko/http/caching/scaladsl/Cache.scala

@@ -18,7 +18,7 @@ import java.util.concurrent.{ CompletableFuture, CompletionStage }
 
 import org.apache.pekko
 import pekko.annotation.{ ApiMayChange, DoNotInherit }
-import pekko.japi.{ Creator, Procedure }
+import pekko.japi.function.{ Creator, Procedure }
 import pekko.util.FutureConverters._
 
 import scala.collection.JavaConverters._