Merge commit '402c7955427b700218da165fbfd13c29ccf91fca'

Author: jenkins

CHANGELOG.rst

@@ -7,20 +7,50 @@ Note that ``RB_ID=#`` and ``PHAB_ID=#`` correspond to associated message in comm
 Unreleased
 ----------
 
+19.10.0
+-------
+
+Changed
+~~~~~~~
+
+* finatra-jackson: Update jackson reflection to use `org.json.reflect` instead of
+  custom reflection. This enables support for parsing case classes defined over generic
+  types, e.g., `case class Page[T](data: T)`. As a result of this change, use of `lazy val`
+  for trait members which are mixed into case classes for use in deserialization is no
+  longer supported. This addresses issue #480. ``PHAB_ID=D368822``
+
+Fixed
+~~~~~
+
+* finatra-jackson: Add support for parsing of case classes defined over generic types
+  (even nested, and multiple), e.g., `case class Page[T, U] (data: List[T], column: U)`.
+  Fixes issue #408. ``PHAB_ID=D368822``
+
+* finatra-kafka: Sanitize topic name in MonitoringConsumer stats scope
+  ``PHAB_ID=D373402``
+
+* inject-server: Fix printing of all stats from the underlying `InMemoryStatsReceiver` in
+  the `eventually` loop for stat assertion. Address finatra/kafka test logging for
+  finatra/kakfa-streams/kafka-streams and finatra/kafka. ``PHAB__ID=D372108``
+
+* inject-logback: A `NullReferenceException` could be thrown during metrics
+  collection due to an incorrect logback.xml configuration. This has been fixed.
+  ``PHAB_ID=D369234``
+
 19.9.0
 ------
 
 Added
 ~~~~~
 
-* finatra-kafka:  Add `withConfig` method variant which takes a `Map[String, String]`
-                  to allow for more complex configurations ``PHAB_ID=D354389``
+* finatra-kafka: Add `withConfig` method variant which takes a `Map[String, String]`
+  to allow for more complex configurations ``PHAB_ID=D354389``
 
 Changed
 ~~~~~~~
 
 * finatra: Remove commons-lang as a dependency and replace it with alternatives from stdlib 
-           when possible. ``PHAB_ID=D354013``
+  when possible. ``PHAB_ID=D354013``
 
 * inject-server: Changed `c.t.inject.server.InMemoryStatsReceiverUtility` to show the expected and
   actual values as part of the error message when metric values do not match. ``PHAB_ID=D360470``
@@ -30,8 +60,8 @@ Changed
 Fixed
 ~~~~~
 
-* finatra-http:  Support Http 405 response code, improve routing performance for non-constant route
-                 ``PHAB_ID=D278146``
+* finatra-http: Support Http 405 response code, improve routing performance for non-constant route
+  ``PHAB_ID=D278146``
 
 * inject-app: Update `c.t.inject.app.App` to only recurse through modules once. We currently
   call `TwitterModule#modules` more than once in reading flags and parsing the list of modules

build.sbt

@@ -4,7 +4,7 @@ import scoverage.ScoverageKeys
 concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
 
 // All Twitter library releases are date versioned as YY.MM.patch
