Merge commit '1947141b02f5e9d548294baa2eeff77cfcb9afaa'

CHANGELOG.md

@@ -12,6 +12,53 @@ All notable changes to this project will be documented in this file. Note that `
 
 ### Closed
 
+## [finatra-18.3.0](https://github.com/twitter/finatra/tree/finatra-18.3.0) (2018-03-05)
+
+### Added
+
+* inject-server: Add a lint rule in `c.t.inject.server.TwitterServer#warmup`. If a server does not
+  override the default implementation of `TwitterServer#warmup` a lint rule violation will appear
+  on the lint page of the HTTP admin interface. ``PHAB_ID=D141267``
+
+* inject-server: Add `c.t.inject.server.TwitterServer#setup` lifecycle callback method. This is
+  run at the end of the `postInjectorStartup` phase and is primarily intended as a way for
+  servers to start pub-sub components on which the server depends. Users should prefer this method
+  over overriding the `c.t.inject.server.TwitterServer#postWarmup` @Lifecycle-annotated method as
+  the callback does not require a call its super implementation for the server to correctly start
+  and is ideally less error-prone to use. ``PHAB_ID=D135827``
+
+* inject-app: Add `c.t.inject.annotations.Flags#named` for getting an implementation of an `@Flag`
+  annotation. This is useful when trying to get or bind an instance of an `@Flag` annotated type.
+  ``PHAB_ID=D140831``
+
+### Changed
+
+* finatra-http: `ReaderDiscarded` failures writing in `c.t.f.http.StreamingResponse` now only log
+  at the info level without a stack trace, while other failures log at the error level with
+  a stacktrace. ``PHAB_ID=D141453``
+
+* inject-thrift-client: Removed `withBackupRequestFilter` method on deprecated
+  `c.t.inject.thrift.filters.ThriftClientFilterChain`. Instead of
+  `c.t.inject.thrift.modules.FilteredThriftClientModule`, use
+  `c.t.inject.thrift.modules.ThriftMethodBuilderClientModule` and use the `idempotent` method on
+  `c.t.inject.thrift.ThriftMethodBuilder` to configure backup requests. ``PHAB_ID=D142049``.
+
+* inject-app: `c.t.inject.annotations.FlagImpl` is no longer public and should not be used directly.
+  Use `c.t.inject.annotations.Flags#named` instead. ``PHAB_ID=D140831``
+
+### Fixed
+
+* inject-thrift-client: Fix for duplicate stack client registration. The
+  `c.t.inject.thrift.modules.ThriftMethodBuilderClientModule` was incorrectly calling the
+  `ThriftMux.client` twice. Once to create a MethodBuilder and once to create a ServicePerEndpoint.
+  Now, the ServicePerEndpoint is obtained from the configured MethodBuilder. ``PHAB_ID=D141304``
+
+* inject-thrift-client: Convert non-camel case `ThriftMethod` names, e.g., "get_tweets" to
+  camelCase, e.g., "getTweets" for reflection lookup on generated `ServicePerEndpoint` interface in
+  `c.t.inject.thrift.ThriftMethodBuilder`. ``PHAB_ID=D138499``
+
+### Closed
+
 ## [finatra-18.2.0](https://github.com/twitter/finatra/tree/finatra-18.2.0) (2018-02-05)
 
 ### Added

benchmarks/BUILD

@@ -1,11 +1,12 @@
 target(
-  dependencies=[
-    'finatra/benchmarks/src/main/java'
-  ]
+    dependencies = [
+        "finatra/benchmarks/src/main/java",
+    ],
 )
 
