Skip to content

Commit

Permalink
Format code before release
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieuancelin committed Dec 13, 2021
1 parent fbdd2e9 commit ef8798a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
11 changes: 7 additions & 4 deletions otoroshi/app/ssl/ssl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2185,13 +2185,16 @@ class CustomSSLEngine(delegate: SSLEngine) extends SSLEngine {
}
}

override def setHandshakeApplicationProtocolSelector(selector: BiFunction[SSLEngine, util.List[String], String]): Unit = {
override def setHandshakeApplicationProtocolSelector(
selector: BiFunction[SSLEngine, util.List[String], String]
): Unit = {
delegate.setHandshakeApplicationProtocolSelector(selector)
}

override def getHandshakeApplicationProtocolSelector: BiFunction[SSLEngine, util.List[String], String] = delegate.getHandshakeApplicationProtocolSelector
override def getHandshakeApplicationProtocol: String = delegate.getHandshakeApplicationProtocol
override def getApplicationProtocol: String = delegate.getApplicationProtocol
override def getHandshakeApplicationProtocolSelector: BiFunction[SSLEngine, util.List[String], String] =
delegate.getHandshakeApplicationProtocolSelector
override def getHandshakeApplicationProtocol: String = delegate.getHandshakeApplicationProtocol
override def getApplicationProtocol: String = delegate.getApplicationProtocol
}

sealed trait ClientCertificateValidationDataStore extends BasicStore[ClientCertificateValidator] {
Expand Down
8 changes: 5 additions & 3 deletions otoroshi/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,11 @@ libraryDependencies ++= Seq(
// tests
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
// do not update because the feature is deprecated and will be removed
"org.reactivemongo" %% "reactivemongo" % "0.20.13" excludeAll ExclusionRule(organization = "org.apache.logging.log4j"),
"org.reactivemongo" %% "reactivemongo" % "0.20.13" excludeAll ExclusionRule(organization =
"org.apache.logging.log4j"
),
"org.iq80.leveldb" % "leveldb" % "0.12",
"org.apache.logging.log4j" % "log4j-api" % "2.15.0"
"org.apache.logging.log4j" % "log4j-api" % "2.15.0"
)

scalacOptions ++= Seq(
Expand Down Expand Up @@ -224,4 +226,4 @@ addJava "--add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED"
addJava "--add-exports=java.base/sun.security.x509=ALL-UNNAMED"
addJava "--add-opens=java.base/sun.security.ssl=ALL-UNNAMED"
addJava "-Dlog4j2.formatMsgNoLookups=True"
"""
"""

0 comments on commit ef8798a

Please sign in to comment.