Merge commit '27c540c253487d3d11457dd9de51768c593470f1'

twitter · Nov 16, 2017 · cd3d2e7 · cd3d2e7
2 parents e124df8 + 27c540c
commit cd3d2e7
Show file tree

Hide file tree

Showing 68 changed files with 356 additions and 144 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ before_cache:
 
 scala:
   - 2.11.11
-  - 2.12.1
+  - 2.12.4
 
 jdk:
   - oraclejdk8

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,22 @@ All notable changes to this project will be documented in this file. Note that `
 
 ### Closed
 
+## [finatra-17.11.0](https://github.com/twitter/finatra/tree/finatra-17.11.0) (2017-11-15)
+
+### Added
+
+### Changed
+
+* EmbeddedTwitterServer, EmbeddedHttpServer, and EmbeddedThriftServer flags
+  and args parameters changed to call-by-name. ``PHAB_ID=`D104733`
+
+### Fixed
+
+* inject-server: Ensure EmbeddedTwitterServer has started before trying to
+  close httpAdminClient. ``PHAB_ID=D111294``
+
+### Closed
+
 ## [finatra-17.10.0](https://github.com/twitter/finatra/tree/finatra-17.10.0) (2017-10-26)
 
 ### Added
@@ -31,10 +47,14 @@ All notable changes to this project will be documented in this file. Note that `
   that use the @Named binding annotation. ``PHAB_ID=D91330``
 
 * finatra-http: Allow setting the content type of a Mustache view.
-  ``PHAB_ID=D91857``
+  ``PHAB_ID=D91949``
 
 ### Changed
 
+* finatra-http: Move `FileResolver` to finatra/utils. ``PHAB_ID=D103536``
+
+* finatra-utils: Move `ResponseUtils` to finatra/http. ``PHAB_ID=D103507``
+
 * From now on, release versions will be based on release date in the format of
   YY.MM.x where x is a patch number. ``PHAB_ID=D101244``
 
@@ -64,6 +84,13 @@ All notable changes to this project will be documented in this file. Note that `
 
 ### Fixed
 
+* finatra-http: Parameterized route callback inputs fail because the lookup of a
+  corresponding `MessageBodyManager` reader lookup does not properly handle parameterized
+  types such as collections. This change updates the `MessageBodyManager` `MessageBodyReader`
+  lookup to take into account parameterized types. This allows for a user to parse a
+  `Seq[T]`, or `Map[K, V]` as a route callback input type using the default Finatra
+  `MessageBodyReader`. ``PHAB_ID=D104277``
+
 * finatra-jackson: Fix issue causing `IllegalArgumentException` from Validations to
   be swallowed. A catch clause in the `c.t.finatra.json.internal.caseclass.jackson.FinatraCaseClassDeserializer`
   is too broad as it catches thrown `IllegalArgumentException`s from field validations
@@ -151,7 +178,7 @@ All notable changes to this project will be documented in this file. Note that `
 ### Fixed
 
 * finatra-http: Correctly return a JsonParseException when the incoming JSON is not parsable
-  as an expected custom case class request object. ``RB_ID=``
+  as an expected custom case class request object. ``RB_ID=912529``
 
 * finatra-http: Ensure underlying members are injected for AbstractControllers. ``RB_ID=911635``
 

diff --git a/benchmarks/src/test/scala/BUILD b/benchmarks/src/test/scala/BUILD
@@ -23,7 +23,7 @@ junit_tests(
     'finatra/inject/inject-core/src/test/scala:test-deps',
     'finatra/inject/inject-request-scope/src/main/scala',
     'finatra/jackson/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-slf4j-api/src/main/scala',
     'util/util-stats/src/main/scala',

diff --git a/build.sbt b/build.sbt
@@ -4,13 +4,13 @@ import scoverage.ScoverageKeys
 concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
 
 // All Twitter library releases are date versioned as YY.MM.patch
-val releaseVersion = "17.10.0"
+val releaseVersion = "17.11.0"
 
 lazy val buildSettings = Seq(
   version := releaseVersion,
-  scalaVersion := "2.12.1",
-  crossScalaVersions := Seq("2.11.11", "2.12.1"),
-  ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true)),
+  scalaVersion := "2.12.4",
+  crossScalaVersions := Seq("2.11.11", "2.12.4"),
+  scalaModuleInfo := scalaModuleInfo.value.map(_.withOverrideScalaVersion(true)),
   fork in Test := true,
   javaOptions in Test ++= travisTestJavaOptions
 )
