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

Jump to bottom

Collections API as separate module. #4

Merged
merged 1 commit into from
Dec 19, 2016
Merged

Collections API as separate module. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions flower-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,12 @@
<relativePath>..</relativePath>
<version>1.0.0-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.github.xdcrafts</groupId>
<artifactId>flower-tools</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/KeywordExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion flower-core/src/main/java/org/xdcrafts/flower/core/impl/extensions/PredicateExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion flower-core/src/main/java/org/xdcrafts/flower/core/impl/flows/BasicAsyncFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/KeywordSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion flower-core/src/main/java/org/xdcrafts/flower/core/impl/switches/PredicateSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions flower-core/src/test/java/org/xdcrafts/flower/core/FlowerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions flower-spring/src/test/java/org/xdcrafts/flower/core/spring/SpringIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Authenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/Receiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...r-spring/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...ng/src/test/java/org/xdcrafts/flower/core/spring/example/email/EmailRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion flower-spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...spring/src/test/java/org/xdcrafts/flower/core/spring/example/sms/SmsRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 14 additions & 0 deletions flower-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>flower-tools</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<packaging>jar</packaging>

<parent>
<groupId>org.github.xdcrafts</groupId>
<artifactId>flower</artifactId>
<relativePath>..</relativePath>
<version>1.0.0-SNAPSHOT</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion .../xdcrafts/flower/core/utils/ClassApi.java → ...a/org/xdcrafts/flower/tools/ClassApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...g/xdcrafts/flower/core/utils/ListApi.java → ...va/org/xdcrafts/flower/tools/ListApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/xdcrafts/flower/core/utils/MapApi.java → ...ava/org/xdcrafts/flower/tools/MapApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/xdcrafts/flower/core/utils/MapDsl.java → ...ava/org/xdcrafts/flower/tools/MapDsl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...crafts/flower/core/utils/ListApiTest.java → ...rg/xdcrafts/flower/tools/ListApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
10 changes: 5 additions & 5 deletions ...dcrafts/flower/core/utils/MapDslTest.java → ...org/xdcrafts/flower/tools/MapDslTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
* 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;

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.
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
</properties>

<modules>
<module>flower-tools</module>
<module>flower-core</module>
<module>flower-spring</module>
</modules>
Expand Down