Merge commit '5bd27e8ca729f08e1904e2df2294cce38400e0fb'

Author: jenkins

.travis.yml

@@ -25,7 +25,7 @@ before_cache:
 
 scala:
   - 2.11.12
-  - 2.12.7
+  - 2.12.8
 
 jdk:
   - oraclejdk8

CHANGELOG.rst

@@ -7,12 +7,82 @@ Note that ``RB_ID=#`` and ``PHAB_ID=#`` correspond to associated message in comm
 Unreleased
 ----------
 
+19.4.0
+------
+
+Added
+~~~~~
+
+* inject-server: Add `globalFlags` argument to EmbeddedTwitterServer, which will
+   allow for scoping a `c.t.a.GlobalFlag` property change to the lifecycle of the
+   underlying TwitterServer, as a `c.t.a.GlobalFlag` is normally scoped to the JVM/process.
+   This change is also reflected in `EmbeddedHttpServer` and `EmbeddedThriftServer` constructors.
+   ``PHAB_ID=D288032``
+
+* inject-utils: add `toOrderedMap` implicit conversion for `java.util.Map` ``PHAB_ID=D295005``
+
+* finatra-kafka-streams: Add flag `rocksdb.manifest.preallocation.size` with default value
+    `4.megabytes` to `c.t.f.k.c.RocksDbFlags` and set value in
+    `c.t.f.k.c.FinatraRocksDBConfig`. ``PHAB_ID=D290130``
+
+* finatra-http: Add `commaSeparatedList` boolean parameter to QueryParams, for
+   parsing comma-separated query parameters into collection types. ``PHAB_ID=D268989``
+
+Changed
+~~~~~~~
+
+* finatra-kafka: Upgraded kafka libraries from 2.0.0 to 2.2.0.
+  - `Kafka 2.0.1 Release Notes <https://archive.apache.org/dist/kafka/2.0.1/RELEASE_NOTES.html>`__
+  - `Kafka 2.1.0 Release Notes <https://archive.apache.org/dist/kafka/2.1.0/RELEASE_NOTES.html>`__
+  - `Kafka 2.1.1 Release Notes <https://archive.apache.org/dist/kafka/2.1.1/RELEASE_NOTES.html>`__
+  - `Kafka 2.2.0 Release Notes <https://archive.apache.org/dist/kafka/2.2.0/RELEASE_NOTES.html>`__
+  ``PHAB_ID=D248171``
+
+* finatra-thrift: Removed `c.t.finatra.thrift.exceptions.FinatraThriftExceptionMapper`,
+  `c.t.finatra.thrift.filters.ClientIdAcceptlistFilter`,
+  `c.t.finatra.thrift.modules.ClientIdAcceptlistModule`,
+  `c.t.finatra.thrift.filters.ClientIdWhitelistFilter`,
+  `c.t.finatra.thrift.modules.ClientIdWhitelistModule`,
+  and the `finatra/finatra_thrift_exceptions.thrift` IDL. ``PHAB_ID=D278231``
+
+* finatra-thrift: Constructing a `ThriftRouter` now requires `serverName`. ``PHAB_ID=D294345``
+
+* finatra-examples: Updated `StreamingController` to use `Reader` instead of `AsyncStream`
+  ``PHAB_ID=D295227``
+
+* finatra-kafka-streams: Implement FinatraKeyValueStore as custom store. ``PHAB_ID=D277612``
+
+* finatra-thrift: Constructing a `ThriftRouter` now requires `c.t.f.StackTransformer`.
+  ``PHAB_ID=D277493``
+
+Fixed
+~~~~~
+
+ * finatra-kafka: Ensure that `EmbeddedKafka` implementation of `beforeAll()` makes
+   call to `super.beforeAll()` so hooks registered in super class get executed. ``PHAB_ID=D296643``
+
+ * finatra-kafka-streams: `FinatraTransformer.timerStore` config object references immutable
+   map which causes exception thrown if user code calls `AbstractStoreBuilder.withLoggingDisabled`.
+   Fixed `FinatraTransformer.timerStore` to convert from immutable map to mutable map before
+   forwarding config object to kafka library. ``PHAB_ID=D293979``
+
 19.3.0
 ------
 
 Added
 ~~~~~
 
