Update internal atomic wrapper (#104)

* Add missing getAndUpdate fun

Add missing return types
Add couple of inlines to high-order functions
Put declarations on new line

* Add more restrictive gradle config

* Adjust Traverse docs

Co-authored-by: Rachel M. Carmena <[email protected]>

Author: aballano

arrow-libs/core/arrow-core-data/build.gradle

@@ -12,6 +12,7 @@ plugins {
 apply from: "$SUBPROJECT_CONF"
 apply from: "$DOC_CONF"
 apply from: "$PUBLISH_CONF"
+apply plugin: 'kotlinx-atomicfu'
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"

arrow-libs/core/arrow-core-data/src/main/kotlin/arrow/typeclasses/Traverse.kt

@@ -352,8 +352,7 @@ import arrow.core.ValidatedNel
  * import arrow.fx.IO
  * import arrow.fx.extensions.fx
  * import arrow.fx.extensions.io.concurrent.parTraverse
- * import arrow.fx.extensions.runBlocking
- * import arrow.unsafe
+ * import arrow.fx.unsafeRunSync
  *
  * interface Profile
  * interface User
@@ -374,7 +373,7 @@ import arrow.core.ValidatedNel
  * }
  * //sampleEnd
  * fun main() {
- *   unsafe { runBlocking { program() } }
+ *   program().unsafeRunSync()
  * }
  * ```
  *

arrow-libs/core/arrow-core/build.gradle

@@ -12,6 +12,7 @@ plugins {
 apply from: "$SUBPROJECT_CONF"
 apply from: "$DOC_CONF"
 apply from: "$PUBLISH_CONF"
+apply plugin: 'kotlinx-atomicfu'
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"

arrow-libs/core/arrow-core/src/main/kotlin/arrow/core/internal/atomic.kt

@@ -2,6 +2,7 @@ package arrow.core.internal
 
 import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.updateAndGet
+import kotlinx.atomicfu.getAndUpdate
 
 /**
  * Internal wrapper for Atomic-FU Atomics to be used as local variables
@@ -15,15 +16,23 @@ class AtomicRefW<A>(a: A) {
     }
     get() = atomicRef.value
 
-  fun getAndSet(a: A) = atomicRef.getAndSet(a)
+  fun getAndSet(a: A): A =
+    atomicRef.getAndSet(a)
 
-  fun updateAndGet(function: (A) -> A) = atomicRef.updateAndGet(function)
+  fun updateAndGet(function: (A) -> A): A =
+    atomicRef.updateAndGet(function)
 
-  fun compareAndSet(expect: A, update: A) = atomicRef.compareAndSet(expect, update)
+  fun getAndUpdate(f: (A) -> A): A =
+    atomicRef.getAndUpdate(f)
 
-  fun lazySet(a: A) = atomicRef.lazySet(a)
+  fun compareAndSet(expect: A, update: A): Boolean =
+    atomicRef.compareAndSet(expect, update)
 
-  override fun toString(): String = value.toString()
+  fun lazySet(a: A): Unit =
+    atomicRef.lazySet(a)
+
+  override fun toString(): String =
+    value.toString()
 }
 
 class AtomicBooleanW(a: Boolean) {
@@ -35,15 +44,23 @@ class AtomicBooleanW(a: Boolean) {
     }
     get() = atomicRef.value
 
-  fun getAndSet(a: Boolean) = atomicRef.getAndSet(a)
+  fun getAndSet(a: Boolean): Boolean =
+    atomicRef.getAndSet(a)
+
+  fun updateAndGet(function: (Boolean) -> Boolean): Boolean =
+    atomicRef.updateAndGet(function)
 
-  fun updateAndGet(function: (Boolean) -> Boolean) = atomicRef.updateAndGet(function)
+  fun getAndUpdate(f: (Boolean) -> Boolean): Boolean =
+    atomicRef.getAndUpdate(f)
 
-  fun compareAndSet(expect: Boolean, update: Boolean) = atomicRef.compareAndSet(expect, update)
+  fun compareAndSet(expect: Boolean, update: Boolean): Boolean =
+    atomicRef.compareAndSet(expect, update)
 
-  fun lazySet(a: Boolean) = atomicRef.lazySet(a)
+  fun lazySet(a: Boolean): Unit =
+    atomicRef.lazySet(a)
 
-  override fun toString(): String = value.toString()
+  override fun toString(): String =
+    value.toString()
 }
 
 class AtomicIntW(a: Int) {
@@ -55,25 +72,39 @@ class AtomicIntW(a: Int) {
     }
     get() = atomicRef.value
 
-  fun getAndSet(a: Int) = atomicRef.getAndSet(a)
+  fun getAndSet(a: Int): Int =
+    atomicRef.getAndSet(a)
+
+  fun getAndAdd(delta: Int): Int =
+    atomicRef.getAndAdd(delta)
 
-  fun getAndAdd(delta: Int) = atomicRef.getAndAdd(delta)
+  fun addAndGet(delta: Int): Int =
+    atomicRef.addAndGet(delta)
 
-  fun addAndGet(delta: Int) = atomicRef.addAndGet(delta)
+  fun getAndIncrement(): Int =
+    atomicRef.getAndIncrement()
 
-  fun getAndIncrement() = atomicRef.getAndIncrement()
+  fun getAndDecrement(): Int =
+    atomicRef.getAndDecrement()
 
-  fun getAndDecrement() = atomicRef.getAndDecrement()
+  fun incrementAndGet(): Int =
+    atomicRef.incrementAndGet()
 
-  fun incrementAndGet() = atomicRef.incrementAndGet()
+  fun decrementAndGet(): Int =
+    atomicRef.decrementAndGet()
 
-  fun decrementAndGet() = atomicRef.decrementAndGet()
+  fun updateAndGet(function: (Int) -> Int): Int =
+    atomicRef.updateAndGet(function)
 
-  fun updateAndGet(function: (Int) -> Int) = atomicRef.updateAndGet(function)
+  fun getAndUpdate(f: (Int) -> Int): Int =
+    atomicRef.getAndUpdate(f)
 
-  fun compareAndSet(expect: Int, update: Int) = atomicRef.compareAndSet(expect, update)
+  fun compareAndSet(expect: Int, update: Int): Boolean =
+    atomicRef.compareAndSet(expect, update)
 
-  fun lazySet(a: Int) = atomicRef.lazySet(a)
+  fun lazySet(a: Int): Unit =
+    atomicRef.lazySet(a)
 
-  override fun toString(): String = value.toString()
+  override fun toString(): String =
+    value.toString()
 }

arrow-libs/core/build.gradle

@@ -24,10 +24,6 @@ plugins {
 
 apply from: "$GENERIC_CONF"
 
-subprojects {
-    apply plugin: 'kotlinx-atomicfu'
-}
-
 configure(subprojects - project("arrow-meta")) {
     apply plugin: 'ru.vyarus.animalsniffer'
     apply plugin: 'java'