Skip to content

Commit 398ef5f

Browse files
thsc42thsc42
committed
asap hop list is now parameter of notify method
1 parent 881d3bf commit 398ef5f

13 files changed

+31
-34
lines changed

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

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

33
import java.io.IOException;
4+
import java.util.List;
45

56
public interface ASAPMessageReceivedListener {
67
void asapMessagesReceived(ASAPMessages messages, String senderE2E, // E2E part
7-
ASAPHop asapHop /* Point-to-point part */ ) throws IOException;
8+
List<ASAPHop> asapHop /* Point-to-point part */ ) throws IOException;
89
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.io.IOException;
88
import java.util.Collection;
9+
import java.util.List;
910

1011
public class ASAPPeerFS extends ASAPInternalPeerWrapper implements ASAPPeerService, ASAPChunkReceivedListener {
1112
public static final CharSequence DEFAULT_ROOT_FOLDER_NAME = ASAPEngineFS.DEFAULT_ROOT_FOLDER_NAME;
@@ -25,25 +26,25 @@ public void overwriteChuckReceivedListener(ASAPChunkReceivedListener listener) {
2526

2627
@Override
2728
public void chunkReceived(String format, String senderE2E, String uri, int era,
28-
ASAPHop asapHop) throws IOException {
29+
List<ASAPHop> asapHopList) throws IOException {
2930

3031
StringBuilder sb = new StringBuilder();
3132
sb.append("\n++++++++++++++++++++++++++++++++++++++++++ chunkReceived +++++++++++++++++++++++++++++++++++++++++++\n");
32-
sb.append("E2E|P2P: " + senderE2E + " | " + asapHop.sender() + " | uri: " + uri + " | era: " + era + " | appFormat: " + format);
33+
sb.append("E2E|P2P: " + senderE2E + " | " + asapHopList.get(asapHopList.size()-1).sender() + " | uri: " + uri + " | era: " + era + " | appFormat: " + format);
3334
sb.append("\n++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
3435
this.log(sb.toString());
3536

3637
if(this.chunkReceivedListener != null) {
3738
this.log("chunk received listener set - call this one");
38-
this.chunkReceivedListener.chunkReceived(format, senderE2E, uri, era, asapHop);
39+
this.chunkReceivedListener.chunkReceived(format, senderE2E, uri, era, asapHopList);
3940
} else {
4041
this.log("extract messages from chunk and notify listener");
4142
ASAPMessages receivedMessages =
4243
Helper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolder, era);
4344

4445
this.asapMessageReceivedListenerManager.notifyReceived(
4546
format, receivedMessages, true,
46-
senderE2E, asapHop);
47+
senderE2E, asapHopList);
4748
}
4849
}
4950

‎src/net/sharksystem/asap/apps/gossip/GossipUI.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.sharksystem.asap.apps.gossip;
22

33
import net.sharksystem.asap.ASAPHop;
4-
import net.sharksystem.asap.EncounterConnectionType;
54
import net.sharksystem.asap.ASAPException;
65
import net.sharksystem.asap.ASAPMessages;
76
import net.sharksystem.asap.engine.*;
@@ -99,7 +98,7 @@ private void go() {
9998

10099
@Override
101100
public void chunkReceived(String format, String senderE2E, String uri, int era,
102-
ASAPHop asapHop) throws IOException {
101+
List<ASAPHop> asapHop) throws IOException {
103102

104103
ASAPMessages receivedMessages =
105104
Helper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolderName, era);

‎src/net/sharksystem/asap/engine/ASAPChunkReceivedListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package net.sharksystem.asap.engine;
22

33
import net.sharksystem.asap.ASAPHop;
4-
import net.sharksystem.asap.EncounterConnectionType;
54

65
import java.io.IOException;
6+
import java.util.List;
77

88
/**
99
*
@@ -28,5 +28,5 @@ public interface ASAPChunkReceivedListener {
2828
*
2929
*/
3030
void chunkReceived(String format, String senderE2E, String uri, int era, // E2E part
31-
ASAPHop asapHop) throws IOException;
31+
List<ASAPHop> asapHop) throws IOException;
3232
}

‎src/net/sharksystem/asap/engine/ASAPEngine.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,10 +545,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
545545

