Revert "Freestyle & sbt-org-policies plugin Integration"

Author: juanpedromoreno

src/main/scala/org/scalaexercises/exercises/Exercises.scala

@@ -1,20 +1,6 @@
 /*
- *  scala-exercises
- *
- *  Copyright 2015-2017 47 Degrees, LLC. <http://www.47deg.com>
- *
- * 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.
- *
+ * scala-exercises-runtime
+ * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
 package org.scalaexercises.runtime
@@ -34,38 +20,33 @@ object Exercises {
   val LIBRARIES_PACKAGE = "org.scalaexercises.content"
 
   private[this] def classMap(cl: ClassLoader) = {
-    val files       = cl.asInstanceOf[URLClassLoader].getURLs map (_.getFile)
+    val files = cl.asInstanceOf[URLClassLoader].getURLs map (_.getFile)
     val classFinder = ClassFinder(files map (new File(_)) filter (f ⇒ f.exists()))
-    val classes     = classFinder.getClasses.toIterator
+    val classes = classFinder.getClasses.toIterator
     ClassFinder.classInfoMap(classes)
   }
 
   private[this] def subclassesOf[A: ClassTag](cl: ClassLoader): List[String] = {
-    def loop(currentClassLoader: ClassLoader, acc: List[String]): List[String] =
-      Option(currentClassLoader) match {
-        case None ⇒ acc
-        case Some(cll: URLClassLoader) ⇒
-          val cn = ClassFinder
-            .concreteSubclasses(implicitly[ClassTag[A]].runtimeClass.getName, classMap(cll))
-            .filter(_.name.startsWith(LIBRARIES_PACKAGE))
-            .map(_.name)
-            .toList
-          loop(currentClassLoader.getParent, acc ++ cn)
-        case Some(o) ⇒ loop(o.getParent, acc)
-      }
+    def loop(currentClassLoader: ClassLoader, acc: List[String]): List[String] = Option(currentClassLoader) match {
+      case None ⇒ acc
+      case Some(cll: URLClassLoader) ⇒
+        val cn = ClassFinder.concreteSubclasses(implicitly[ClassTag[A]].runtimeClass.getName, classMap(cll))
+          .filter(_.name.startsWith(LIBRARIES_PACKAGE))
+          .map(_.name)
+          .toList
+        loop(currentClassLoader.getParent, acc ++ cn)
+      case Some(o) ⇒ loop(o.getParent, acc)
+    }
     loop(cl, Nil)
   }
 
-  def discoverLibraries(
-      cl: ClassLoader = classOf[Exercise].getClassLoader): (List[String], List[Library]) = {
+  def discoverLibraries(cl: ClassLoader = classOf[Exercise].getClassLoader): (List[String], List[Library]) = {
     val classNames: List[String] = subclassesOf[Library](cl)
 
     val errorsAndLibraries = classNames.map { name ⇒
       for {
         loadedClass ← guard(Class.forName(name, true, cl), s"$name not found")
-        loadedObject ← guard(
-          loadedClass.getField("MODULE$").get(null),
-          s"$name must be defined as an object")
+        loadedObject ← guard(loadedClass.getField("MODULE$").get(null), s"$name must be defined as an object")
         loadedLibrary ← guard(loadedObject.asInstanceOf[Library], s"$name must extend Library")
       } yield loadedLibrary
     }
@@ -77,16 +58,16 @@ object Exercises {
     Either.catchNonFatal(f).leftMap(_ ⇒ message)
 
   def buildEvaluatorRequest(
-      pkg: String,
-      qualifiedMethod: String,
-      rawArgs: List[String],
-      imports: List[String] = Nil,
-      resolvers: List[String],
-      libraryDependencies: List[String]
+    pkg:                 String,
+    qualifiedMethod:     String,
+    rawArgs:             List[String],
+    imports:             List[String] = Nil,
+    resolvers:           List[String],
+    libraryDependencies: List[String]
   ): (List[String], List[Dependency], String) = {
 
     val extractEvaluatorResolvers: List[String] = {
-      resolvers.filter(r => !r.isEmpty && r.contains("http")) map { resolver ⇒
+      resolvers.filter(!_.isEmpty) map { resolver ⇒
         resolver.substring(resolver.indexOf("http"))
       }
     }
@@ -98,7 +79,7 @@ object Exercises {
       }
     }
 
-    val pre  = (s"import $pkg._" :: imports).mkString("; ")
+    val pre = (s"import $pkg._" :: imports).mkString("; ")
     val code = s"""$qualifiedMethod(${rawArgs.mkString(", ")})"""
 
     val allCode = s"{$pre; $code}"

src/main/scala/org/scalaexercises/exercises/Timestamp.scala

@@ -1,26 +1,12 @@
 /*
- *  scala-exercises
- *
- *  Copyright 2015-2017 47 Degrees, LLC. <http://www.47deg.com>
- *
- * 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.
- *
+ * scala-exercises-exercise-compiler
+ * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
 package org.scalaexercises.runtime
 
 import java.text.SimpleDateFormat
-import java.util.{Date, TimeZone}
+import java.util.{ Date, TimeZone }
 
 object Timestamp {
   val ISO8601 = "yyyy-MM-dd'T'HH:mm:ssz"
@@ -31,8 +17,9 @@ object Timestamp {
     setTimeZone(UTC)
   }
 
-  def fromDate(d: Date): String =
+  def fromDate(d: Date): String = {
     FORMAT.format(d)
+  }
 
   def toDate(timestamp: String): Date = FORMAT.parse(timestamp)
 }

src/main/scala/org/scalaexercises/exercises/model.scala

@@ -1,20 +1,6 @@
 /*
- *  scala-exercises
- *
- *  Copyright 2015-2017 47 Degrees, LLC. <http://www.47deg.com>
- *
- * 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.
- *
+ * scala-exercises-runtime
+ * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
 
 package org.scalaexercises.runtime
@@ -23,7 +9,7 @@ package model
 // This is the exercise runtime metamodel
 
 /** An exercise library.
- */
+  */
 trait Library {
   def owner: String
   def repository: String
@@ -38,14 +24,14 @@ trait Library {
 }
 
 /** Library Build Metadata Information
- */
+  */
 trait BuildInfo {
   def resolvers: List[String]
   def libraryDependencies: List[String]
 }
 
 /** A section in a library.
- */
+  */
 trait Section {
   def name: String
   def description: Option[String]
@@ -56,7 +42,7 @@ trait Section {
 }
 
 /** A contribution to a section.
- */
+  */
 trait Contribution {
   def sha: String
   def message: String
@@ -68,7 +54,7 @@ trait Contribution {
 }
 
 /** Exercises within a section.
- */
+  */
 trait Exercise {
   def name: String
   def description: Option[String]
@@ -81,47 +67,48 @@ trait Exercise {
 
 // default case class implementations
 case class DefaultLibrary(
-    owner: String,
-    repository: String,
-    name: String,
-    description: String,
-    color: Option[String],
-    logoPath: String,
-    logoData: Option[String],
-    sections: List[Section] = Nil,
-    timestamp: String,
-    buildMetaInfo: BuildInfo
+  owner:         String,
+  repository:    String,
+  name:          String,
+  description:   String,
+  color:         Option[String],
+  logoPath:      String,
+  logoData:      Option[String],
+  sections:      List[Section]  = Nil,
+  timestamp:     String,
+  buildMetaInfo: BuildInfo
 ) extends Library
 
 case class DefaultContribution(
-    sha: String,
-    message: String,
-    timestamp: String,
-    url: String,
-    author: String,
-    authorUrl: String,
-    avatarUrl: String
+  sha:       String,
+  message:   String,
+  timestamp: String,
+  url:       String,
+  author:    String,
+  authorUrl: String,
+  avatarUrl: String
 ) extends Contribution
 
 case class DefaultSection(
-    name: String,
-    description: Option[String],
-    exercises: List[Exercise] = Nil,
-    imports: List[String] = Nil,
-    path: Option[String] = None,
-    contributions: List[DefaultContribution] = Nil
+  name:          String,
+  description:   Option[String],
+  exercises:     List[Exercise]            = Nil,
+  imports:       List[String]              = Nil,
+  path:          Option[String]            = None,
+  contributions: List[DefaultContribution] = Nil
 ) extends Section
 
 case class DefaultExercise(
-    name: String,
-    description: Option[String] = None,
-    code: String,
-    qualifiedMethod: String,
-    imports: List[String],
-    explanation: Option[String] = None,
-    packageName: String
+  name:            String,
+  description:     Option[String] = None,
+  code:            String,
+  qualifiedMethod: String,
+  imports:         List[String],
+  explanation:     Option[String] = None,
+  packageName:     String
 ) extends Exercise
 /*
  * scala-exercises-runtime
  * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
  */
+