scrooge: Get the maven demos to build

Problem

The maven demos are broken, cf #254

Solution

Fix 'em and update the libraries and plugin.

RB_ID=916328

Author: mosesn

demos/scrooge-maven-demo/pom.xml

@@ -33,27 +33,27 @@
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-core_2.12</artifactId>
-      <version>6.40.0</version>
+      <version>6.43.0</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-codec_2.12</artifactId>
-      <version>6.40.0</version>
+      <version>6.43.0</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-core_2.12</artifactId>
-      <version>6.41.0</version>
+      <version>6.44.0</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-thrift_2.12</artifactId>
-      <version>6.41.0</version>
+      <version>6.44.0</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>scrooge-core_2.12</artifactId>
-      <version>4.13.0</version>
+      <version>4.16.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

demos/scrooge-maven-demo/src/main/scala/BUILD

@@ -0,0 +1,7 @@
+scala_library(name='scala',
+  dependencies=[
+    'scrooge/scrooge-core',
+    'scrooge/demos/scrooge-maven-demo/src/main/thrift',
+  ],
+  sources=globs('com/twitter/example/Demo.scala'),
+)

demos/scrooge-maven-demo/src/main/scala/com/twitter/example/Demo.scala

@@ -1,17 +1,17 @@
 package com.twitter.example
-import com.twitter.mydemo.renamed.{User, UserService}
+
 import com.twitter.finagle.Thrift
-import com.twitter.finagle.thrift.ThriftClientRequest
 import com.twitter.finagle.builder.{ServerBuilder, ClientBuilder}
-import org.apache.thrift.protocol.TBinaryProtocol
-import java.net.{SocketAddress, InetSocketAddress}
+import com.twitter.mydemo.renamed.{User, UserService}
 import com.twitter.util.Future
+import java.net.{SocketAddress, InetSocketAddress}
 import java.util.concurrent.atomic.AtomicInteger
+import org.apache.thrift.protocol.TBinaryProtocol
 
 object DemoClient {
   def buildClient(address: SocketAddress) = {
     val clientService = ClientBuilder()
-      .hosts(Seq(address))
+      .hosts(address.asInstanceOf[InetSocketAddress])
       .stack(Thrift.client)
       .hostConnectionLimit(1)
       .build()
@@ -34,7 +34,7 @@ object DemoServer {
     val protocol = new TBinaryProtocol.Factory()
     val serverService = new UserService.FinagledService(new MyUserImpl, protocol)
     ServerBuilder()
-      .stack(Thrift.client)
+      .stack(Thrift.server)
       .name("binary_service")
       .bindTo(new InetSocketAddress(0))
       .build(serverService)

demos/scrooge-maven-demo/src/main/thrift/BUILD

@@ -0,0 +1,9 @@
+java_thrift_library(name='thrift',
+  sources=['user.thrift'],
+  compiler='scrooge',
+  language='scala',
+  rpc_style='finagle',
+  namespace_map={
+    'com.twitter.demo.thriftscala': 'com.twitter.mydemo.renamed',
+  },
+)

demos/scrooge-maven-demo/src/test/scala/BUILD

@@ -0,0 +1,8 @@
+junit_tests(
+  dependencies=[
+    '3rdparty/jvm/junit',
+    '3rdparty/jvm/org/scalatest',
+    'scrooge/demos/scrooge-maven-demo/src/main/scala',
+  ],
+  sources=globs('com/twitter/example/DemoSpec.scala'),
+)

demos/scrooge-maven-demo/src/test/scala/com/twitter/example/DemoSpec.scala

@@ -1,20 +1,24 @@
 package com.twitter.example
 
+import com.twitter.conversions.time._
+import com.twitter.mydemo.renamed.User
+import com.twitter.util.{Future, Await}
 import org.junit.runner.RunWith
-import org.scalatest.{MustMatchers, WordSpec}
 import org.scalatest.junit.JUnitRunner
-import com.twitter.mydemo.renamed.User
+import org.scalatest.{MustMatchers, WordSpec}
 
 @RunWith(classOf[JUnitRunner])
 class DemoSpec extends WordSpec with MustMatchers {
   def printUser(user: User) {println("User %s, id %d".format(user.name, user.id))}
 
+  def await[A](f: Future[A]): A = Await.result(f, 5.seconds)
+
   "generated finagle service" should {
     "server and client" in {
       val server = DemoServer.buildServer()
       val client = DemoClient.buildClient(server.boundAddress)
-      client.createUser("Tyrion")().name must be("Tyrion")
-      client.createUser("Jon")().name must be("Jon")
+      await(client.createUser("Tyrion")).name must be("Tyrion")
+      await(client.createUser("Jon")).name must be("Jon")
     }
   }
 }