-val releaseVersion = "19.9.0"
+val releaseVersion = "19.10.0"
 
 lazy val buildSettings = Seq(
   version := releaseVersion,
@@ -69,14 +69,13 @@ lazy val versions = new {
 
   val agrona = "0.9.22"
   val bijectionCore = "0.9.5"
-  val commonsCodec = "1.9"
   val commonsFileupload = "1.4"
-  val commonsLang = "2.6"
   val fastutil = "8.1.1"
   val guice = "4.0"
   val jackson = "2.9.9"
   val jodaConvert = "1.2"
   val jodaTime = "2.5"
+  val json4s = "3.6.7"
   val junit = "4.12"
   val kafka = "2.2.0"
   val libThrift = "0.10.0"
@@ -618,7 +617,7 @@ lazy val jackson = project
       "com.fasterxml.jackson.core" % "jackson-databind" % versions.jackson,
       "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % versions.jackson,
       "com.fasterxml.jackson.module" %% "jackson-module-scala" % versions.jackson,
-      "org.scala-lang" % "scalap" % scalaVersion.value,
+      "org.json4s" %% "json4s-core" % versions.json4s,
       "com.twitter" %% "finagle-http" % versions.twLibVersion,
       "com.twitter" %% "util-core" % versions.twLibVersion
     ),
@@ -700,7 +699,6 @@ lazy val httpclient = project
     name := "finatra-httpclient",
     moduleName := "finatra-httpclient",
     libraryDependencies ++= Seq(
-      "commons-codec" % "commons-codec" % versions.commonsCodec,
       "com.twitter" %% "finagle-core" % versions.twLibVersion,
       "com.twitter" %% "finagle-http" % versions.twLibVersion,
       "com.twitter" %% "twitter-server" % versions.twLibVersion % Test,

doc/src/sphinx/conf.py

@@ -62,7 +62,7 @@
 # fall back if theme is not there
 try:
     __import__('flask_theme_support')
-except ImportError, e:
+except ImportError as e:
     print '-' * 74
     print 'Warning: Flask themes unavailable.  Building with default theme'
     print 'If you want the Flask themes, run this command and build again:'

examples/benchmark-server/src/main/scala/BUILD

@@ -6,7 +6,6 @@ scala_library(
         "3rdparty/jvm/com/fasterxml/jackson/module:jackson-module-scala",
         "3rdparty/jvm/com/google/inject:guice",
         "3rdparty/jvm/org/slf4j:slf4j-nop",
-        "finagle-internal/finagle-netty3/src/main/scala",
         "finagle/finagle-core/src/main/scala",
         "finagle/finagle-http/src/main/scala",
         "finatra/http/src/main/scala",
@@ -16,7 +15,6 @@ scala_library(
         "finatra/inject/inject-slf4j/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",
         "util/util-logging/src/main/scala",
         "util/util-slf4j-api/src/main/scala",

examples/benchmark-server/src/test/scala/BUILD

@@ -3,13 +3,9 @@ junit_tests(
     compiler_option_sets = {"fatal_warnings"},
     dependencies = [
         "3rdparty/jvm/org/scalatest",
-        "3rdparty/jvm/org/slf4j:slf4j-api",
-        "finagle/finagle-http/src/main/scala",
         "finatra/examples/benchmark-server/src/main/scala",
         "finatra/http/src/test/scala:test-deps",
-        "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-core/src/test/scala:test-deps",
         "finatra/inject/inject-server/src/main/scala",
-        "util/util-slf4j-api/src/main/scala",
     ],
 )

examples/example-twitter-server/src/main/scala/BUILD

@@ -4,7 +4,6 @@ scala_library(
     dependencies = [
         "3rdparty/jvm/com/google/inject:guice",
         "finatra/examples/example-twitter-server/src/main/resources",
-        "finatra/inject/inject-logback/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
         "finatra/inject/inject-slf4j/src/main/scala",
         "finatra/utils/src/main/scala",

examples/example-twitter-server/src/test/scala/BUILD

@@ -3,7 +3,6 @@ junit_tests(
     compiler_option_sets = {"fatal_warnings"},
     dependencies = [
         "3rdparty/jvm/com/google/inject:guice",
-        "3rdparty/jvm/org/slf4j:slf4j-api",
         "3rdparty/jvm/org/slf4j:slf4j-simple",
         "finatra/examples/example-twitter-server/src/main/scala",
         "finatra/inject/inject-core/src/test/scala:test-deps",

examples/http-server/src/main/scala/BUILD

@@ -13,7 +13,6 @@ scala_library(
         "finatra/inject/inject-slf4j/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",
         "util/util-logging/src/main/scala",
         "util/util-slf4j-api/src/main/scala",

examples/http-server/src/test/scala/BUILD

@@ -8,15 +8,10 @@ junit_tests(
         "3rdparty/jvm/com/google/inject/extensions:guice-testlib",
         "3rdparty/jvm/net/codingwell:scala-guice",
         "3rdparty/jvm/org/scalatest",
-        "3rdparty/jvm/org/slf4j:slf4j-api",
         "3rdparty/jvm/org/slf4j:slf4j-simple",
-        "finagle/finagle-http/src/main/scala",
         "finatra/examples/http-server/src/main/scala",
         "finatra/http/src/test/scala:test-deps",
-        "finatra/inject/inject-core/src/main/scala",
-        "finatra/inject/inject-core/src/test/scala:test-deps",
         "finatra/inject/inject-server/src/main/scala",
         "finatra/inject/inject-server/src/test/scala:test-deps",
-        "util/util-slf4j-api/src/main/scala",
     ],
 )

examples/java-http-server/src/main/java/BUILD

@@ -3,25 +3,15 @@ java_library(
     compiler_option_sets = {},
     dependencies = [
         "3rdparty/jvm/com/google/inject:guice",
-        "3rdparty/jvm/org/slf4j:slf4j-api",
         "finagle/finagle-base-http/src/main/scala",
         "finagle/finagle-core/src/main/scala",
-        "finagle/finagle-http/src/main/scala",
         "finatra/examples/java-http-server/src/main/resources",
         "finatra/http/src/main/java",
         "finatra/http/src/main/scala",
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
-        "finatra/inject/inject-utils/src/main/scala",
-        "finatra/utils/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",
-        "util/util-logging/src/main/scala",
-        "util/util-slf4j-api/src/main/scala",
-        "util/util-stats/src/main/scala",
     ],
 )