Fix most of the existing warnings on source code

scalate-camel/src/main/scala/org/fusesource/scalate/camel/ScalateEndpoint.scala

@@ -98,8 +98,8 @@ class ScalateEndpoint(component: ScalateComponent, uri: String, templateUri: Str
 
       // now lets output the headers to the exchange
       variableMap.get("headers") match {
-        case map: ju.Map[String, AnyRef] =>
-          for ((key, value) <- map) {
+        case map: ju.Map[_, _] =>
+          for ((key, value) <- map.asInstanceOf[ju.Map[String, AnyRef]]) {
             out.setHeader(key, value)
           }
         case _ =>
@@ -111,4 +111,4 @@ class ScalateEndpoint(component: ScalateComponent, uri: String, templateUri: Str
     val text: String = message
     log.debug(text)
   }
-}
+}

scalate-camel/src/test/scala/org/fusesource/scalate/camel/CamelScalateEndpointTest.scala

@@ -83,10 +83,10 @@ class CamelScalateEndpointTest extends FunSuite {
           val actualBody = out.getBody(classOf[String])
           assume(actualBody != null, "Null body should not be returned when sending to: " + uri + " with out message: " + out)
 
-          expect(expectedResult) {
+          assertResult(expectedResult) {
             actualBody.trim()
           }
-          expect(headerValue) {
+          assertResult(headerValue) {
             out.getHeader("cheese", classOf[String])
           }
       }

scalate-core/src/main/scala/org/fusesource/scalate/DefaultRenderContext.scala

@@ -95,5 +95,5 @@ class DefaultRenderContext(private val _requestUri: String, val engine: Template
     }
   }
 
-  def flush = out.flush
+  def flush() = out.flush
 }

scalate-core/src/main/scala/org/fusesource/scalate/RenderContext.scala

@@ -31,6 +31,8 @@ import xml.{ Node, PCData, NodeSeq, NodeBuffer }
 import collection.mutable.{ ListMap, LinkedHashSet, ListBuffer, HashMap }
 import reflect.ClassTag
 
+import scala.language.implicitConversions
+
 object RenderContext {
   val threadLocal = new ThreadLocal[RenderContext]
 

scalate-core/src/main/scala/org/fusesource/scalate/TemplateEngine.scala

@@ -39,6 +39,8 @@ import collection.generic.TraversableForwarder
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.ConcurrentHashMap
 
+import scala.language.existentials
+
 object TemplateEngine {
   val log = Log(getClass); import log._
 
@@ -127,7 +129,7 @@ class TemplateEngine(var sourceDirectories: Traversable[File] = None, var mode:
 
   private var booted = new AtomicBoolean()
 
-  def boot: Unit = {
+  def boot(): Unit = {
     if (booted.compareAndSet(false, true)) {
 
       if (allowReload) {

scalate-core/src/main/scala/org/fusesource/scalate/console/ConsoleHelper.scala

@@ -31,7 +31,11 @@ import util.parsing.input.{ Position, OffsetPosition }
 import xml.NodeSeq
 import org.fusesource.scalate.util.{ Log, SourceMapInstaller, SourceMap }
 
-case class SourceLine(line: Int, source: String) {
+case class SourceLine(
+    line: Int,
+    source: String
+) {
+
   def style(errorLine: Int): String = if (line == errorLine) "line error" else "line"
 
   def nonBlank = source != null && source.length > 0
@@ -136,15 +140,17 @@ class ConsoleHelper(context: RenderContext) extends ConsoleSnippets {
    * Returns the current template names used in the current context
    */
   def templates: List[String] = attributes.get("scalateTemplates") match {
-    case Some(list: List[String]) => list.distinct.sortWith(_ < _)
+    case Some(list: List[_]) =>
+      list.map(_.asInstanceOf[String]).distinct.sortWith(_ < _)
     case _ => Nil
   }
 
   /**
    * Returns the current layouts used in the current context
    */
   def layouts: List[String] = attributes.get("scalateLayouts") match {
-    case Some(list: List[String]) => list.distinct.sortWith(_ < _)
+    case Some(list: List[_]) =>
+      list.map(_.asInstanceOf[String]).distinct.sortWith(_ < _)
     case _ => Nil
   }
 

scalate-core/src/main/scala/org/fusesource/scalate/layout/DefaultLayoutStrategy.scala

@@ -64,7 +64,7 @@ class DefaultLayoutStrategy(val engine: TemplateEngine, val defaultLayouts: Stri
   }
 
   private def tryLayout(layoutTemplate: String, body: String, context: RenderContext): Boolean = {
-    def removeLayout = {
+    def removeLayout() = {
       context.attributes("scalateLayouts") = context.attributeOrElse[List[String]]("scalateLayouts", List()).filterNot(_ == layoutTemplate)
     }
 

scalate-core/src/main/scala/org/fusesource/scalate/mustache/MustacheCodeGenerator.scala

@@ -22,6 +22,8 @@ import support.{ Code, AbstractCodeGenerator }
 import collection.mutable.Stack
 import util.Log
 
+import scala.language.implicitConversions
+
 object MustacheCodeGenerator extends Log
 
 /**
@@ -133,4 +135,3 @@ class MustacheCodeGenerator extends AbstractCodeGenerator[Statement] {
     Code(source.className, sb.code, Set(uri), sb.positions)
   }
 }
-

scalate-core/src/main/scala/org/fusesource/scalate/rest/ElementResource.scala

@@ -22,7 +22,10 @@ import javax.ws.rs.{ PUT, DELETE }
 /**
  * @version $Revision: 1.1 $
  */
-class ElementResource[K, E](element: E, container: Container[K, E]) {
+class ElementResource[K, E](
+    element: E,
+    container: Container[K, E]
+) {
 
   @PUT
   def put(updatedElement: E): Unit = {
@@ -31,7 +34,7 @@ class ElementResource[K, E](element: E, container: Container[K, E]) {
   }
 
   @DELETE
-  def delete: Unit = {
+  def delete(): Unit = {
     container.remove(element)
   }
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/scaml/ScamlCodeGenerator.scala

@@ -21,9 +21,10 @@ import org.fusesource.scalate._
 import collection.mutable.LinkedHashMap
 import support.{ Text, Code, AbstractCodeGenerator }
 import support.RenderHelper
-import collection.immutable.List
 import scala.util.parsing.input.OffsetPosition
 
+import scala.language.implicitConversions
+
 /**
  * Generates a scala class given a HAML document
  *

scalate-core/src/main/scala/org/fusesource/scalate/scuery/ScueryConversions.scala

@@ -19,6 +19,8 @@ package org.fusesource.scalate.scuery
 
 import xml.{ Node, NodeSeq }
 
+import scala.language.implicitConversions
+
 /**
  * All the various implicit conversions for the scuery package
  */

scalate-core/src/main/scala/org/fusesource/scalate/scuery/Transform.scala

@@ -19,6 +19,8 @@ package org.fusesource.scalate.scuery
 
 import xml.{ Attribute, Document, Elem, Node, NodeSeq, Null, Text }
 
+import scala.language.implicitConversions
+
 object Transform {
   implicit def toNodes(transform: Transform): NodeSeq = transform()
   implicit def toTraversable(transform: Transform): Traversable[Node] = transform()

scalate-core/src/main/scala/org/fusesource/scalate/scuery/Transformer.scala

@@ -23,6 +23,8 @@ import collection.mutable.{ HashMap }
 import xml.{ Attribute, Document, Elem, Node, NodeSeq, Null, Text }
 import XmlHelper._
 
+import scala.language.implicitConversions
+
 /**
  * Allows simple XML replacement rules to be registered
  *
@@ -76,7 +78,7 @@ class Transformer {
     if (size == 0) {
       node match {
         case e: Elem => replaceContent(e, apply(e.child, e +: ancestors))
-        case d: Document => apply(d.child)
+        case d: Node => apply(d.child)
         case n => n
       }
     } else {
@@ -255,4 +257,4 @@ case class SXml(nodes: NodeSeq) {
  */
 case class NodeAndAncestors(node: Node, ancestors: Seq[Node]) {
   implicit def toNode = node
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/servlet/Config.scala

@@ -20,6 +20,8 @@ package org.fusesource.scalate.servlet
 import java.util.Enumeration
 import javax.servlet.{ FilterConfig, ServletContext, ServletConfig }
 
+import scala.language.implicitConversions
+
 object Config {
   implicit def servletConfig2Config(servletConfig: ServletConfig) = new Config {
     def getName = servletConfig.getServletName
@@ -44,4 +46,4 @@ trait Config {
   def getServletContext: ServletContext
   def getInitParameter(name: String): String
   def getInitParameterNames: Enumeration[_]
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/ssp/SspCodeGenerator.scala

@@ -21,6 +21,8 @@ import org.fusesource.scalate._
 import collection.mutable.Stack
 import support.{ Text, Code, AbstractCodeGenerator }
 
+import scala.language.implicitConversions
+
 class SspCodeGenerator extends AbstractCodeGenerator[PageFragment] {
   override val stratumName = "SSP"
 
@@ -357,4 +359,3 @@ class SspCodeGenerator extends AbstractCodeGenerator[PageFragment] {
     pass2
   }
 }
-

scalate-core/src/main/scala/org/fusesource/scalate/support/AbstractCodeGenerator.scala

@@ -22,6 +22,8 @@ import util.parsing.input.{ Positional, OffsetPosition, Position }
 import org.fusesource.scalate.{ TemplateSource, Binding, TemplateEngine }
 import org.fusesource.scalate.util.Log
 
+import scala.language.postfixOps
+
 object AbstractCodeGenerator extends Log
 
 /**
@@ -93,9 +95,19 @@ abstract class AbstractCodeGenerator[T] extends CodeGenerator {
       rc
     }
 
-    def indent[T](op: => T): T = { indentLevel += 1; val rc = op; indentLevel -= 1; rc }
+    def indent[T](op: => T): T = {
+      indentLevel += 1
+      val rc = op
+      indentLevel -= 1
+      rc
+    }
 
-    def generate(engine: TemplateEngine, source: TemplateSource, bindings: Traversable[Binding], statements: List[T]): Unit = {
+    def generate(
+      engine: TemplateEngine,
+      source: TemplateSource,
+      bindings: Traversable[Binding],
+      statements: List[T]
+    ): Unit = {
 
       val packageName = source.packageName
       val className = source.simpleClassName
@@ -146,7 +158,7 @@ abstract class AbstractCodeGenerator[T] extends CodeGenerator {
 
     }
 
-    def generateInitialImports: Unit = {}
+    def generateInitialImports(): Unit = {}
 
     def generate(statements: List[T]): Unit
 

scalate-core/src/main/scala/org/fusesource/scalate/support/Boots.scala

@@ -3,6 +3,8 @@ package support
 
 import util.Objects
 
+import scala.language.reflectiveCalls
+
 /**
  * A helper class for working with Boot style classes which
  * take a TemplateEngine as a constructor argument and have a zero argument
@@ -33,4 +35,4 @@ object Boots {
       case e: Throwable => throw new TemplateException("Failed to invoke " + bootClassName + ".run() : " + e, e)
     }
   }
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/support/Precompiler.scala

@@ -24,6 +24,8 @@ import scala.collection.mutable.ListBuffer
 import org.fusesource.scalate.{ Binding, TemplateEngine }
 import org.fusesource.scalate.servlet.ServletRenderContext
 
+import scala.language.reflectiveCalls
+
 /**
  * This class can precompile Scalate templates into JVM
  * classes.
@@ -114,4 +116,4 @@ class Precompiler {
     collected
   }
 
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/support/ScalaCompiler.scala

@@ -34,6 +34,8 @@ import java.io.{ PrintWriter, StringWriter, File }
 
 import util.{ Log, IOUtil, ClassPathBuilder }
 
+import scala.language.reflectiveCalls
+
 object ScalaCompiler extends Log {
 
   def create(engine: TemplateEngine): ScalaCompiler = {
@@ -213,4 +215,3 @@ class OsgiScalaCompiler(val engine: TemplateEngine, val bundle: Bundle)
     )
   }
 }
-

scalate-core/src/main/scala/org/fusesource/scalate/support/ScalaParseSupport.scala

@@ -22,6 +22,8 @@ import CharData._
 import Integer._
 import util.parsing.input.{ Positional, CharArrayReader }
 
+import scala.language.postfixOps
+
 /**
  * Is a String with positioning information
  */
@@ -205,4 +207,4 @@ object CharData {
   def isControl(c: Char) = Character.isISOControl(c)
 
   def isControl(codepoint: Int) = Character.isISOControl(codepoint)
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/support/SiteGenerator.scala

@@ -29,6 +29,8 @@ import org.fusesource.scalate.util._
 object SiteGenerator extends Log
 import SiteGenerator._
 
+import scala.language.reflectiveCalls
+
 /**
  * This class generates static HTML files for your website using the Scalate templates, filters and wiki markups
  * you are using.
@@ -161,4 +163,4 @@ class DummyRenderContext(val _requestUri: String, _engine: TemplateEngine, _out:
 
 class DummyResponse {
   def setContentType(value: String): Unit = {}
-}
+}

scalate-core/src/main/scala/org/fusesource/scalate/support/TemplateConversions.scala

@@ -19,6 +19,8 @@ package org.fusesource.scalate.support
 
 import org.fusesource.scalate.util.Log
 
+import scala.language.implicitConversions
+
 /**
  * A number of helper implicit conversions for use in templates
  */
@@ -55,4 +57,4 @@ object TemplateConversions {
     }
   }
 
-}
+}

scalate-core/src/main/scala_2.11/org/fusesource/scalate/osgi/BundleClassPathBuilder.scala

@@ -192,15 +192,15 @@ object BundleClassPathBuilder {
           val dirs = bundle.getEntryPaths(fullName)
           var nextEntry = prefetch()
 
-          def hasNext() = {
+          def hasNext = {
             if (nextEntry == null)
               nextEntry = prefetch()
 
             nextEntry != null
           }
 
           def next() = {
-            if (hasNext()) {
+            if (hasNext) {
               val entry = nextEntry
               nextEntry = null
               entry
@@ -303,4 +303,3 @@ object BundleClassPathBuilder {
     if (t == null) default
     else t
 }
-

scalate-core/src/test/scala/org/fusesource/scalate/BindingsTest.scala

@@ -35,11 +35,11 @@ class BindingsTest extends TemplateTestSupport {
 
     val text1 = engine.layout(TemplateSource.fromText("foo2.ssp", "${year.toString}'s is the hippies era"))
     info("Got: " + text1)
-    expect("1970's is the hippies era") { text1.trim }
+    assertResult("1970's is the hippies era") { text1.trim }
 
     val text2 = engine.layout(TemplateSource.fromText("foo3.ssp", "${year.toString}'s is the hippies era"), Map("year" -> 1950))
     info("Got: " + text2)
-    expect("1950's is the hippies era") { text2.trim }
+    assertResult("1950's is the hippies era") { text2.trim }
   }
 }