From 03638cb41e99cbb71781a505a255860ad66667d0 Mon Sep 17 00:00:00 2001 From: vdubs Date: Mon, 19 Dec 2016 10:04:15 +0600 Subject: [PATCH] Collections API as separate module. --- flower-core/pom.xml | 8 ++++++++ .../core/impl/extensions/KeywordExtension.java | 2 +- .../core/impl/extensions/PredicateExtension.java | 2 +- .../flower/core/impl/flows/BasicAsyncFlow.java | 2 +- .../flower/core/impl/switches/KeywordSwitch.java | 2 +- .../flower/core/impl/switches/PredicateSwitch.java | 2 +- .../java/org/xdcrafts/flower/core/FlowerTest.java | 8 ++++---- .../flower/core/spring/SpringIntegrationTest.java | 4 ++-- .../flower/core/spring/example/Authenticator.java | 4 ++-- .../flower/core/spring/example/Receiver.java | 2 +- .../core/spring/example/email/EmailAuthorizer.java | 2 +- .../example/email/EmailRequestValidator.java | 2 +- .../core/spring/example/sms/SmsAuthorizer.java | 2 +- .../spring/example/sms/SmsRequestValidator.java | 2 +- flower-tools/pom.xml | 14 ++++++++++++++ .../java/org/xdcrafts/flower/tools}/ClassApi.java | 2 +- .../java/org/xdcrafts/flower/tools}/ListApi.java | 2 +- .../java/org/xdcrafts/flower/tools}/MapApi.java | 2 +- .../java/org/xdcrafts/flower/tools}/MapDsl.java | 2 +- .../org/xdcrafts/flower/tools}/ListApiTest.java | 6 +++--- .../org/xdcrafts/flower/tools}/MapDslTest.java | 10 +++++----- pom.xml | 1 + 22 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 flower-tools/pom.xml rename {flower-core/src/main/java/org/xdcrafts/flower/core/utils => flower-tools/src/main/java/org/xdcrafts/flower/tools}/ClassApi.java (98%) rename {flower-core/src/main/java/org/xdcrafts/flower/core/utils => flower-tools/src/main/java/org/xdcrafts/flower/tools}/ListApi.java (99%) rename {flower-core/src/main/java/org/xdcrafts/flower/core/utils => flower-tools/src/main/java/org/xdcrafts/flower/tools}/MapApi.java (99%) rename {flower-core/src/main/java/org/xdcrafts/flower/core/utils => flower-tools/src/main/java/org/xdcrafts/flower/tools}/MapDsl.java (98%) rename {flower-core/src/test/java/org/xdcrafts/flower/core/utils => flower-tools/src/test/java/org/xdcrafts/flower/tools}/ListApiTest.java (87%) rename {flower-core/src/test/java/org/xdcrafts/flower/core/utils => flower-tools/src/test/java/org/xdcrafts/flower/tools}/MapDslTest.java (82%) diff --git a/flower-core/pom.xml b/flower-core/pom.xml index a7a9c0f..99a101f 100644 --- a/flower-core/pom.xml +++ b/flower-core/pom.xml @@ -11,4 +11,12 @@ .. 1.0.0-SNAPSHOT + + + + org.github.xdcrafts + flower-tools + 1.0.0-SNAPSHOT + + diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/KeywordExtension.java b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/KeywordExtension.java index 37855bf..5450d52 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/KeywordExtension.java +++ b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/KeywordExtension.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapDsl.Mutable.with; +import static org.xdcrafts.flower.tools.MapDsl.Mutable.with; /** * Keyword-based implementation of selectAction. diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/PredicateExtension.java b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/PredicateExtension.java index eea50ff..37fbbbd 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/PredicateExtension.java +++ b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/PredicateExtension.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.function.Predicate; -import static org.xdcrafts.flower.core.utils.MapDsl.Mutable.with; +import static org.xdcrafts.flower.tools.MapDsl.Mutable.with; /** * Predicate-based implementation of Extension. diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/flows/BasicAsyncFlow.java b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/flows/BasicAsyncFlow.java index 71942f0..16350a5 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/flows/BasicAsyncFlow.java +++ b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/flows/BasicAsyncFlow.java @@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; -import static org.xdcrafts.flower.core.utils.MapApi.Mutable.assoc; +import static org.xdcrafts.flower.tools.MapApi.Mutable.assoc; /** * Basic implementation of asynchronous flow. diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/KeywordSwitch.java b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/KeywordSwitch.java index 748c335..317e39d 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/KeywordSwitch.java +++ b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/KeywordSwitch.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.DotNotation.dotGetString; +import static org.xdcrafts.flower.tools.MapApi.DotNotation.dotGetString; /** * Implementation of Switch that selects Action based on value of keyword in context. diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/PredicateSwitch.java b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/PredicateSwitch.java index 0c3cf2b..c72568a 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/PredicateSwitch.java +++ b/flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/PredicateSwitch.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.function.Predicate; -import static org.xdcrafts.flower.core.utils.MapApi.get; +import static org.xdcrafts.flower.tools.MapApi.get; /** * Implementation of Switch that selects Action based on predicates. diff --git a/flower-core/src/test/java/org/xdcrafts/flower/core/FlowerTest.java b/flower-core/src/test/java/org/xdcrafts/flower/core/FlowerTest.java index 7ecaebf..be1df41 100644 --- a/flower-core/src/test/java/org/xdcrafts/flower/core/FlowerTest.java +++ b/flower-core/src/test/java/org/xdcrafts/flower/core/FlowerTest.java @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.get; -import static org.xdcrafts.flower.core.utils.MapApi.getUnsafe; -import static org.xdcrafts.flower.core.utils.MapApi.Mutable.assoc; -import static org.xdcrafts.flower.core.utils.MapDsl.Mutable.with; +import static org.xdcrafts.flower.tools.MapApi.get; +import static org.xdcrafts.flower.tools.MapApi.getUnsafe; +import static org.xdcrafts.flower.tools.MapApi.Mutable.assoc; +import static org.xdcrafts.flower.tools.MapDsl.Mutable.with; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/SpringIntegrationTest.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/SpringIntegrationTest.java index 0052c8a..37af623 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/SpringIntegrationTest.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/SpringIntegrationTest.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.concurrent.ExecutionException; -import static org.xdcrafts.flower.core.utils.MapApi.DotNotation.dotGetUnsafe; -import static org.xdcrafts.flower.core.utils.MapDsl.Mutable.with; +import static org.xdcrafts.flower.tools.MapApi.DotNotation.dotGetUnsafe; +import static org.xdcrafts.flower.tools.MapDsl.Mutable.with; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Authenticator.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Authenticator.java index 667fcdc..6436fd4 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Authenticator.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Authenticator.java @@ -18,8 +18,8 @@ import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.DotNotation.Mutable.dotAssoc; -import static org.xdcrafts.flower.core.utils.MapApi.DotNotation.dotGetString; +import static org.xdcrafts.flower.tools.MapApi.DotNotation.Mutable.dotAssoc; +import static org.xdcrafts.flower.tools.MapApi.DotNotation.dotGetString; /** * Performs user authentication. diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Receiver.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Receiver.java index 9f0fc7a..f09f6bb 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Receiver.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Receiver.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapDsl.Mutable.with; +import static org.xdcrafts.flower.tools.MapDsl.Mutable.with; /** * Receiver. diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailAuthorizer.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailAuthorizer.java index 095132b..cebbe15 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailAuthorizer.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailAuthorizer.java @@ -22,7 +22,7 @@ import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.DotNotation.dotGetUnsafe; +import static org.xdcrafts.flower.tools.MapApi.DotNotation.dotGetUnsafe; /** * Email authorizer. diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailRequestValidator.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailRequestValidator.java index 946c4f9..5e42e80 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailRequestValidator.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailRequestValidator.java @@ -16,7 +16,7 @@ package org.xdcrafts.flower.core.spring.example.email; -import org.xdcrafts.flower.core.utils.MapApi; +import org.xdcrafts.flower.tools.MapApi; import java.util.Map; diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsAuthorizer.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsAuthorizer.java index 9544b44..9878e36 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsAuthorizer.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsAuthorizer.java @@ -22,7 +22,7 @@ import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.DotNotation.dotGetUnsafe; +import static org.xdcrafts.flower.tools.MapApi.DotNotation.dotGetUnsafe; /** * Sms authorizer. diff --git a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsRequestValidator.java b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsRequestValidator.java index 8cc5a47..dcfea9b 100644 --- a/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsRequestValidator.java +++ b/flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsRequestValidator.java @@ -18,7 +18,7 @@ import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.getString; +import static org.xdcrafts.flower.tools.MapApi.getString; /** * Sms request validator. diff --git a/flower-tools/pom.xml b/flower-tools/pom.xml new file mode 100644 index 0000000..f0b2c6f --- /dev/null +++ b/flower-tools/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + flower-tools + ${project.groupId}:${project.artifactId} + jar + + + org.github.xdcrafts + flower + .. + 1.0.0-SNAPSHOT + + diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/ClassApi.java b/flower-tools/src/main/java/org/xdcrafts/flower/tools/ClassApi.java similarity index 98% rename from flower-core/src/main/java/org/xdcrafts/flower/core/utils/ClassApi.java rename to flower-tools/src/main/java/org/xdcrafts/flower/tools/ClassApi.java index 451c175..e7c9a56 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/ClassApi.java +++ b/flower-tools/src/main/java/org/xdcrafts/flower/tools/ClassApi.java @@ -14,7 +14,7 @@ * language governing permissions and limitations under the License. */ -package org.xdcrafts.flower.core.utils; +package org.xdcrafts.flower.tools; import java.util.Optional; diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/ListApi.java b/flower-tools/src/main/java/org/xdcrafts/flower/tools/ListApi.java similarity index 99% rename from flower-core/src/main/java/org/xdcrafts/flower/core/utils/ListApi.java rename to flower-tools/src/main/java/org/xdcrafts/flower/tools/ListApi.java index 3d06788..8f34b17 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/ListApi.java +++ b/flower-tools/src/main/java/org/xdcrafts/flower/tools/ListApi.java @@ -14,7 +14,7 @@ * language governing permissions and limitations under the License. */ -package org.xdcrafts.flower.core.utils; +package org.xdcrafts.flower.tools; import java.util.Arrays; import java.util.List; diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/MapApi.java b/flower-tools/src/main/java/org/xdcrafts/flower/tools/MapApi.java similarity index 99% rename from flower-core/src/main/java/org/xdcrafts/flower/core/utils/MapApi.java rename to flower-tools/src/main/java/org/xdcrafts/flower/tools/MapApi.java index bd2d87e..9dafe52 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/MapApi.java +++ b/flower-tools/src/main/java/org/xdcrafts/flower/tools/MapApi.java @@ -14,7 +14,7 @@ * language governing permissions and limitations under the License. */ -package org.xdcrafts.flower.core.utils; +package org.xdcrafts.flower.tools; import java.util.Arrays; import java.util.List; diff --git a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/MapDsl.java b/flower-tools/src/main/java/org/xdcrafts/flower/tools/MapDsl.java similarity index 98% rename from flower-core/src/main/java/org/xdcrafts/flower/core/utils/MapDsl.java rename to flower-tools/src/main/java/org/xdcrafts/flower/tools/MapDsl.java index dfb3e30..13b6ea4 100644 --- a/flower-core/src/main/java/org/xdcrafts/flower/core/utils/MapDsl.java +++ b/flower-tools/src/main/java/org/xdcrafts/flower/tools/MapDsl.java @@ -14,7 +14,7 @@ * language governing permissions and limitations under the License. */ -package org.xdcrafts.flower.core.utils; +package org.xdcrafts.flower.tools; import java.util.Map; diff --git a/flower-core/src/test/java/org/xdcrafts/flower/core/utils/ListApiTest.java b/flower-tools/src/test/java/org/xdcrafts/flower/tools/ListApiTest.java similarity index 87% rename from flower-core/src/test/java/org/xdcrafts/flower/core/utils/ListApiTest.java rename to flower-tools/src/test/java/org/xdcrafts/flower/tools/ListApiTest.java index fc2f1d5..58a19d5 100644 --- a/flower-core/src/test/java/org/xdcrafts/flower/core/utils/ListApiTest.java +++ b/flower-tools/src/test/java/org/xdcrafts/flower/tools/ListApiTest.java @@ -14,15 +14,15 @@ * language governing permissions and limitations under the License. */ -package org.xdcrafts.flower.core.utils; +package org.xdcrafts.flower.tools; import org.junit.Test; import java.util.List; import static java.util.Arrays.asList; -import static org.xdcrafts.flower.core.utils.ListApi.getNullable; -import static org.xdcrafts.flower.core.utils.ListApi.getNullableString; +import static org.xdcrafts.flower.tools.ListApi.getNullable; +import static org.xdcrafts.flower.tools.ListApi.getNullableString; import static org.junit.Assert.assertEquals; /** diff --git a/flower-core/src/test/java/org/xdcrafts/flower/core/utils/MapDslTest.java b/flower-tools/src/test/java/org/xdcrafts/flower/tools/MapDslTest.java similarity index 82% rename from flower-core/src/test/java/org/xdcrafts/flower/core/utils/MapDslTest.java rename to flower-tools/src/test/java/org/xdcrafts/flower/tools/MapDslTest.java index ac84b4b..a9bf11b 100644 --- a/flower-core/src/test/java/org/xdcrafts/flower/core/utils/MapDslTest.java +++ b/flower-tools/src/test/java/org/xdcrafts/flower/tools/MapDslTest.java @@ -14,7 +14,7 @@ * language governing permissions and limitations under the License. */ -package org.xdcrafts.flower.core.utils; +package org.xdcrafts.flower.tools; import org.junit.Assert; import org.junit.Test; @@ -22,10 +22,10 @@ import java.util.HashMap; import java.util.Map; -import static org.xdcrafts.flower.core.utils.MapApi.contains; -import static org.xdcrafts.flower.core.utils.MapApi.getNullableString; -import static org.xdcrafts.flower.core.utils.MapApi.getUnsafe; -import static org.xdcrafts.flower.core.utils.MapDsl.Mutable.with; +import static org.xdcrafts.flower.tools.MapApi.contains; +import static org.xdcrafts.flower.tools.MapApi.getNullableString; +import static org.xdcrafts.flower.tools.MapApi.getUnsafe; +import static org.xdcrafts.flower.tools.MapDsl.Mutable.with; /** * Simple MapDsl tests. diff --git a/pom.xml b/pom.xml index ad95bf7..7dafb86 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ + flower-tools flower-core flower-spring