This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new cae290384 remove some deprecated code (#1164)
cae290384 is described below
commit cae29038465d8cbce24d424c6098b288baaadcf6
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Sep 11 14:40:16 2025 +0100
remove some deprecated code (#1164)
* remove some deprecated code
* scala 2.12 compile issues
* Update MessageFactory.scala
* mima
* Update remove-deprecated-methods.backwards.excludes
* Create remove-deprecated-methods.backwards.excludes
---
.../remove-deprecated-methods.backwards.excludes | 19 +++++++
.../connectors/dynamodb/javadsl/DynamoDb.scala | 12 -----
.../remove-deprecated-methods.backwards.excludes | 19 +++++++
.../ElasticsearchConnectionSettings.scala | 24 ---------
file/src/test/java/docs/javadsl/ArchiveHelper.java | 1 -
.../remove-deprecated-methods.backwards.excludes | 19 +++++++
.../stream/connectors/ftp/javadsl/FtpApi.scala | 13 -----
.../remove-deprecated-methods.backwards.excludes | 20 +++++++
.../connectors/googlecloud/pubsub/model.scala | 63 ----------------------
.../remove-deprecated-methods.backwards.excludes | 21 ++++++++
.../googlecloud/storage/javadsl/GCStorage.scala | 50 -----------------
.../connectors/jakartams/JmsExceptions.scala | 12 -----
.../remove-deprecated-methods.backwards.excludes | 22 ++++++++
.../stream/connectors/jms/JmsExceptions.scala | 12 -----
.../remove-deprecated-methods.backwards.excludes | 19 +++++++
.../connectors/pravega/PravegaSettings.scala | 3 --
.../spring/web/PekkoStreamsRegistrar.java | 10 ----
.../remove-deprecated-methods.backwards.excludes | 19 +++++++
.../remove-deprecated-methods.backwards.excludes | 19 +++++++
.../connectors/sse/javadsl/EventSource.scala | 24 ---------
20 files changed, 177 insertions(+), 224 deletions(-)
diff --git
a/dynamodb/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/dynamodb/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..05469b189
--- /dev/null
+++
b/dynamodb/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,19 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.dynamodb.javadsl.DynamoDb.single")
diff --git
a/dynamodb/src/main/scala/org/apache/pekko/stream/connectors/dynamodb/javadsl/DynamoDb.scala
b/dynamodb/src/main/scala/org/apache/pekko/stream/connectors/dynamodb/javadsl/DynamoDb.scala
index 31a5facc1..3c0f65008 100644
---
a/dynamodb/src/main/scala/org/apache/pekko/stream/connectors/dynamodb/javadsl/DynamoDb.scala
+++
b/dynamodb/src/main/scala/org/apache/pekko/stream/connectors/dynamodb/javadsl/DynamoDb.scala
@@ -19,7 +19,6 @@ import org.apache.pekko
import pekko.NotUsed
import pekko.actor.ClassicActorSystemProvider
import pekko.annotation.ApiMayChange
-import pekko.stream.Materializer
import pekko.stream.connectors.dynamodb.{ scaladsl, DynamoDbOp,
DynamoDbPaginatedOp }
import pekko.stream.javadsl.{ Flow, FlowWithContext, Sink, Source }
import software.amazon.awssdk.core.async.SdkPublisher
@@ -79,17 +78,6 @@ object DynamoDb {
operation: DynamoDbPaginatedOp[In, Out, _]): Flow[In, Out, NotUsed] =
scaladsl.DynamoDb.flowPaginated()(client, operation).asJava
- /**
- * Create a CompletionStage that will be completed with a response to a
given request.
- * @deprecated pass in the actor system instead of the materializer, since
Alpakka 3.0.0
- */
- @deprecated("pass in the actor system instead of the materializer", "Alpakka
3.0.0")
- def single[In <: DynamoDbRequest, Out <: DynamoDbResponse](client:
DynamoDbAsyncClient,
- operation: DynamoDbOp[In, Out],
- request: In,
- mat: Materializer): CompletionStage[Out] =
- single(client, operation, request, mat.system)
-
/**
* Create a CompletionStage that will be completed with a response to a
given request.
*/
diff --git
a/elasticsearch/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/elasticsearch/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..308a0afda
--- /dev/null
+++
b/elasticsearch/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,19 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.elasticsearch.ElasticsearchConnectionSettings.withConnectionContext")
diff --git
a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
index e0efdea7e..3dba7a4d2 100644
---
a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
+++
b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/ElasticsearchConnectionSettings.scala
@@ -17,9 +17,7 @@ import org.apache.pekko
import pekko.http.scaladsl.{ ConnectionContext, HttpsConnectionContext }
import pekko.http.scaladsl.model.HttpHeader
import pekko.http.scaladsl.model.HttpHeader.ParsingResult
-import pekko.japi.Util
import pekko.util.ccompat.JavaConverters._
-import pekko.util.OptionConverters._
import javax.net.ssl.SSLContext
@@ -57,28 +55,6 @@ final class ElasticsearchConnectionSettings private (
copy(headers = scalaHeaders)
}
- /** Scala API */
- @deprecated("prefer ElasticsearchConnectionSettings.withSSLContext",
"Alpakka 3.1.0")
- @Deprecated
- def withConnectionContext(connectionContext: HttpsConnectionContext):
ElasticsearchConnectionSettings =
- copy(connectionContext = Option(connectionContext))
-
- /** Java API */
- @deprecated("prefer ElasticsearchConnectionSettings.withSSLContext",
"Alpakka 3.1.0")
- @Deprecated
- def withConnectionContext(
- connectionContext: pekko.http.javadsl.HttpsConnectionContext):
ElasticsearchConnectionSettings = {
- val scalaContext = new HttpsConnectionContext(
- connectionContext.getSslContext,
- None,
-
connectionContext.getEnabledCipherSuites.toScala.map(Util.immutableSeq(_)),
- connectionContext.getEnabledProtocols.toScala.map(Util.immutableSeq(_)),
- connectionContext.getClientAuth.toScala,
- connectionContext.getSslParameters.toScala)
-
- copy(connectionContext = Option(scalaContext))
- }
-
def withSSLContext(
sslContext: SSLContext): ElasticsearchConnectionSettings = {
copy(connectionContext = Option(ConnectionContext.httpsClient(sslContext)))
diff --git a/file/src/test/java/docs/javadsl/ArchiveHelper.java
b/file/src/test/java/docs/javadsl/ArchiveHelper.java
index 56062e94d..48b01fb89 100644
--- a/file/src/test/java/docs/javadsl/ArchiveHelper.java
+++ b/file/src/test/java/docs/javadsl/ArchiveHelper.java
@@ -15,7 +15,6 @@ package docs.javadsl;
import org.apache.pekko.util.ByteString;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.HashMap;
import java.util.Map;
diff --git
a/ftp/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/ftp/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..089427b42
--- /dev/null
+++
b/ftp/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,19 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.ftp.javadsl.FtpApi.mkdirAsync")
diff --git
a/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/javadsl/FtpApi.scala
b/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/javadsl/FtpApi.scala
index 95f34c4e1..6cacf13a5 100644
---
a/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/javadsl/FtpApi.scala
+++
b/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/javadsl/FtpApi.scala
@@ -205,19 +205,6 @@ sealed trait FtpApi[FtpClient, S <: RemoteFileSettings] {
self: FtpSourceFactory
*/
def mkdir(basePath: String, name: String, connectionSettings: S):
Source[Done, NotUsed]
- /**
- * Java API for creating a directory in a given path
- *
- * @param basePath path to start with
- * @param name name of a directory to create
- * @param connectionSettings connection settings
- * @param materializer materializer
- * @return [[java.util.concurrent.CompletionStage CompletionStage]] of
[[pekko.Done]] indicating a materialized, asynchronous request
- * @deprecated pass in the actor system instead of the materializer, since
Alpakka 3.0.0
- */
- @Deprecated
- def mkdirAsync(basePath: String, name: String, connectionSettings: S, mat:
Materializer): CompletionStage[Done]
-
/**
* Java API for creating a directory in a given path
*
diff --git
a/google-cloud-pub-sub/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/google-cloud-pub-sub/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..138f1bd8f
--- /dev/null
+++
b/google-cloud-pub-sub/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,20 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.googlecloud.pubsub.PubSubConfig.create")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.googlecloud.pubsub.PubSubConfig.apply")
diff --git
a/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
b/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
index 925ded556..7226b085d 100644
---
a/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
+++
b/google-cloud-pub-sub/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/pubsub/model.scala
@@ -54,69 +54,6 @@ object PubSubConfig {
def create(pullReturnImmediately: Boolean, pullMaxMessagesPerInternalBatch:
Int): PubSubConfig =
apply(pullReturnImmediately, pullMaxMessagesPerInternalBatch)
-
- /**
- * @deprecated Use [[pekko.stream.connectors.google.GoogleSettings]] to
manage credentials
- */
- @deprecated("Use org.apache.pekko.stream.connectors.google.GoogleSettings to
manage credentials", "Alpakka 3.0.0")
- @Deprecated
- def apply(projectId: String, clientEmail: String, privateKey: String)(
- implicit actorSystem: ActorSystem): PubSubConfig =
- new PubSubConfig(
- projectId = projectId,
- pullReturnImmediately = true,
- pullMaxMessagesPerInternalBatch = 1000,
- Some(
- GoogleSettings().copy(
- projectId = projectId,
- credentials =
- ServiceAccountCredentials(projectId, clientEmail, privateKey,
- Set("https://www.googleapis.com/auth/pubsub";)))))
-
- /**
- * @deprecated Use [[pekko.stream.connectors.google.GoogleSettings]] to
manage credentials
- */
- @deprecated("Use org.apache.pekko.stream.connectors.google.GoogleSettings to
manage credentials", "Alpakka 3.0.0")
- @Deprecated
- def apply(projectId: String,
- clientEmail: String,
- privateKey: String,
- pullReturnImmediately: Boolean,
- pullMaxMessagesPerInternalBatch: Int)(
- implicit actorSystem: ActorSystem): PubSubConfig =
- new PubSubConfig(
- projectId = projectId,
- pullReturnImmediately = pullReturnImmediately,
- pullMaxMessagesPerInternalBatch = pullMaxMessagesPerInternalBatch,
- Some(
- GoogleSettings().copy(
- projectId = projectId,
- credentials =
- ServiceAccountCredentials(projectId, clientEmail, privateKey,
- Set("https://www.googleapis.com/auth/pubsub";)))))
-
- /**
- * Java API
- * @deprecated Use [[pekko.stream.connectors.google.GoogleSettings]] to
manage credentials
- */
- @deprecated("Use org.apache.pekko.stream.connectors.google.GoogleSettings to
manage credentials", "Alpakka 3.0.0")
- @Deprecated
- def create(projectId: String, clientEmail: String, privateKey: String,
actorSystem: ActorSystem): PubSubConfig =
- apply(projectId, clientEmail, privateKey)(actorSystem)
-
- /**
- * Java API
- * @deprecated Use [[pekko.stream.connectors.google.GoogleSettings]] to
manage credentials
- */
- @deprecated("Use org.apache.pekko.stream.connectors.google.GoogleSettings to
manage credentials", "Alpakka 3.0.0")
- @Deprecated
- def create(projectId: String,
- clientEmail: String,
- privateKey: String,
- actorSystem: ActorSystem,
- pullReturnImmediately: Boolean,
- pullMaxMessagesPerInternalBatch: Int): PubSubConfig =
- apply(projectId, clientEmail, privateKey, pullReturnImmediately,
pullMaxMessagesPerInternalBatch)(actorSystem)
}
final class PublishMessage private (val data: String,
diff --git
a/google-cloud-storage/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/google-cloud-storage/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..343054cc4
--- /dev/null
+++
b/google-cloud-storage/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,21 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.googlecloud.storage.javadsl.GCStorage.createBucket")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.googlecloud.storage.javadsl.GCStorage.deleteBucket")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.googlecloud.storage.javadsl.GCStorage.getBucket")
diff --git
a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
index b085ae64f..e9e5c52de 100644
---
a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
+++
b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/javadsl/GCStorage.scala
@@ -37,26 +37,6 @@ import pekko.{ Done, NotUsed }
*/
object GCStorage {
- /**
- * Gets information on a bucket
- *
- * @see https://cloud.google.com/storage/docs/json_api/v1/buckets/get
- *
- * @param bucketName the name of the bucket to look up
- * @param materializer materializer to run with
- * @param attributes attributes to run request with
- * @return a `CompletionStage` containing `Bucket` if it exists
- * @deprecated pass in the actor system instead of the materializer, since
Alpakka 3.0.0
- */
- @deprecated("pass in the actor system instead of the materializer", "Alpakka
3.0.0")
- def getBucket(bucketName: String,
- materializer: Materializer,
- attributes: Attributes): CompletionStage[Optional[Bucket]] =
- GCStorageStream
- .getBucket(bucketName)(materializer, attributes)
- .map(_.toJava)(materializer.executionContext)
- .asJava
-
/**
* Gets information on a bucket
*
@@ -84,23 +64,6 @@ object GCStorage {
def getBucketSource(bucketName: String): Source[Optional[Bucket], NotUsed] =
GCStorageStream.getBucketSource(bucketName).map(_.toJava).asJava
- /**
- * Creates a new bucket
- *
- * @see https://cloud.google.com/storage/docs/json_api/v1/buckets/insert
- *
- * @param bucketName the name of the bucket
- * @param location the region to put the bucket in
- * @return a `CompletionStage` of `Bucket` with created bucket
- * @deprecated pass in the actor system instead of the materializer, since
Alpakka 3.0.0
- */
- @deprecated("pass in the actor system instead of the materializer", "Alpakka
3.0.0")
- def createBucket(bucketName: String,
- location: String,
- materializer: Materializer,
- attributes: Attributes): CompletionStage[Bucket] =
- GCStorageStream.createBucket(bucketName, location)(materializer,
attributes).asJava
-
/**
* Creates a new bucket
*
@@ -128,19 +91,6 @@ object GCStorage {
def createBucketSource(bucketName: String, location: String): Source[Bucket,
NotUsed] =
GCStorageStream.createBucketSource(bucketName, location).asJava
- /**
- * Deletes bucket
- *
- * @see https://cloud.google.com/storage/docs/json_api/v1/buckets/delete
- *
- * @param bucketName the name of the bucket
- * @return a `CompletionStage` of `Done` on successful deletion
- * @deprecated pass in the actor system instead of the materializer, since
Alpakka 3.0.0
- */
- @deprecated("pass in the actor system instead of the materializer", "Alpakka
3.0.0")
- def deleteBucket(bucketName: String, materializer: Materializer, attributes:
Attributes): CompletionStage[Done] =
- GCStorageStream.deleteBucket(bucketName)(materializer, attributes).asJava
-
/**
* Deletes bucket
*
diff --git
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsExceptions.scala
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsExceptions.scala
index bc8ce15b9..785addfa7 100644
---
a/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsExceptions.scala
+++
b/jakartams/src/main/scala/org/apache/pekko/stream/connectors/jakartams/JmsExceptions.scala
@@ -30,24 +30,12 @@ case class UnsupportedMessagePropertyType(propertyName:
String, propertyValue: A
"Only primitive types and String are supported as property values.")
with NonRetriableJmsException
-@deprecated("Not used anywhere", "Alpakka 3.0.4")
-case class NullMessageProperty(propertyName: String, message: JmsEnvelope[_])
- extends Exception(
- s"null value was given for Jms property '$propertyName'.")
- with NonRetriableJmsException
-
case class UnsupportedMapMessageEntryType(entryName: String, entryValue: Any,
message: JmsMapMessagePassThrough[_])
extends Exception(
s"Jms MapMessage entry '$entryName' has unknown type
'${entryValue.getClass.getName}'. " +
"Only primitive types, String, and Byte array are supported as entry
values.")
with NonRetriableJmsException
-@deprecated("Not used anywhere", "Alpakka 3.0.4")
-case class NullMapMessageEntry(entryName: String, message:
JmsMapMessagePassThrough[_])
- extends Exception(
- s"null value was given for Jms MapMessage entry '$entryName'.")
- with NonRetriableJmsException
-
case class UnsupportedMessageType(message: jms.Message)
extends Exception(
s"Can't convert a ${message.getClass.getName} to a JmsMessage")
diff --git
a/jms/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/jms/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..a81ee98f9
--- /dev/null
+++
b/jms/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,22 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.stream.connectors.jms.NullMapMessageEntry")
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.stream.connectors.jms.NullMapMessageEntry$")
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.stream.connectors.jms.NullMessageProperty")
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.stream.connectors.jms.NullMessageProperty$")
diff --git
a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsExceptions.scala
b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsExceptions.scala
index fb5a2cb69..320830e71 100644
---
a/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsExceptions.scala
+++
b/jms/src/main/scala/org/apache/pekko/stream/connectors/jms/JmsExceptions.scala
@@ -30,24 +30,12 @@ case class UnsupportedMessagePropertyType(propertyName:
String, propertyValue: A
"Only primitive types and String are supported as property values.")
with NonRetriableJmsException
-@deprecated("Not used anywhere", "Alpakka 3.0.4")
-case class NullMessageProperty(propertyName: String, message: JmsEnvelope[_])
- extends Exception(
- s"null value was given for Jms property '$propertyName'.")
- with NonRetriableJmsException
-
case class UnsupportedMapMessageEntryType(entryName: String, entryValue: Any,
message: JmsMapMessagePassThrough[_])
extends Exception(
s"Jms MapMessage entry '$entryName' has unknown type
'${entryValue.getClass.getName}'. " +
"Only primitive types, String, and Byte array are supported as entry
values.")
with NonRetriableJmsException
-@deprecated("Not used anywhere", "Alpakka 3.0.4")
-case class NullMapMessageEntry(entryName: String, message:
JmsMapMessagePassThrough[_])
- extends Exception(
- s"null value was given for Jms MapMessage entry '$entryName'.")
- with NonRetriableJmsException
-
case class UnsupportedMessageType(message: jms.Message)
extends Exception(
s"Can't convert a ${message.getClass.getName} to a JmsMessage")
diff --git
a/pravega/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/pravega/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..ed721bd8a
--- /dev/null
+++
b/pravega/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,19 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.pravega.TableReaderSettingsBuilder.withTableKey")
diff --git
a/pravega/src/main/scala/org/apache/pekko/stream/connectors/pravega/PravegaSettings.scala
b/pravega/src/main/scala/org/apache/pekko/stream/connectors/pravega/PravegaSettings.scala
index c88d8e323..439a2feaf 100644
---
a/pravega/src/main/scala/org/apache/pekko/stream/connectors/pravega/PravegaSettings.scala
+++
b/pravega/src/main/scala/org/apache/pekko/stream/connectors/pravega/PravegaSettings.scala
@@ -344,9 +344,6 @@ class TableReaderSettingsBuilder[K, V](
maximumInflightMessages,
maxEntriesAtOnce)
- @deprecated("Use withKeyExtractor instead", "Alpakka 4.0.0")
- def withTableKey(extractor: K => TableKey): TableReaderSettingsBuilder[K, V]
= withKeyExtractor(extractor)
-
def withKeyExtractor(
extractor: K => TableKey): TableReaderSettingsBuilder[K, V] =
copy(tableKeyExtractor = Some(extractor))
diff --git
a/spring-web/src/main/java/org/apache/pekko/stream/connectors/spring/web/PekkoStreamsRegistrar.java
b/spring-web/src/main/java/org/apache/pekko/stream/connectors/spring/web/PekkoStreamsRegistrar.java
index 9ad250446..5de7f69d2 100644
---
a/spring-web/src/main/java/org/apache/pekko/stream/connectors/spring/web/PekkoStreamsRegistrar.java
+++
b/spring-web/src/main/java/org/apache/pekko/stream/connectors/spring/web/PekkoStreamsRegistrar.java
@@ -26,16 +26,6 @@ public class PekkoStreamsRegistrar {
private final ActorSystem system;
- /**
- * deprecated, use {@link
#PekkoStreamsRegistrar(ClassicActorSystemProvider)}.
- *
- * @deprecated pass in the actor system instead of the materializer, since
3.0.0
- */
- @Deprecated
- public PekkoStreamsRegistrar(Materializer materializer) {
- this(materializer.system());
- }
-
public PekkoStreamsRegistrar(ClassicActorSystemProvider system) {
this.system = system.classicSystem();
}
diff --git
a/spring-web/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/spring-web/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..1a8bdd793
--- /dev/null
+++
b/spring-web/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,19 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.spring.web.PekkoStreamsRegistrar.this")
diff --git
a/sse/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
b/sse/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
new file mode 100644
index 000000000..8c11e5eed
--- /dev/null
+++
b/sse/src/main/mima-filters/2.0.x.backward.excludes/remove-deprecated-methods.backwards.excludes
@@ -0,0 +1,19 @@
+# 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.
+
+# remove deprecated methods
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.connectors.sse.javadsl.EventSource.create")
diff --git
a/sse/src/main/scala/org/apache/pekko/stream/connectors/sse/javadsl/EventSource.scala
b/sse/src/main/scala/org/apache/pekko/stream/connectors/sse/javadsl/EventSource.scala
index 6ae9fadc0..1b14ddf73 100644
---
a/sse/src/main/scala/org/apache/pekko/stream/connectors/sse/javadsl/EventSource.scala
+++
b/sse/src/main/scala/org/apache/pekko/stream/connectors/sse/javadsl/EventSource.scala
@@ -18,7 +18,6 @@ import org.apache.pekko
import pekko.NotUsed
import pekko.http.javadsl.model.{ HttpRequest, HttpResponse, Uri }
import pekko.http.scaladsl.model.{ HttpResponse => SHttpResponse }
-import pekko.stream.Materializer
import pekko.stream.javadsl.Source
import pekko.http.javadsl.model.sse.ServerSentEvent
import pekko.util.FutureConverters
@@ -96,27 +95,4 @@ object EventSource {
.map(v => v: ServerSentEvent)
eventSource.asJava
}
-
- /**
- * @param uri URI with absolute path, e.g. "http://myserver/events
- * @param send function to send a HTTP request
- * @param lastEventId initial value for Last-Evend-ID header, optional
- * @param mat `Materializer`
- * @return continuous source of server-sent events
- * @deprecated pass in the actor system instead of the materializer, since
Alpakka 3.0.0
- */
- @deprecated("pass in the actor system instead of the materializer", "Alpakka
3.0.0")
- def create(uri: Uri,
- send: JFunction[HttpRequest, CompletionStage[HttpResponse]],
- lastEventId: Optional[String],
- mat: Materializer): Source[ServerSentEvent, NotUsed] = {
- val eventSource =
- scaladsl
- .EventSource(
- uri.asScala,
-
send(_).asScala.map(_.asInstanceOf[SHttpResponse])(mat.executionContext),
- lastEventId.toScala)(mat.system)
- .map(v => v: ServerSentEvent)
- eventSource.asJava
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
