[DEV] add signal with 2 parameters
This commit is contained in:
parent
87d81386a5
commit
70245bef36
169
src/org/atriasoft/esignal/Signal2.java
Normal file
169
src/org/atriasoft/esignal/Signal2.java
Normal file
@ -0,0 +1,169 @@
|
||||
package org.atriasoft.esignal;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
class BiConnectedElement<T, U> {
|
||||
protected final WeakReference<BiConsumer<T, U>> consumer;
|
||||
|
||||
public BiConnectedElement(final BiConsumer<T, U> consumer) {
|
||||
this.consumer = new WeakReference<BiConsumer<T, U>>(consumer);
|
||||
}
|
||||
|
||||
public BiConsumer<T, U> getConsumer() {
|
||||
return this.consumer.get();
|
||||
}
|
||||
|
||||
public boolean isCompatibleWith(final Object elem) {
|
||||
Object out = this.consumer.get();
|
||||
if (out == elem) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void disconnect() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class BiConnectedElementDynamic<T, U> extends BiConnectedElement<T, U> {
|
||||
protected final WeakReference<Object> linkedObject;
|
||||
|
||||
public BiConnectedElementDynamic(final Object linkedObject, final BiConsumer<T, U> consumer) {
|
||||
super(consumer);
|
||||
this.linkedObject = new WeakReference<Object>(linkedObject);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiConsumer<T, U> getConsumer() {
|
||||
if (this.linkedObject.get() == null) {
|
||||
return null;
|
||||
}
|
||||
return this.consumer.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCompatibleWith(final Object elem) {
|
||||
if (super.isCompatibleWith(elem)) {
|
||||
return true;
|
||||
}
|
||||
Object obj = this.linkedObject.get();
|
||||
if (obj == elem) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect() {
|
||||
Object obj = this.linkedObject.get();
|
||||
if (obj == null) {
|
||||
return;
|
||||
}
|
||||
if (obj instanceof Connection tmp) {
|
||||
tmp.connectionIsRemovedBySignal();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class Signal2<T, U> implements ConnectionRemoveInterface {
|
||||
List<BiConnectedElement<T, U>> data = new ArrayList<>();
|
||||
|
||||
public void clear() {
|
||||
List<BiConnectedElement<T, U>> data2 = this.data;
|
||||
synchronized(this.data) {
|
||||
this.data = new ArrayList<>();
|
||||
}
|
||||
final Iterator<BiConnectedElement<T, U>> iterator = data2.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
final BiConnectedElement<T, U> elem = iterator.next();
|
||||
elem.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
public void connect(final BiConsumer<T, U> function) {
|
||||
synchronized(this.data) {
|
||||
this.data.add(new BiConnectedElement<T, U>(function));
|
||||
}
|
||||
}
|
||||
public void disconnect(final BiConsumer<T, U> obj) {
|
||||
synchronized(this.data) {
|
||||
final Iterator<BiConnectedElement<T, U>> iterator = this.data.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
final BiConnectedElement<T, U> elem = iterator.next();
|
||||
if (elem.isCompatibleWith(obj)) {
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public Connection connectDynamic(final BiConsumer<T, U> function) {
|
||||
Connection out = new Connection(this);
|
||||
synchronized(this.data) {
|
||||
this.data.add(new BiConnectedElementDynamic<T, U>(out, function));
|
||||
}
|
||||
return out;
|
||||
}
|
||||
public void connectAutoRemoveObject(final Object reference, final BiConsumer<T, U> function) {
|
||||
synchronized(this.data) {
|
||||
this.data.add(new BiConnectedElementDynamic<T, U>(reference, function));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(final Connection connection) {
|
||||
synchronized(this.data) {
|
||||
final Iterator<BiConnectedElement<T, U>> iterator = this.data.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
final BiConnectedElement<T, U> elem = iterator.next();
|
||||
if (elem.isCompatibleWith(connection)) {
|
||||
elem.disconnect();
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void emit(final T valueT, final U valueU) {
|
||||
List<BiConnectedElement<T, U>> tmp;
|
||||
// clean the list:
|
||||
synchronized(this.data) {
|
||||
final Iterator<BiConnectedElement<T, U>> iterator = this.data.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
final BiConnectedElement<T, U> elem = iterator.next();
|
||||
Object tmpObject = elem.getConsumer();
|
||||
if (tmpObject == null) {
|
||||
elem.disconnect();
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
// simple optimization:
|
||||
if (this.data.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
// clone the list to permit to have asynchronous remove call
|
||||
tmp = new ArrayList<>(this.data);
|
||||
}
|
||||
// real call elements
|
||||
{
|
||||
final Iterator<BiConnectedElement<T, U>> iterator = tmp.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
final BiConnectedElement<T, U> elem = iterator.next();
|
||||
BiConsumer<T, U> tmpObject = elem.getConsumer();
|
||||
if (tmpObject == null) {
|
||||
continue;
|
||||
}
|
||||
tmpObject.accept(valueT, valueU);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public int size() {
|
||||
return this.data.size();
|
||||
}
|
||||
|
||||
}
|
||||
@ -22,7 +22,7 @@ import org.junit.jupiter.api.Order;
|
||||
import org.junit.jupiter.api.TestMethodOrder;
|
||||
|
||||
@TestMethodOrder(OrderAnnotation.class)
|
||||
public class TestSignalType {
|
||||
public class TestSignal {
|
||||
|
||||
class EmiterSimple {
|
||||
public Signal<String> signalEvent = new Signal<String>();
|
||||
311
test/src/test/atriasoft/esignal/TestSignal2.java
Normal file
311
test/src/test/atriasoft/esignal/TestSignal2.java
Normal file
@ -0,0 +1,311 @@
|
||||
/*******************************************************************************
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* Contributors:
|
||||
* Edouard DUPIN - initial API and implementation
|
||||
******************************************************************************/
|
||||
package test.atriasoft.esignal;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
import org.atriasoft.esignal.Connection;
|
||||
import org.atriasoft.esignal.Signal2;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
|
||||
import org.junit.jupiter.api.Order;
|
||||
//import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestMethodOrder;
|
||||
|
||||
@TestMethodOrder(OrderAnnotation.class)
|
||||
public class TestSignal2 {
|
||||
|
||||
class EmiterSimple {
|
||||
public Signal2<String, Double> signalEvent = new Signal2<>();
|
||||
public void sendEvent(final String value, final double valueD) {
|
||||
this.signalEvent.emit(value, valueD);
|
||||
}
|
||||
}
|
||||
class ReceiverSimple {
|
||||
private String dataReceive = null;
|
||||
ReceiverSimple() {
|
||||
}
|
||||
public void connect1(final EmiterSimple other) {
|
||||
WeakReference<ReceiverSimple> tmpp = new WeakReference<ReceiverSimple>(this);
|
||||
other.signalEvent.connect((data, data2) -> {
|
||||
tmpp.get().onData(data, data2);
|
||||
});
|
||||
}
|
||||
public void connect2(final EmiterSimple other) {
|
||||
// the solo lambda will not depend on the object => the remove must be done manually...
|
||||
other.signalEvent.connect((data, data2) -> {
|
||||
Log.error("lambda receive: " + data + " " + data2);
|
||||
});
|
||||
}
|
||||
public void connect3(final EmiterSimple other) {
|
||||
// we reference the local object, then the lambda is alive while the object is alive...
|
||||
other.signalEvent.connect((data, data2) -> {
|
||||
Log.error("lambda receive: " + data + " " + data2);
|
||||
this.dataReceive = data;
|
||||
});
|
||||
}
|
||||
public void connect4(final EmiterSimple other) {
|
||||
other.signalEvent.connect((data, data2) -> {
|
||||
onData(data, data2);
|
||||
});
|
||||
}
|
||||
// record consumer
|
||||
private BiConsumer<String, Double> tmpConsumer = null;
|
||||
public void connect5(final EmiterSimple other) {
|
||||
this.tmpConsumer = this::onData;
|
||||
other.signalEvent.connect(this.tmpConsumer);
|
||||
}
|
||||
|
||||
public void disconnect5(final EmiterSimple other) {
|
||||
other.signalEvent.disconnect(this.tmpConsumer);
|
||||
this.tmpConsumer = null;
|
||||
}
|
||||
|
||||
public void connect6(final EmiterSimple other) {
|
||||
// the solo lambda will not depend on the object => the remove must be done manually...
|
||||
other.signalEvent.connectAutoRemoveObject(this, (data, data2) -> {
|
||||
Log.error("lambda receive: " + data + " " + data2);
|
||||
});
|
||||
}
|
||||
private Connection tmpConnect = null;
|
||||
|
||||
public void connect7(final EmiterSimple other) {
|
||||
this.tmpConnect = other.signalEvent.connectDynamic(this::onData);
|
||||
}
|
||||
|
||||
public void disconnect7(final EmiterSimple other) {
|
||||
other.signalEvent.disconnect(this.tmpConnect);
|
||||
}
|
||||
|
||||
public void disconnect72() {
|
||||
this.tmpConnect.disconnect();
|
||||
}
|
||||
public boolean isConnected() {
|
||||
return this.tmpConnect.isConnected();
|
||||
}
|
||||
|
||||
public void onData(final String data, final double data2) {
|
||||
Log.error("Retrive data : " + data);
|
||||
this.dataReceive = data;
|
||||
}
|
||||
public String getDataAndClean() {
|
||||
String tmp = this.dataReceive;
|
||||
this.dataReceive = null;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@Order(1)
|
||||
public void testConnectAndTransmit1() {
|
||||
Log.warning("Test 1 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
receiver.connect1(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data...";
|
||||
sender.sendEvent(testData1, 15);
|
||||
Assertions.assertEquals(testData1, receiver.getDataAndClean());
|
||||
receiver = null;
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
System.gc();
|
||||
String testData2 = "MUST NOT receive this data...";
|
||||
sender.sendEvent(testData2, 16);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Log.warning("Test 1 [ END ]");
|
||||
|
||||
}
|
||||
@Test
|
||||
@Order(2)
|
||||
public void testConnectAndTransmit2() {
|
||||
Log.warning("Test 2 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
receiver.connect2(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data...";
|
||||
sender.sendEvent(testData1, 17);
|
||||
// No data stored ... assertEquals(testData1, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
receiver = null;
|
||||
System.gc();
|
||||
String testData2 = "Solo Lambda MUST receive this data...";
|
||||
sender.sendEvent(testData2, 18);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
Log.warning("Test 2 [ END ]");
|
||||
}
|
||||
|
||||
@Test
|
||||
@Order(3)
|
||||
public void testConnectAndTransmit3() {
|
||||
Log.warning("Test 3 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
receiver.connect3(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data...";
|
||||
sender.sendEvent(testData1, 19);
|
||||
Assertions.assertEquals(testData1, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
receiver = null;
|
||||
System.gc();
|
||||
String testData2 = "MUST NOT receive this data...";
|
||||
sender.sendEvent(testData2, 20);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Log.warning("Test 3 [ END ]");
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@Order(4)
|
||||
public void testConnectAndTransmit4() {
|
||||
Log.warning("Test 4 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
receiver.connect4(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data...";
|
||||
sender.sendEvent(testData1, 21);
|
||||
Assertions.assertEquals(testData1, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
receiver = null;
|
||||
System.gc();
|
||||
String testData2 = "MUST NOT receive this data...";
|
||||
sender.sendEvent(testData2, 22);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Log.warning("Test 4 [ END ]");
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@Order(5)
|
||||
public void testConnectAndTransmit5() {
|
||||
Log.warning("Test 5 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
//connect step 1
|
||||
receiver.connect5(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data... 111";
|
||||
sender.sendEvent(testData1, 23);
|
||||
Assertions.assertEquals(testData1, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
// remove connection
|
||||
receiver.disconnect5(sender);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
System.gc();
|
||||
String testData2 = "MUST NOT receive this data... 222";
|
||||
sender.sendEvent(testData2, 24);
|
||||
Assertions.assertEquals(null, receiver.getDataAndClean());
|
||||
// reconnect (step 2
|
||||
receiver.connect5(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData3 = "MUST receive this data... 333";
|
||||
sender.sendEvent(testData3, 25);
|
||||
Assertions.assertEquals(testData3, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
// check auto remove...
|
||||
receiver = null;
|
||||
System.gc();
|
||||
String testData4 = "MUST NOT receive this data... 444";
|
||||
sender.sendEvent(testData4, 26);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Log.warning("Test 5 [ END ]");
|
||||
|
||||
}
|
||||
@Test
|
||||
@Order(6)
|
||||
public void testConnectAndTransmit6() {
|
||||
Log.warning("Test 6 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
receiver.connect6(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data...";
|
||||
sender.sendEvent(testData1, 27);
|
||||
//assertEquals(testData1, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
receiver = null;
|
||||
System.gc();
|
||||
String testData2 = "MUST NOT receive this data...";
|
||||
sender.sendEvent(testData2, 28);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Log.warning("Test 6 [ END ]");
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@Order(7)
|
||||
public void testConnectAndTransmit7() {
|
||||
Log.warning("Test 7 [BEGIN]");
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
//connect step 1
|
||||
receiver.connect7(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData1 = "MUST receive this data... 111";
|
||||
sender.sendEvent(testData1, 29);
|
||||
Assertions.assertEquals(testData1, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
Assertions.assertEquals(true, receiver.isConnected());
|
||||
// remove connection
|
||||
receiver.disconnect7(sender);
|
||||
Assertions.assertEquals(false, receiver.isConnected());
|
||||
System.gc();
|
||||
String testData2 = "MUST NOT receive this data... 222";
|
||||
sender.sendEvent(testData2, 30);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Assertions.assertEquals(null, receiver.getDataAndClean());
|
||||
// reconnect (step 2
|
||||
receiver.connect7(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData3 = "MUST receive this data... 333";
|
||||
sender.sendEvent(testData3, 31);
|
||||
Assertions.assertEquals(testData3, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
Assertions.assertEquals(true, receiver.isConnected());
|
||||
// remove connection
|
||||
receiver.disconnect72();
|
||||
Assertions.assertEquals(false, receiver.isConnected());
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
System.gc();
|
||||
String testData4 = "MUST NOT receive this data... 444";
|
||||
sender.sendEvent(testData4, 32);
|
||||
Assertions.assertEquals(null, receiver.getDataAndClean());
|
||||
// reconnect (step 2
|
||||
receiver.connect7(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
String testData5 = "MUST receive this data... 555";
|
||||
sender.sendEvent(testData5, 33);
|
||||
Assertions.assertEquals(testData5, receiver.getDataAndClean());
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
// check auto remove...
|
||||
receiver = null;
|
||||
System.gc();
|
||||
String testData6 = "MUST NOT receive this data... 666";
|
||||
sender.sendEvent(testData6, 34);
|
||||
Assertions.assertEquals(0, sender.signalEvent.size());
|
||||
Log.warning("Test 7 [ END ]");
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClearConnection() {
|
||||
EmiterSimple sender = new EmiterSimple();
|
||||
ReceiverSimple receiver = new ReceiverSimple();
|
||||
//connect step 1
|
||||
receiver.connect7(sender);
|
||||
Assertions.assertEquals(1, sender.signalEvent.size());
|
||||
sender.signalEvent.clear();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user