Skip to content

Commit b404d4f

Browse files
thsc42thsc42
committed
rename Serialization to ASAPSerialization. Its more obvious what it is good for.
1 parent d3ebdb6 commit b404d4f

File tree

11 files changed

+71
-71
lines changed

11 files changed

+71
-71
lines changed

‎src/net/sharksystem/asap/protocol/ASAPCryptoMessage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import net.sharksystem.asap.ASAPSecurityException;
55
import net.sharksystem.crypto.BasicCryptoParameters;
66
import net.sharksystem.crypto.ASAPCryptoAlgorithms;
7-
import net.sharksystem.utils.Serialization;
7+
import net.sharksystem.utils.ASAPSerialization;
88

99
import java.io.*;
1010

@@ -89,11 +89,11 @@ public void finish() throws ASAPSecurityException {
8989

9090
if(this.encrypted) {
9191
// have to store it - message and signature will be encrypted
92-
Serialization.writeByteArray(signatureBytes, this.outputStreamCopy);
92+
ASAPSerialization.writeByteArray(signatureBytes, this.outputStreamCopy);
9393
} else {
9494
// no encryption planned - write clear to stream
9595
this.realOS.write(asapMessageAsBytes);
96-
Serialization.writeByteArray(signatureBytes, this.realOS);
96+
ASAPSerialization.writeByteArray(signatureBytes, this.realOS);
9797
}
9898
} catch (IOException e) {
9999
throw new ASAPSecurityException(this.getLogStart(), e);
@@ -156,7 +156,7 @@ public InputStream setupCopyInputStream(int priorInt, InputStream is)
156156
public boolean verify(String sender, InputStream is) throws IOException, ASAPException {
157157
// try to get senders' public key
158158
byte[] signedData = this.inputStreamCopy.getCopy();
159-
byte[] signatureBytes = Serialization.readByteArray(is);
159+
byte[] signatureBytes = ASAPSerialization.readByteArray(is);
160160
// debug break
161161
boolean wasVerified =
162162
ASAPCryptoAlgorithms.verify(signedData, signatureBytes, sender, this.basicCryptoParameters);

‎src/net/sharksystem/asap/protocol/ASAP_Modem_Impl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import net.sharksystem.crypto.ASAPCryptoAlgorithms;
77
import net.sharksystem.crypto.BasicCryptoParameters;
88
import net.sharksystem.crypto.ASAPCommunicationCryptoSettings;
9-
import net.sharksystem.utils.Serialization;
9+
import net.sharksystem.utils.ASAPSerialization;
1010

1111
import java.io.ByteArrayInputStream;
1212
import java.io.IOException;
@@ -171,7 +171,7 @@ public void assimilate(CharSequence sender, CharSequence recipient, CharSequence
171171

172172
@Override
173173
public ASAP_PDU_1_0 readPDU(InputStream is) throws IOException, ASAPException {
174-
byte cmd = Serialization.readByte(is);
174+
byte cmd = ASAPSerialization.readByte(is);
175175

176176
// encrypted?
177177
boolean encrypted = (cmd & ENCRYPTED_MASK) != 0;
@@ -198,7 +198,7 @@ public ASAP_PDU_1_0 readPDU(InputStream is) throws IOException, ASAPException {
198198
}
199199
}
200200

201-
int flagsInt = Serialization.readByte(is);
201+
int flagsInt = ASAPSerialization.readByte(is);
202202

203203
InputStream realIS = is;
204204
ASAPCryptoMessage verifyCryptoMessage = null;

‎src/net/sharksystem/asap/protocol/AssimilationPDU_Impl.java‎

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

33
import net.sharksystem.asap.ASAPException;
4-
import net.sharksystem.utils.Serialization;
4+
import net.sharksystem.utils.ASAPSerialization;
55

66
import java.io.*;
77
import java.util.ArrayList;
@@ -32,7 +32,7 @@ public AssimilationPDU_Impl(int flagsInt, boolean encrypted, InputStream is) thr
3232
if(this.eraSet()) { this.readEra(is); }
3333
if(this.offsetsSet()) { this.readOffsets(is); }
3434

35-
this.dataLength = Serialization.readLongParameter(is);
35+
this.dataLength = ASAPSerialization.readLongParameter(is);
3636

3737
this.is = is;
3838

@@ -43,11 +43,11 @@ public AssimilationPDU_Impl(int flagsInt, boolean encrypted, InputStream is) thr
4343
}
4444

4545
private void readOffsets(InputStream is) throws IOException, ASAPException {
46-
this.offsets = string2list(Serialization.readCharSequenceParameter(is));
46+
this.offsets = string2list(ASAPSerialization.readCharSequenceParameter(is));
4747
}
4848

4949
private void readRecipientPeer(InputStream is) throws IOException, ASAPException {
50-
this.recipientPeer = Serialization.readCharSequenceParameter(is);
50+
this.recipientPeer = ASAPSerialization.readCharSequenceParameter(is);
5151
}
5252

5353
static void sendPDUWithoutCmd(CharSequence peer, CharSequence recipient, CharSequence format, CharSequence channel,
@@ -71,14 +71,14 @@ static void sendPDUWithoutCmd(CharSequence peer, CharSequence recipient, CharSeq
7171

7272
PDU_Impl.sendFlags(flags, os);
7373

74-
Serialization.writeCharSequenceParameter(peer, os); // opt
75-
Serialization.writeCharSequenceParameter(recipient, os); // opt
76-
Serialization.writeCharSequenceParameter(format, os); // mand
77-
Serialization.writeCharSequenceParameter(channel, os); // opt
78-
Serialization.writeNonNegativeIntegerParameter(era, os); // opt
79-
Serialization.writeCharSequenceParameter(list2string(offsets), os); // opt
74+
ASAPSerialization.writeCharSequenceParameter(peer, os); // opt
75+
ASAPSerialization.writeCharSequenceParameter(recipient, os); // opt
76+
ASAPSerialization.writeCharSequenceParameter(format, os); // mand
77+
ASAPSerialization.writeCharSequenceParameter(channel, os); // opt
78+
ASAPSerialization.writeNonNegativeIntegerParameter(era, os); // opt
79+
ASAPSerialization.writeCharSequenceParameter(list2string(offsets), os); // opt
8080

81-
Serialization.writeNonNegativeLongParameter(length, os); // mand
81+
ASAPSerialization.writeNonNegativeLongParameter(length, os); // mand
8282

8383
// stream data
8484
while(length-- > 0) {

‎src/net/sharksystem/asap/protocol/InterestPDU_Impl.java‎

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

33
import net.sharksystem.asap.ASAPException;
4-
import net.sharksystem.utils.Serialization;
4+
import net.sharksystem.utils.ASAPSerialization;
55

66
import java.io.IOException;
77
import java.io.InputStream;
@@ -25,11 +25,11 @@ class InterestPDU_Impl extends PDU_Impl implements ASAP_Interest_PDU_1_0 {
2525
}
2626

2727
private void readToEra(InputStream is) throws IOException, ASAPException {
28-
this.eraTo = Serialization.readIntegerParameter(is);
28+
this.eraTo = ASAPSerialization.readIntegerParameter(is);
2929
}
3030

3131
private void readFromEra(InputStream is) throws IOException, ASAPException {
32-
this.eraFrom = Serialization.readIntegerParameter(is);
32+
this.eraFrom = ASAPSerialization.readIntegerParameter(is);
3333
}
3434

3535
static void sendPDUWithoutCmd(CharSequence sender, CharSequence recipient, CharSequence format,
@@ -56,12 +56,12 @@ static void sendPDUWithoutCmd(CharSequence sender, CharSequence recipient, CharS
5656

5757
PDU_Impl.sendFlags(flags, os);
5858

59-
Serialization.writeCharSequenceParameter(sender, os); // opt
60-
Serialization.writeCharSequenceParameter(recipient, os); // opt
61-
Serialization.writeCharSequenceParameter(format, os); // mand
62-
Serialization.writeCharSequenceParameter(channel, os); // opt
63-
Serialization.writeNonNegativeIntegerParameter(eraFrom, os); // opt
64-
Serialization.writeNonNegativeIntegerParameter(eraTo, os); // opt
59+
ASAPSerialization.writeCharSequenceParameter(sender, os); // opt
60+
ASAPSerialization.writeCharSequenceParameter(recipient, os); // opt
61+
ASAPSerialization.writeCharSequenceParameter(format, os); // mand
62+
ASAPSerialization.writeCharSequenceParameter(channel, os); // opt
63+
ASAPSerialization.writeNonNegativeIntegerParameter(eraFrom, os); // opt
64+
ASAPSerialization.writeNonNegativeIntegerParameter(eraTo, os); // opt
6565
}
6666

6767
@Override

‎src/net/sharksystem/asap/protocol/OfferPDU_Impl.java‎

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

33
import net.sharksystem.asap.ASAPException;
4-
import net.sharksystem.utils.Serialization;
4+
import net.sharksystem.utils.ASAPSerialization;
55

66
import java.io.IOException;
77
import java.io.InputStream;
@@ -37,9 +37,9 @@ static void sendPDU(CharSequence peer, CharSequence format, CharSequence channel
3737
// PDU: CMD | FLAGS | PEER | FORMAT | CHANNEL | ERA
3838
PDU_Impl.sendHeader(ASAP_1_0.OFFER_CMD, flags, os);
3939

40-
Serialization.writeCharSequenceParameter(peer, os); // opt
41-
Serialization.writeCharSequenceParameter(format, os); // mand
42-
Serialization.writeCharSequenceParameter(channel, os); // opt
43-
Serialization.writeNonNegativeIntegerParameter(era, os); // opt
40+
ASAPSerialization.writeCharSequenceParameter(peer, os); // opt
41+
ASAPSerialization.writeCharSequenceParameter(format, os); // mand
42+
ASAPSerialization.writeCharSequenceParameter(channel, os); // opt
43+
ASAPSerialization.writeNonNegativeIntegerParameter(era, os); // opt
4444
}
4545
}

‎src/net/sharksystem/asap/protocol/PDU_Impl.java‎

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

33
import net.sharksystem.asap.ASAPException;
4-
import net.sharksystem.utils.Serialization;
4+
import net.sharksystem.utils.ASAPSerialization;
55

66
import java.io.IOException;
77
import java.io.InputStream;
@@ -86,16 +86,16 @@ private void appendTrueFalse(boolean value, StringBuilder sb) {
8686
* @deprecated
8787
*/
8888
protected static void sendHeader(byte cmd, int flags, OutputStream os) throws IOException {
89-
Serialization.writeByteParameter(cmd, os); // mand
90-
Serialization.writeByteParameter((byte)flags, os); // mand
89+
ASAPSerialization.writeByteParameter(cmd, os); // mand
90+
ASAPSerialization.writeByteParameter((byte)flags, os); // mand
9191
}
9292

9393
public static void sendFlags(int flags, OutputStream os) throws IOException {
94-
Serialization.writeByteParameter((byte)flags, os); // mand
94+
ASAPSerialization.writeByteParameter((byte)flags, os); // mand
9595
}
9696

9797
public static void sendCmd(byte cmd, OutputStream os) throws IOException {
98-
Serialization.writeByteParameter(cmd, os); // mand
98+
ASAPSerialization.writeByteParameter(cmd, os); // mand
9999
}
100100

101101
protected void evaluateFlags(int flag) {
@@ -152,24 +152,24 @@ static boolean flagSet(int bitPosition, int flags) {
152152
public byte getCommand() { return this.cmd; }
153153

154154
protected void readSender(InputStream is) throws IOException, ASAPException {
155-
this.sender = Serialization.readCharSequenceParameter(is);
155+
this.sender = ASAPSerialization.readCharSequenceParameter(is);
156156
}
157157

158158
protected void readRecipient(InputStream is) throws IOException, ASAPException {
159-
this.recipient = Serialization.readCharSequenceParameter(is);
159+
this.recipient = ASAPSerialization.readCharSequenceParameter(is);
160160
}
161161

162162
protected void readFormat(InputStream is) throws IOException, ASAPException {
163-
this.format = Serialization.readCharSequenceParameter(is);
163+
this.format = ASAPSerialization.readCharSequenceParameter(is);
164164
}
165165

166166

167167
protected void readChannel(InputStream is) throws IOException, ASAPException {
168-
this.channel = Serialization.readCharSequenceParameter(is);
168+
this.channel = ASAPSerialization.readCharSequenceParameter(is);
169169
}
170170

171171
protected void readEra(InputStream is) throws IOException, ASAPException {
172-
this.era = Serialization.readIntegerParameter(is);
172+
this.era = ASAPSerialization.readIntegerParameter(is);
173173
}
174174

175175
static void sendCommand(byte cmd, OutputStream os) throws IOException {

‎src/net/sharksystem/asap/sharknet/SharkNetMessage.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import net.sharksystem.asap.ASAPSecurityException;
55
import net.sharksystem.crypto.ASAPCryptoAlgorithms;
66
import net.sharksystem.crypto.BasicCryptoParameters;
7-
import net.sharksystem.utils.Serialization;
7+
import net.sharksystem.utils.ASAPSerialization;
88

99
import java.io.ByteArrayInputStream;
1010
import java.io.ByteArrayOutputStream;
@@ -37,18 +37,18 @@ static byte[] serializeMessage(byte[] message, CharSequence topic, CharSequence
3737

3838
// merge content, sender and recipient
3939
ByteArrayOutputStream baos = new ByteArrayOutputStream();
40-
Serialization.writeByteArray(message, baos);
41-
Serialization.writeCharSequenceParameter(ownerID, baos);
42-
Serialization.writeCharSequenceParameter(recipient, baos);
40+
ASAPSerialization.writeByteArray(message, baos);
41+
ASAPSerialization.writeCharSequenceParameter(ownerID, baos);
42+
ASAPSerialization.writeCharSequenceParameter(recipient, baos);
4343
message = baos.toByteArray();
4444

4545
byte flags = 0;
4646
if(sign) {
4747
byte[] signature = ASAPCryptoAlgorithms.sign(message, basicCryptoParameters);
4848
baos = new ByteArrayOutputStream();
49-
Serialization.writeByteArray(message, baos); // message has three parts: content, sender, receiver
49+
ASAPSerialization.writeByteArray(message, baos); // message has three parts: content, sender, receiver
5050
// append signature
51-
Serialization.writeByteArray(signature, baos);
51+
ASAPSerialization.writeByteArray(signature, baos);
5252
// attach signature to message
5353
message = baos.toByteArray();
5454
flags += SIGNED_MASK;
@@ -62,8 +62,8 @@ static byte[] serializeMessage(byte[] message, CharSequence topic, CharSequence
6262

6363
// serialize SN message
6464
baos = new ByteArrayOutputStream();
65-
Serialization.writeByteParameter(flags, baos);
66-
Serialization.writeByteArray(message, baos);
65+
ASAPSerialization.writeByteParameter(flags, baos);
66+
ASAPSerialization.writeByteArray(message, baos);
6767

6868
return baos.toByteArray();
6969
}
@@ -72,8 +72,8 @@ static SharkNetMessage parseMessage(byte[] message, String sender, String uri,
7272
CharSequence ownerID, BasicCryptoParameters basicCryptoParameters) throws IOException, ASAPException {
7373

7474
ByteArrayInputStream bais = new ByteArrayInputStream(message);
75-
byte flags = Serialization.readByte(bais);
76-
byte[] tmpMessage = Serialization.readByteArray(bais);
75+
byte flags = ASAPSerialization.readByte(bais);
76+
byte[] tmpMessage = ASAPSerialization.readByteArray(bais);
7777

7878
boolean signed = (flags & SIGNED_MASK) != 0;
7979
boolean encrypted = (flags & ENCRYPTED_MASK) != 0;
@@ -99,14 +99,14 @@ static SharkNetMessage parseMessage(byte[] message, String sender, String uri,
9999
if(signed) {
100100
// split message from signature
101101
bais = new ByteArrayInputStream(tmpMessage);
102-
tmpMessage = Serialization.readByteArray(bais);
102+
tmpMessage = ASAPSerialization.readByteArray(bais);
103103
signedMessage = tmpMessage;
104-
signature = Serialization.readByteArray(bais);
104+
signature = ASAPSerialization.readByteArray(bais);
105105
}
106106
bais = new ByteArrayInputStream(tmpMessage);
107-
byte[] snMessage = Serialization.readByteArray(bais);
108-
String snSender = Serialization.readCharSequenceParameter(bais);
109-
String snReceiver = Serialization.readCharSequenceParameter(bais);
107+
byte[] snMessage = ASAPSerialization.readByteArray(bais);
108+
String snSender = ASAPSerialization.readCharSequenceParameter(bais);
109+
String snReceiver = ASAPSerialization.readCharSequenceParameter(bais);
110110

111111
boolean verified = false; // initialize
112112
if(signature != null) {

‎src/net/sharksystem/crypto/ASAPCryptoAlgorithms.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.sharksystem.asap.ASAPException;
44
import net.sharksystem.asap.ASAPSecurityException;
5-
import net.sharksystem.utils.Serialization;
5+
import net.sharksystem.utils.ASAPSerialization;
66

77
import javax.crypto.*;
88
import javax.crypto.spec.SecretKeySpec;
@@ -33,7 +33,7 @@ public static void writeEncryptedMessagePackage(byte[] unencryptedBytes, CharSeq
3333

3434
try {
3535
// send receiver - unencrypted - need this for ad-hoc routing
36-
Serialization.writeCharSequenceParameter(recipient, os);
36+
ASAPSerialization.writeCharSequenceParameter(recipient, os);
3737

3838
// get symmetric key
3939
SecretKey encryptionKey = basicCryptoParameters.generateSymmetricKey();
@@ -45,12 +45,12 @@ public static void writeEncryptedMessagePackage(byte[] unencryptedBytes, CharSeq
4545
byte[] encryptedSymmetricKeyBytes = cipher.doFinal(encodedSymmetricKey);
4646

4747
// send encrypted key
48-
Serialization.writeByteArray(encryptedSymmetricKeyBytes, os);
48+
ASAPSerialization.writeByteArray(encryptedSymmetricKeyBytes, os);
4949

5050
byte[] encryptedText = encryptSymmetric(unencryptedBytes, encryptionKey, basicCryptoParameters);
5151

5252
// send encrypted bytes
53-
Serialization.writeByteArray(encryptedText, os);
53+
ASAPSerialization.writeByteArray(encryptedText, os);
5454

5555
} catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException
5656
| IllegalBlockSizeException | BadPaddingException | IOException e) {
@@ -94,9 +94,9 @@ public interface EncryptedMessagePackage {
9494
}
9595

9696
public static EncryptedMessagePackage parseEncryptedMessagePackage(InputStream is) throws IOException, ASAPException {
97-
String recipient = Serialization.readCharSequenceParameter(is);
98-
byte[] encryptedSymmetricKey = Serialization.readByteArray(is);
99-
byte[] encryptedContent = Serialization.readByteArray(is);
97+
String recipient = ASAPSerialization.readCharSequenceParameter(is);
98+
byte[] encryptedSymmetricKey = ASAPSerialization.readByteArray(is);
99+
byte[] encryptedContent = ASAPSerialization.readByteArray(is);
100100

101101
return new EncryptedMessagePackage() {
102102
@Override
@@ -110,9 +110,9 @@ public static EncryptedMessagePackage parseEncryptedMessagePackage(InputStream i
110110

111111
public static void writeEncryptedMessagePackage(EncryptedMessagePackage encryptedPackage, OutputStream os)
112112
throws IOException, ASAPException {
113-
Serialization.writeCharSequenceParameter(encryptedPackage.getRecipient(), os);
114-
Serialization.writeByteArray(encryptedPackage.getEncryptedSymmetricKey(), os);
115-
Serialization.writeByteArray(encryptedPackage.getEncryptedContent(), os);
113+
ASAPSerialization.writeCharSequenceParameter(encryptedPackage.getRecipient(), os);
114+
ASAPSerialization.writeByteArray(encryptedPackage.getEncryptedSymmetricKey(), os);
115+
ASAPSerialization.writeByteArray(encryptedPackage.getEncryptedContent(), os);
116116
}
117117

118118
public static byte[] getEncryptedMessagePackageAsBytes(EncryptedMessagePackage encryptedPackage)

src/net/sharksystem/utils/Serialization.java renamed to src/net/sharksystem/utils/ASAPSerialization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.io.InputStream;
77
import java.io.OutputStream;
88

9-
public class Serialization {
9+
public class ASAPSerialization {
1010
public static void writeByteArray(byte[] bytes2Write, OutputStream os) throws IOException {
1111
writeNonNegativeIntegerParameter(bytes2Write.length, os);
1212
os.write(bytes2Write);

‎test/net/sharksystem/asap/V1TestSuite.java‎

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

33
import net.sharksystem.asap.protocol.PDUTests;
4-
import net.sharksystem.asap.sharknet.SharkNetMessageSerializationTests;
4+
import net.sharksystem.asap.sharknet.SharkNetMessageASAPSerializationTests;
55
import org.junit.runner.RunWith;
66
import org.junit.runners.Suite;
77

@@ -15,7 +15,7 @@
1515
CreateNewChannelFromOutsideTest.class,
1616
PDUTests.class,
1717
CryptoTests.class,
18-
SharkNetMessageSerializationTests.class
18+
SharkNetMessageASAPSerializationTests.class
1919
})
2020
public class V1TestSuite {
2121

0 commit comments

Comments
 (0)