@@ -160,7 +160,7 @@ lazy val publishSettings = Seq(
   resourceGenerators in Compile += Def.task {
     val dir = (resourceManaged in Compile).value
     val file = dir / "com" / "twitter" / name.value / "build.properties"
-    val buildRev = Process("git" :: "rev-parse" :: "HEAD" :: Nil).!!.trim
+    val buildRev = scala.sys.process.Process("git" :: "rev-parse" :: "HEAD" :: Nil).!!.trim
     val buildName = new java.text.SimpleDateFormat("yyyyMMdd-HHmmss").format(new java.util.Date)
     val contents = s"name=${name.value}\nversion=${version.value}\nbuild_revision=$buildRev\nbuild_name=$buildName"
     IO.write(file, contents)
@@ -530,7 +530,7 @@ lazy val utils = project
       previous.filter(mappingContainsAnyPath(_, utilsTestJarSources))
     }
   ).dependsOn(
-    injectApp % "test->test",
+    injectApp % "test->test;compile->compile",
     injectCore % "test->test",
     injectServer % "test->test",
     injectUtils)

diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst
@@ -126,11 +126,13 @@ To continue getting started, please see the `Finatra User's Guide <user-guide/in
 Useful Links
 ------------
 
-- `User's Guide <user-guide/index.html>`__
-- `Scaladocs <https://twitter.github.io/finatra/scaladocs/index.html>`__
-- `Finagle Blog <http://finagle.github.io/blog/>`__
-- `Presentations <presentations/index.html>`__
-- `Forum <https://groups.google.com/forum/#!forum/finatra-users>`__
+.. toctree::
+
+  user-guide/index
+  Scaladocs <https://twitter.github.io/finatra/scaladocs/index.html>
+  Finagle Blog <https://finagle.github.io/blog/>
+  presentations/index
+  Forum <https://groups.google.com/forum/#!forum/finatra-users>
 
 Contributing
 ------------

diff --git a/doc/src/sphinx/presentations/index.rst b/doc/src/sphinx/presentations/index.rst
@@ -1,3 +1,5 @@
+.. _presentations:
+
 Finatra Presentations
 =====================
 

diff --git a/doc/src/sphinx/user-guide/logging/logback.rst b/doc/src/sphinx/user-guide/logging/logback.rst
@@ -46,9 +46,7 @@ Examples
 
 See the
 `logback.xml <https://github.com/twitter/finatra/blob/develop/examples/hello-world/src/main/resources/logback.xml>`__
-and
-`logback-test.xml <https://github.com/twitter/finatra/blob/develop/examples/hello-world/src/test/resources/logback-test.xml>`__
-configuration files in the
+configuration file in the
 `hello-world <https://github.com/twitter/finatra/tree/develop/examples/hello-world>`__
 example project for example Logback configurations.
 

