Skip to content

Commit 07beab8

Browse files
authored
0.38.0
* Add jacoco * Docs * Incorporate some v2 into the unit tests
1 parent 0cfaf5c commit 07beab8

File tree

12 files changed

+51
-613
lines changed

12 files changed

+51
-613
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# sdk-dslink-java-v2
22
[![](https://jitpack.io/v/iot-dsa-v2/sdk-dslink-java-v2.svg)](https://jitpack.io/#iot-dsa-v2/sdk-dslink-java-v2)
33

4-
* [Developer Guide](https://iot-dsa-v2.github.io/sdk-dslink-java-v2/)
4+
* [Documentation](https://github.com/iot-dsa-v2/sdk-dslink-java-v2/wiki)
55
* [Javadoc](https://jitpack.io/com/github/iot-dsa-v2/sdk-dslink-java-v2/dslink-v2/master-SNAPSHOT/javadoc/)
66
* JDK 1.6+
77

@@ -21,7 +21,7 @@ the DSA architecture, please visit
2121

2222
## Link Development
2323

24-
Please read the [developer guide](https://iot-dsa-v2.github.io/sdk-dslink-java-v2/).
24+
Please read the [developer guide](https://github.com/iot-dsa-v2/sdk-dslink-java-v2/wiki/DSLink-Development-Guide).
2525

2626
## Acknowledgements
2727

build.gradle

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
subprojects {
22

33
apply plugin: 'java'
4+
apply plugin: 'jacoco'
45
apply plugin: 'maven'
56

67
group 'org.iot-dsa'
7-
version '0.37.0'
8+
version '0.38.0'
89

910
sourceCompatibility = 1.6
1011
targetCompatibility = 1.6
@@ -23,6 +24,17 @@ subprojects {
2324
classifier = 'javadoc'
2425
from javadoc.destinationDir
2526
}
27+
28+
/*
29+
jacocoTestReport {
30+
reports {
31+
xml.enabled false
32+
csv.enabled false
33+
html.enabled true
34+
}
35+
}
36+
*/
37+
2638
}
2739

2840
wrapper {

dslink-v2/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ dependencies {
1010
javadoc {
1111
exclude("**/com/**")
1212
}
13+

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Session.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ protected boolean hasPingToSend() {
131131
@Override
132132
protected void onConnected() {
133133
super.onConnected();
134+
setRequesterAllowed(true); //TODO - currently used for testing
134135
messageReader = null;
135136
messageWriter = null;
136137
requester.onConnected();
@@ -140,11 +141,11 @@ protected void onConnected() {
140141
@Override
141142
protected void onDisconnected() {
142143
super.onDisconnected();
144+
requester.onDisconnected();
145+
responder.onDisconnected();
143146
messageReader = null;
144147
messageWriter = null;
145148
multiparts.clear();
146-
requester.onDisconnected();
147-
responder.onDisconnected();
148149
}
149150

150151
@Override

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2Responder.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ public void handleRequest(DS2MessageReader reader) {
8686
}
8787
}
8888

89-
public void onConnected() {
90-
}
91-
92-
public void onConnectFail() {
93-
}
94-
9589
/**
9690
* Handles an invoke request.
9791
*/

0 commit comments

Comments
 (0)