+* finatra-kafka-streams: Exposing additional consumer configuration flags.
+  - `kafka.consumer.max.poll.interval.ms` Maximum delay between invocations of poll() when using
+  consumer group management.
+  - `kafka.consumer.max.partition.fetch.bytes` Consumer's maximum amount of data per-partition the
+  server will return.
+  - `kafka.consumer.request.timeout.ms` Consumer's maximum amount of time to wait for the response
+  of a request.
+  - `kafka.consumer.connections.max.idle.ms` Consumer's maximum idle time for connections before
+  closing the connection.
+  ``PHAB_ID=D287371``
+
 * finatra-kafka: FinagleKafka clients pass correct deadline for close to
   underlying Kafka clients. ``PHAB_ID=D261115``
 
@@ -32,6 +102,8 @@ Added
 Changed
 ~~~~~~~
 
+* finatra-kafka-streams: finatra-kafka-streams: Refactor queryable state management  ``PHAB_ID=D277594``
+
 * finatra-kafka-streams: Improve querying of windowed stores. ``PHAB_ID=D277553``
 
 * inject-utils: Mark `c.t.inject.utils.StringUtils#snakify,camelify,pascalify` as
@@ -84,7 +156,6 @@ Added
 
 Changed
 ~~~~~~~
-
 * finatra-kafka-streams: Refactor package names. All classes moved from
   com.twitter.finatra.streams to com.twitter.finatra.kafkastreams. ``PHAB_ID=D268027``
 

CONTRIBUTING.md

