From f7236b301baa201cec5783d36e366eda924a0bbb Mon Sep 17 00:00:00 2001 From: Muhammed Almas Date: Sat, 21 Jan 2017 18:21:04 +0530 Subject: [PATCH] BAEL-519 Disruptor in its own module. (#1017) * BAL-36 File size api in java and apache commons IO * BAEL-282 grep in java - fixes after code review * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor * BAEL-519 Moved all supporting classes to main source * BAEL-519 Moved all supporting classes to main source * BAEL-519 Moved asserts and test classes in test folder. * BAEL-519 moved test related producer and consumer to src. * BAEL-586 Guide to Guava BiMap. * BAEL-587 formatted code. * BAEL-519 LMAX Disruptor * BAEL-587 resolved merge * BAEL-587 Resolved merge * BAEL-519 Removed disruptor link. * BAEL-519 Reverted Guava changes * RFQ-587 Added disruptor as a separate module. * BAEL-519 Disruptor changes. * BAEL-519 Removed disruptor from core-java module. --- core-java/pom.xml | 6 - disruptor/README.md | 0 disruptor/pom.xml | 251 ++++++++++++++++++ .../disruptor/DelayedMultiEventProducer.java | 0 .../com/baeldung/disruptor/EventConsumer.java | 0 .../com/baeldung/disruptor/EventProducer.java | 0 .../disruptor/MultiEventPrintConsumer.java | 0 .../disruptor/SingleEventPrintConsumer.java | 0 .../disruptor/SingleEventProducer.java | 0 .../com/baeldung/disruptor/ValueEvent.java | 0 .../com/baeldung/disruptor/DisruptorTest.java | 0 .../disruptor/MultiEventConsumer.java | 0 .../disruptor/SingleEventConsumer.java | 0 pom.xml | 1 + 14 files changed, 252 insertions(+), 6 deletions(-) create mode 100644 disruptor/README.md create mode 100644 disruptor/pom.xml rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java (100%) rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/EventConsumer.java (100%) rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/EventProducer.java (100%) rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java (100%) rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java (100%) rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/SingleEventProducer.java (100%) rename {core-java => disruptor}/src/main/java/com/baeldung/disruptor/ValueEvent.java (100%) rename {core-java => disruptor}/src/test/java/com/baeldung/disruptor/DisruptorTest.java (100%) rename {core-java => disruptor}/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java (100%) rename {core-java => disruptor}/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java (100%) diff --git a/core-java/pom.xml b/core-java/pom.xml index 3406bddda9..85afee2968 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -64,11 +64,6 @@ ${grep4j.version} - - com.lmax - disruptor - ${disruptor.version} - @@ -369,7 +364,6 @@ 0.4 1.8.7 1.16.12 - 3.3.6 1.3 diff --git a/disruptor/README.md b/disruptor/README.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/disruptor/pom.xml b/disruptor/pom.xml new file mode 100644 index 0000000000..7f2c78c9b0 --- /dev/null +++ b/disruptor/pom.xml @@ -0,0 +1,251 @@ + + 4.0.0 + com.baeldung + disruptor + 0.1.0-SNAPSHOT + jar + + disruptor + + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + + com.lmax + disruptor + ${disruptor.version} + + + + + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + + + + + + org.hamcrest + hamcrest-all + 1.3 + test + + + + junit + junit + ${junit.version} + test + + + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + + + + + + disruptor + + + src/main/resources + true + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.directory}/libs + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + org.baeldung.executable.ExecutableMavenJar + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + + org.baeldung.executable.ExecutableMavenJar + + + + jar-with-dependencies + + + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + + shade + + + true + + + org.baeldung.executable.ExecutableMavenJar + + + + + + + + + com.jolira + onejar-maven-plugin + + + + org.baeldung.executable.ExecutableMavenJar + true + ${project.build.finalName}-onejar.${project.packaging} + + + one-jar + + + + + + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + + + json + + + + + + + + + + + 1.7.21 + 1.1.7 + + + 3.5 + 3.3.6 + + + 1.3 + 4.12 + 1.10.19 + 6.10 + 3.6.1 + + + 3.6.0 + 2.19.1 + + + + \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java b/disruptor/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java rename to disruptor/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java diff --git a/core-java/src/main/java/com/baeldung/disruptor/EventConsumer.java b/disruptor/src/main/java/com/baeldung/disruptor/EventConsumer.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/EventConsumer.java rename to disruptor/src/main/java/com/baeldung/disruptor/EventConsumer.java diff --git a/core-java/src/main/java/com/baeldung/disruptor/EventProducer.java b/disruptor/src/main/java/com/baeldung/disruptor/EventProducer.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/EventProducer.java rename to disruptor/src/main/java/com/baeldung/disruptor/EventProducer.java diff --git a/core-java/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java b/disruptor/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java rename to disruptor/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java diff --git a/core-java/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java b/disruptor/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java rename to disruptor/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java diff --git a/core-java/src/main/java/com/baeldung/disruptor/SingleEventProducer.java b/disruptor/src/main/java/com/baeldung/disruptor/SingleEventProducer.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/SingleEventProducer.java rename to disruptor/src/main/java/com/baeldung/disruptor/SingleEventProducer.java diff --git a/core-java/src/main/java/com/baeldung/disruptor/ValueEvent.java b/disruptor/src/main/java/com/baeldung/disruptor/ValueEvent.java similarity index 100% rename from core-java/src/main/java/com/baeldung/disruptor/ValueEvent.java rename to disruptor/src/main/java/com/baeldung/disruptor/ValueEvent.java diff --git a/core-java/src/test/java/com/baeldung/disruptor/DisruptorTest.java b/disruptor/src/test/java/com/baeldung/disruptor/DisruptorTest.java similarity index 100% rename from core-java/src/test/java/com/baeldung/disruptor/DisruptorTest.java rename to disruptor/src/test/java/com/baeldung/disruptor/DisruptorTest.java diff --git a/core-java/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java b/disruptor/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java similarity index 100% rename from core-java/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java rename to disruptor/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java diff --git a/core-java/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java b/disruptor/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java similarity index 100% rename from core-java/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java rename to disruptor/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java diff --git a/pom.xml b/pom.xml index 661b80fca5..cd17b611c2 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ guava guava18 guava19 + disruptor handling-spring-static-resources hazelcast