From b71357e4f9cc1eb0fcbef6ab96a726f3f23f02ad Mon Sep 17 00:00:00 2001
From: Simon Vergauwen <vergauwen.simon@gmail.com>
Date: Sat, 7 Apr 2018 14:28:44 +0200
Subject: [PATCH] Move optics annotation to optics package and rename @optic to
 @optics

---
 .../src/main/java/arrow/ap/objects/Optional.kt              | 6 +++---
 .../src/main/java/arrow/ap/objects/OptionalSealed.kt        | 6 +++---
 .../src/main/java/arrow/optics/AnnotationInfo.kt            | 4 +---
 .../src/main/java/arrow/optics/OpticsProcessor.kt           | 1 -
 .../core/arrow-annotations/src/main/java/arrow/optics.kt    | 4 ++--
 5 files changed, 9 insertions(+), 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
index 4b6b87c6afd..ff849489cfc 100644
--- 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>)
\ No newline at end of file
diff --git a/modules/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/OptionalSealed.kt b/modules/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/OptionalSealed.kt
index e8d80631c07..76cd47dd97f 100644
--- a/modules/core/arrow-annotations-processor-test/src/main/java/arrow/ap/objects/OptionalSealed.kt
+++ b/modules/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())
 }
\ No newline at end of file
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
index 174bc70129c..1e3304348fd 100644
--- 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
index 7d3928785da..96997aada8e 100644
--- 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
index 1dc6f2f4547..0eebdbbacd3 100644
--- 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