From 5df6107631b4a421e5bedf5a39a4e9e25b588ef2 Mon Sep 17 00:00:00 2001 From: Crosson David Date: Sun, 29 Oct 2023 00:42:14 +0200 Subject: [PATCH] Migrate to pekko --- .scalafmt.conf | 2 +- LICENSE | 331 +++++++----------- LICENSE-ADDON | 3 - built.sbt | 64 ++-- project/build.properties | 2 +- project/plugins.sbt | 10 +- src/main/resources/reference.conf | 8 +- src/main/scala/spy/Service.scala | 6 +- src/main/scala/spy/ServiceRoutes.scala | 4 +- src/main/scala/spy/routing/AdminRouting.scala | 7 +- .../scala/spy/routing/AssetsRouting.scala | 6 +- src/main/scala/spy/routing/HomeRouting.scala | 10 +- src/main/scala/spy/routing/Routing.scala | 8 +- src/main/scala/spy/routing/SpyRouting.scala | 8 +- .../scala/spy/routing/SwaggerRouting.scala | 10 +- src/test/scala/spy/ServiceTest.scala | 4 +- 16 files changed, 204 insertions(+), 279 deletions(-) delete mode 100644 LICENSE-ADDON diff --git a/.scalafmt.conf b/.scalafmt.conf index c1fe75f..a2297d2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.0 +version = 3.7.15 runner.dialect = scala3 align.preset = most maxColumn = 200 diff --git a/LICENSE b/LICENSE index 261eeb9..1ce97d7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,130 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Apache NON-AI License, Version 2.0 + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +“License” shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities that control, are controlled by, +or are under common control with that entity. For the purposes of this definition, “control” means (i) the power, direct or indirect, +to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) +or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, +and configuration files. + +“Object” form shall mean any form resulting from mechanical transformation or translation of a Source form, including +but not limited to compiled object code, generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made available under the License, +as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and +for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. +For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) +to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version of the Work and any modifications or additions to +that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or +by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, “submitted” +means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, +the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, +sublicense, and distribute the Work and such Derivative Works in Source or Object form, +under the following conditions: + + 2.1. You shall not use the Covered Software in the creation of an Artificial Intelligence training dataset, + including but not limited to any use that contributes to the training or development of an AI model or algorithm, + unless You obtain explicit written permission from the Contributor to do so. + + 2.2. You acknowledge that the Covered Software is not intended for use in the creation of an Artificial Intelligence training dataset, + and that the Contributor has no obligation to provide support or assistance for any use that violates this license. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, +royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, +and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are +necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which +such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) +alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, +then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, +and in Source or Object form, provided that You meet the following conditions: + + 1. You must give any other recipients of the Work or Derivative Works a copy of this License; and + + 2. You must cause any modified files to carry prominent notices stating that You changed the files; and + + 3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, + and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + 4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative Works that You distribute + must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that + do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; + or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. + The contents of the NOTICE file are for informational purposes only and do not modify the License. + +You may add Your own attribution notices within Derivative Works that You distribute, +alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, +and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor +shall be under the terms and conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) +on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, +any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. +You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated +with Your exercise of permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, +shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages +of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages +for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), +even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, +warranty, indemnity, or other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, +not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, +or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/LICENSE-ADDON b/LICENSE-ADDON deleted file mode 100644 index 4be8f2f..0000000 --- a/LICENSE-ADDON +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE LEARNING LICENSE EXCEPTION : -Usage for machine training of this code source or any if its binary artifacts is not allowed. Software such as -Github COPILOT can't use this software for its training. \ No newline at end of file diff --git a/built.sbt b/built.sbt index 6421e7b..3ed3051 100644 --- a/built.sbt +++ b/built.sbt @@ -2,7 +2,7 @@ name := "spy" organization := "fr.janalyse" homepage := Some(new URL("https://github.com/dacr/spy")) -licenses += "Apache 2" -> url(s"http://www.apache.org/licenses/LICENSE-2.0.txt") +licenses += "NON-AI-APACHE2" -> url(s"https://github.com/non-ai-licenses/non-ai-licenses/blob/main/NON-AI-APACHE2") scmInfo := Some(ScmInfo(url(s"https://github.com/dacr/spy.git"), s"git@github.com:dacr/spy.git")) @@ -11,7 +11,7 @@ packageBin / mainClass := Some("spy.Main") versionScheme := Some("semver-spec") -scalaVersion := "2.13.10" +scalaVersion := "2.13.12" scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-feature") @@ -26,21 +26,21 @@ Test / testOptions += { lazy val versions = new { // client side dependencies - val swaggerui = "4.15.0" - val bootstrap = "5.2.2" - val jquery = "3.6.1" + val swaggerui = "4.19.1" + val bootstrap = "5.3.2" + val jquery = "3.7.1" // server side dependencies - val pureConfig = "0.17.1" - val akka = "2.6.20" - val akkaHttp = "10.2.10" - val akkaHttpJson4s = "1.39.2" - val json4s = "4.0.6" - val logback = "1.4.4" - val slf4j = "2.0.3" - val scalatest = "3.2.14" - val commonsio = "2.11.0" - val webjarsLocator = "0.45" + val pureConfig = "0.17.4" + val pekko = "1.0.1" + val pekkoHttp = "1.0.0" + val pekkoHttpJson4s = "2.1.1" + val json4s = "4.0.6" + val logback = "1.4.11" + val slf4j = "2.0.9" + val scalatest = "3.2.17" + val webjarsLocator = "0.48" + val commonsio = "2.11.0" } // client side dependencies @@ -52,23 +52,23 @@ libraryDependencies ++= Seq( // server side dependencies libraryDependencies ++= Seq( - "com.github.pureconfig" %% "pureconfig" % versions.pureConfig, - "org.json4s" %% "json4s-jackson" % versions.json4s, - "org.json4s" %% "json4s-ext" % versions.json4s, - "com.typesafe.akka" %% "akka-actor-typed" % versions.akka, - "com.typesafe.akka" %% "akka-http" % versions.akkaHttp, - "com.typesafe.akka" %% "akka-http-caching" % versions.akkaHttp, - "com.typesafe.akka" %% "akka-stream" % versions.akka, - "com.typesafe.akka" %% "akka-slf4j" % versions.akka, - "com.typesafe.akka" %% "akka-testkit" % versions.akka % Test, - "com.typesafe.akka" %% "akka-stream-testkit" % versions.akka % Test, - "com.typesafe.akka" %% "akka-http-testkit" % versions.akkaHttp % Test, - "de.heikoseeberger" %% "akka-http-json4s" % versions.akkaHttpJson4s, - "org.slf4j" % "slf4j-api" % versions.slf4j, - "ch.qos.logback" % "logback-classic" % versions.logback, - "commons-io" % "commons-io" % versions.commonsio, - "org.scalatest" %% "scalatest" % versions.scalatest % Test, - "org.webjars" % "webjars-locator" % versions.webjarsLocator + "com.github.pureconfig" %% "pureconfig" % versions.pureConfig, + "org.json4s" %% "json4s-jackson" % versions.json4s, + "org.json4s" %% "json4s-ext" % versions.json4s, + "org.apache.pekko" %% "pekko-actor-typed" % versions.pekko, + "org.apache.pekko" %% "pekko-http" % versions.pekkoHttp, + "org.apache.pekko" %% "pekko-http-caching" % versions.pekkoHttp, + "org.apache.pekko" %% "pekko-stream" % versions.pekko, + "org.apache.pekko" %% "pekko-slf4j" % versions.pekko, + "org.apache.pekko" %% "pekko-testkit" % versions.pekko % Test, + "org.apache.pekko" %% "pekko-stream-testkit" % versions.pekko % Test, + "org.apache.pekko" %% "pekko-http-testkit" % versions.pekkoHttp % Test, + "com.github.pjfanning" %% "pekko-http-json4s" % versions.pekkoHttpJson4s, + "org.slf4j" % "slf4j-api" % versions.slf4j, + "ch.qos.logback" % "logback-classic" % versions.logback, + "commons-io" % "commons-io" % versions.commonsio, + "org.scalatest" %% "scalatest" % versions.scalatest % Test, + "org.webjars" % "webjars-locator" % versions.webjarsLocator ) enablePlugins(JavaServerAppPackaging) diff --git a/project/build.properties b/project/build.properties index ff6e0dd..331a838 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.2 \ No newline at end of file +sbt.version = 1.9.7 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 42356a9..22ce630 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") -//addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") +//addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9") //addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.0-M7") -addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.0-M6") +addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.2") diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index e6e2530..c98ecff 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -39,10 +39,10 @@ spy { } // ---------------------------------------------------------------- - // Akka & akka-http framework configuration + // pekko & pekko-http framework configuration // This configuration is used when this project is used as an app and not as a lib - akka { + pekko { daemonic = off http { server { @@ -67,9 +67,9 @@ spy { max-connections = 100 } } - loggers = ["akka.event.slf4j.Slf4jLogger"] + loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"] loglevel = "INFO" - logging-filter = "akka.event.slf4j.Slf4jLoggingFilter" + logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter" } } diff --git a/src/main/scala/spy/Service.scala b/src/main/scala/spy/Service.scala index 3eb5ca5..fe3c497 100644 --- a/src/main/scala/spy/Service.scala +++ b/src/main/scala/spy/Service.scala @@ -15,8 +15,8 @@ */ package spy -import akka.actor.ActorSystem -import akka.http.scaladsl._ +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.http.scaladsl._ import com.typesafe.config.ConfigFactory import org.slf4j.Logger @@ -34,7 +34,7 @@ case class Service(dependencies: ServiceDependencies, servicesRoutes: ServiceRou logger.info(s"$appCode service version $version is starting") val config = ConfigFactory.load() // akka specific config is accessible under the path named 'spy' - implicit val system: ActorSystem = akka.actor.ActorSystem(s"akka-http-$appCode-system", config.getConfig("spy")) + implicit val system: ActorSystem = org.apache.pekko.actor.ActorSystem(s"akka-http-$appCode-system", config.getConfig("spy")) implicit val executionContext: ExecutionContextExecutor = system.dispatcher val bindingFuture: Future[Http.ServerBinding] = Http().newServerAt(interface = interface, port = port).bindFlow(servicesRoutes.routes) diff --git a/src/main/scala/spy/ServiceRoutes.scala b/src/main/scala/spy/ServiceRoutes.scala index 63298f1..d3f668a 100644 --- a/src/main/scala/spy/ServiceRoutes.scala +++ b/src/main/scala/spy/ServiceRoutes.scala @@ -16,8 +16,8 @@ package spy -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import spy.routing.{AdminRouting, AssetsRouting, HomeRouting, SpyRouting, SwaggerRouting} /** diff --git a/src/main/scala/spy/routing/AdminRouting.scala b/src/main/scala/spy/routing/AdminRouting.scala index d430dd2..2f556c8 100644 --- a/src/main/scala/spy/routing/AdminRouting.scala +++ b/src/main/scala/spy/routing/AdminRouting.scala @@ -15,12 +15,11 @@ */ package spy.routing -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import de.heikoseeberger.akkahttpjson4s.Json4sSupport._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import com.github.pjfanning.pekkohttpjson4s.Json4sSupport._ import spy.ServiceDependencies - case class Health(alive: Boolean = true, description: String = "alive") object AdminRouting { diff --git a/src/main/scala/spy/routing/AssetsRouting.scala b/src/main/scala/spy/routing/AssetsRouting.scala index 99ba55f..10a3558 100644 --- a/src/main/scala/spy/routing/AssetsRouting.scala +++ b/src/main/scala/spy/routing/AssetsRouting.scala @@ -16,9 +16,9 @@ package spy.routing -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import akka.http.scaladsl.server.directives.ContentTypeResolver.Default +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.server.directives.ContentTypeResolver.Default import org.webjars.WebJarAssetLocator import spy.ServiceDependencies diff --git a/src/main/scala/spy/routing/HomeRouting.scala b/src/main/scala/spy/routing/HomeRouting.scala index 3fd7106..1a82f07 100644 --- a/src/main/scala/spy/routing/HomeRouting.scala +++ b/src/main/scala/spy/routing/HomeRouting.scala @@ -1,10 +1,10 @@ package spy.routing -import akka.http.scaladsl.model.HttpCharsets._ -import akka.http.scaladsl.model.{HttpEntity, HttpResponse} -import akka.http.scaladsl.model.MediaTypes.`text/html` -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.model.HttpCharsets._ +import org.apache.pekko.http.scaladsl.model.{HttpEntity, HttpResponse} +import org.apache.pekko.http.scaladsl.model.MediaTypes.`text/html` +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import spy.ServiceDependencies import spy.templates.html.HomeTemplate diff --git a/src/main/scala/spy/routing/Routing.scala b/src/main/scala/spy/routing/Routing.scala index 4a03c73..02d0ea3 100644 --- a/src/main/scala/spy/routing/Routing.scala +++ b/src/main/scala/spy/routing/Routing.scala @@ -15,10 +15,10 @@ */ package spy.routing -import akka.http.scaladsl.model.{DateTime, HttpHeader} -import akka.http.scaladsl.model.headers.CacheDirectives.{`max-age`, `must-revalidate`, `no-cache`, `no-store`, `proxy-revalidate`} -import akka.http.scaladsl.model.headers.{Expires, `Cache-Control`, `Last-Modified`} -import akka.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.model.{DateTime, HttpHeader} +import org.apache.pekko.http.scaladsl.model.headers.CacheDirectives.{`max-age`, `must-revalidate`, `no-cache`, `no-store`, `proxy-revalidate`} +import org.apache.pekko.http.scaladsl.model.headers.{Expires, `Cache-Control`, `Last-Modified`} +import org.apache.pekko.http.scaladsl.server.Route import spy.tools.JsonImplicits import java.util.Date diff --git a/src/main/scala/spy/routing/SpyRouting.scala b/src/main/scala/spy/routing/SpyRouting.scala index 1426029..e607946 100644 --- a/src/main/scala/spy/routing/SpyRouting.scala +++ b/src/main/scala/spy/routing/SpyRouting.scala @@ -15,10 +15,10 @@ */ package spy.routing -import akka.http.scaladsl.model._ -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import de.heikoseeberger.akkahttpjson4s.Json4sSupport._ +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import com.github.pjfanning.pekkohttpjson4s.Json4sSupport._ import org.slf4j.LoggerFactory import spy.ServiceDependencies import spy.tools.DateTimeTools diff --git a/src/main/scala/spy/routing/SwaggerRouting.scala b/src/main/scala/spy/routing/SwaggerRouting.scala index b86c9d2..e990a65 100644 --- a/src/main/scala/spy/routing/SwaggerRouting.scala +++ b/src/main/scala/spy/routing/SwaggerRouting.scala @@ -15,11 +15,11 @@ */ package spy.routing -import akka.http.scaladsl.model.HttpCharsets._ -import akka.http.scaladsl.model.{HttpEntity, HttpResponse} -import akka.http.scaladsl.model.MediaTypes.{`application/json`, `text/html`} -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.model.HttpCharsets._ +import org.apache.pekko.http.scaladsl.model.{HttpEntity, HttpResponse} +import org.apache.pekko.http.scaladsl.model.MediaTypes.{`application/json`, `text/html`} +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import spy.ServiceDependencies import spy.templates.txt.SwaggerJson import spy.templates.html.SwaggerUI diff --git a/src/test/scala/spy/ServiceTest.scala b/src/test/scala/spy/ServiceTest.scala index 3999cf8..7718902 100644 --- a/src/test/scala/spy/ServiceTest.scala +++ b/src/test/scala/spy/ServiceTest.scala @@ -15,7 +15,7 @@ */ package spy -import akka.http.scaladsl.testkit.ScalatestRouteTest +import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest import org.scalatest.matchers._ import org.scalatest.wordspec._ import spy.routing.Health @@ -29,7 +29,7 @@ class ServiceTest extends AnyWordSpec with should.Matchers with ScalatestRouteTe "Web Echo Service" should { "Respond OK when pinged" in { Get("/health") ~> routes ~> check { - import de.heikoseeberger.akkahttpjson4s.Json4sSupport._ + import com.github.pjfanning.pekkohttpjson4s.Json4sSupport._ responseAs[Health] shouldBe Health(true, "alive") } }