Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated methods #1268

Merged
merged 4 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ val scala213 = "2.13.12"

val scala3 = "3.3.1"

ThisBuild / tlBaseVersion := "3.2"
ThisBuild / tlBaseVersion := "3.3"

ThisBuild / tlCiReleaseBranches := Seq("series/3.x")

Expand Down Expand Up @@ -275,7 +275,14 @@ ThisBuild / mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core.*
Seq(
ProblemFilters.exclude[Problem]("fs2.kafka.internal.*"),
ProblemFilters.exclude[MissingClassProblem]("kafka.utils.VerifiableProperties")
ProblemFilters.exclude[MissingClassProblem]("kafka.utils.VerifiableProperties"),
ProblemFilters.exclude[DirectMissingMethodProblem]("fs2.kafka.AdminClientSettings.apply"),
ProblemFilters
.exclude[DirectMissingMethodProblem]("fs2.kafka.TransactionalProducerRecords.apply"),
ProblemFilters
.exclude[DirectMissingMethodProblem]("fs2.kafka.vulcan.AvroSettings.createAvroSerializer"),
ProblemFilters
.exclude[DirectMissingMethodProblem]("fs2.kafka.vulcan.AvroSettings.withCreateAvroSerializer")
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,6 @@ object AdminClientSettings {

}

@deprecated("use the overload that takes an argument for BootstrapServers", "2.0.0")
def apply: AdminClientSettings =
AdminClientSettingsImpl(
properties = Map.empty,
closeTimeout = 20.seconds
)

def apply(bootstrapServers: String): AdminClientSettings =
AdminClientSettingsImpl(
properties = Map.empty,
Expand Down
5 changes: 0 additions & 5 deletions modules/core/src/main/scala/fs2/kafka/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ package kafka {

object TransactionalProducerRecords {

@deprecated("this is now an identity operation", "3.0.0-M5")
def apply[F[_], K, V](
chunk: Chunk[CommittableProducerRecords[F, K, V]]
): Chunk[CommittableProducerRecords[F, K, V]] = chunk

/**
* Creates a new [[TransactionalProducerRecords]] for producing exactly one
* [[CommittableProducerRecords]]
Expand Down
16 changes: 0 additions & 16 deletions modules/vulcan/src/main/scala/fs2/kafka/vulcan/AvroSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ sealed abstract class AvroSettings[F[_]] {
writerSchema: Option[Schema]
): F[(KafkaAvroSerializer, SchemaRegistryClient)]

@deprecated("use the overload that takes an optional writer schema", "2.5.0-M3")
final def createAvroSerializer(
isKey: Boolean
): F[(KafkaAvroSerializer, SchemaRegistryClient)] =
createAvroSerializer(isKey, writerSchema = None)

/**
* Creates a new [[AvroSettings]] instance with the specified function for creating
* `KafkaAvroDeserializer`s from settings. The arguments are [[schemaRegistryClient]], `isKey`,
Expand All @@ -132,16 +126,6 @@ sealed abstract class AvroSettings[F[_]] {
// format: on
): AvroSettings[F]

@deprecated("use the overload that has an `Option[Schema]` argument", "2.5.0-M3")
final def withCreateAvroSerializer(
// format: off
createAvroSerializerWith: (F[SchemaRegistryClient], Boolean, Map[String, String]) => F[(KafkaAvroSerializer, SchemaRegistryClient)]
// format: on
): AvroSettings[F] =
withCreateAvroSerializer((client, isKey, _, properties) =>
createAvroSerializerWith(client, isKey, properties)
)

/**
* Creates a new [[AvroSettings]] instance with the specified function for registering schemas
* from settings. The arguments are [[schemaRegistryClient]], `subject`, and `codec`.
Expand Down