Move optics annotation to optics package and rename @optic to @Optics

arrow-kt · Apr 7, 2018 · b71357e · b71357e
1 parent 688d10a
commit b71357e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/modules/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/Optional.kt b/modules/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/Optional.kt
@@ -1,8 +1,8 @@
 package arrow.ap.objects
 
-import arrow.OpticsTarget
 import arrow.core.Option
-import arrow.optic
+import arrow.optics.OpticsTarget
+import arrow.optics.optics
 
-@optic([(OpticsTarget.OPTIONAL)])
+@optics([(OpticsTarget.OPTIONAL)])
 data class Optional(val field: String, val nullable: String?, val option: Option<String>)
diff --git a/...es/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/OptionalSealed.kt b/...es/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/OptionalSealed.kt
@@ -1,10 +1,10 @@
 package arrow.ap.objects
 
-import arrow.OpticsTarget
 import arrow.core.Option
-import arrow.optic
+import arrow.optics.OpticsTarget
+import arrow.optics.optics
 
-@optic([OpticsTarget.OPTIONAL])
+@optics([OpticsTarget.OPTIONAL])
 sealed class OptionalSealed(val field: String, val nullable: String?, val option: Option<String>) {
   data class Optional2(val a: String?) : OptionalSealed("", null, Option.empty())
 }
diff --git a/modules/core/arrow-annotations-processor/src/main/java/arrow/optics/AnnotationInfo.kt b/modules/core/arrow-annotations-processor/src/main/java/arrow/optics/AnnotationInfo.kt
@@ -1,7 +1,5 @@
 package arrow.optics
 
-import arrow.optic
-
-val opticsAnnotationKClass = optic::class
+val opticsAnnotationKClass = optics::class
 val opticsAnnotationClass = opticsAnnotationKClass.java
 val opticsAnnotationName = "@" + opticsAnnotationKClass.simpleName
diff --git a/modules/core/arrow-annotations-processor/src/main/java/arrow/optics/OpticsProcessor.kt b/modules/core/arrow-annotations-processor/src/main/java/arrow/optics/OpticsProcessor.kt
@@ -1,6 +1,5 @@
 package arrow.optics
 
-import arrow.OpticsTarget
 import arrow.common.messager.logW
 import arrow.common.utils.AbstractProcessor
 import arrow.common.utils.isSealed

diff --git a/modules/core/arrow-annotations/src/main/java/arrow/optics.kt b/modules/core/arrow-annotations/src/main/java/arrow/optics.kt
@@ -1,11 +1,11 @@
-package arrow
+package arrow.optics
 
 import kotlin.annotation.AnnotationRetention.SOURCE
 import kotlin.annotation.AnnotationTarget.CLASS
 
 @Retention(SOURCE)
 @Target(CLASS)
-annotation class optic(val targets: Array<OpticsTarget> = [OpticsTarget.ISO, OpticsTarget.LENS, OpticsTarget.PRISM, OpticsTarget.OPTIONAL, OpticsTarget.DSL])
+annotation class optics(val targets: Array<OpticsTarget> = [OpticsTarget.ISO, OpticsTarget.LENS, OpticsTarget.PRISM, OpticsTarget.OPTIONAL, OpticsTarget.DSL])
 
 enum class OpticsTarget {
   ISO, LENS, PRISM, OPTIONAL, DSL