Skip to content

Commit 206b2a7

Browse files
author
Guzman, David
committed
Merging master into branch
2 parents f40fcc6 + 45c1860 commit 206b2a7

File tree

336 files changed

+7102
-3119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+7102
-3119
lines changed

‎.DS_Store

-6 KB
Binary file not shown.

‎.gradletasknamecache

Lines changed: 2550 additions & 0 deletions
Large diffs are not rendered by default.

‎.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
sudo: true
12
language: java
2-
install: gradle clean build
3+
install: gradle clean
34
jdk:
45
- oraclejdk8
6+
addons:
7+
apt:
8+
packages:
9+
- oracle-java8-installer

‎gradle.properties

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
version=0.89.5
2-
springVersion=4.3.2.RELEASE
3-
springBootVersion=1.4.0.RELEASE
4-
jerseyVersion=2.23.2
5-
grizzlyVersion=2.3.26
6-
cyclopsReactVersion=1.0.0-FINAL
7-
cyclopsVersion=8.1.0
1+
version=0.91
2+
springVersion=4.3.3.RELEASE
3+
springBootVersion=1.4.1.RELEASE
4+
jerseyVersion=2.24
5+
grizzlyVersion=2.3.28
6+
cyclopsReactVersion=2.0.0-MI5
7+
cyclopsVersion=9.0.0-MI1
88
hamcrestVersion=1.3
99
hibernateVersion=5.1.0.Final
1010
hibernateValidator=5.2.4.Final
11-
springDataJPA=1.10.1.RELEASE
12-
guavaVersion=19.0
13-
javaslangDatatypeVersion=2.0.2
14-
javaslangVersion=2.0.2
15-
jacksonVersion=2.6.3
16-
guavaDatatypeVersion=2.6.3
11+
springDataJPA=1.10.5.RELEASE
12+
guavaVersion=20.0
13+
javaslangDatatypeVersion=2.0.4
14+
javaslangVersion=2.0.4
15+
jacksonVersion=2.8.4
16+
guavaDatatypeVersion=2.8.4
17+
pcollectionsDatatypeVersion=2.8.4
1718
logbackVersion=1.1.3
1819
slf4jVersion=1.7.13
1920
aspectJVersion=1.8.7

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Mon May 08 11:28:18 IST 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip

‎gradlew.bat

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12+
set DEFAULT_JVM_OPTS=
13+
14+
set DIRNAME=%~dp0
15+
if "%DIRNAME%" == "" set DIRNAME=.
16+
set APP_BASE_NAME=%~n0
17+
set APP_HOME=%DIRNAME%
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windowz variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
if "%@eval[2+2]" == "4" goto 4NT_args
53+
54+
:win9xME_args
55+
@rem Slurp the command line arguments.
56+
set CMD_LINE_ARGS=
57+
set _SKIP=2
58+
59+
:win9xME_args_slurp
60+
if "x%~1" == "x" goto execute
61+
62+
set CMD_LINE_ARGS=%*
63+
goto execute
64+
65+
:4NT_args
66+
@rem Get arguments from the 4NT Shell from JP Software
67+
set CMD_LINE_ARGS=%$
68+
69+
:execute
70+
@rem Setup the command line
71+
72+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if "%ERRORLEVEL%"=="0" goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85+
exit /b 1
86+
87+
:mainEnd
88+
if "%OS%"=="Windows_NT" endlocal
89+
90+
:omega

