Merge pull request #349 from aol/cyclops9MI2

migration to cyclops 9 MI2
aol · Jun 3, 2017 · 3979e76 · 3979e76
2 parents 5ab8171 + b0f6804
commit 3979e76
Show file tree

Hide file tree

Showing 111 changed files with 385 additions and 353 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
-version=0.91
+version=0.91.1
 springVersion=4.3.3.RELEASE
 springBootVersion=1.4.1.RELEASE
 jerseyVersion=2.24
 grizzlyVersion=2.3.28
-cyclopsReactVersion=2.0.0-MI5
-cyclopsVersion=9.0.0-MI1
+cyclopsReactVersion=2.0.0-MI7
+cyclopsVersion=9.0.0-MI2
 hamcrestVersion=1.3
 hibernateVersion=5.1.0.Final
 hibernateValidator=5.2.4.Final

diff --git a/...gister/src/main/java/com/aol/micro/server/application/registry/RegistryHealthChecker.java b/...gister/src/main/java/com/aol/micro/server/application/registry/RegistryHealthChecker.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import cyclops.Semigroups;
-import cyclops.collections.ListX;
+import cyclops.companion.Semigroups;
+import cyclops.collections.mutable.ListX;
 import cyclops.function.Monoid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

diff --git a/...egister/src/main/java/com/aol/micro/server/application/registry/RegistryStatsChecker.java b/...egister/src/main/java/com/aol/micro/server/application/registry/RegistryStatsChecker.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