@@ -200,15 +200,15 @@ Scaladocs. Please file an [issue](https://github.com/twitter/finatra/issues).
 [finagle-repo]: https://github.com/twitter/finagle 
 [util-repo]: https://github.com/twitter/util
 [effectivescala]: https://twitter.github.io/effectivescala/ 
-[funsuite]: http://doc.scalatest.org/2.2.1/#org.scalatest.FunSuite
-[scalatest]: http://www.scalatest.org/ 
+[funsuite]: https://doc.scalatest.org/2.2.1/#org.scalatest.FunSuite
+[scalatest]: https://www.scalatest.org/ 
 [scala-style-guide]: https://docs.scala-lang.org/style/index.html
 [sbt]: https://www.scala-sbt.org/
 [travis-ci]: https://travis-ci.org/twitter/finatra 
 [test-trait]: https://github.com/twitter/finatra/blob/develop/inject/inject-core/src/test/scala/com/twitter/inject/Test.scala
 [scaladoc]: https://docs.scala-lang.org/style/scaladoc.html
 [scalacheck]: https://www.scalacheck.org/
-[gendrivenprop]: http://www.scalatest.org/user_guide/generator_driven_property_checks
+[gendrivenprop]: https://www.scalatest.org/user_guide/generator_driven_property_checks
 
 ### License 
 By contributing your code, you agree to license your contribution under the 

README.md

@@ -107,7 +107,7 @@ The [master branch](https://github.com/twitter/finatra/tree/master) in Github tr
 available on Maven Central. See the [First Steps](https://twitter.github.io/finatra/user-guide/getting-started/basics.html#first-steps) section in the [User Guide][user-guide] for how to add dependencies.
 
 Releases are done on an approximately monthly schedule. While
-[semver](http://semver.org/) is not followed, the
+[semver](https://semver.org/) is not followed, the
 [changelogs](CHANGELOG.rst) are detailed and include sections on public API
 breaks and changes in runtime behavior.
 
@@ -148,4 +148,4 @@ Licensed under the Apache License, Version 2.0: https://www.apache.org/licenses/
 [maven]: https://maven.apache.org/
 [maven-central]: https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.twitter%22%20AND%20%28a%3A%22finatra-http_2.12%22%20OR%20a%3A%22finatra-thrift_2.12%22%29
 [user-guide]: https://twitter.github.io/finatra/user-guide/index.html
-[sbt]: http://www.scala-sbt.org/
+[sbt]: https://www.scala-sbt.org/

benchmarks/README.md

@@ -1,6 +1,6 @@
 # Finatra Benchmarks
 
-We use [JMH](http://openjdk.java.net/projects/code-tools/jmh/) as our benchmarking framework.
+We use [JMH](https://openjdk.java.net/projects/code-tools/jmh/) as our benchmarking framework.
 
 ## Tests
 
@@ -48,7 +48,7 @@ Or you can run the tests manually in an IDE.
 
 ## Running
 
-[JMH](http://openjdk.java.net/projects/code-tools/jmh/) is integrated via the 
+[JMH](https://openjdk.java.net/projects/code-tools/jmh/) is integrated via the 
 [`sbt-jmh`](https://github.com/ktoso/sbt-jmh) plugin.
 
 Benchmarks can be run using [SBT](https://www.scala-sbt.org/) via the plugin, e.g., from the

build.sbt

@@ -4,12 +4,12 @@ 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.3.0"
+val releaseVersion = "19.4.0"
 
 lazy val buildSettings = Seq(
   version := releaseVersion,
-  scalaVersion := "2.12.7",
-  crossScalaVersions := Seq("2.11.12", "2.12.7"),
+  scalaVersion := "2.12.8",
+  crossScalaVersions := Seq("2.11.12", "2.12.8"),
   scalaModuleInfo := scalaModuleInfo.value.map(_.withOverrideScalaVersion(true)),
   fork in Test := true,
   javaOptions in Test ++= travisTestJavaOptions
@@ -64,7 +64,7 @@ lazy val versions = new {
   val jodaConvert = "1.2"
   val jodaTime = "2.5"
   val junit = "4.12"
-  val kafka = "2.0.1"
+  val kafka = "2.2.0"
   val libThrift = "0.10.0"
   val logback = "1.1.7"
   val mockito = "1.9.5"
@@ -130,7 +130,7 @@ lazy val publishSettings = Seq(
     else
       Some("releases" at nexus + "service/local/staging/deploy/maven2")
   },
-  licenses := Seq("Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
+  licenses := Seq("Apache 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")),
   homepage := Some(url("https://github.com/twitter/finatra")),
   autoAPIMappings := true,
   apiURL := Some(url("https://twitter.github.io/finatra/scaladocs/")),
@@ -724,9 +724,7 @@ lazy val thrift = project
       "com.novocode" % "junit-interface" % "0.11" % Test,
       "org.yaml" % "snakeyaml" % versions.snakeyaml
     ),
-    scroogePublishThrift in Compile := true,
-    scroogeThriftIncludeFolders in Test := Seq(file("thrift/src/main/thrift")),
-    scroogeLanguages in Compile := Seq("java", "scala"),
+    scroogePublishThrift in Test := true,
     scroogeLanguages in Test := Seq("java", "scala"),
     excludeFilter in unmanagedResources := "BUILD",
     publishArtifact in Test := true,
@@ -753,7 +751,6 @@ lazy val injectThriftClientHttpMapper = (project in file("inject-thrift-client-h
   .settings(
     name := "inject-thrift-client-http-mapper",
     moduleName := "inject-thrift-client-http-mapper",
-    scroogeThriftIncludeFolders in Test := Seq(file("thrift/src/main/thrift")),
     excludeFilter in Test in unmanagedResources := "BUILD"
   ).dependsOn(
     http % "test->test;compile->compile",
@@ -1035,7 +1032,6 @@ lazy val thriftExampleIdl = (project in file("examples/thrift-server/thrift-exam
     moduleName := "thrift-example-idl",
     ScoverageKeys.coverageExcludedPackages := "<empty>;.*\\.thriftscala.*",
     scroogeThriftIncludeFolders in Compile := Seq(
-      file("thrift/src/main/thrift"),
       file("examples/thrift-server/thrift-example-idl/src/main/thrift"))
   ).dependsOn(thrift)
 
@@ -1064,7 +1060,6 @@ lazy val thriftJavaExampleIdl = (project in file("examples/java-thrift-server/th
     ScoverageKeys.coverageExcludedPackages := "<empty>;.*\\.thriftjava.*",
     scroogeLanguages in Compile := Seq("java"),
     scroogeThriftIncludeFolders in Compile := Seq(
-      file("thrift/src/main/thrift"),
       file("examples/java-thrift-server/thrift-example-idl/src/main/thrift"))
   ).dependsOn(thrift)
 

doc/src/sphinx/FinatraLifecycle.svg

@@ -54,7 +54,7 @@
 }
 
 rst_epilog = '''
-.. _Sphinx: http://sphinx.pocoo.org/
+.. _Sphinx: https://www.sphinx-doc.org/en/master/
 '''
 
 pygments_style = 'sphinx'

doc/src/sphinx/conf.py

@@ -16,9 +16,9 @@ For servers, Finatra builds on top of the `features <https://twitter.github.io/t
 Getting Started
 ---------------
 
-To get started, add a dependency on either `finatra-http <http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.twitter%22%20AND%20a%3A%22finatra-http_2.12%22>`__ or `finatra-thrift <http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.twitter%22%20AND%20a%3A%22finatra-thrift_2.12%22>`__ depending if you are building an HTTP or Thrift server.
+To get started, add a dependency on either `finatra-http <https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.twitter%22%20AND%20a%3A%22finatra-http_2.12%22>`__ or `finatra-thrift <https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.twitter%22%20AND%20a%3A%22finatra-thrift_2.12%22>`__ depending if you are building an HTTP or Thrift server.
 
-E.g., with `sbt <http://www.scala-sbt.org/>`__:
+E.g., with `sbt <https://www.scala-sbt.org/>`__:
 
 .. parsed-literal::
 
@@ -30,7 +30,7 @@ or
 
     "com.twitter" %% "finatra-thrift" % "\ |release|\ "
 
-Or similarily with `Maven <http://maven.apache.org/>`__:
+Or similarily with `Maven <https://maven.apache.org/>`__:
 
 .. parsed-literal::
 
@@ -59,7 +59,7 @@ Test Dependencies
 
 Finatra publishes `test-jars <https://maven.apache.org/guides/mini/guide-attached-tests.html>`__ for most modules. The test-jars include re-usable utilities for use in testing (e.g., the `EmbeddedTwitterServer <https://github.com/twitter/finatra/blob/develop/inject/inject-server/src/test/scala/com/twitter/inject/server/EmbeddedTwitterServer.scala>`__).
 
-To add a test-jar dependency, depend on the appropriate module with the `tests` classifier. Additionally, these dependencies are typically **only needed** in the ``test`` scope for your project. E.g., with `sbt <http://www.scala-sbt.org/>`__:
+To add a test-jar dependency, depend on the appropriate module with the `tests` classifier. Additionally, these dependencies are typically **only needed** in the ``test`` scope for your project. E.g., with `sbt <https://www.scala-sbt.org/>`__:
 
 .. parsed-literal::
 
@@ -71,9 +71,9 @@ or
 
     "com.twitter" %% "finatra-thrift" % "\ |release|\ " % "test" classifier "tests"
 
-See the `sbt <http://www.scala-sbt.org/>`__ documentation for more information on using `ivy configurations and classifiers <http://www.scala-sbt.org/0.13/docs/Library-Management.html>`__.
+See the `sbt <https://www.scala-sbt.org/>`__ documentation for more information on using `ivy configurations and classifiers <https://www.scala-sbt.org/0.13/docs/Library-Management.html>`__.
 
-And with `Maven <http://maven.apache.org/>`__:
+And with `Maven <https://maven.apache.org/>`__:
 
 .. parsed-literal::
 
@@ -145,9 +145,9 @@ For support feel free to follow and/or tweet at the `@finatra <https://twitter.c
 
 
 .. |Build Status| image:: https://secure.travis-ci.org/twitter/finatra.png?branch=develop 
-   :target: http://travis-ci.org/twitter/finatra?branch=develop
-.. |Test Coverage| image:: http://codecov.io/github/twitter/finatra/coverage.svg?branch=develop 
-   :target: http://codecov.io/github/twitter/finatra?branch=develop
+   :target: https://travis-ci.org/twitter/finatra?branch=develop
+.. |Test Coverage| image:: https://codecov.io/github/twitter/finatra/coverage.svg?branch=develop 
+   :target: https://codecov.io/github/twitter/finatra?branch=develop
 .. |Project status| image:: https://img.shields.io/badge/status-active-brightgreen.svg 
    :target: https://github.com/twitter/finatra#status
 .. |Maven Central| image:: https://maven-badges.herokuapp.com/maven-central/com.twitter/finatra-http_2.12/badge.svg

doc/src/sphinx/index.rst

@@ -11,9 +11,9 @@ October 2015
 August 2015
 -----------
 
-- `#FinagleCon 2015 <http://finagle.github.io/finaglecon/>`__ - `Streaming HTTP with Finatra and AsyncStream <http://schd.ws/hosted_files/finaglecon2015/d1/Streaming%20HTTP%20with%20Finatra%20and%20AsyncStream.pdf>`__ 	· `Youtube Video <https://youtu.be/7dsX0S0WsEk>`__
+- `#FinagleCon 2015 <https://finagle.github.io/finaglecon/>`__ - `Streaming HTTP with Finatra and AsyncStream <https://schd.ws/hosted_files/finaglecon2015/d1/Streaming%20HTTP%20with%20Finatra%20and%20AsyncStream.pdf>`__ 	· `Youtube Video <https://youtu.be/7dsX0S0WsEk>`__
 
 April 2015
 ----------
 
-- `SF Scala <http://www.meetup.com/SF-Scala/>`__ at Twitter - `Introducing to Finatra 2.0 </finatra/Presentations/FinatraSFScala.pdf>`__ 	· `Youtube Video <https://youtu.be/hkVp9W4c9bs>`__
+- `SF Scala <https://www.meetup.com/SF-Scala/>`__ at Twitter - `Introducing to Finatra 2.0 </finatra/Presentations/FinatraSFScala.pdf>`__ 	· `Youtube Video <https://youtu.be/hkVp9W4c9bs>`__