cleanup

Author: ghik

commons-akka/src/main/scala/com/avsystem/commons/rpc/akka/AkkaRPCFramework.scala

@@ -16,6 +16,7 @@ import com.avsystem.commons.serialization.GenCodec
   */
 object AkkaRPCFramework extends GetterRPCFramework with ProcedureRPCFramework with FunctionRPCFramework with MonixRPCFramework {
   trait RawRPC extends GetterRawRPC with ProcedureRawRPC with FunctionRawRPC with MonixRawRPC
+  abstract class FullRPCInfo[T] extends BaseFullRPCInfo[T]
 
   type RawValue = ByteString
 

commons-macros/src/main/scala/com/avsystem/commons/macros/rpc/RPCFrameworkMacros.scala

@@ -17,7 +17,6 @@ class RPCFrameworkMacros(ctx: blackbox.Context) extends AbstractMacroCommons(ctx
   val AsRawRPCCls = tq"$FrameworkObj.AsRawRPC"
   val AsRealRPCObj = q"$FrameworkObj.AsRealRPC"
   val AsRealRPCCls = tq"$FrameworkObj.AsRealRPC"
-  val AllRPCTypeClassesObj = q"$RpcPackage.AllRPCTypeClasses"
   val RawValueCls = tq"$FrameworkObj.RawValue"
   val ArgListsCls = tq"$ListCls[$ListCls[$RawValueCls]]"
   val RealInvocationHandlerCls = tq"$FrameworkObj.RealInvocationHandler"
@@ -218,13 +217,6 @@ class RPCFrameworkMacros(ctx: blackbox.Context) extends AbstractMacroCommons(ctx
      """
   }
 
-  def allRpcTypeClassesImpl[F: c.WeakTypeTag, T: c.WeakTypeTag]: Tree = {
-    val ftpe = weakTypeOf[F]
-    val frameworkObj = singleValueFor(ftpe).getOrElse(abort(s"Could not find singleton value for $ftpe"))
-    val tpe = weakTypeOf[T]
-    q"$AllRPCTypeClassesObj[$ftpe,$tpe]($frameworkObj.materializeAsReal[$tpe], $frameworkObj.materializeAsRaw[$tpe], $frameworkObj.materializeMetadata[$tpe])"
-  }
-
   def isRPC[T: c.WeakTypeTag]: Tree = {
     checkRpc(weakTypeOf[T])
     q"null"

commons-shared/src/test/scala/com/avsystem/commons/rpc/TestRPC.scala

@@ -15,7 +15,7 @@ case class Record(i: Int, fuu: String)
 
   def indirectRecursion(): TestRPC
 }
-object InnerRPC extends RPCTypeClasses[DummyRPC.type, InnerRPC]
+object InnerRPC extends DummyRPC.RPCCompanion[InnerRPC]
 
 @RPC trait TestRPC {
   @silent
@@ -39,7 +39,7 @@ object InnerRPC extends RPCTypeClasses[DummyRPC.type, InnerRPC]
 }
 
 @silent
-object TestRPC extends RPCTypeClasses[DummyRPC.type, TestRPC] {
+object TestRPC extends DummyRPC.RPCCompanion[TestRPC] {
   def rpcImpl(onInvocation: (String, List[List[Any]], Option[Any]) => Any) = new TestRPC { outer =>
     private def onProcedure(methodName: String, args: List[List[Any]]): Unit =
       onInvocation(methodName, args, None)

docs/RPCFramework.md

@@ -370,7 +370,7 @@ object SimpleHandler extends RequestHandler {
 
 ## Declaring typeclass instances explicitly
 
-For every RPC trait, there are usually three typeclass instances needed: `MyRPCFramework.AsRawRPC`, `MyRPCFramework.AsRealRPC` and (optionally) `RPCMetadata`. Instances for all these typeclasses are automatically materialized by macros. If your trait is designed specifically for particular `RPCFramework` implementation then in order to avoid problems with incremental compilation and possible duplication of code generated by macros, it is recommended that these type class instances be declared explicitly in companion objects of your RPC traits. For example:
+For every RPC trait, there are usually three typeclass instances needed: `MyRPCFramework.AsRawRPC`, `MyRPCFramework.AsRealRPC` and (optionally) `MyRPCFramework.RPCMetadata`. Instances for all these typeclasses are automatically materialized by macros. If your trait is designed specifically for particular `RPCFramework` implementation then in order to avoid problems with incremental compilation and possible duplication of code generated by macros, it is recommended that these type class instances be declared explicitly in companion objects of your RPC traits. For example:
 
 ```scala
 import com.avsystem.commons.rpc._
@@ -381,7 +381,7 @@ import com.avsystem.commons.rpc._
 object MyApi {
   implicit val asRawRPC: MyRPCFramework.AsRawRPC[MyApi] = MyRPCFramework.materializeAsRaw[MyApi]
   implicit val asRealRPC: MyRPCFramework.AsRealRPC[MyApi] = MyRPCFramework.materializeAsReal[MyApi]
-  implicit val rpcMetadata: RPCMetadata[MyApi] = RPCMetadata.materialize[MyApi]
+  implicit val rpcMetadata: MyRPCFramework.RPCMetadata[MyApi] = MyRPCFramework.materializeMetadata[MyApi]
 }
 ```
 
@@ -393,5 +393,5 @@ import com.avsystem.commons.rpc._
 @RPC trait MyApi {
   ...
 }
-object MyApi extends RPCTypeClasses[MyRPCFramework.type, MyApi]
+object MyApi extends MyRPCFramework.RPCCompanion[MyApi]
 ```