diff --git a/...ster/src/main/java/com/aol/micro/server/application/registry/ServiceRegistryResource.java b/...ster/src/main/java/com/aol/micro/server/application/registry/ServiceRegistryResource.java
@@ -43,17 +43,16 @@ public ServiceRegistryResource(Cleaner cleaner, Finder finder, Register register
 	@Path("/list")
 	@Produces("application/json")
 	public void list(@Suspended AsyncResponse response) {
-		ReactiveSeq.of(this)
-				.futureOperations(WorkerThreads.ioExecutor.get())
-				.forEachX(Long.MAX_VALUE,next -> {
+		ReactiveSeq.of(this).foldFuture(WorkerThreads.ioExecutor.get(),
+				s->s.forEach(Long.MAX_VALUE,next -> {
 			try{
 				cleaner.clean();
 				response.resume(finder.find());
 			}catch(Exception e){
 				logger.error(e.getMessage(),e);
 				response.resume(Arrays.asList("failed due to error"));
 			}
-		});
+		}));
 
 	}
 
@@ -62,17 +61,16 @@ public void list(@Suspended AsyncResponse response) {
 	@Consumes("application/json")
 	@Produces("application/json")
 	public void schedule(@Suspended AsyncResponse response) {
-		ReactiveSeq.of(this)
-				  .futureOperations(WorkerThreads.ioExecutor.get())
-				  .forEachX(Long.MAX_VALUE,next -> {
+		ReactiveSeq.of(this).foldFuture(WorkerThreads.ioExecutor.get(),s->
+				  s.forEach(Long.MAX_VALUE,next -> {
 			try{
 				job.schedule();
 				response.resume(HashMapBuilder.of("status", "success"));
 			}catch(Exception e){
 				logger.error(e.getMessage(),e);
 				response.resume(HashMapBuilder.of("status", "failure"));
 			}
-		});
+		}));
 
 	}
 
@@ -81,17 +79,16 @@ public void schedule(@Suspended AsyncResponse response) {
 	@Consumes("application/json")
 	@Produces("application/json")
 	public void register(@Suspended AsyncResponse response,RegisterEntry entry) {
-		ReactiveSeq.of(this)
-			.futureOperations(WorkerThreads.ioExecutor.get())
-			.forEachX(Long.MAX_VALUE,next -> {
+		ReactiveSeq.of(this).foldFuture(WorkerThreads.ioExecutor.get(),
+			s->s.forEach(Long.MAX_VALUE,next -> {
 			try{
 				register.register(entry);
 				response.resume(HashMapBuilder.of("status", "complete"));
 			}catch(Exception e){
 				logger.error(e.getMessage(),e);
 				response.resume(HashMapBuilder.of("status", "failure"));
 			}
-		});
+		}));
 
 	}
 

diff --git a/...main/java/com/aol/micro/server/application/registry/plugin/ApplicationRegistryPlugin.java b/...main/java/com/aol/micro/server/application/registry/plugin/ApplicationRegistryPlugin.java
@@ -10,13 +10,13 @@
 import com.aol.micro.server.application.registry.RegisterConfig;
 import com.aol.micro.server.application.registry.ServiceRegistryResource;
 import com.aol.micro.server.application.registry.RegistryStatsChecker;
-import cyclops.collections.immutable.PSetX;
+import cyclops.collections.immutable.PersistentSetX;
 
 public class ApplicationRegistryPlugin implements Plugin {
 
     @Override
-    public PSetX<Class> springClasses() {
-        return PSetX.of(ApplicationRegisterImpl.class, Cleaner.class, Register.class, ServiceRegistryResource.class,
+    public PersistentSetX<Class> springClasses() {
+        return PersistentSetX.of(ApplicationRegisterImpl.class, Cleaner.class, Register.class, ServiceRegistryResource.class,
                         RegisterConfig.class, Job.class, Finder.class, RegistryHealthChecker.class, RegistryStatsChecker.class);
     }
 

diff --git a/...egister/src/test/java/app/registry/config/com/aol/micro/server/HealthCheckerResource.java b/...egister/src/test/java/app/registry/config/com/aol/micro/server/HealthCheckerResource.java
@@ -8,7 +8,8 @@
 import com.aol.micro.server.HealthStatusChecker;
 import com.aol.micro.server.StatsSupplier;
 import com.aol.micro.server.auto.discovery.Rest;
-import cyclops.collections.MapXs;
+import cyclops.companion.MapXs;
+
 
 @Rest
 @Path("/health")

diff --git a/.../main/java/com/aol/micro/server/async/data/loader/ConfigureSchedulingAsyncDataLoader.java b/.../main/java/com/aol/micro/server/async/data/loader/ConfigureSchedulingAsyncDataLoader.java
@@ -4,8 +4,8 @@
 import java.util.concurrent.Executors;
 import java.util.function.BinaryOperator;
 
-import cyclops.collections.ListX;
-import cyclops.collections.SetX;
+import cyclops.collections.mutable.ListX;
+import cyclops.collections.mutable.SetX;
 import cyclops.stream.ReactiveSeq;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/micro-async-data-loader/src/main/java/com/aol/micro/server/async/data/loader/DataLoader.java b/micro-async-data-loader/src/main/java/com/aol/micro/server/async/data/loader/DataLoader.java
@@ -9,7 +9,7 @@
 import com.aol.micro.server.manifest.ManifestComparator;
 import com.aol.micro.server.utility.HashMapBuilder;
 
-import cyclops.collections.MapX;
+import cyclops.collections.mutable.MapX;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

diff --git a/...ync-data-loader/src/main/java/com/aol/micro/server/async/data/loader/LoaderSchedular.java b/...ync-data-loader/src/main/java/com/aol/micro/server/async/data/loader/LoaderSchedular.java
@@ -6,7 +6,7 @@
 import com.aol.micro.server.events.SystemData;
 import com.google.common.eventbus.EventBus;
 
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import cyclops.stream.ReactiveSeq;
 import lombok.AllArgsConstructor;
 
@@ -23,10 +23,9 @@ public void schedule() {
         loader.forEach(dl -> {
 
             // run on startup
-            create(dl).limit(1)
-                      .futureOperations(executor)
-                      .forEachX(Long.MAX_VALUE,l -> {
-            });
+            create(dl).limit(1).foldFuture(executor,
+                      s->s.forEach(Long.MAX_VALUE,l -> {
+            }));
 
             // schedule
             create(dl).schedule(dl.getCron(), executor);

diff --git a/...er/src/main/java/com/aol/micro/server/async/data/loader/plugin/AsyncDataLoaderPlugin.java b/...er/src/main/java/com/aol/micro/server/async/data/loader/plugin/AsyncDataLoaderPlugin.java
@@ -5,7 +5,7 @@
 
 import com.aol.micro.server.Plugin;
 import com.aol.micro.server.async.data.loader.ConfigureSchedulingAsyncDataLoader;
-import cyclops.collections.SetX;
+import cyclops.collections.mutable.SetX;
 
 public class AsyncDataLoaderPlugin implements Plugin {
 

diff --git a/...ata-loader/src/test/java/app/loader/scheduled/com/aol/micro/server/CouchbaseResource.java b/...ata-loader/src/test/java/app/loader/scheduled/com/aol/micro/server/CouchbaseResource.java
@@ -4,12 +4,12 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
-import cyclops.collections.immutable.PStackX;
+import cyclops.collections.immutable.LinkedListX;
 import cyclops.control.Maybe;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
-import com.aol.micro.server.async.data.loader.DataLoader;
+
 import com.aol.micro.server.auto.discovery.Rest;
 import com.aol.micro.server.distributed.DistributedMap;
 import com.aol.micro.server.events.SystemData;
@@ -21,7 +21,7 @@
 public class CouchbaseResource {
 
     private final DistributedMap client;
-    private volatile PStackX<SystemData> dataLoads = PStackX.empty();
+    private volatile LinkedListX<SystemData> dataLoads = LinkedListX.empty();
 
     @Autowired
     public CouchbaseResource(DistributedMap client, EventBus bus) {
@@ -38,7 +38,7 @@ public synchronized void events(SystemData event) {
     @GET
     @Path("/loading-events")
     @Produces("application/json")
-    public synchronized PStackX<SystemData> loadingEvents() {
+    public synchronized LinkedListX<SystemData> loadingEvents() {
         return dataLoads;
     }
 

diff --git a/...loader/src/test/java/app/loader/scheduled/off/com/aol/micro/server/CouchbaseResource.java b/...loader/src/test/java/app/loader/scheduled/off/com/aol/micro/server/CouchbaseResource.java
@@ -4,7 +4,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
-import cyclops.collections.immutable.PStackX;
+import cyclops.collections.immutable.LinkedListX;
 import cyclops.control.Maybe;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -21,7 +21,7 @@
 public class CouchbaseResource {
 
     private final DistributedMap client;
-    private volatile PStackX<SystemData> dataLoads = PStackX.empty();
+    private volatile LinkedListX<SystemData> dataLoads = LinkedListX.empty();
 
     @Autowired
     public CouchbaseResource(DistributedMap client, EventBus bus) {
@@ -38,7 +38,7 @@ public synchronized void events(SystemData event) {
     @GET
     @Path("/loading-events")
     @Produces("application/json")
-    public synchronized PStackX<SystemData> loadingEvents() {
+    public synchronized LinkedListX<SystemData> loadingEvents() {
         return dataLoads;
     }
 

diff --git a/...c-data-writer/src/main/java/com/aol/micro/server/async/data/cleaner/CleanerSchedular.java b/...c-data-writer/src/main/java/com/aol/micro/server/async/data/cleaner/CleanerSchedular.java
@@ -5,7 +5,7 @@
 
 import com.google.common.eventbus.EventBus;
 
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import cyclops.stream.ReactiveSeq;
 import lombok.AllArgsConstructor;
 

diff --git a/...main/java/com/aol/micro/server/async/data/cleaner/ConfigureSchedulingAsyncDataWriter.java b/...main/java/com/aol/micro/server/async/data/cleaner/ConfigureSchedulingAsyncDataWriter.java
@@ -4,7 +4,7 @@
 import java.util.concurrent.Executors;
 import java.util.function.BinaryOperator;
 
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import cyclops.control.Maybe;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/...-async-data-writer/src/main/java/com/aol/micro/server/async/data/cleaner/DataCleaner.java b/...-async-data-writer/src/main/java/com/aol/micro/server/async/data/cleaner/DataCleaner.java
@@ -9,7 +9,7 @@
 import com.aol.micro.server.manifest.ManifestComparator;
 import com.aol.micro.server.utility.HashMapBuilder;
 
-import cyclops.collections.MapX;
+import cyclops.collections.mutable.MapX;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

diff --git a/...ync-data-writer/src/main/java/com/aol/micro/server/async/data/writer/AsyncDataWriter.java b/...ync-data-writer/src/main/java/com/aol/micro/server/async/data/writer/AsyncDataWriter.java
@@ -5,7 +5,7 @@
 import java.util.function.Supplier;
 
 import cyclops.async.Future;
-import cyclops.collections.MapX;
+import cyclops.collections.mutable.MapX;
 import org.jooq.lambda.tuple.Tuple;
 
 

diff --git a/...data-writer/src/main/java/com/aol/micro/server/async/data/writer/ConfigureDataWriter.java b/...data-writer/src/main/java/com/aol/micro/server/async/data/writer/ConfigureDataWriter.java
@@ -4,7 +4,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...ync-data-writer/src/main/java/com/aol/micro/server/async/data/writer/MultiDataWriter.java b/...ync-data-writer/src/main/java/com/aol/micro/server/async/data/writer/MultiDataWriter.java
@@ -3,7 +3,7 @@
 
 
 import cyclops.async.Future;
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor

diff --git a/...er/src/main/java/com/aol/micro/server/async/data/writer/plugin/AsyncDataWriterPlugin.java b/...er/src/main/java/com/aol/micro/server/async/data/writer/plugin/AsyncDataWriterPlugin.java
@@ -6,7 +6,7 @@
 import com.aol.micro.server.Plugin;
 import com.aol.micro.server.async.data.cleaner.ConfigureSchedulingAsyncDataWriter;
 import com.aol.micro.server.async.data.writer.ConfigureDataWriter;
-import cyclops.collections.SetX;
+import cyclops.collections.mutable.SetX;
 
 public class AsyncDataWriterPlugin implements Plugin {
 

diff --git a/...riter/src/test/java/app/cleaner/off/scheduled/com/aol/micro/server/CouchbaseResource.java b/...riter/src/test/java/app/cleaner/off/scheduled/com/aol/micro/server/CouchbaseResource.java
@@ -4,7 +4,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
-import cyclops.collections.immutable.PStackX;
+import cyclops.collections.immutable.LinkedListX;
 import cyclops.control.Maybe;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -21,7 +21,7 @@ public class CouchbaseResource {
 
     private final DistributedMap client;
 
-    private volatile PStackX<SystemData> dataCleans = PStackX.empty();
+    private volatile LinkedListX<SystemData> dataCleans = LinkedListX.empty();
 
     @Autowired
     public CouchbaseResource(DistributedMap client, EventBus bus) {
@@ -37,7 +37,7 @@ public synchronized void events(SystemData event) {
     @GET
     @Path("/cleaning-events")
     @Produces("application/json")
-    public synchronized PStackX<SystemData> cleaningEvents() {
+    public synchronized LinkedListX<SystemData> cleaningEvents() {
         return dataCleans;
     }
 

diff --git a/...ta-writer/src/test/java/app/cleaner/scheduled/com/aol/micro/server/CouchbaseResource.java b/...ta-writer/src/test/java/app/cleaner/scheduled/com/aol/micro/server/CouchbaseResource.java
@@ -4,7 +4,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
-import cyclops.collections.immutable.PStackX;
+import cyclops.collections.immutable.LinkedListX;
 import cyclops.control.Maybe;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -21,7 +21,7 @@ public class CouchbaseResource {
 
     private final DistributedMap client;
 
-    private volatile PStackX<SystemData> dataCleans = PStackX.empty();
+    private volatile LinkedListX<SystemData> dataCleans = LinkedListX.empty();
 
     @Autowired
     public CouchbaseResource(DistributedMap client, EventBus bus) {
@@ -37,7 +37,7 @@ public synchronized void events(SystemData event) {
     @GET
     @Path("/cleaning-events")
     @Produces("application/json")
-    public synchronized PStackX<SystemData> cleaningEvents() {
+    public synchronized LinkedListX<SystemData> cleaningEvents() {
         return dataCleans;
     }
 

diff --git a/...data-writer/src/test/java/com/aol/micro/server/async/data/writer/MultiDataWriterTest.java b/...data-writer/src/test/java/com/aol/micro/server/async/data/writer/MultiDataWriterTest.java
@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 
-import cyclops.collections.ListX;
+import cyclops.collections.mutable.ListX;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/micro-client/src/main/java/com/aol/micro/server/rest/client/nio/ClientPlugin.java b/micro-client/src/main/java/com/aol/micro/server/rest/client/nio/ClientPlugin.java
@@ -2,7 +2,7 @@
 
 
 import com.aol.micro.server.Plugin;
-import cyclops.collections.immutable.PSetX;
+import cyclops.collections.immutable.PersistentSetX;
 
 /**
  * 
@@ -12,8 +12,8 @@
 public class ClientPlugin implements Plugin{
 
 	@Override
-	public PSetX<Class> springClasses() {
-		return PSetX.of(SpringConfig.class);
+	public PersistentSetX<Class> springClasses() {
+		return PersistentSetX.of(SpringConfig.class);
 	}