‎micro-application-register/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description = 'micro-application-register'
22
dependencies {
33

4-
compile 'org.apache.commons:commons-io:1.3.2'
4+
compile 'commons-io:commons-io:'+commonsIOVersion
55
compile project(':micro-core')
66
compile project(':micro-client')
77
compile project(':micro-ip-tracker')

‎micro-application-register/src/main/java/com/aol/micro/server/application/registry/ApplicationRegisterImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
import java.util.stream.Collectors;
88
import java.util.stream.Stream;
99

10+
import com.aol.cyclops2.util.ExceptionSoftener;
1011
import org.slf4j.Logger;
1112
import org.slf4j.LoggerFactory;
1213
import org.springframework.beans.factory.annotation.Autowired;
1314
import org.springframework.beans.factory.annotation.Qualifier;
1415
import org.springframework.beans.factory.annotation.Value;
1516
import org.springframework.stereotype.Component;
1617

17-
import com.aol.cyclops.util.ExceptionSoftener;
18+
1819
import com.aol.micro.server.servers.ApplicationRegister;
1920
import com.aol.micro.server.servers.model.ServerData;
2021

‎micro-application-register/src/main/java/com/aol/micro/server/application/registry/ManifestLoader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
import java.util.jar.Attributes;
88
import java.util.jar.Manifest;
99

10+
import cyclops.function.FluentFunctions;
11+
import cyclops.stream.ReactiveSeq;
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214

13-
import com.aol.cyclops.control.FluentFunctions;
14-
import com.aol.cyclops.control.ReactiveSeq;
15+
1516

1617
import lombok.AccessLevel;
1718
import lombok.NoArgsConstructor;

‎micro-application-register/src/main/java/com/aol/micro/server/application/registry/RegistryHealthChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import java.util.List;
44

5+
import cyclops.Semigroups;
6+
import cyclops.collections.ListX;
7+
import cyclops.function.Monoid;
58
import org.springframework.beans.factory.annotation.Autowired;
69
import org.springframework.stereotype.Component;
710

8-
import com.aol.cyclops.Monoid;
9-
import com.aol.cyclops.Semigroups;
10-
import com.aol.cyclops.data.collections.extensions.standard.ListX;
1111
import com.aol.micro.server.HealthStatusChecker;
1212

1313
@Component

‎micro-application-register/src/main/java/com/aol/micro/server/application/registry/RegistryStatsChecker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import java.util.Map;
55
import java.util.Objects;
66

7+
import cyclops.collections.ListX;
78
import org.springframework.beans.factory.annotation.Autowired;
89
import org.springframework.beans.factory.annotation.Value;
910
import org.springframework.stereotype.Component;
1011

11-
import com.aol.cyclops.data.collections.extensions.standard.ListX;
12+
1213
import com.aol.micro.server.StatsSupplier;
1314

1415
@Component

‎micro-application-register/src/main/java/com/aol/micro/server/application/registry/ServiceRegistryResource.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
import javax.ws.rs.container.AsyncResponse;
1111
import javax.ws.rs.container.Suspended;
1212

13+
import cyclops.stream.ReactiveSeq;
1314
import org.slf4j.Logger;
1415
import org.slf4j.LoggerFactory;
1516
import org.springframework.beans.factory.annotation.Autowired;
1617

17-
import com.aol.cyclops.control.ReactiveSeq;
18+
1819
import com.aol.micro.server.WorkerThreads;
1920
import com.aol.micro.server.auto.discovery.Rest;
2021
import com.aol.micro.server.utility.HashMapBuilder;
@@ -44,7 +45,7 @@ public ServiceRegistryResource(Cleaner cleaner, Finder finder, Register register
4445
public void list(@Suspended AsyncResponse response) {
4546
ReactiveSeq.of(this)
4647
.futureOperations(WorkerThreads.ioExecutor.get())
47-
.forEach(next -> {
48+
.forEachX(Long.MAX_VALUE,next -> {
4849
try{
4950
cleaner.clean();
5051
response.resume(finder.find());
@@ -63,7 +64,7 @@ public void list(@Suspended AsyncResponse response) {
6364
public void schedule(@Suspended AsyncResponse response) {
6465
ReactiveSeq.of(this)
6566
.futureOperations(WorkerThreads.ioExecutor.get())
66-
.forEach(next -> {
67+
.forEachX(Long.MAX_VALUE,next -> {
6768
try{
6869
job.schedule();
6970
response.resume(HashMapBuilder.of("status", "success"));
@@ -82,7 +83,7 @@ public void schedule(@Suspended AsyncResponse response) {
8283
public void register(@Suspended AsyncResponse response,RegisterEntry entry) {
8384
ReactiveSeq.of(this)
8485
.futureOperations(WorkerThreads.ioExecutor.get())
85-
.forEach(next -> {
86+
.forEachX(Long.MAX_VALUE,next -> {
8687
try{
8788
register.register(entry);
8889
response.resume(HashMapBuilder.of("status", "complete"));

‎micro-application-register/src/main/java/com/aol/micro/server/application/registry/plugin/ApplicationRegistryPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.aol.micro.server.application.registry.plugin;
22

3-
import com.aol.cyclops.data.collections.extensions.persistent.PSetX;
43
import com.aol.micro.server.Plugin;
54
import com.aol.micro.server.application.registry.ApplicationRegisterImpl;
65
import com.aol.micro.server.application.registry.Cleaner;
@@ -11,6 +10,7 @@
1110
import com.aol.micro.server.application.registry.RegisterConfig;
1211
import com.aol.micro.server.application.registry.ServiceRegistryResource;
1312
import com.aol.micro.server.application.registry.RegistryStatsChecker;
13+
import cyclops.collections.immutable.PSetX;
1414

1515
public class ApplicationRegistryPlugin implements Plugin {
1616

‎micro-application-register/src/test/java/app/registry/com/aol/micro/server/RegistryAppRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void runAppAndBasicTest() throws InterruptedException, ExecutionException
6464
Thread.sleep(1000);
6565
System.out.println(rest.getJson("http://localhost:8080/registry-app/service-registry/list"));
6666
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
67-
containsString("[{\"port\":8081,"));
67+
containsString("{\"port\":8081,"));
6868

6969
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
7070
containsString("\"target\":\"my-target\""));
@@ -95,4 +95,4 @@ private void sendPing(RegisterEntry entry) {
9595
}
9696
}
9797

98-
}
98+
}

‎micro-application-register/src/test/java/app/registry/config/com/aol/micro/server/HealthCheckerResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import javax.ws.rs.GET;
66
import javax.ws.rs.Path;
77

8-
import com.aol.cyclops.data.collections.extensions.standard.MapXs;
98
import com.aol.micro.server.HealthStatusChecker;
109
import com.aol.micro.server.StatsSupplier;
1110
import com.aol.micro.server.auto.discovery.Rest;
11+
import cyclops.collections.MapXs;
1212

1313
@Rest
1414
@Path("/health")

‎micro-application-register/src/test/java/app/registry/config/com/aol/micro/server/RegistryAppRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void runAppAndBasicTest() throws InterruptedException, ExecutionException
6060
Thread.sleep(1000);
6161
System.out.println(rest.getJson("http://localhost:8080/registry-app/service-registry/list"));
6262
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
63-
containsString("[{\"port\":8081,"));
63+
containsString("{\"port\":8081,"));
6464
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
6565
containsString("\"hostname\":\"test-host\""));
6666
assertThat(rest.getJson("http://localhost:8080/registry-app/service-registry/list"),
@@ -93,4 +93,4 @@ private void sendPing(RegisterEntry entry) {
9393
}
9494
}
9595

96-
}
96+
}

‎micro-async-data-loader/src/main/java/com/aol/micro/server/async/data/loader/ConfigureSchedulingAsyncDataLoader.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
import java.util.concurrent.Executors;
55
import java.util.function.BinaryOperator;
66

7+
import cyclops.collections.ListX;
8+
import cyclops.collections.SetX;
9+
import cyclops.stream.ReactiveSeq;
710
import org.springframework.beans.factory.annotation.Autowired;
811
import org.springframework.beans.factory.annotation.Value;
912
import org.springframework.context.annotation.Bean;
1013
import org.springframework.context.annotation.Configuration;
1114

12-
import com.aol.cyclops.control.ReactiveSeq;
13-
import com.aol.cyclops.data.collections.extensions.standard.ListX;
14-
import com.aol.cyclops.data.collections.extensions.standard.SetX;
15+
1516
import com.aol.micro.server.manifest.ManifestComparator;
1617
import com.google.common.eventbus.EventBus;
1718

@@ -42,7 +43,7 @@ private ListX<DataLoader> dataLoaders() {
4243
.filter(i -> !comparatorSet.contains(i))
4344
.map(mc -> new DataLoader(
4445
mc, defaultCron))
45-
.concat(dataLoaders.stream())
46+
.appendS(dataLoaders.stream())
4647
.toListX();
4748

4849
}

‎micro-async-data-loader/src/main/java/com/aol/micro/server/async/data/loader/DataLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import java.util.Random;
44
import java.util.function.Supplier;
55

6-
import com.aol.cyclops.data.collections.extensions.standard.MapX;
6+
77
import com.aol.micro.server.events.ScheduledJob;
88
import com.aol.micro.server.events.SystemData;
99
import com.aol.micro.server.manifest.ManifestComparator;
1010
import com.aol.micro.server.utility.HashMapBuilder;
1111

12+
import cyclops.collections.MapX;
1213
import lombok.AllArgsConstructor;
1314
import lombok.Getter;
1415

‎micro-async-data-loader/src/main/java/com/aol/micro/server/async/data/loader/LoaderSchedular.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import java.util.concurrent.ScheduledExecutorService;
44

5-
import com.aol.cyclops.control.ReactiveSeq;
6-
import com.aol.cyclops.data.collections.extensions.standard.ListX;
5+
76
import com.aol.micro.server.events.SystemData;
87
import com.google.common.eventbus.EventBus;
98

9+
import cyclops.collections.ListX;
10+
import cyclops.stream.ReactiveSeq;
1011
import lombok.AllArgsConstructor;
1112

1213
@AllArgsConstructor
@@ -24,7 +25,7 @@ public void schedule() {
2425
// run on startup
2526
create(dl).limit(1)
2627
.futureOperations(executor)
27-
.forEach(l -> {
28+
.forEachX(Long.MAX_VALUE,l -> {
2829
});
2930

3031
// schedule

‎micro-async-data-loader/src/main/java/com/aol/micro/server/async/data/loader/plugin/AsyncDataLoaderPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.Set;
44

5-
import com.aol.cyclops.data.collections.extensions.standard.SetX;
5+
66
import com.aol.micro.server.Plugin;
77
import com.aol.micro.server.async.data.loader.ConfigureSchedulingAsyncDataLoader;
8+
import cyclops.collections.SetX;
89

910
public class AsyncDataLoaderPlugin implements Plugin {
1011

0 commit comments

Comments
 (0)