diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6d24334305..df54f93580 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,12 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com Unreleased ---------- +Breaking API Changes +~~~~~~~~~~~~~~~~~~~~ + +* finagle-thrift: Removed c.t.finagle.thrift.ThriftClient#newMethodIface and + ThriftClient#thriftService, use c.t.f.thrift.ThriftClient#methodPerEndpoint. ``PHAB_ID=D747744`` + Bug Fixes ~~~~~~~~~~ diff --git a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftClient.scala b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftClient.scala index 61627a8aed..efe7465209 100644 --- a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftClient.scala +++ b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftClient.scala @@ -1,6 +1,6 @@ package com.twitter.finagle.thrift -import com.twitter.finagle.thrift.service.{MethodPerEndpointBuilder, ThriftServiceBuilder} +import com.twitter.finagle.thrift.service.MethodPerEndpointBuilder /** * Stateless helper methods which wrap a given `ServiceIface` (deprecated) or a @@ -8,20 +8,6 @@ import com.twitter.finagle.thrift.service.{MethodPerEndpointBuilder, ThriftServi */ trait ThriftClient { - /** - * Converts from a Service interface (`ServiceIface`) to the - * method interface (`newIface`). - */ - @deprecated( - "Use com.twitter.finagle.ThriftClient#methodPerEndpoint[ServicePerEndpoint, MethodPerEndpoint]", - "2017-11-13" - ) - def newMethodIface[ServiceIface, FutureIface]( - serviceIface: ServiceIface - )( - implicit builder: MethodIfaceBuilder[ServiceIface, FutureIface] - ): FutureIface = builder.newMethodIface(serviceIface) - /** * Converts from a Service interface (`ServicePerEndpoint`) to the * method interface (`MethodPerEndpoint`). @@ -31,15 +17,4 @@ trait ThriftClient { )( implicit builder: MethodPerEndpointBuilder[ServicePerEndpoint, MethodPerEndpoint] ): MethodPerEndpoint = builder.methodPerEndpoint(servicePerEndpoint) - - /** - * Converts from a Service interface (`ServicePerEndpoint`) to the higher-kinded - * method interface (`MethodPerEndpoint`). - */ - @deprecated("Use methodPerEndpoint", "2018-01-12") - def thriftService[ServicePerEndpoint, ThriftServiceType]( - servicePerEndpoint: ServicePerEndpoint - )( - implicit builder: ThriftServiceBuilder[ServicePerEndpoint, ThriftServiceType] - ): ThriftServiceType = builder.build(servicePerEndpoint) } diff --git a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftUtil.scala b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftUtil.scala index a5a6261344..9addcc93c1 100644 --- a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftUtil.scala +++ b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/ThriftUtil.scala @@ -1,7 +1,9 @@ package com.twitter.finagle.thrift -import com.twitter.finagle.stats.{NullStatsReceiver, StatsReceiver} -import com.twitter.finagle.{Service, Thrift} +import com.twitter.finagle.stats.NullStatsReceiver +import com.twitter.finagle.stats.StatsReceiver +import com.twitter.finagle.Service +import com.twitter.finagle.Thrift import java.lang.reflect.Constructor import org.apache.thrift.protocol.TProtocolFactory @@ -142,7 +144,7 @@ private[twitter] object ThriftUtil { val baseName: String = stripSuffix(iface) (for { serviceCls <- findClass[BinaryService](baseName + FinagledServerSuffixScala) - baseClass <- findClass1(baseName) + baseClass <- findClass1(baseName + "$MethodPerEndpoint") } yield { findConstructor( serviceCls, diff --git a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/deprecatedBuilders.scala b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/deprecatedBuilders.scala index 7105abb36d..75b0258668 100644 --- a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/deprecatedBuilders.scala +++ b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/deprecatedBuilders.scala @@ -2,7 +2,8 @@ package com.twitter.finagle.thrift import com.twitter.finagle._ import com.twitter.finagle.service.ResponseClassifier -import com.twitter.finagle.stats.{NullStatsReceiver, StatsReceiver} +import com.twitter.finagle.stats.NullStatsReceiver +import com.twitter.finagle.stats.StatsReceiver import com.twitter.finagle.thrift.service.Filterable import org.apache.thrift.protocol.TProtocolFactory @@ -57,19 +58,3 @@ trait ServiceIfaceBuilder[ServiceIface <: Filterable[ServiceIface]] { newServiceIface(thriftService, clientParam) } } - -/** - * A typeclass to construct a MethodIface by wrapping a ServiceIface. - * This is a compatibility constructor to replace an existing Future interface - * with one built from a ServiceIface. - * - * Scrooge generates implementations of this builder. - */ -@deprecated("Use com.twitter.finagle.thrift.service.MethodPerEndpointBuilder", "2017-11-13") -trait MethodIfaceBuilder[ServiceIface, MethodIface] { - - /** - * Build a FutureIface wrapping a ServiceIface. - */ - def newMethodIface(serviceIface: ServiceIface): MethodIface -} diff --git a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/service/ThriftServiceBuilder.scala b/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/service/ThriftServiceBuilder.scala deleted file mode 100644 index 048ed0d019..0000000000 --- a/finagle-thrift/src/main/scala/com/twitter/finagle/thrift/service/ThriftServiceBuilder.scala +++ /dev/null @@ -1,17 +0,0 @@ -package com.twitter.finagle.thrift.service - -/** - * A typeclass to construct a ThriftService by wrapping a ServicePerEndpoint. - * This is a compatibility constructor to replace an existing Future interface - * with one built from a ServicePerEndpoint. - * - * Scrooge generates implementations of this builder. - */ -@deprecated("Use MethodPerEndpointBuilder", "2018-01-12") -trait ThriftServiceBuilder[ServicePerEndpoint, ThriftService] { - - /** - * Build a MethodPerEndpoint wrapping a ServicePerEndpoint. - */ - def build(servicePerEndpoint: ServicePerEndpoint): ThriftService -}