Skip to content

Commit 4391ec9

Browse files
thsc42thsc42
committed
ASAPMessageReceivedListener enhanced. Removed Mocking classes - no longer needed. Tests with local TCP connection run stable. Mocking does not help.
1 parent 975f9a6 commit 4391ec9

10 files changed

Lines changed: 62 additions & 393 deletions

‎src/net/sharksystem/asap/ASAPMessageReceivedListener.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package net.sharksystem.asap;
22

3+
import net.sharksystem.EncounterConnectionType;
4+
35
import java.io.IOException;
46

57
public interface ASAPMessageReceivedListener {
6-
void asapMessagesReceived(ASAPMessages messages) throws IOException;
8+
void asapMessagesReceived(ASAPMessages messages,
9+
String senderE2E, // E2E part
10+
String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
11+
EncounterConnectionType connectionType) throws IOException;
712
}

‎src/net/sharksystem/asap/ASAPPeerFS.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ public void chunkReceived(String format, String senderE2E, String uri, int era,
4444
ASAPMessages receivedMessages =
4545
Helper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolder, era);
4646

47-
this.asapMessageReceivedListenerManager.notifyReceived(format, receivedMessages, true);
47+
this.asapMessageReceivedListenerManager.notifyReceived(
48+
format, receivedMessages, true,
49+
senderE2E,
50+
senderPoint2Point, verified, encrypted,
51+
connectionType);
4852
}
4953
}
5054

‎src/net/sharksystem/asap/apps/testsupport/ASAPPeerMock.java‎

Lines changed: 0 additions & 216 deletions
This file was deleted.

‎src/net/sharksystem/asap/listenermanager/ASAPMessageReceivedListenerManager.java‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.sharksystem.asap.listenermanager;
22

3+
import net.sharksystem.EncounterConnectionType;
34
import net.sharksystem.asap.ASAPMessages;
45
import net.sharksystem.asap.ASAPMessageReceivedListener;
56
import net.sharksystem.asap.ASAPMessageReceivedListenerManagement;
@@ -35,30 +36,54 @@ public void removeAllListeners() {
3536
this.listenerMap = new HashMap();
3637
}
3738

38-
public void notifyReceived(CharSequence format, ASAPMessages asapMessage) {
39-
this.notifyReceived(format, asapMessage, false);
39+
public void notifyReceived(CharSequence format, ASAPMessages asapMessage,
40+
String senderE2E, // E2E part
41+
String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
42+
EncounterConnectionType connectionType) {
43+
44+
this.notifyReceived(format, asapMessage, false, senderE2E, senderPoint2Point,
45+
verified, encrypted, connectionType);
4046
}
4147

42-
public void notifyReceived(CharSequence format, ASAPMessages asapMessage, boolean useThreads) {
48+
public void notifyReceived(CharSequence format, ASAPMessages asapMessage, boolean useThreads,
49+
String senderE2E, String senderPoint2Point, boolean verified, boolean encrypted,
50+
EncounterConnectionType connectionType) {
51+
4352
GenericListenerImplementation<ASAPMessageReceivedListener> listenerList = this.listenerMap.get(format);
4453
if(listenerList != null) {
4554
ASAPMessageReceivedNotifier asapMessageReceivedNotifier
46-
= new ASAPMessageReceivedNotifier(asapMessage);
55+
= new ASAPMessageReceivedNotifier(asapMessage, senderE2E, senderPoint2Point,
56+
verified, encrypted, connectionType);
4757

4858
listenerList.notifyAll(asapMessageReceivedNotifier, useThreads);
4959
}
5060
}
5161

5262
public class ASAPMessageReceivedNotifier implements GenericNotifier<ASAPMessageReceivedListener> {
5363
private final ASAPMessages asapMessage;
64+
private final String senderE2E;
65+
private final String senderPoint2Point;
66+
private final boolean verified;
67+
private final boolean encrypted;
68+
private final EncounterConnectionType connectionType;
69+
70+
ASAPMessageReceivedNotifier(ASAPMessages asapMessage,
71+
String senderE2E,
72+
String senderPoint2Point, boolean verified, boolean encrypted,
73+
EncounterConnectionType connectionType) {
5474

55-
ASAPMessageReceivedNotifier(ASAPMessages asapMessage) {
5675
this.asapMessage = asapMessage;
76+
this.senderE2E = senderE2E;
77+
this.senderPoint2Point = senderPoint2Point;
78+
this.verified = verified;
79+
this.encrypted = encrypted;
80+
this.connectionType = connectionType;
5781
}
5882

5983
public void doNotify(ASAPMessageReceivedListener listener) {
6084
try {
61-
listener.asapMessagesReceived(this.asapMessage);
85+
listener.asapMessagesReceived(this.asapMessage, this.senderE2E, this.senderPoint2Point,
86+
this.verified, this.encrypted, this.connectionType);
6287
} catch (IOException e) {
6388
System.err.println("error when notifying about received asap message: "
6489
+ e.getLocalizedMessage());

‎test/net/sharksystem/CountsReceivedMessagesListener.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ public CountsReceivedMessagesListener(String peerName) {
1818
}
1919

2020
@Override
21-
public void asapMessagesReceived(ASAPMessages messages) throws IOException {
21+
public void asapMessagesReceived(ASAPMessages messages,
22+
String senderE2E, // E2E part
23+
String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
24+
EncounterConnectionType connectionType) throws IOException {
2225
CharSequence format = messages.getFormat();
2326
CharSequence uri = messages.getURI();
2427
if (peerName != null) {

‎test/net/sharksystem/asap/mockAndTemplates/ASAPMessageReceivedListenerExample.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.sharksystem.asap.mockAndTemplates;
22

3+
import net.sharksystem.EncounterConnectionType;
34
import net.sharksystem.asap.ASAPMessages;
45
import net.sharksystem.asap.ASAPMessageReceivedListener;
56

@@ -18,7 +19,11 @@ class ASAPMessageReceivedListenerExample implements ASAPMessageReceivedListener
1819
}
1920

2021
@Override
21-
public void asapMessagesReceived(ASAPMessages messages) throws IOException {
22+
public void asapMessagesReceived(ASAPMessages messages,
23+
String senderE2E, // E2E part
24+
String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
25+
EncounterConnectionType connectionType) throws IOException {
26+
2227
CharSequence format = messages.getFormat();
2328
CharSequence uri = messages.getURI();
2429
if (peerName != null) {

0 commit comments

Comments
 (0)