+
+
Java implementation of **E**rlang **N**ode **CON**nector (using Eralng Distribution Protocol). For more information, visit the [site](https://appulse.io).
@@ -46,7 +50,7 @@ $> mvn clean compile
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
-[INFO] encon 1.6.5 ........................................ SUCCESS [ 1.210 s]
+[INFO] encon 2.0.0 ........................................ SUCCESS [ 1.210 s]
[INFO] encon-common ....................................... SUCCESS [ 25.693 s]
[INFO] encon-terms ........................................ SUCCESS [ 27.517 s]
[INFO] encon-config ....................................... SUCCESS [ 18.707 s]
@@ -64,7 +68,7 @@ $> mvn clean compile
[INFO] handler-advanced ................................... SUCCESS [ 11.289 s]
[INFO] load-config ........................................ SUCCESS [ 3.725 s]
[INFO] load-config-spring ................................. SUCCESS [ 6.420 s]
-[INFO] benchmark 1.6.5 .................................... SUCCESS [ 5.594 s]
+[INFO] benchmark 2.0.0 .................................... SUCCESS [ 5.594 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
diff --git a/benchmark/README.md b/benchmark/README.md
index 01ccce5..1cf381c 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -37,9 +37,9 @@ H/W path Device Class Description
* **JMH version:** 1.21
-* **VM version:** JDK 1.8.0_181, Java HotSpot(TM) 64-Bit Server VM, 25.181-b13
+* **VM version:** JDK 11.0.1, OpenJDK 64-Bit Server VM, 11.0.1+13
-* **VM options:** -Xms1G -Xmx2G
+* **VM options:** -Xms3G -Xmx4G
* **Warmup:** 10 iterations, 10 s each
@@ -59,14 +59,14 @@ The installation consist of a server node at separate thread, which echoes the m
| implementation | clients | score | error | units |
|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------:|------------:|------------:|:------|
-| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L130) | 1 | `11679.266` | `414.090` | ops/s |
-| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L109) | 1 | `11862.914` | `385.573` | ops/s |
-| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L138) | 2 | `22337.500` | `918.292` | ops/s |
-| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L117) | 2 | `18217.878` | `861.270` | ops/s |
-| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L146) | 4 | `36001.870` | `2033.472` | ops/s |
-| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L125) | 4 | `23202.485` | `1295.186` | ops/s |
-| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L154) | 8 | `44742.858` | `1865.853` | ops/s |
-| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L133) | 8 | `23495.184` | `671.766` | ops/s |
+| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L130) | 1 | `13404.955` | `832.219` | ops/s |
+| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L109) | 1 | `11382.375` | `358.907` | ops/s |
+| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L138) | 2 | `21676.979` | `654.934` | ops/s |
+| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L117) | 2 | `18982.318` | `395.596` | ops/s |
+| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L146) | 4 | `33532.304` | `609.782` | ops/s |
+| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L125) | 4 | `23027.511` | `327.508` | ops/s |
+| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_Node2NodeBenchmarks.java#L154) | 8 | `48659.749` | `572.108` | ops/s |
+| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_Node2NodeBenchmarks.java#L133) | 8 | `25457.217` | `295.665` | ops/s |
### Mailbox to mailbox
@@ -74,31 +74,38 @@ In this test we have only one node and two mailboxes which send the message to e
| implementation | score | error | units |
|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------:|------------:|:------|
-| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_SimpleBenchmarks.java#L57) | `4080746.356` | `79809.419` | ops/s |
-| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_SimpleBenchmarks.java#L51) | `4885380.490` | `61920.971` | ops/s |
+| [encon](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/Encon_SimpleBenchmarks.java#L57) | `2906135.871` | `46718.600` | ops/s |
+| [jinterface](https://github.com/appulse-projects/encon-java/blob/master/benchmark/src/main/java/io/appulse/encon/benchmark/JInterface_SimpleBenchmarks.java#L51) | `3388805.729` | `10400.968` | ops/s |
## How to setup the environment
-1. Add Java repository:
+1. Update and upgrade the distro:
```bash
-$> sudo add-apt-repository --yes ppa:webupd8team/java
+$> sudo apt-get update --yes && sudo apt-get upgrade --yes
```
-2. Update and upgrade the distro:
+2. Install `git`, `curl`, `zip` and `unzip`:
```bash
-$> sudo apt-get update --yes && sudo apt-get upgrade --yes
+$> sudo apt-get install --yes git curl zip unzip
+```
+
+3. Install `sdkman`:
+
+```bash
+$> curl -s "https://get.sdkman.io" | bash
+$> source "$HOME/.sdkman/bin/sdkman-init.sh"
```
-3. Install `Git`, `Java 8` and `Maven`:
+4. Install `Java`:
```bash
-$> sudo apt-get install --yes oracle-java8-installer git maven
+$> sdk install java 11.0.1-open
```
-4. Clone the repo:
+5. Clone the repo:
```bash
$> git clone https://github.com/appulse-projects/encon-java.git
@@ -115,7 +122,7 @@ $> cd encon-java
2. Build the project with only needed dependencies:
```bash
-$> mvn clean package \
+$> ./mvnw clean package \
-DskipTests \
-Dgpg.skip \
-Dfindbugs.skip=true \
@@ -128,18 +135,20 @@ $> mvn clean package \
3. Run the tests
```bash
-$> nohup java -Xms1G -Xmx2G -jar benchmark/target/benchmarks.jar > job.logs 2>&1 &
+$> nohup java -Xms3G -Xmx4G -jar benchmark/target/benchmarks.jar > job.logs 2>&1 &
```
### One-liner
```bash
-$> sudo add-apt-repository --yes ppa:webupd8team/java && \
- sudo apt-get update --yes && sudo apt-get upgrade --yes && \
- sudo apt-get install --yes oracle-java8-installer git maven && \
+$> sudo apt-get update --yes && sudo apt-get upgrade --yes && \
+ sudo apt-get install --yes git curl zip unzip && \
+ curl -s "https://get.sdkman.io" | bash && \
+ source "$HOME/.sdkman/bin/sdkman-init.sh" && \
+ sdk install java 11.0.1-open && \
git clone https://github.com/appulse-projects/encon-java.git && \
cd encon-java && \
- mvn clean package \
+ ./mvnw clean package \
-DskipTests \
-Dgpg.skip \
-Dfindbugs.skip=true \
@@ -147,5 +156,5 @@ $> sudo add-apt-repository --yes ppa:webupd8team/java && \
-Dcheckstyle.skip \
-Dmaven.test.skip=true \
-pl benchmark -am && \
- nohup java -Xms1G -Xmx2G -jar benchmark/target/benchmarks.jar > job.logs 2>&1 &
+ nohup java -Xms3G -Xmx4G -jar benchmark/target/benchmarks.jar > job.logs 2>&1 &
```
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 2066446..350ba29 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -25,20 +25,12 @@ limitations under the License.
+
+
Encon's common classes for all subprojects.
diff --git a/encon-common/pom.xml b/encon-common/pom.xml
index b41a7b9..5b7888c 100644
--- a/encon-common/pom.xml
+++ b/encon-common/pom.xml
@@ -25,45 +25,17 @@ limitations under the License.
+
+
Encon's configuration classes.
## Usage
@@ -14,7 +22,7 @@ First of all, add config's dependency:
+ * Configuration could be present in two forms: + *
+ * Configuration could be present in two forms: + *
+ * Configuration could be present in two forms: + *
+ * Configuration could be present in two forms: + *
+ * Configuration could be present in two forms: + *
- * For primitive types use {@code #any*()} family or {@link #isA(Class)} or {@link #any(Class)}.
+ * For primitive types use {@code #any*()} family or {@link #is(Class)} or {@link #any(Class)}.
*
* @param
+
+
The set of Erlang's terms classes and different helpers.
diff --git a/encon-terms/pom.xml b/encon-terms/pom.xml
index d8a2387..bca0826 100644
--- a/encon-terms/pom.xml
+++ b/encon-terms/pom.xml
@@ -25,52 +25,24 @@ limitations under the License.
* Encodes a map. The Arity field is an unsigned 4 byte integer in big-endian format that determines the - * number of key-value pairs in the map. Key and value pairs (Ki => Vi) are encoded in section Pairs in the + * number of key-value pairs in the map. Key and value pairs (Ki => Vi) are encoded in section Pairs in the * following order: K1, V1, K2, V2,..., Kn, Vn. *
* Duplicate keys are not allowed within the same map. @@ -661,7 +661,7 @@ public enum TermType { FUNCTION(117, ErlangFunction.class), /** - * This is the new encoding of internal funs: fun F/A and fun(Arg1,..) -> ... end. + * This is the new encoding of internal funs: fun F/A and fun(Arg1,..) -> ... end. *
* Structure: *
diff --git a/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java b/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java
index a0b9232..f9cf9f8 100644
--- a/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java
+++ b/encon-terms/src/main/java/io/appulse/encon/terms/type/ErlangAtom.java
@@ -21,25 +21,20 @@
import static io.appulse.encon.terms.TermType.SMALL_ATOM_UTF8;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Locale.ENGLISH;
import static lombok.AccessLevel.PRIVATE;
import java.nio.charset.Charset;
-import java.util.Arrays;
import io.appulse.encon.terms.ErlangTerm;
import io.appulse.encon.terms.TermType;
import io.appulse.encon.terms.exception.IllegalErlangTermTypeException;
-import io.appulse.utils.cache.LruCache;
import io.netty.buffer.ByteBuf;
-import io.netty.util.ByteProcessor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
import lombok.ToString;
import lombok.experimental.FieldDefaults;
-import lombok.experimental.NonFinal;
/**
* An atom is a literal, a constant with name. An atom is to be enclosed in
@@ -51,83 +46,48 @@
* @author Artem Labazin
*/
@ToString
+@SuppressWarnings("deprecation")
@EqualsAndHashCode(callSuper = true, of = "bytes")
@FieldDefaults(level = PRIVATE, makeFinal = true)
public class ErlangAtom extends ErlangTerm {
private static final long serialVersionUID = -2748345367418129439L;
- private static final int MAX_ATOM_CODE_POINTS_LENGTH = 255;
-
- private static final int MAX_SMALL_ATOM_BYTES_LENGTH = 255;
-
- private static final LruCache
+ * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
+ *
+ *
+ * + * Note that this method has unpredicatble results if the remote node is not + * an Erlang node. + *
+ * + *+ * The response will be send back to this node in format: + *
+ * { :rex, response_body }
+ *
+ *
+ *
+ * @param remoteNodeName remote node name
+ *
+ * @param module the name of the Erlang module containing the function to be called.
+ *
+ * @param function the name of the function to call.
+ *
+ * @param args a list of Erlang terms, to be used as arguments to the function.
+ *
+ * @return response holder, instance of {@link RpcResponse}.
+ */
+ public RpcResponse call (@NonNull String remoteNodeName, @NonNull String module, @NonNull String function, ErlangTerm ...args) {
+ return call(remoteNodeName, atom(module), atom(function), args);
+ }
+
+ /**
+ * Send an RPC request to the remote Erlang node. This convenience function
+ * creates the following message and sends it to 'rex' on the remote node:
+ *
+ *
+ * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
+ *
+ *
+ * + * Note that this method has unpredicatble results if the remote node is not + * an Erlang node. + *
+ * + *+ * The response will be send back to this node in format: + *
+ * { :rex, response_body }
+ *
+ *
+ *
+ * @param descriptor remote node descriptor
+ *
+ * @param module the name of the Erlang module containing the function to be called.
+ *
+ * @param function the name of the function to call.
+ *
+ * @param args a list of Erlang terms, to be used as arguments to the function.
+ *
+ * @return response holder, instance of {@link RpcResponse}.
+ */
+ public RpcResponse call (@NonNull NodeDescriptor descriptor, @NonNull String module, @NonNull String function, ErlangTerm ...args) {
+ return call(descriptor, atom(module), atom(function), args);
+ }
+
+ /**
+ * Send an RPC request to the remote Erlang node. This convenience function
+ * creates the following message and sends it to 'rex' on the remote node:
+ *
+ *
+ * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
+ *
+ *
+ * + * Note that this method has unpredicatble results if the remote node is not + * an Erlang node. + *
+ * + *+ * The response will be send back to this node in format: + *
+ * { :rex, response_body }
+ *
+ *
+ *
+ * @param remote remote node descriptor
+ *
+ * @param module the name of the Erlang module containing the function to be called.
+ *
+ * @param function the name of the function to call.
+ *
+ * @param args a list of Erlang terms, to be used as arguments to the function.
+ *
+ * @return response holder, instance of {@link RpcResponse}.
+ */
+ public RpcResponse call (@NonNull RemoteNode remote, @NonNull String module, @NonNull String function, ErlangTerm ...args) {
+ return call(remote, atom(module), atom(function), args);
+ }
+
+ /**
+ * Send an RPC request to the remote Erlang node. This convenience function
+ * creates the following message and sends it to 'rex' on the remote node:
+ *
+ *
+ * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
+ *
+ *
+ * + * Note that this method has unpredicatble results if the remote node is not + * an Erlang node. + *
+ * + *+ * The response will be send back to this node in format: + *
+ * { :rex, response_body }
+ *
+ *
+ *
+ * @param remoteNodeName remote node name
+ *
+ * @param module the atom of the Erlang module containing the function to be called.
+ *
+ * @param function the atom of the function to call.
+ *
+ * @param args a list of Erlang terms, to be used as arguments to the function.
+ *
+ * @return response holder, instance of {@link RpcResponse}.
+ */
+ public RpcResponse call (@NonNull String remoteNodeName, @NonNull ErlangAtom module, @NonNull ErlangAtom function, ErlangTerm ...args) {
+ val descriptor = NodeDescriptor.from(remoteNodeName);
+ return call(descriptor, module, function, args);
+ }
+
+ /**
+ * Send an RPC request to the remote Erlang node. This convenience function
+ * creates the following message and sends it to 'rex' on the remote node:
+ *
+ *
+ * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
+ *
+ *
+ * + * Note that this method has unpredicatble results if the remote node is not + * an Erlang node. + *
+ * + *+ * The response will be send back to this node in format: + *
+ * { :rex, response_body }
+ *
+ *
+ *
+ * @param descriptor remote node descriptor
+ *
+ * @param module the atom of the Erlang module containing the function to be called.
+ *
+ * @param function the atom of the function to call.
+ *
+ * @param args a list of Erlang terms, to be used as arguments to the function.
+ *
+ * @return response holder, instance of {@link RpcResponse}.
+ */
+ public RpcResponse call (@NonNull NodeDescriptor descriptor,
+ @NonNull ErlangAtom module,
+ @NonNull ErlangAtom function,
+ ErlangTerm ...args
+ ) {
+ RemoteNode remote = node.lookup(descriptor);
+ if (remote == null) {
+ throw new NoSuchRemoteNodeException(descriptor);
+ }
+ return call(remote, module, function, args);
+ }
+
+ /**
+ * Send an RPC request to the remote Erlang node. This convenience function
+ * creates the following message and sends it to 'rex' on the remote node:
+ *
+ *
+ * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
+ *
+ *
+ * + * Note that this method has unpredicatble results if the remote node is not + * an Erlang node. + *
+ * + *+ * The response will be send back to this node in format: + *
+ * { :rex, response_body }
+ *
+ *
+ *
+ * @param remote remote node descriptor
+ *
+ * @param module the atom of the Erlang module containing the function to be called.
+ *
+ * @param function the atom of the function to call.
+ *
+ * @param args a list of Erlang terms, to be used as arguments to the function.
+ *
+ * @return response holder, instance of {@link RpcResponse}.
+ */
+ @SuppressWarnings("PMD.AccessorClassGeneration")
+ public RpcResponse call (@NonNull RemoteNode remote, @NonNull ErlangAtom module, @NonNull ErlangAtom function, ErlangTerm ...args) {
+ ErlangTerm argumentsList;
+ if (args == null || args.length == 0) {
+ argumentsList = NIL;
+ } else if (args.length == 1 && args[0].isList()) {
+ argumentsList = args[0];
+ } else {
+ argumentsList = list(args);
+ }
+
+ Mailbox mailbox = node.mailbox().build();
+ mailbox.send(remote, "rex", tuple(
+ mailbox.getPid(),
+ tuple(
+ atom("call"),
+ module,
+ function,
+ argumentsList,
+ atom("user")
+ )
+ ));
+ return new RpcResponse(mailbox);
+ }
+
+ /**
+ * Remote procedure call response holder.
+ */
+ @FieldDefaults(level = PRIVATE)
+ public static final class RpcResponse {
+
+ Mailbox mailbox;
+
+ final AtomicReference
+ * { :rex, ErlangTerm }
+ *
+ *
+ * @return the second element of the tuple if the received message is a
+ * two-tuple, otherwise empty. No further error checking is
+ * performed.
+ */
+ public Optional
+ * { :rex, ErlangTerm }
+ *
+ *
+ * @return the second element of the tuple if the received message is a
+ * two-tuple, otherwise null. No further error checking is
+ * performed.
+ */
+ public ErlangTerm getSync () {
+ ErlangTerm result = response.get();
+ if (result != null) {
+ return result;
+ }
+ return mailbox.receive()
+ .getBody()
+ .get(1)
+ .map(this::process)
+ .orElse(null);
+ }
+
+ /**
+ * Receive an RPC reply from the remote Erlang node in synchronous manner.
+ * This convenience function receives a message from the remote node, and expects it to have
+ * the following format:
+ *
+ *
+ * { :rex, ErlangTerm }
+ *
+ *
+ * @param timeout how long to wait before giving up, in units of
+ * {@code unit}
+ * @param unit a {@code TimeUnit} determining how to interpret the
+ * {@code timeout} parameter
+ *
+ * @return the second element of the tuple if the received message is a
+ * two-tuple, otherwise null. No further error checking is
+ * performed. It also could return {@code null} if the specified
+ * waiting time elapses before an element is available
+ */
+ public ErlangTerm getSync (long timeout, TimeUnit unit) {
+ ErlangTerm result = response.get();
+ if (result != null) {
+ return result;
+ }
+ Message message = mailbox.receive(timeout, unit);
+ if (message == null) {
+ return null;
+ }
+ return message.getBody()
+ .get(1)
+ .map(this::process)
+ .orElse(null);
+ }
+
+ @SuppressWarnings("PMD.NullAssignment")
+ private ErlangTerm process (ErlangTerm term) {
+ if (!response.compareAndSet(null, term)) {
+ return null;
+ }
+ mailbox.close();
+ mailbox = null;
+ return term;
+ }
+ }
+}
diff --git a/encon/src/main/java/io/appulse/encon/Node.java b/encon/src/main/java/io/appulse/encon/Node.java
index 9cb2ce8..59e4997 100644
--- a/encon/src/main/java/io/appulse/encon/Node.java
+++ b/encon/src/main/java/io/appulse/encon/Node.java
@@ -23,10 +23,10 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+import io.appulse.encon.NodesConfig.NodeConfig;
import io.appulse.encon.common.Meta;
import io.appulse.encon.common.NodeDescriptor;
import io.appulse.encon.common.RemoteNode;
-import io.appulse.encon.config.NodeConfig;
import io.appulse.encon.connection.Connection;
import io.appulse.encon.mailbox.Mailbox;
import io.appulse.encon.mailbox.ModuleMailbox;
@@ -41,7 +41,6 @@
import lombok.ToString;
import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
-import lombok.val;
/**
* Node's state holder and provider of all needed functions.
@@ -59,23 +58,26 @@
@FieldDefaults(level = PACKAGE, makeFinal = true)
public final class Node implements Closeable {
- static Node newInstance (@NonNull String name, @NonNull NodeConfig config) {
+ // static Node newInstance (@NonNull String name, @NonNull Config config) {
+ // NodeConfig nodeConfig = config.get(NodeConfig.class, NodeConfig.DEFAULT);
+ static Node newInstance (@NonNull String name, @NonNull NodeConfig nodeConfig) {
+ NodeConfig configCopy = new NodeConfig(nodeConfig);
- val descriptor = NodeDescriptor.from(name, config.getShortName());
- log.debug("Creating new Node '{}' with config:\n {}\n", descriptor.getFullName(), config);
+ NodeDescriptor descriptor = NodeDescriptor.from(name, configCopy.getShortName());
+ log.debug("Creating new Node '{}' with config:\n {}\n", descriptor.getFullName(), configCopy);
- val meta = Meta.builder()
- .type(config.getType())
- .protocol(config.getProtocol())
- .low(config.getLowVersion())
- .high(config.getHighVersion())
- .flags(config.getDistributionFlags())
+ Meta meta = Meta.builder()
+ .type(configCopy.getType())
+ .protocol(configCopy.getProtocol())
+ .low(configCopy.getLowVersion())
+ .high(configCopy.getHighVersion())
+ .flags(configCopy.getDistributionFlags())
.build();
- val epmd = new EpmdClient(config.getEpmdPort());
- val creation = epmd.register(Registration.builder()
+ EpmdClient epmd = new EpmdClient(configCopy.getEpmdPort());
+ int creation = epmd.register(Registration.builder()
.name(descriptor.getNodeName())
- .port(config.getServer().getPort())
+ .port(configCopy.getServer().getOrFindAndSetPort())
.type(meta.getType())
.protocol(meta.getProtocol())
.high(meta.getHigh())
@@ -89,17 +91,11 @@ static Node newInstance (@NonNull String name, @NonNull NodeConfig config) {
.meta(meta)
.epmd(epmd)
.creation(creation)
- .config(config)
+ .config(configCopy)
.build();
node.moduleMailbox.registerNetKernelMailbox();
- config.getMailboxes().forEach(it -> {
- node.mailbox()
- .name(it.getName())
- .build();
- });
-
log.debug("Node '{}' was created", descriptor.getFullName());
return node;
}
@@ -137,6 +133,8 @@ static Node newInstance (@NonNull String name, @NonNull NodeConfig config) {
ModuleClient moduleClient;
+ ModuleRemoteProcedureCall moduleRemoteProcedureCall;
+
@Builder
private Node (@NonNull NodeDescriptor descriptor,
@NonNull Meta meta,
@@ -144,12 +142,14 @@ private Node (@NonNull NodeDescriptor descriptor,
int creation,
@NonNull NodeConfig config
) {
+ NodeConfig configCopy = new NodeConfig(config);
+
this.descriptor = descriptor;
this.meta = meta;
this.epmd = epmd;
- cookie = config.getCookie();
- port = config.getServer().getPort();
+ cookie = configCopy.getCookie();
+ port = configCopy.getServer().getOrFindAndSetPort();
generatorPid = new GeneratorPid(descriptor.getFullName(), creation);
generatorPort = new GeneratorPort(descriptor.getFullName(), creation);
@@ -159,12 +159,24 @@ private Node (@NonNull NodeDescriptor descriptor,
moduleLookup = new ModuleLookup(epmd);
moduleConnection = new ModuleConnection(
descriptor.getNodeName(),
- config.getServer().getBossThreads(),
- config.getServer().getWorkerThreads()
+ configCopy.getServer().getBossThreads(),
+ configCopy.getServer().getWorkerThreads()
);
moduleServer = new ModuleServer(this, moduleConnection, port);
- moduleClient = new ModuleClient(this, moduleConnection, config.getShortName());
+ moduleClient = new ModuleClient(this, moduleConnection, configCopy.getShortName());
moduleMailbox = new ModuleMailbox(this, () -> generatorPid.generate());
+
+ moduleRemoteProcedureCall = new ModuleRemoteProcedureCall(this);
+ }
+
+ /**
+ * Returns reference on {@link ModuleRemoteProcedureCall} instance
+ * for calling remote node's functions.
+ *
+ * @return {@link ModuleRemoteProcedureCall} instance.
+ */
+ public ModuleRemoteProcedureCall rpc () {
+ return moduleRemoteProcedureCall;
}
/**
diff --git a/encon/src/main/java/io/appulse/encon/Nodes.java b/encon/src/main/java/io/appulse/encon/Nodes.java
index b29362e..d9102a0 100644
--- a/encon/src/main/java/io/appulse/encon/Nodes.java
+++ b/encon/src/main/java/io/appulse/encon/Nodes.java
@@ -26,16 +26,14 @@
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
+import io.appulse.encon.NodesConfig.NodeConfig;
import io.appulse.encon.common.NodeDescriptor;
import io.appulse.encon.config.Config;
-import io.appulse.encon.config.Defaults;
-import io.appulse.encon.config.NodeConfig;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
-import lombok.val;
/**
* The set of different helper functions
@@ -55,7 +53,9 @@ public final class Nodes implements Iterable
- * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
- *
- *
- * - * Note that this method has unpredicatble results if the remote node is not - * an Erlang node. - *
- * - *- * The response will be send back to this node in format: - *
- * { :rex, response_body }
- *
- *
- *
- * @param remoteNodeName remote node name
- *
- * @param module the name of the Erlang module containing the function to be called.
- *
- * @param function the name of the function to call.
- *
- * @param args a list of Erlang terms, to be used as arguments to the function.
- *
- * @since 1.6.4
- */
- public void call (@NonNull String remoteNodeName, @NonNull String module, @NonNull String function, ErlangTerm ...args) {
- call(remoteNodeName, atom(module), atom(function), args);
- }
-
- /**
- * Send an RPC request to the remote Erlang node. This convenience function
- * creates the following message and sends it to 'rex' on the remote node:
- *
- *
- * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
- *
- *
- * - * Note that this method has unpredicatble results if the remote node is not - * an Erlang node. - *
- * - *- * The response will be send back to this node in format: - *
- * { :rex, response_body }
- *
- *
- *
- * @param descriptor remote node descriptor
- *
- * @param module the name of the Erlang module containing the function to be called.
- *
- * @param function the name of the function to call.
- *
- * @param args a list of Erlang terms, to be used as arguments to the function.
- *
- * @since 1.6.4
- */
- public void call (@NonNull NodeDescriptor descriptor, @NonNull String module, @NonNull String function, ErlangTerm ...args) {
- call(descriptor, atom(module), atom(function), args);
- }
-
- /**
- * Send an RPC request to the remote Erlang node. This convenience function
- * creates the following message and sends it to 'rex' on the remote node:
- *
- *
- * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
- *
- *
- * - * Note that this method has unpredicatble results if the remote node is not - * an Erlang node. - *
- * - *- * The response will be send back to this node in format: - *
- * { :rex, response_body }
- *
- *
- *
- * @param remote remote node descriptor
- *
- * @param module the name of the Erlang module containing the function to be called.
- *
- * @param function the name of the function to call.
- *
- * @param args a list of Erlang terms, to be used as arguments to the function.
- *
- * @since 1.6.4
- */
- public void call (@NonNull RemoteNode remote, @NonNull String module, @NonNull String function, ErlangTerm ...args) {
- call(remote, atom(module), atom(function), args);
- }
-
- /**
- * Send an RPC request to the remote Erlang node. This convenience function
- * creates the following message and sends it to 'rex' on the remote node:
- *
- *
- * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
- *
- *
- * - * Note that this method has unpredicatble results if the remote node is not - * an Erlang node. - *
- * - *- * The response will be send back to this node in format: - *
- * { :rex, response_body }
- *
- *
- *
- * @param remoteNodeName remote node name
- *
- * @param module the atom of the Erlang module containing the function to be called.
- *
- * @param function the atom of the function to call.
- *
- * @param args a list of Erlang terms, to be used as arguments to the function.
- *
- * @since 1.6.4
- */
- public void call (@NonNull String remoteNodeName, @NonNull ErlangAtom module, @NonNull ErlangAtom function, ErlangTerm ...args) {
- val descriptor = NodeDescriptor.from(remoteNodeName);
- call(descriptor, module, function, args);
- }
-
- /**
- * Send an RPC request to the remote Erlang node. This convenience function
- * creates the following message and sends it to 'rex' on the remote node:
- *
- *
- * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
- *
- *
- * - * Note that this method has unpredicatble results if the remote node is not - * an Erlang node. - *
- * - *- * The response will be send back to this node in format: - *
- * { :rex, response_body }
- *
- *
- *
- * @param descriptor remote node descriptor
- *
- * @param module the atom of the Erlang module containing the function to be called.
- *
- * @param function the atom of the function to call.
- *
- * @param args a list of Erlang terms, to be used as arguments to the function.
- *
- * @since 1.6.4
- */
- public void call (@NonNull NodeDescriptor descriptor, @NonNull ErlangAtom module, @NonNull ErlangAtom function, ErlangTerm ...args) {
- RemoteNode remote = node.lookup(descriptor);
- if (remote == null) {
- throw new NoSuchRemoteNodeException(descriptor);
- }
- call(remote, module, function, args);
- }
-
- /**
- * Send an RPC request to the remote Erlang node. This convenience function
- * creates the following message and sends it to 'rex' on the remote node:
- *
- *
- * { selfPid, { :call, :module_name, :function_name, [arguments], :user } }
- *
- *
- * - * Note that this method has unpredicatble results if the remote node is not - * an Erlang node. - *
- * - *- * The response will be send back to this node in format: - *
- * { :rex, response_body }
- *
- *
- *
- * @param remote remote node descriptor
- *
- * @param module the atom of the Erlang module containing the function to be called.
- *
- * @param function the atom of the function to call.
- *
- * @param args a list of Erlang terms, to be used as arguments to the function.
- *
- * @since 1.6.4
- */
- public void call (@NonNull RemoteNode remote, @NonNull ErlangAtom module, @NonNull ErlangAtom function, ErlangTerm ...args) {
- ErlangTerm argumentsList;
- if (args == null || args.length == 0) {
- argumentsList = NIL;
- } else if (args.length == 1 && args[0].isList()) {
- argumentsList = args[0];
- } else {
- argumentsList = list(args);
- }
-
- send(remote, "rex", tuple(
- pid,
- tuple(
- atom("call"),
- module,
- function,
- argumentsList,
- atom("user")
- )
- ));
- }
-
- /**
- * Receive an RPC reply from the remote Erlang node. This convenience
- * function receives a message from the remote node, and expects it to have
- * the following format:
- *
- *
- * { :rex, ErlangTerm }
- *
- *
- * @return the second element of the tuple if the received message is a
- * two-tuple, otherwise null. No further error checking is
- * performed.
- */
- public ErlangTerm receiveRemoteProcedureResult () {
- return receive().getBody()
- .get(1)
- .orElse(null);
- }
-
- /**
- * Receive an RPC reply from the remote Erlang node. This convenience
- * function receives a message from the remote node, and expects it to have
- * the following format:
- *
- *
- * { :rex, ErlangTerm }
- *
- *
- * @param timeout how long to wait before giving up, in units of
- * {@code unit}
- * @param unit a {@code TimeUnit} determining how to interpret the
- * {@code timeout} parameter
- *
- * @return the second element of the tuple if the received message is a
- * two-tuple, otherwise null. No further error checking is
- * performed. It also could return {@ null} if the specified
- * waiting time elapses before an element is available
- */
- public ErlangTerm receiveRemoteProcedureResult (long timeout, TimeUnit unit) {
- Message message = receive(timeout, unit);
- if (message == null) {
- return null;
- }
- return message.getBody()
- .get(1)
- .orElse(null);
- }
/**
* Links the mailbox.
diff --git a/encon/src/test/java/io/appulse/encon/GeneratorPidTest.java b/encon/src/test/java/io/appulse/encon/GeneratorPidTest.java
index c4fa9bd..040dd67 100644
--- a/encon/src/test/java/io/appulse/encon/GeneratorPidTest.java
+++ b/encon/src/test/java/io/appulse/encon/GeneratorPidTest.java
@@ -19,26 +19,31 @@
import static org.assertj.core.api.Assertions.assertThat;
import io.appulse.encon.common.NodeDescriptor;
-import io.appulse.utils.test.TestMethodNamePrinter;
+
import lombok.val;
import org.assertj.core.api.SoftAssertions;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
/**
*
* @author Artem Labazin
* @since 1.0.0
*/
-public class GeneratorPidTest {
+@DisplayName("Pid generator tests")
+class GeneratorPidTest {
- @Rule
- public TestRule watcher = new TestMethodNamePrinter();
+ @BeforeEach
+ void beforeEach (TestInfo testInfo) {
+ System.out.println("- " + testInfo.getDisplayName());
+ }
@Test
- public void generate () {
+ @DisplayName("generate")
+ void generate () {
val descriptor = NodeDescriptor.from("popa");
val creation = 1;
diff --git a/encon/src/test/java/io/appulse/encon/GeneratorPortTest.java b/encon/src/test/java/io/appulse/encon/GeneratorPortTest.java
index 65617fe..3c01f81 100644
--- a/encon/src/test/java/io/appulse/encon/GeneratorPortTest.java
+++ b/encon/src/test/java/io/appulse/encon/GeneratorPortTest.java
@@ -19,26 +19,31 @@
import static org.assertj.core.api.Assertions.assertThat;
import io.appulse.encon.common.NodeDescriptor;
-import io.appulse.utils.test.TestMethodNamePrinter;
+
import lombok.val;
import org.assertj.core.api.SoftAssertions;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
/**
*
* @author Artem Labazin
* @since 1.0.0
*/
-public class GeneratorPortTest {
+@DisplayName("Port generator tests")
+class GeneratorPortTest {
- @Rule
- public TestRule watcher = new TestMethodNamePrinter();
+ @BeforeEach
+ void beforeEach (TestInfo testInfo) {
+ System.out.println("- " + testInfo.getDisplayName());
+ }
@Test
- public void generate () {
+ @DisplayName("generate")
+ void generate () {
val descriptor = NodeDescriptor.from("popa");
val creation = 1;
diff --git a/encon/src/test/java/io/appulse/encon/GeneratorReferenceTest.java b/encon/src/test/java/io/appulse/encon/GeneratorReferenceTest.java
index bedb085..ae43d90 100644
--- a/encon/src/test/java/io/appulse/encon/GeneratorReferenceTest.java
+++ b/encon/src/test/java/io/appulse/encon/GeneratorReferenceTest.java
@@ -19,26 +19,30 @@
import static org.assertj.core.api.Assertions.assertThat;
import io.appulse.encon.common.NodeDescriptor;
-import io.appulse.utils.test.TestMethodNamePrinter;
import lombok.val;
import org.assertj.core.api.SoftAssertions;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
/**
*
* @author Artem Labazin
* @since 1.0.0
*/
-public class GeneratorReferenceTest {
+@DisplayName("Reference generator tests")
+class GeneratorReferenceTest {
- @Rule
- public TestRule watcher = new TestMethodNamePrinter();
+ @BeforeEach
+ void beforeEach (TestInfo testInfo) {
+ System.out.println("- " + testInfo.getDisplayName());
+ }
@Test
- public void generateReference () {
+ @DisplayName("generate")
+ void generateReference () {
val descriptor = NodeDescriptor.from("popa");
val creation = 1;
diff --git a/encon/src/test/java/io/appulse/encon/NodeTest.java b/encon/src/test/java/io/appulse/encon/NodeTest.java
index 27b5bbb..ed866c1 100644
--- a/encon/src/test/java/io/appulse/encon/NodeTest.java
+++ b/encon/src/test/java/io/appulse/encon/NodeTest.java
@@ -28,37 +28,33 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static java.util.Optional.ofNullable;
-import static io.appulse.encon.connection.control.ControlMessageTag.SEND;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadLocalRandom;
-import io.appulse.encon.config.MailboxConfig;
-import io.appulse.encon.config.NodeConfig;
-import io.appulse.encon.config.ServerConfig;
-import io.appulse.encon.connection.control.ControlMessage;
-import io.appulse.encon.connection.regular.Message;
+import io.appulse.encon.ModuleRemoteProcedureCall.RpcResponse;
+import io.appulse.encon.NodesConfig.NodeConfig;
+import io.appulse.encon.NodesConfig.NodeConfig.ServerConfig;
import io.appulse.encon.mailbox.Mailbox;
import io.appulse.encon.mailbox.exception.ReceivedExitException;
import io.appulse.encon.terms.ErlangTerm;
import io.appulse.encon.terms.type.ErlangAtom;
-import io.appulse.utils.test.TestMethodNamePrinter;
import io.appulse.epmd.java.server.cli.CommonOptions;
import io.appulse.epmd.java.server.command.server.ServerCommandExecutor;
import io.appulse.epmd.java.server.command.server.ServerCommandOptions;
import io.appulse.utils.SocketUtils;
-import java.util.concurrent.ThreadLocalRandom;
-
import lombok.val;
import lombok.extern.slf4j.Slf4j;
import org.assertj.core.api.SoftAssertions;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
/**
*
@@ -66,7 +62,8 @@
* @since 1.0.0
*/
@Slf4j
-public class NodeTest {
+@DisplayName("Node tests")
+class NodeTest {
private static final String ELIXIR_ECHO_SERVER = "echo@localhost";
@@ -74,14 +71,10 @@ public class NodeTest {
private static ServerCommandExecutor epmdServer;
- @Rule
- public TestRule watcher = new TestMethodNamePrinter();
-
-
Node node;
- @BeforeClass
- public static void beforeClass () {
+ @BeforeAll
+ static void beforeAll () {
if (SocketUtils.isPortAvailable(4369)) {
executor = Executors.newSingleThreadExecutor();
epmdServer = new ServerCommandExecutor(new CommonOptions(), new ServerCommandOptions());
@@ -89,8 +82,8 @@ public static void beforeClass () {
}
}
- @AfterClass
- public static void afterClass () {
+ @AfterAll
+ static void afterAll () {
ofNullable(epmdServer)
.ifPresent(ServerCommandExecutor::close);
@@ -98,8 +91,13 @@ public static void afterClass () {
.ifPresent(ExecutorService::shutdown);
}
- @After
- public void after () throws Exception {
+ @BeforeEach
+ void beforeEach (TestInfo testInfo) {
+ System.out.println("- " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void afterEach () throws Exception {
if (node != null) {
node.close();
node = null;
@@ -108,7 +106,8 @@ public void after () throws Exception {
}
@Test
- public void register () {
+ @DisplayName("node registration")
+ void register () {
val name = createName();
node = Nodes.singleNode(name, true);
@@ -137,13 +136,14 @@ public void register () {
}
@Test
- public void ping () throws Exception {
+ @DisplayName("sending ping message")
+ void ping () throws Exception {
val name1 = createName();
val name2 = createName();
node = Nodes.singleNode(name1, NodeConfig.builder()
- .shortName(true)
- .cookie("secret")
- .build()
+ .shortName(true)
+ .cookie("secret")
+ .build()
);
assertThat(node.ping(ELIXIR_ECHO_SERVER))
@@ -175,26 +175,19 @@ public void ping () throws Exception {
}
@Test
- public void instantiating () throws Exception {
+ @DisplayName("simple instantiating")
+ void instantiating () throws Exception {
val name = createName();
node = Nodes.singleNode(name, NodeConfig.builder()
- .shortName(true)
- .mailbox(MailboxConfig.builder()
- .name("one")
- .build())
- .mailbox(MailboxConfig.builder()
- .name("two")
- .build())
- .build()
+ .shortName(true)
+ .build()
);
-
- assertThat(node.mailbox("one")).isNotNull();
- assertThat(node.mailbox("two")).isNotNull();
- assertThat(node.mailbox("three")).isNull();
+ assertThat(node.mailbox("one")).isNull();
}
@Test
- public void sendFromOneToAnotherNode () throws Exception {
+ @DisplayName("send message from one node to another")
+ void sendFromOneToAnotherNode () throws Exception {
val name1 = createName();
val name2 = createName();
@@ -226,7 +219,8 @@ public void sendFromOneToAnotherNode () throws Exception {
}
@Test
- public void sendWithRedirect () throws Exception {
+ @DisplayName("send message from A node, through Elixir echo, to B node")
+ void sendWithRedirect () throws Exception {
val config = NodeConfig.builder()
.shortName(true)
.cookie("secret")
@@ -285,7 +279,8 @@ public void sendWithRedirect () throws Exception {
}
@Test
- public void send () throws Exception {
+ @DisplayName("send message to Elixir echo server and catch back")
+ void send () throws Exception {
val name = createName();
node = Nodes.singleNode(name, NodeConfig.builder()
.shortName(true)
@@ -327,7 +322,8 @@ public void send () throws Exception {
}
@Test
- public void link () throws Exception {
+ @DisplayName("link two nodes")
+ void link () throws Exception {
val name = createName();
node = Nodes.singleNode(name, true);
@@ -355,7 +351,8 @@ public void link () throws Exception {
}
@Test
- public void exit () throws Exception {
+ @DisplayName("send exit message from node A to node B")
+ void exit () throws Exception {
val name = createName();
node = Nodes.singleNode(name, true);
@@ -382,40 +379,27 @@ public void exit () throws Exception {
}
@Test
- public void remoteProcedureCall () throws Exception {
+ @DisplayName("send RPC message to Elixir echo server")
+ void remoteProcedureCall () throws Exception {
val name = createName();
node = Nodes.singleNode(name, NodeConfig.builder()
.shortName(true)
.cookie("secret")
.build());
- Mailbox mailbox = node.mailbox().build();
- mailbox.call(ELIXIR_ECHO_SERVER, "erlang", "date");
-
- Message message = mailbox.receive(5, SECONDS);
- assertThat(message.getHeader())
- .extracting(ControlMessage::getTag)
- .isEqualTo(SEND);
-
- assertThat(message.getBody())
- .isNotNull();
-
- ErlangTerm term = message.getBody();
- assertThat(term.isTuple()).isTrue();
- assertThat(term.size()).isEqualTo(2);
-
- assertThat(term.getUnsafe(0).asText()).isEqualTo("rex");
- assertThat(term.getUnsafe(1).isTuple()).isTrue();
+ RpcResponse response = node.rpc()
+ .call(ELIXIR_ECHO_SERVER, "erlang", "date");
- ErlangTerm response1 = term.getUnsafe(1);
- assertThat(response1.getUnsafe(0).isNumber()).isTrue();
- assertThat(response1.getUnsafe(1).isNumber()).isTrue();
- assertThat(response1.getUnsafe(2).isNumber()).isTrue();
+ ErlangTerm payload = response.getSync(5, SECONDS);
+ assertThat(payload.getUnsafe(0).isNumber()).isTrue();
+ assertThat(payload.getUnsafe(1).isNumber()).isTrue();
+ assertThat(payload.getUnsafe(2).isNumber()).isTrue();
- mailbox.call(ELIXIR_ECHO_SERVER, "erlang", "date");
- ErlangTerm response2 = mailbox.receiveRemoteProcedureResult(5, SECONDS);
- assertThat(response2).isEqualTo(response1);
+ assertThat(response.hasResponse()).isTrue();
+ assertThat(response.getAsync().get())
+ .isEqualTo(payload)
+ .isSameAs(payload);
}
private String createName () {
diff --git a/encon/src/test/java/io/appulse/encon/NodesTest.java b/encon/src/test/java/io/appulse/encon/NodesTest.java
index d98404f..1a4e8ba 100644
--- a/encon/src/test/java/io/appulse/encon/NodesTest.java
+++ b/encon/src/test/java/io/appulse/encon/NodesTest.java
@@ -23,40 +23,33 @@
import java.util.concurrent.Executors;
import io.appulse.encon.config.Config;
-import io.appulse.encon.config.Defaults;
-import io.appulse.encon.config.MailboxConfig;
-import io.appulse.encon.config.NodeConfig;
-import io.appulse.encon.config.ServerConfig;
import io.appulse.epmd.java.server.cli.CommonOptions;
import io.appulse.epmd.java.server.command.server.ServerCommandExecutor;
import io.appulse.epmd.java.server.command.server.ServerCommandOptions;
import io.appulse.utils.SocketUtils;
-import io.appulse.utils.test.TestMethodNamePrinter;
+import io.appulse.encon.NodesConfig.NodeConfig;
-import lombok.val;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
/**
*
* @author Artem Labazin
* @since 1.0.0
*/
-public class NodesTest {
+@DisplayName("Nodes cluster tests")
+class NodesTest {
private static ExecutorService executor;
private static ServerCommandExecutor epmdServer;
- @Rule
- public TestRule watcher = new TestMethodNamePrinter();
-
- @BeforeClass
- public static void beforeClass () {
+ @BeforeAll
+ static void beforeClass () {
if (SocketUtils.isPortAvailable(4369)) {
executor = Executors.newSingleThreadExecutor();
epmdServer = new ServerCommandExecutor(new CommonOptions(), new ServerCommandOptions());
@@ -64,8 +57,8 @@ public static void beforeClass () {
}
}
- @AfterClass
- public static void afterClass () {
+ @AfterAll
+ static void afterClass () {
ofNullable(epmdServer)
.ifPresent(ServerCommandExecutor::close);
@@ -73,32 +66,26 @@ public static void afterClass () {
.ifPresent(ExecutorService::shutdown);
}
+ @BeforeEach
+ void beforeEach (TestInfo testInfo) {
+ System.out.println("- " + testInfo.getDisplayName());
+ }
+
@Test
- public void instantiating () {
- val config = Config.builder()
- .defaults(Defaults.builder()
- .cookie("kojima-secret")
- .server(ServerConfig.builder()
- .bossThreads(1)
- .workerThreads(1)
- .build())
+ @DisplayName("start several nodes from programmatically config")
+ void instantiating () {
+ Config config = Config.builder()
+ .config(NodesConfig.builder()
+ .node("kojima1", NodeConfig.DEFAULT)
+ .node("kojima2", NodeConfig.DEFAULT)
.build())
- .node("kojima1", new NodeConfig())
- .node("kojima2", new NodeConfig())
- .node("ocelot", NodeConfig.builder()
- .mailbox(MailboxConfig.builder()
- .name("revolver")
- .build())
- .build())
.build();
- try (val nodes = Nodes.start(config)) {
+ try (Nodes nodes = Nodes.start(config)) {
assertThat(nodes.node("kojima1"))
.isPresent();
assertThat(nodes.node("kojima2"))
.isPresent();
- assertThat(nodes.node("ocelot"))
- .isPresent();
assertThat(nodes.node("kojima3"))
.isNotPresent();
}
diff --git a/encon/src/test/java/io/appulse/encon/connection/ConnectionModuleTest.java b/encon/src/test/java/io/appulse/encon/connection/ConnectionModuleTest.java
index aaae7c9..0cf1389 100644
--- a/encon/src/test/java/io/appulse/encon/connection/ConnectionModuleTest.java
+++ b/encon/src/test/java/io/appulse/encon/connection/ConnectionModuleTest.java
@@ -20,17 +20,27 @@
import java.util.concurrent.CompletableFuture;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
/**
*
* @author Artem Labazin
* @since 1.0.0
*/
-public class ConnectionModuleTest {
+@DisplayName("Connection module tests")
+class ConnectionModuleTest {
+
+ @BeforeEach
+ void beforeEach (TestInfo testInfo) {
+ System.out.println("- " + testInfo.getDisplayName());
+ }
@Test
- public void futureTests () {
+ @DisplayName("future POC")
+ void futureTests () {
CompletableFuture