-target(name='tests',
-  dependencies=[
-    'finatra/benchmarks/src/test/scala'
-  ]
+target(
+    name = "tests",
+    dependencies = [
+        "finatra/benchmarks/src/test/scala",
+    ],
 )

benchmarks/src/main/java/BUILD

@@ -1,9 +1,9 @@
 java_library(
-  provides = artifact(
-    org = 'com.twitter.finatra',
-    name = 'finatra-benchmarks-java',
-    repo = artifactory,
-  ),
-  fatal_warnings=False,
-  sources=rglobs('*.java')
+    sources = rglobs("*.java"),
+    fatal_warnings = False,
+    provides = artifact(
+        org = "com.twitter.finatra",
+        name = "finatra-benchmarks-java",
+        repo = artifactory,
+    ),
 )

benchmarks/src/test/scala/BUILD

@@ -1,34 +1,34 @@
 junit_tests(
-  dependencies=[
-    '3rdparty/jvm/com/fasterxml/jackson/datatype:jackson-datatype-joda',
-    '3rdparty/jvm/com/fasterxml/jackson/module:jackson-module-scala',
-    '3rdparty/jvm/com/github/nscala_time:nscala_time',
-    '3rdparty/jvm/com/google/inject/extensions:guice-assistedinject',
-    '3rdparty/jvm/com/google/inject/extensions:guice-multibindings',
-    '3rdparty/jvm/com/google/inject/extensions:guice-testlib',
-    '3rdparty/jvm/com/google/inject:guice',
-    '3rdparty/jvm/commons-lang:commons-lang',
-    '3rdparty/jvm/joda-time:joda-time',
-    '3rdparty/jvm/net/codingwell:scala-guice',
-    '3rdparty/jvm/org/openjdk/jmh:jmh-core',
-    '3rdparty/jvm/org/scalatest:scalatest',
-    '3rdparty/jvm/org/slf4j:slf4j-api',
-    '3rdparty/jvm/org/slf4j:slf4j-simple',
-    'finagle/finagle-core/src/main/scala',
-    'finagle/finagle-http/src/main/scala',
-    'finagle/finagle-stats/src/main/scala',
-    'finatra/benchmarks/src/main/java',
-    'finatra/http/src/main/scala',
-    'finatra/inject/inject-app/src/test/scala:test-deps',
-    'finatra/inject/inject-core/src/main/scala',
-    'finatra/inject/inject-core/src/test/scala:test-deps',
-    'finatra/inject/inject-request-scope/src/main/scala',
-    'finatra/jackson/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',
-  ],
-  fatal_warnings=True,
-  sources=rglobs('*.scala'),
+    sources = rglobs("*.scala"),
+    fatal_warnings = True,
+    dependencies = [
+        "3rdparty/jvm/com/fasterxml/jackson/datatype:jackson-datatype-joda",
+        "3rdparty/jvm/com/fasterxml/jackson/module:jackson-module-scala",
+        "3rdparty/jvm/com/github/nscala_time",
+        "3rdparty/jvm/com/google/inject:guice",
+        "3rdparty/jvm/com/google/inject/extensions:guice-assistedinject",
+        "3rdparty/jvm/com/google/inject/extensions:guice-multibindings",
+        "3rdparty/jvm/com/google/inject/extensions:guice-testlib",
+        "3rdparty/jvm/commons-lang",
+        "3rdparty/jvm/joda-time",
+        "3rdparty/jvm/net/codingwell:scala-guice",
+        "3rdparty/jvm/org/openjdk/jmh:jmh-core",
+        "3rdparty/jvm/org/scalatest",
+        "3rdparty/jvm/org/slf4j:slf4j-api",
+        "3rdparty/jvm/org/slf4j:slf4j-simple",
+        "finagle/finagle-core/src/main/scala",
+        "finagle/finagle-http/src/main/scala",
+        "finagle/finagle-stats/src/main/scala",
+        "finatra/benchmarks/src/main/java",
+        "finatra/http/src/main/scala",
+        "finatra/inject/inject-app/src/test/scala:test-deps",
+        "finatra/inject/inject-core/src/main/scala",
+        "finatra/inject/inject-core/src/test/scala:test-deps",
+        "finatra/inject/inject-request-scope/src/main/scala",
+        "finatra/jackson/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",
+    ],
 )

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 = "18.2.0"
+val releaseVersion = "18.3.0"
 
 lazy val buildSettings = Seq(
   version := releaseVersion,
@@ -768,7 +768,6 @@ lazy val benchmarkServer = (project in file("examples/benchmark-server"))
     moduleName := "benchmark-server",
     mainClass in Compile := Some("com.twitter.finatra.http.benchmark.FinatraBenchmarkServerMain"),
     libraryDependencies ++= Seq(
-      "com.twitter" %% "finagle-netty3" % versions.twLibVersion,
       "org.slf4j" % "slf4j-nop" % versions.slf4j
     )
   ).dependsOn(