Merge pull request #227 from kelnos/remove-option-converter

Remove RichJavaOptional in favor of scala-java8-compat
guardrail-dev · Apr 4, 2019 · 57e9ddd · 57e9ddd
2 parents 81d08f8 + cba1f6b
commit 57e9ddd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -183,7 +183,8 @@ lazy val codegen = (project in file("modules/codegen"))
       "org.typelevel"               %% "cats-core"                    % catsVersion,
       "org.typelevel"               %% "cats-kernel"                  % catsVersion,
       "org.typelevel"               %% "cats-macros"                  % catsVersion,
-      "org.typelevel"               %% "cats-free"                    % catsVersion
+      "org.typelevel"               %% "cats-free"                    % catsVersion,
+      "org.scala-lang.modules"      %% "scala-java8-compat"           % "0.9.0",
     ),
     scalacOptions += "-language:higherKinds",
     bintrayRepository := {

diff --git a/modules/codegen/src/main/scala/com/twilio/guardrail/generators/syntax/Java.scala b/modules/codegen/src/main/scala/com/twilio/guardrail/generators/syntax/Java.scala
@@ -7,16 +7,12 @@ import com.github.javaparser.ast.expr.{ Expression, Name, SimpleName }
 import com.github.javaparser.ast.{ CompilationUnit, ImportDeclaration, Node, NodeList }
 import com.twilio.guardrail.languages.JavaLanguage
 import com.twilio.guardrail.{ SupportDefinition, Target }
-import java.util.Optional
+import scala.compat.java8.OptionConverters._
 import scala.collection.JavaConverters._
 import scala.reflect.ClassTag
 import scala.util.{ Failure, Success, Try }
 
 object Java {
-  implicit class RichJavaOptional[T](val o: Optional[T]) extends AnyVal {
-    def asScala: Option[T] = if (o.isPresent) Option(o.get) else None
-  }
-
   implicit class RichType(val tpe: Type) extends AnyVal {
     def isOptional: Boolean =
       tpe match {