Skip to content

Commit abc2656

Browse files
Merge pull request #534 from permutive-engineering/deprecate/fs2-pubsub
Deprecate everything inside the current library in favor of new `fs2-pubsub`
2 parents a54ad7e + 820249d commit abc2656

File tree

48 files changed

+364
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+364
-5
lines changed

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/consumer/grpc/PubsubGoogleConsumer.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ object PubsubGoogleConsumer {
4646
* @param subscription name of the subscription
4747
* @param errorHandler upon failure to decode, an exception is thrown. Allows acknowledging the message.
4848
*/
49+
@deprecated(
50+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
51+
since = "0.22.2"
52+
)
4953
final def subscribe[F[_]: Sync, A: MessageDecoder](
5054
projectId: Model.ProjectId,
5155
subscription: Model.Subscription,
@@ -77,6 +81,10 @@ object PubsubGoogleConsumer {
7781
* @param subscription name of the subscription
7882
* @param errorHandler upon failure to decode, an exception is thrown. Allows acknowledging the message.
7983
*/
84+
@deprecated(
85+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
86+
since = "0.22.2"
87+
)
8088
final def subscribeAndAck[F[_]: Sync, A: MessageDecoder](
8189
projectId: Model.ProjectId,
8290
subscription: Model.Subscription,
@@ -95,6 +103,10 @@ object PubsubGoogleConsumer {
95103
*
96104
* The stream fails with an [[InternalPubSubError]] if the underlying Java consumer fails.
97105
*/
106+
@deprecated(
107+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
108+
since = "0.22.2"
109+
)
98110
final def subscribeRaw[F[_]: Sync](
99111
projectId: Model.ProjectId,
100112
subscription: Model.Subscription,
@@ -106,6 +118,10 @@ object PubsubGoogleConsumer {
106118
ConsumerRecord(msg.value, msg.value.getAttributesMap.asScala.toMap, msg.ack, msg.nack, _ => Applicative[F].unit)
107119
)
108120

121+
@deprecated(
122+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
123+
since = "0.22.2"
124+
)
109125
private def subscribeDecode[F[_]: Sync, A: MessageDecoder, B](
110126
projectId: Model.ProjectId,
111127
subscription: Model.Subscription,

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/consumer/grpc/PubsubGoogleConsumerConfig.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ import scala.concurrent.duration._
2929
* @param onFailedTerminate upon failure to terminate, call this function
3030
* @param customizeSubscriber optionally, provide a function that allows full customisation of the underlying Java Subscriber object.
3131
*/
32+
@deprecated(
33+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
34+
since = "0.22.2"
35+
)
3236
case class PubsubGoogleConsumerConfig[F[_]](
3337
maxQueueSize: Int = 1000,
3438
parallelPullCount: Int = 3,

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/consumer/grpc/internal/PubsubSubscriber.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ import scala.collection.mutable.Builder
3636

3737
private[consumer] object PubsubSubscriber {
3838

39+
@deprecated(
40+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
41+
since = "0.22.2"
42+
)
3943
def createSubscriber[F[_]: Sync](
4044
projectId: PublicModel.ProjectId,
4145
subscription: PublicModel.Subscription,
@@ -103,6 +107,10 @@ private[consumer] object PubsubSubscriber {
103107
}
104108
} yield chunk
105109

110+
@deprecated(
111+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
112+
since = "0.22.2"
113+
)
106114
def subscribe[F[_]: Sync](
107115
projectId: PublicModel.ProjectId,
108116
subscription: PublicModel.Subscription,

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/producer/grpc/GooglePubsubProducer.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ import com.permutive.pubsub.producer.encoder.MessageEncoder
2323
import com.permutive.pubsub.producer.grpc.internal.{DefaultPublisher, PubsubPublisher}
2424

2525
object GooglePubsubProducer {
26+
@deprecated(
27+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
28+
since = "0.22.2"
29+
)
2630
def of[F[_]: Async, A: MessageEncoder](
2731
projectId: ProjectId,
2832
topic: Topic,

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/producer/grpc/PubsubProducerConfig.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ import com.google.cloud.pubsub.v1.Publisher
2020

2121
import scala.concurrent.duration._
2222

23+
@deprecated(
24+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
25+
since = "0.22.2"
26+
)
2327
case class PubsubProducerConfig[F[_]](
2428
batchSize: Long,
2529
delayThreshold: FiniteDuration,

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/producer/grpc/internal/DefaultPublisher.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ import com.permutive.pubsub.producer.{Model, PubsubProducer}
2929
import java.util.UUID
3030
import scala.jdk.CollectionConverters._
3131

32+
@deprecated(
33+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
34+
since = "0.22.2"
35+
)
3236
private[pubsub] class DefaultPublisher[F[_]: Async, A: MessageEncoder](
3337
publisher: Publisher,
3438
) extends PubsubProducer[F, A] {

fs2-google-pubsub-grpc/src/main/scala/com/permutive/pubsub/producer/grpc/internal/PubsubPublisher.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ import org.threeten.bp.Duration
2727

2828
import java.util.concurrent.TimeUnit
2929

30+
@deprecated(
31+
"Use `fs2-pubsub` instead. Replace with: `\"com.permutive\" %% \"fs2-pubsub\" % \"1.0.0\"`",
32+
since = "0.22.2"
33+
)
3034
private[producer] object PubsubPublisher {
3135
def createJavaPublisher[F[_]: Sync](
3236
projectId: ProjectId,

fs2-google-pubsub-grpc/src/test/scala/com/permutive/pubsub/GrpcPingPongSpec.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ import org.typelevel.log4cats.Logger
2828
import org.typelevel.log4cats.slf4j.Slf4jLogger
2929

3030
import scala.concurrent.duration._
31+
import scala.annotation.nowarn
3132

33+
@nowarn("cat=deprecation")
3234
class GrpcPingPongSpec extends PubSubSpec with BeforeAndAfterEach {
3335

3436
implicit val logger: Logger[IO] = Slf4jLogger.getLogger

fs2-google-pubsub-grpc/src/test/scala/com/permutive/pubsub/PubSubSpec.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ import org.testcontainers.containers.wait.strategy.Wait
4444
import org.typelevel.log4cats.Logger
4545

4646
import scala.concurrent.duration._
47+
import scala.annotation.nowarn
4748

49+
@nowarn("cat=deprecation")
4850
trait PubSubSpec extends AnyFlatSpec with ForAllTestContainer with Matchers with TripleEquals {
4951

5052
implicit val logger: Logger[IO]

fs2-google-pubsub-grpc/src/test/scala/com/permutive/pubsub/ValueHolder.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ package com.permutive.pubsub
1919
import com.permutive.pubsub.consumer.decoder.MessageDecoder
2020
import com.permutive.pubsub.producer.encoder.MessageEncoder
2121
import scala.util.Try
22+
import scala.annotation.nowarn
2223

2324
case class ValueHolder(value: String) extends AnyVal
2425

26+
@nowarn("cat=deprecation")
2527
object ValueHolder {
2628
implicit val decoder: MessageDecoder[ValueHolder] = (bytes: Array[Byte]) => {
2729
Try(ValueHolder(new String(bytes))).toEither

0 commit comments

Comments
 (0)