This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch wip-akka-22.10-patriknw in repository https://gitbox.apache.org/repos/asf/incubator-pekko-samples.git
commit b4f67ecc6de970021c316956ac2df872f53ea0b3 Author: Patrik Nordwall <[email protected]> AuthorDate: Fri Oct 28 14:02:35 2022 +0200 fix WeatherRoutes --- .gitignore | 1 + akka-sample-sharding-scala/build.sbt | 7 ++----- .../src/main/scala/sample/killrweather/WeatherRoutes.scala | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 02f7ff9..9f84d50 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ .#* .*.swp .DS_Store +.bsp .cache .cache .classpath diff --git a/akka-sample-sharding-scala/build.sbt b/akka-sample-sharding-scala/build.sbt index 1706200..1865678 100644 --- a/akka-sample-sharding-scala/build.sbt +++ b/akka-sample-sharding-scala/build.sbt @@ -3,11 +3,6 @@ val AkkaVersion = "2.7.0" val AkkaHttpVersion = "10.4.0" val LogbackVersion = "1.2.11" -lazy val buildSettings = Seq( - organization := "com.lightbend.akka.samples", - scalaVersion := "2.13.10" -) - lazy val commonScalacOptions = Seq( "-deprecation", "-feature", @@ -23,6 +18,8 @@ lazy val commonJavacOptions = Seq( ) lazy val commonSettings = Seq( + organization := "com.lightbend.akka.samples", + scalaVersion := "2.13.10", Compile / scalacOptions ++= commonScalacOptions, Compile / javacOptions ++= commonJavacOptions, run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m"), diff --git a/akka-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherRoutes.scala b/akka-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherRoutes.scala index 3b04551..b0a726f 100644 --- a/akka-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherRoutes.scala +++ b/akka-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherRoutes.scala @@ -49,7 +49,7 @@ private[killrweather] final class WeatherRoutes(system: ActorSystem[_]) { path("weather" / LongNumber) { wsid => concat( get { - parameters(("type".as[WeatherStation.DataType], "function".as[WeatherStation.Function])) { (dataType, function) => + parameters("type".as[WeatherStation.DataType], "function".as[WeatherStation.Function]) { (dataType, function) => complete(query(wsid, dataType, function)) } }, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
