Skip to content

Commit 90c9ef0

Browse files
RHeniganRHenigan
committed
Add JavaSE Child Class for SdlPacket
1 parent 322aa77 commit 90c9ef0

3 files changed

Lines changed: 128 additions & 24 deletions

File tree

‎android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
import android.os.Parcel;
44
import android.os.Parcelable;
55

6-
import com.livio.BSON.BsonEncoder;
76
import com.smartdevicelink.transport.utl.TransportRecord;
87
import com.smartdevicelink.util.DebugTool;
98

10-
import java.util.HashMap;
11-
129
public class SdlPacket extends BaseSdlPacket implements Parcelable {
1310
private static final int EXTRA_PARCEL_DATA_LENGTH = 24;
1411

@@ -115,25 +112,4 @@ public SdlPacket[] newArray(int size) {
115112
}
116113

117114
};
118-
119-
public void putTag(String tag, Object data){
120-
if(bsonPayload == null){
121-
bsonPayload = new HashMap<>();
122-
}
123-
bsonPayload.put(tag, data);
124-
}
125-
126-
public Object getTag(String tag){
127-
if(payload == null){
128-
return null;
129-
}else if(bsonPayload == null || bsonPayload.isEmpty()){
130-
bsonPayload = BsonEncoder.decodeFromBytes(payload);
131-
}
132-
133-
if(bsonPayload == null){
134-
return null;
135-
}
136-
137-
return bsonPayload.get(tag);
138-
}
139115
}

‎javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without
6+
* modification, are permitted provided that the following conditions are met:
7+
*
8+
* Redistributions of source code must retain the above copyright notice, this
9+
* list of conditions and the following disclaimer.
10+
*
11+
* Redistributions in binary form must reproduce the above copyright notice,
12+
* this list of conditions and the following
13+
* disclaimer in the documentation and/or other materials provided with the
14+
* distribution.
15+
*
16+
* Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
17+
* contributors may be used to endorse or promote products derived from this
18+
* software without specific prior written permission.
19+
*
20+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30+
* POSSIBILITY OF SUCH DAMAGE.
31+
*/
32+
package com.smartdevicelink.protocol;
33+
34+
import android.os.Parcel;
35+
import android.os.Parcelable;
36+
37+
public class SdlPacket extends BaseSdlPacket {
38+
private static final int EXTRA_PARCEL_DATA_LENGTH = 24;
39+
40+
public SdlPacket(int version, boolean encryption, int frameType,
41+
int serviceType, int frameInfo, int sessionId,
42+
int dataSize, int messageId, byte[] payload) {
43+
super(version, encryption, frameType, serviceType, frameInfo, sessionId, dataSize, messageId, payload);
44+
}
45+
46+
public SdlPacket(int version, boolean encryption, int frameType,
47+
int serviceType, int frameInfo, int sessionId,
48+
int dataSize, int messageId, byte[] payload, int offset, int bytesToWrite) {
49+
super(version, encryption, frameType, serviceType, frameInfo, sessionId, dataSize, messageId, payload, offset, bytesToWrite);
50+
}
51+
52+
protected SdlPacket() {
53+
super();
54+
}
55+
56+
protected SdlPacket(BaseSdlPacket packet) {
57+
super(packet);
58+
}
59+
60+
@Deprecated
61+
public SdlPacket(Parcel p){}
62+
63+
@Deprecated
64+
public int describeContents() {
65+
return 0;
66+
}
67+
68+
@Deprecated
69+
public void writeToParcel(Parcel dest, int flags) {}
70+
71+
@Deprecated
72+
public static final Parcelable.Creator<SdlPacket> CREATOR = new Parcelable.Creator<SdlPacket>() {
73+
public SdlPacket createFromParcel(Parcel in) {
74+
return new SdlPacket(in);
75+
}
76+
77+
@Override
78+
public SdlPacket[] newArray(int size) {
79+
return new SdlPacket[size];
80+
}
81+
82+
};
83+
}

‎javaSE/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without
6+
* modification, are permitted provided that the following conditions are met:
7+
*
8+
* Redistributions of source code must retain the above copyright notice, this
9+
* list of conditions and the following disclaimer.
10+
*
11+
* Redistributions in binary form must reproduce the above copyright notice,
12+
* this list of conditions and the following
13+
* disclaimer in the documentation and/or other materials provided with the
14+
* distribution.
15+
*
16+
* Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
17+
* contributors may be used to endorse or promote products derived from this
18+
* software without specific prior written permission.
19+
*
20+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30+
* POSSIBILITY OF SUCH DAMAGE.
31+
*/
32+
package com.smartdevicelink.transport.utl;
33+
34+
import com.smartdevicelink.transport.enums.TransportType;
35+
36+
public class TransportRecord extends BaseTransportRecord {
37+
private TransportType type;
38+
private String address;
39+
40+
public TransportRecord(TransportType transportType, String address) {
41+
super(transportType, address);
42+
this.type = transportType;
43+
this.address = address;
44+
}
45+
}

0 commit comments

Comments
 (0)