Skip to content

Commit

Permalink
Add default parameters to the right ConnectionContext.https (#2610)
Browse files Browse the repository at this point in the history
  • Loading branch information
raboof authored and jrudolph committed Jul 24, 2019
1 parent ab90841 commit aaf8489
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Situations when it may be fine to ignore a MiMa issued warning include:
- if it is touching any class marked with the `@InternalApi`, `@DoNotInherit`, and `@ApiMayChange`. See [API stability annotations and comments](https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#api-stability-annotations-and-comments)
- other tricky situations

If it turns out that the change can be safely ignored, please add the filter to the submodule's `src/main/mima-filters/<last-released-version>.backwards.excludes` file using (or creating) the file corresponding to the latest released version.
If it turns out that the change can be safely ignored, please add the filter to a file with the issue number in the filename, placed in the submodule's `src/main/mima-filters/<last-released-version>.backwards.excludes` directory.

You can run `mimaReportBinaryIssues` on the sbt console to check if you introduced a binary incompatibility or whether an
incompatibility has been successfully ignored after adding it to the filter file.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# https://github.com/akka/akka-http/issues/2605
# This is the static forwarder on the interface, we are manually
# adding the method on the object which is still used.
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.ConnectionContext.https$default$7")
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,31 @@ trait ConnectionContext extends akka.http.javadsl.ConnectionContext {

object ConnectionContext {
// ConnectionContext
@deprecated("This method is planned to disappear in 10.2.0", "10.1.9")
//#https-context-creation
def https(
sslContext: SSLContext,
sslConfig: Option[AkkaSSLConfig] = None,
enabledCipherSuites: Option[immutable.Seq[String]] = None,
enabledProtocols: Option[immutable.Seq[String]] = None,
clientAuth: Option[TLSClientAuth] = None,
sslParameters: Option[SSLParameters] = None,
http2: UseHttp2 = UseHttp2.Negotiated) =
sslParameters: Option[SSLParameters] = None) =
new HttpsConnectionContext(sslContext, sslConfig, enabledCipherSuites, enabledProtocols, clientAuth, sslParameters)

//#https-context-creation

@deprecated("This method is planned to disappear in 10.2.0", "10.1.9")
def https(
sslContext: SSLContext,
sslConfig: Option[AkkaSSLConfig],
enabledCipherSuites: Option[immutable.Seq[String]],
enabledProtocols: Option[immutable.Seq[String]],
clientAuth: Option[TLSClientAuth],
sslParameters: Option[SSLParameters]) =
sslParameters: Option[SSLParameters],
http2: UseHttp2) =
new HttpsConnectionContext(sslContext, sslConfig, enabledCipherSuites, enabledProtocols, clientAuth, sslParameters)
//#https-context-creation

// for bincompat
@deprecated("This method is planned to disappear in 10.2.0", "10.1.9")
private[scaladsl] def https$default$7(): akka.http.scaladsl.UseHttp2 = UseHttp2.Negotiated

@deprecated("for binary-compatibility", "2.4.7")
def https(
Expand Down

0 comments on commit aaf8489

Please sign in to comment.