Merge pull request #1111 from aol/memoizeFix

fix: Memoize issue fix

Author: johnmcclean

build.gradle

@@ -133,7 +133,7 @@ subprojects {
 
     }
 }
-/**
+
 allprojects {
     tasks.withType(JavaCompile) {
         options.fork = true
@@ -142,4 +142,4 @@ allprojects {
 
 }
 
- **/
+

cyclops-anym/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     api project(':cyclops-futurestream')
     api project(':cyclops-reactive-collections')
     api project(':cyclops-pure')
-    compileOnly 'org.projectlombok:lombok:1.16.20'
+
     testImplementation project(':cyclops').sourceSets.test.output
     testImplementation 'io.projectreactor:reactor-core:3.0.7.RELEASE'
     testImplementation group: 'junit', name: 'junit', version: '4.12'

cyclops-futurestream/build.gradle

@@ -32,7 +32,7 @@ dependencies {
     api project(':cyclops')
     api project(':cyclops-reactive-collections')
 
-    compileOnly 'org.projectlombok:lombok:1.16.20'
+
     testImplementation project(':cyclops').sourceSets.test.output
     testImplementation 'org.reactivestreams:reactive-streams-tck:1.0.0'
     testImplementation 'org.mockito:mockito-core:1.9.5'

cyclops-futurestream/src/main/java/com/oath/cyclops/react/collectors/lazy/BatchingCollector.java

@@ -10,10 +10,11 @@
 import java.util.stream.Collectors;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
-import lombok.experimental.Builder;
 import lombok.experimental.Wither;
 
+
 /**
  * This class allows a Batch of completable futures to be processed before collecting their results, to increase
  * parallelism.

cyclops-futurestream/src/main/java/com/oath/cyclops/react/collectors/lazy/MaxActive.java

@@ -2,7 +2,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.experimental.Builder;
+import lombok.Builder;
 import lombok.experimental.Wither;
 
 @AllArgsConstructor

cyclops-futurestream/src/main/java/com/oath/cyclops/react/collectors/lazy/SamplingCollector.java

@@ -6,9 +6,10 @@
 import com.oath.cyclops.internal.react.async.future.FastFuture;
 
 import lombok.AllArgsConstructor;
-import lombok.experimental.Builder;
+import lombok.Builder;
 import lombok.experimental.Wither;
 
+
 /**
  *
  * Class that allows client code to only collect a sample of results from an Infinite SimpleReact Stream

cyclops-futurestream/src/test/java/cyclops/futurestream/react/simple/AlgorithmCompareTest.java

@@ -15,7 +15,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.experimental.Builder;
+import lombok.Builder;
 import lombok.experimental.Wither;
 
 

cyclops-jackson-integration/src/main/java/com/oath/cyclops/jackson/deserializers/CyclopsDeserializers.java

@@ -98,8 +98,49 @@ public JsonDeserializer<?> findCollectionDeserializer(CollectionType type, Deser
   public JsonDeserializer<?> findReferenceDeserializer(ReferenceType type,
                                                        DeserializationConfig config, BeanDescription bean,
                                                        TypeDeserializer typeDeserializer, JsonDeserializer<?> jsonDeserializer) throws JsonMappingException {
+      Class<?> raw = type.getRawClass();
 
-    return super.findReferenceDeserializer(type, config, bean, typeDeserializer, jsonDeserializer);
+      if (raw == Maybe.class) {
+          return new MaybeDeserializer(type);
+      }
+      if (raw == Option.class) {
+          return new OptionDeserializer(type);
+      }
+      if (raw == Eval.class) {
+          return new EvalDeserializer(type);
+      }
+      if (raw == Future.class) {
+          return new EvalDeserializer(type);
+      }
+      if (raw == Ior.class) {
+          return new IorDeserializer(type);
+      }
+      if (raw == LazyEither.class) {
+          return new LazyEitherDeserializer(type);
+      }
+      if (raw == LazyEither3.class) {
+          return new LazyEither3Deserializer(type);
+      }
+      if (raw == LazyEither4.class) {
+          return new LazyEither4Deserializer(type);
+      }
+
+      if (raw == Either.class) {
+          return new EitherDeserializer(type);
+      }
+      if (raw == Trampoline.class) {
+          return new TrampolineDeserializer(type);
+      }
+      if (raw == Unrestricted.class) {
+          return new TrampolineDeserializer(type);
+      }
+      if(tuples.contains(raw)) {
+          return new TupleDeserializer(raw);
+      }
+      if (PersistentMap.class.isAssignableFrom(type.getRawClass())) {
+          return new PersistentMapDeserializer(raw);
+      }
+        return super.findReferenceDeserializer(type, config, bean, typeDeserializer, jsonDeserializer);
   }
 
 }

cyclops-pure/build.gradle

@@ -28,7 +28,6 @@ dependencies {
     api project(':cyclops')
     api project(':cyclops-reactive-collections')
 
-    compileOnly 'org.projectlombok:lombok:1.16.20'
     testImplementation project(':cyclops').sourceSets.test.output
     testImplementation 'org.reactivestreams:reactive-streams-tck:1.0.0'
     testImplementation 'org.mockito:mockito-core:1.9.5'

cyclops-reactive-collections/build.gradle

@@ -29,7 +29,7 @@ configurations {
 dependencies {
     api project(':cyclops')
     testImplementation project(':cyclops').sourceSets.test.output
-    compileOnly 'org.projectlombok:lombok:1.16.12'
+
     testImplementation project(':cyclops').sourceSets.test.output
     testImplementation 'org.reactivestreams:reactive-streams-tck:1.0.0'
     testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.2.2.RELEASE'

cyclops/build.gradle

@@ -6,7 +6,6 @@ def custom = { "$rootDir/gradle/${it}.gradle" } //find custom plugins locally
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
-//apply plugin: 'com.bmuschko.nexus'
 apply plugin: 'jacoco'
 apply from: custom('jacoco-version')
 apply from: custom('jacoco-config')
@@ -102,12 +101,5 @@ task packageTests(type: Jar) {
 artifacts.archives packageTests
 
 
-/**
 
-nexus {
-    sign = true
-    repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
-    snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
-}
- **/
 

cyclops/src/main/java/cyclops/function/Memoize.java

@@ -71,9 +71,14 @@ public static <T> Function0<T> memoizeSupplier(final Supplier<T> s, final Cachea
      * @param <R> Return type of Function
      * @return Memoized asynchronously updating function
      */
-    public static <R> Function0<R> memoizeSupplierAsync(final Supplier<R> fn, ScheduledExecutorService ex, long updateRateInMillis){
-        return ()-> Memoize.memoizeFunctionAsync(a-> fn.get(),ex,updateRateInMillis)
-                           .apply("k");
+    public static <R> Function0<R> memoizeSupplierAsync(Supplier<R> fn, ScheduledExecutorService ex, long updateRateInMillis) {
+        val memoizeFn = memoizeFunctionAsync((a) -> {
+            return fn.get();
+        }, ex, updateRateInMillis);
+
+        return () -> {
+            return memoizeFn.apply("k");
+        };
     }
     /**
      * Memoize a Supplier and update the cached values asynchronously using the provided Scheduled Executor Service

gradle.properties

@@ -1,12 +1,12 @@
-version = 10.4.0
+version = 10.4.1
 agronaVersion=1.1.11
 reactiveStreamsVersion=1.0.3
 reactorVersion=3.3.1.RELEASE
 rxJava2Version=2.2.16
 kindedJVersion=1.1.0
 hamcrestVersion=1.3
-lombokVersion=1.16.20
-jacksonVersion=2.10.1
+lombokVersion=1.18.4
+jacksonVersion=2.13.2
 
 
 POM_NAME=cyclops