fix scalate-guice build

scalate · May 13, 2024 · 48713ed · 48713ed
1 parent 239ad58
commit 48713ed
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...alate/guice/ScalateAtmosphereModule.scala → ...alate/guice/ScalateAtmosphereModule.scala b/...alate/guice/ScalateAtmosphereModule.scala → ...alate/guice/ScalateAtmosphereModule.scala
@@ -1,6 +1,6 @@
 package org.fusesource.scalate.guice
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * ScalateModule that also configures the Atmosphere framework
@@ -14,7 +14,7 @@ class ScalateAtmosphereModule extends ScalateModule {
   override def configureServlets(): Unit = {
     // We don't need to call super.applyJerseyFilter here because Atmosphere
     // will configure / is using Jersey
-    applyScalateServlets
+    applyScalateServlets()
     applyAtmosphereServlets()
   }
 
@@ -28,4 +28,4 @@ class ScalateAtmosphereModule extends ScalateModule {
     val regex = "(^/.*(?<!\\.%s)$)" format fileExtensionsExcludedFromJersey.mkString("(?:", "|", ")")
     serveRegex(regex).`with`(classOf[ScalateAtmosphereServlet], props.asJava)
   }
-}
+}
diff --git a/...late/guice/ScalateAtmosphereServlet.scala → ...late/guice/ScalateAtmosphereServlet.scala b/...late/guice/ScalateAtmosphereServlet.scala → ...late/guice/ScalateAtmosphereServlet.scala
diff --git a/...scalate/guice/ScalateGuiceContainer.scala → ...scalate/guice/ScalateGuiceContainer.scala b/...scalate/guice/ScalateGuiceContainer.scala → ...scalate/guice/ScalateGuiceContainer.scala
diff --git a/...e/guice/ScalateGuiceContextListener.scala → ...e/guice/ScalateGuiceContextListener.scala b/...e/guice/ScalateGuiceContextListener.scala → ...e/guice/ScalateGuiceContextListener.scala
diff --git a/...esource/scalate/guice/ScalateModule.scala → ...esource/scalate/guice/ScalateModule.scala b/...esource/scalate/guice/ScalateModule.scala → ...esource/scalate/guice/ScalateModule.scala
@@ -38,14 +38,14 @@ class ScalateModule extends ServletModule {
   /**
    * The implicit type conversion to avoid the 'with' method in the DSL
    */
-  implicit def builderToRichBuilder(builder: ServletModule.ServletKeyBindingBuilder) = new RichBuilder(builder)
+  implicit def builderToRichBuilder(builder: ServletModule.ServletKeyBindingBuilder): RichBuilder = new RichBuilder(builder)
 
   /**
    * Configure any servlets or filters for the application
    */
   override def configureServlets = {
-    applyScalateServlets
-    applyJerseyFilter
+    applyScalateServlets()
+    applyJerseyFilter()
   }
 
   var scalateServletUris: List[String] = TemplateEngine.templateTypes.map(s => "*." + s)