diff --git a/examples/benchmark-server/src/main/scala/BUILD b/examples/benchmark-server/src/main/scala/BUILD
@@ -13,7 +13,7 @@ scala_library(
     'finatra/inject/inject-core/src/main/scala',
     'finatra/inject/inject-server/src/main/scala',
     'finatra/inject/inject-slf4j/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala:scala',

diff --git a/examples/hello-world/src/main/scala/BUILD b/examples/hello-world/src/main/scala/BUILD
@@ -9,7 +9,7 @@ scala_library(
     'finatra/inject/inject-core/src/main/scala',
     'finatra/inject/inject-server/src/main/scala',
     'finatra/inject/inject-slf4j/src/main/scala:scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala:scala',

diff --git a/examples/java-http-server/src/main/java/BUILD b/examples/java-http-server/src/main/java/BUILD
@@ -13,7 +13,7 @@ java_library(
     'finatra/inject/inject-slf4j/src/main/scala',
     'finatra/inject/inject-utils/src/main/scala',
     'finatra/utils/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala',

diff --git a/examples/java-http-server/src/test/java/BUILD b/examples/java-http-server/src/test/java/BUILD
@@ -17,7 +17,7 @@ junit_tests(
     'finatra/inject/inject-server/src/main/scala',
     'finatra/inject/inject-server/src/test/scala:test-deps',
     'finatra/inject/inject-slf4j/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-logging/src/main/scala',

diff --git a/examples/java-server/src/main/java/BUILD b/examples/java-server/src/main/java/BUILD
@@ -14,7 +14,7 @@ java_library(
     'finatra/inject/inject-server/src/main/scala',
     'finatra/inject/inject-slf4j/src/main/scala',
     'finatra/inject/inject-utils/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala',

diff --git a/examples/java-server/src/test/java/BUILD b/examples/java-server/src/test/java/BUILD
@@ -12,7 +12,7 @@ junit_tests(
     'finatra/inject/inject-server/src/main/scala',
     'finatra/inject/inject-server/src/test/scala:test-deps',
     'finatra/inject/inject-slf4j/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-logging/src/main/scala',

diff --git a/examples/java-thrift-server/thrift-example-server/src/main/java/BUILD b/examples/java-thrift-server/thrift-example-server/src/main/java/BUILD
@@ -1,6 +1,5 @@
 java_library(
   dependencies=[
-    '3rdparty/jvm/com/fasterxml/jackson:jackson-annotations',
     '3rdparty/jvm/com/google/inject:guice',
     '3rdparty/jvm/javax/inject:javax.inject',
     '3rdparty/jvm/org/apache/thrift:libthrift-0.5.0',
@@ -16,7 +15,7 @@ java_library(
     'finatra/inject/inject-slf4j/src/main/scala',
     'finatra/inject/inject-utils/src/main/scala',
     'finatra/thrift/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala',

diff --git a/examples/java-thrift-server/thrift-example-server/src/test/java/BUILD b/examples/java-thrift-server/thrift-example-server/src/test/java/BUILD
@@ -17,7 +17,7 @@ junit_tests(
     'finatra/inject/inject-slf4j/src/main/scala',
     'finatra/thrift/src/main/scala',
     'finatra/thrift/src/test/scala:test-deps',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-logging/src/main/scala',

diff --git a/examples/streaming-example/src/main/scala/BUILD b/examples/streaming-example/src/main/scala/BUILD
@@ -8,7 +8,7 @@ scala_library(
     'finatra/inject/inject-core/src/main/scala',
     'finatra/inject/inject-server/src/main/scala',
     'finatra/inject/inject-slf4j/src/main/scala:scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala:scala',

diff --git a/examples/thrift-server/thrift-example-server/src/main/scala/BUILD b/examples/thrift-server/thrift-example-server/src/main/scala/BUILD
@@ -18,7 +18,7 @@ scala_library(
     'finatra/thrift/src/main/scala',
     'finatra/thrift/src/main/thrift:thrift-scala',
     'scrooge/scrooge-core/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala:scala',

diff --git a/examples/twitter-clone/src/main/scala/BUILD b/examples/twitter-clone/src/main/scala/BUILD
@@ -22,7 +22,7 @@ scala_library(
     'finatra/inject/inject-utils/src/main/scala',
     'finatra/jackson/src/main/scala',
     'finatra/utils/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala:scala',

diff --git a/...es/twitter-clone/src/main/scala/finatra/quickstart/modules/FirebaseHttpClientModule.scala b/...es/twitter-clone/src/main/scala/finatra/quickstart/modules/FirebaseHttpClientModule.scala
@@ -1,7 +1,7 @@
 package finatra.quickstart.modules
 
 import com.twitter.finatra.httpclient.modules.HttpClientModule
-import com.twitter.finatra.utils.ResponseUtils._
+import com.twitter.finatra.http.response.ResponseUtils._
 import com.twitter.inject.conversions.time._
 import com.twitter.inject.utils.RetryPolicyUtils._
 

diff --git a/examples/web-dashboard/src/main/scala/BUILD b/examples/web-dashboard/src/main/scala/BUILD
@@ -19,7 +19,7 @@ scala_library(
     'finatra/inject/inject-slf4j/src/main/scala:scala',
     'finatra/inject/inject-thrift-client/src/main/scala',
     'finatra/inject/inject-utils/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-core/src/main/scala',
     'util/util-lint/src/main/scala:scala',

diff --git a/...-dashboard/src/main/scala/com/twitter/web/dashboard/controllers/DashboardController.scala b/...-dashboard/src/main/scala/com/twitter/web/dashboard/controllers/DashboardController.scala
@@ -836,7 +836,7 @@ class DashboardController extends Controller {
 
   /**
    * An example of how to serve files or an index. If the path param of "*" matches the name/path
-   * of a file that can be resolved by the [[com.twitter.finatra.http.routing.FileResolver]]
+   * of a file that can be resolved by the [[com.twitter.finatra.utils.FileResolver]]
    * then the file will be returned. Otherwise the file at 'indexPath' (in this case 'index.html')
    * will be returned. This is useful for building "single-page" web applications.
    *

diff --git a/http/src/main/scala/BUILD b/http/src/main/scala/BUILD
@@ -43,7 +43,7 @@ scala_library(
     'finatra/jackson/src/main/scala',
     'finatra/utils/src/main/java',
     'finatra/utils/src/main/scala',
-    'twitter-server/src/main/scala',
+    'twitter-server/server/src/main/scala',
     'util/util-app/src/main/scala',
     'util/util-collection/src/main/scala',
     'util/util-core/src/main/scala',

diff --git a/http/src/main/scala/com/twitter/finatra/http/internal/marshalling/CallbackConverter.scala b/http/src/main/scala/com/twitter/finatra/http/internal/marshalling/CallbackConverter.scala
@@ -6,10 +6,10 @@ import com.twitter.finatra.http.response.{ResponseBuilder, StreamingResponse}
 import com.twitter.finatra.json.FinatraObjectMapper
 import com.twitter.finatra.json.internal.streaming.JsonStreamParser
 import com.twitter.io.Buf
-import com.twitter.util.{FuturePool, Promise, Future}
+import com.twitter.util.{Future, FuturePool, Promise}
 import javax.inject.Inject
-import scala.concurrent.{Future => ScalaFuture,  ExecutionContext => ScalaExecutionContext}
-import scala.util.{Success, Failure}
+import scala.concurrent.{ExecutionContext => ScalaExecutionContext, Future => ScalaFuture}
+import scala.util.{Failure, Success}
 
 private[http] class CallbackConverter @Inject()(
   messageBodyManager: MessageBodyManager,
@@ -20,8 +20,6 @@ private[http] class CallbackConverter @Inject()(
 
   /* Public */
 
-  // Note we use Manifest here as we support Scala 2.10 and reflection is not thread-safe in 2.10 (precluding the use
-  // of typeTag and/or classTag). See: http://docs.scala-lang.org/overviews/reflection/thread-safety.html
   def convertToFutureResponse[RequestType: Manifest, ResponseType: Manifest](
     callback: RequestType => ResponseType
   ): Request => Future[Response] = {