546546
listener.chunkReceived(this.format,
547547
senderE2E, uri, eraSender,
548-
new ASAPHopImpl(encounteredPeer,
549-
asapAssimilationPDU.verified(),
550-
asapAssimilationPDU.encrypted(),
551-
connectionType)
548+
asapHopList
552549
);
553550
} else {
554551
//<<<<<<<<<<<<<<<<<<debug

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import java.io.IOException;
66
import java.util.HashMap;
7+
import java.util.List;
78

89
public class ASAPMessageReceivedListenerManager implements ASAPMessageReceivedListenerManagement {
910
private HashMap<CharSequence, GenericListenerImplementation<ASAPMessageReceivedListener>> listenerMap =
@@ -35,18 +36,18 @@ public void removeAllListeners() {
3536

3637
public void notifyReceived(CharSequence format, ASAPMessages asapMessage,
3738
String senderE2E, // E2E part
38-
ASAPHop asapHop) {
39+
List<ASAPHop> asapHopList) {
3940

40-
this.notifyReceived(format, asapMessage, false, senderE2E, asapHop);
41+
this.notifyReceived(format, asapMessage, false, senderE2E, asapHopList);
4142
}
4243

4344
public void notifyReceived(CharSequence format, ASAPMessages asapMessage, boolean useThreads,
44-
String senderE2E, ASAPHop asapHop) {
45+
String senderE2E, List<ASAPHop> asapHopList) {
4546

4647
GenericListenerImplementation<ASAPMessageReceivedListener> listenerList = this.listenerMap.get(format);
4748
if(listenerList != null) {
4849
ASAPMessageReceivedNotifier asapMessageReceivedNotifier
49-
= new ASAPMessageReceivedNotifier(asapMessage, senderE2E, asapHop);
50+
= new ASAPMessageReceivedNotifier(asapMessage, senderE2E, asapHopList);
5051

5152
listenerList.notifyAll(asapMessageReceivedNotifier, useThreads);
5253
}
@@ -55,20 +56,20 @@ public void notifyReceived(CharSequence format, ASAPMessages asapMessage, boolea
5556
public class ASAPMessageReceivedNotifier implements GenericNotifier<ASAPMessageReceivedListener> {
5657
private final ASAPMessages asapMessage;
5758
private final String senderE2E;
58-
private ASAPHop asapHop;
59+
private List<ASAPHop> asapHopList;
5960

6061
ASAPMessageReceivedNotifier(ASAPMessages asapMessage,
6162
String senderE2E,
62-
ASAPHop asapHop) {
63+
List<ASAPHop> asapHopList) {
6364

6465
this.asapMessage = asapMessage;
6566
this.senderE2E = senderE2E;
66-
this.asapHop = asapHop;
67+
this.asapHopList = asapHopList;
6768
}
6869

6970
public void doNotify(ASAPMessageReceivedListener listener) {
7071
try {
71-
listener.asapMessagesReceived(this.asapMessage, this.senderE2E, this.asapHop);
72+
listener.asapMessagesReceived(this.asapMessage, this.senderE2E, this.asapHopList);
7273
} catch (IOException e) {
7374
System.err.println("error when notifying about received asap message: "
7475
+ e.getLocalizedMessage());

‎src/net/sharksystem/asap/management/ASAPManagementMessageHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.sharksystem.asap.management;
22

33
import net.sharksystem.asap.ASAPHop;
4-
import net.sharksystem.asap.EncounterConnectionType;
54
import net.sharksystem.asap.engine.ASAPInternalChunk;
65
import net.sharksystem.asap.ASAPException;
76
import net.sharksystem.asap.engine.ASAPInternalStorage;
@@ -44,7 +43,7 @@ CharSequence getURI(Set<CharSequence> recipients) throws IOException, ASAPExcept
4443

4544
@Override
4645
public void chunkReceived(String format, String senderE2E, String uri, int era,
47-
ASAPHop asapHop) throws IOException {
46+
List<ASAPHop> asapHop) throws IOException {
4847

4948
System.out.println(this.getLogStart()
5049
+ "handle received chunk (format|senderE2E|uri|era) " + format + senderE2E + "|" + uri + "|" + era);

‎src/net/sharksystem/asap/utils/ASAPChunkReceivedTester.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package net.sharksystem.asap.utils;
22

33
import net.sharksystem.asap.ASAPHop;
4-
import net.sharksystem.asap.EncounterConnectionType;
54
import net.sharksystem.asap.engine.ASAPChunkReceivedListener;
65

76
import java.io.IOException;
7+
import java.util.List;
88

99
/**
1010
*
@@ -18,7 +18,7 @@ public class ASAPChunkReceivedTester implements ASAPChunkReceivedListener {
1818

1919
@Override
2020
public void chunkReceived(String format, String senderE2E, String uri, int era,
21-
ASAPHop asapHop) throws IOException {
21+
List<ASAPHop> asapHop) throws IOException {
2222

2323
System.out.println("ChunkReceiverTester.chunkReceived called: (format|sender|uri|era) " +
2424
format +

‎src/net/sharksystem/cmdline/ExampleASAPChunkReceivedListener.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.sharksystem.cmdline;
22

33
import net.sharksystem.asap.ASAPHop;
4-
import net.sharksystem.asap.EncounterConnectionType;
54
import net.sharksystem.asap.engine.ASAPChunkReceivedListener;
65

76
import java.io.IOException;
@@ -21,7 +20,7 @@ public ExampleASAPChunkReceivedListener(String rootFolder) {
2120

2221
@Override
2322
public void chunkReceived(String format, String senderE2E, String uri, int era,
24-
ASAPHop asapHop) throws IOException {
23+
List<ASAPHop> asapHop) throws IOException {
2524

2625
this.receivedList.add(new ASAPChunkReceivedParameters(format, senderE2E, uri, era));
2726
}

‎test/net/sharksystem/CountsReceivedMessagesListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import net.sharksystem.asap.ASAPHop;
44
import net.sharksystem.asap.ASAPMessageReceivedListener;
55
import net.sharksystem.asap.ASAPMessages;
6-
import net.sharksystem.asap.EncounterConnectionType;
76

87
import java.io.IOException;
8+
import java.util.List;
99

1010
public class CountsReceivedMessagesListener implements ASAPMessageReceivedListener {
1111
private final String peerName;
@@ -22,7 +22,7 @@ public CountsReceivedMessagesListener(String peerName) {
2222
@Override
2323
public void asapMessagesReceived(ASAPMessages messages,
2424
String senderE2E, // E2E part
25-
ASAPHop asapHop) throws IOException {
25+
List<ASAPHop> asapHop) throws IOException {
2626
CharSequence format = messages.getFormat();
2727
CharSequence uri = messages.getURI();
2828
if (peerName != null) {

0 commit comments

Comments
 (0)