Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/maven build #1103

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Feature/maven build #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bf41bb6
Added pom files, updated Lombok decorator
Dec 30, 2020
1c1beb0
Missed pom files in prior commit
Dec 30, 2020
01c7783
Adding `target` directories to ignore
Dec 30, 2020
6acba42
Resolved maven cross module dependencies and updated Lombok decorators
Dec 30, 2020
5a9ae86
Upgraded TestNG, JUnit and surefire plugin to get tests running in ma…
Dec 30, 2020
c487978
Added maven configuration, since the tests require over 4G of memory …
Dec 30, 2020
67a8954
Updated maven dependencies to latest versions
Dec 30, 2020
456025c
Compatibility fix: PublisherVerificationRules moved to flow.support
Dec 30, 2020
e08e156
All compatibility issues with upgraded libraries resolved
Dec 30, 2020
928876d
Replaced Lombok's @experimental.Wither with @With and optimized imports
Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Temporary Items
/build/
/bin/
/doc/
**/target/**
# Created by https://www.gitignore.io

test-output
Expand Down
2 changes: 1 addition & 1 deletion .java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.0.181
1.8.0.251
1 change: 1 addition & 0 deletions .mvn/jvm.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Xmx8G -Xshare:off -XX:TieredStopAtLevel=1 -XX:+UseParallelGC -Djava.awt.headless=true -Dmaven.artifact.threads=4
1 change: 1 addition & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-T4.0C -U
3 changes: 3 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ plugins {
id 'me.champeau.gradle.jmh' version '0.2.0'
}

apply plugin: 'java'
apply plugin: 'maven'

def custom = { "$rootDir/gradle/${it}.gradle" } //find custom plugins locally


Expand Down
127 changes: 127 additions & 0 deletions cyclops-anym/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<groupId>com.oath.cyclops</groupId>
<artifactId>com.oath.cyclops</artifactId>
<version>10.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops-anym</artifactId>
<version>10.4.0</version>
<name>cyclops-anym</name>
<description>A higher kinded monad abstraction for Java</description>
<url>https://github.com/aol/cyclops-react</url>
<inceptionYear>2015</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>johnmcclean</id>
<name>John McClean</name>
<email>[email protected]</email>
</developer>
<developer>
<id>kewangie</id>
<name>Ke Wang</name>
<email>[email protected]</email>
</developer>
<developer>
<id>tkountis</id>
<name>Thomas Kountis Wang</name>
<email>[email protected]</email>
</developer>
<developer>
<id>colinfkennedy</id>
<name>Colin Kennedy</name>
<email>[email protected]</email>
</developer>
</developers>
<scm>
<connection>scm:[email protected]:aol/cyclops-react.git</connection>
<developerConnection>scm:[email protected]:aol/simple-react.git</developerConnection>
<url>scm:[email protected]:aol/cyclops-react.git</url>
</scm>
<dependencies>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops</artifactId>
<version>10.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops</artifactId>
<version>10.4.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops-futurestream</artifactId>
<version>10.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops-reactive-collections</artifactId>
<version>10.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops-pure</artifactId>
<version>10.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
137 changes: 137 additions & 0 deletions cyclops-futurestream/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<groupId>com.oath.cyclops</groupId>
<artifactId>com.oath.cyclops</artifactId>
<version>10.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops-futurestream</artifactId>
<version>10.4.0</version>
<name>cyclops-futurestream</name>
<description>Asynchronous parallel streaming via futures</description>
<url>https://github.com/aol/cyclops-react</url>
<inceptionYear>2015</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>johnmcclean</id>
<name>John McClean</name>
<email>[email protected]</email>
</developer>
<developer>
<id>kewangie</id>
<name>Ke Wang</name>
<email>[email protected]</email>
</developer>
<developer>
<id>tkountis</id>
<name>Thomas Kountis Wang</name>
<email>[email protected]</email>
</developer>
<developer>
<id>colinfkennedy</id>
<name>Colin Kennedy</name>
<email>[email protected]</email>
</developer>
</developers>
<scm>
<connection>scm:[email protected]:aol/cyclops-react.git</connection>
<developerConnection>scm:[email protected]:aol/simple-react.git</developerConnection>
<url>scm:[email protected]:aol/cyclops-react.git</url>
</scm>
<dependencies>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops</artifactId>
<version>10.4.0</version>
</dependency>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops</artifactId>
<version>10.4.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oath.cyclops</groupId>
<artifactId>cyclops-reactive-collections</artifactId>
<version>10.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams-tck</artifactId>
<version>${reactive-streams.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mocikto-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>${vertx-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-client</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.27.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.4.27.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
16 changes: 8 additions & 8 deletions cyclops-futurestream/src/main/java/com/oath/cyclops/internal/react/FutureStreamImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.experimental.Wither;
import lombok.With;
import org.reactivestreams.Subscriber;


@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class FutureStreamImpl<U> implements FutureStream<U> {

@Wither
@With
private final Optional<Consumer<Throwable>> errorHandler;
private final LazyStreamWrapper<U> lastActive;

@Wither
@With
private final Supplier<LazyResultConsumer<U>> lazyCollector;
@Wither
@With
private final QueueFactory<U> queueFactory;
@Wither
@With
private final LazyReact simpleReact;
@Wither
@With
private final Continueable subscription;
private final static ReactPool<LazyReact> pool = ReactPool.elasticPool(() -> new LazyReact(
Executors.newSingleThreadExecutor()));
@Wither
@With
private final ConsumerHolder error;
@Wither
@With
private final MaxActive maxActive;

@AllArgsConstructor
Expand Down
4 changes: 2 additions & 2 deletions ...ops-futurestream/src/main/java/com/oath/cyclops/internal/react/SimpleReactStreamImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.experimental.Wither;
import lombok.With;

@Wither
@With
@Getter
@AllArgsConstructor
public class SimpleReactStreamImpl<U> implements SimpleReactStream<U>, EagerToQueue<U> {
Expand Down
4 changes: 2 additions & 2 deletions ...estream/src/main/java/com/oath/cyclops/internal/react/async/future/ExecutionPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import cyclops.data.Seq;
import lombok.AllArgsConstructor;
import lombok.ToString;
import lombok.experimental.Wither;
import lombok.With;

@ToString
@AllArgsConstructor
@Wither
@With
public class ExecutionPipeline {
private final Seq<Function> functionList;
private final Seq<Executor> execList;
Expand Down
4 changes: 2 additions & 2 deletions ...urestream/src/main/java/com/oath/cyclops/internal/react/async/future/PipelineBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import cyclops.function.Memoize;

import lombok.AllArgsConstructor;
import lombok.experimental.Wither;
import lombok.With;

@AllArgsConstructor
@Wither
@With
public class PipelineBuilder {

private final ExecutionPipeline builder;
Expand Down
4 changes: 2 additions & 2 deletions ...futurestream/src/main/java/com/oath/cyclops/internal/react/stream/EagerStreamWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import com.oath.cyclops.util.ExceptionSoftener;

import lombok.AllArgsConstructor;
import lombok.experimental.Wither;
import lombok.With;

@Wither
@With
@AllArgsConstructor
public class EagerStreamWrapper implements StreamWrapper {
@SuppressWarnings("rawtypes")
Expand Down
6 changes: 3 additions & 3 deletions ...-futurestream/src/main/java/com/oath/cyclops/internal/react/stream/LazyStreamWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import com.oath.cyclops.internal.react.async.future.FinalPipeline;

import lombok.AllArgsConstructor;
import lombok.experimental.Wither;
import lombok.With;

@AllArgsConstructor
public class LazyStreamWrapper<U> implements StreamWrapper<U> {
@Wither
@With
private final Supplier<Stream<U>> values;
@Wither
@With
private final LazyReact react;
private PipelineBuilder pipeline;
private final FuturePool pool;
Expand Down
Loading