Skip to content

Commit 831d0f3

Browse files
authored
0.61.0
- More attempts to fix unit tests that are failing on the build server - Event based IO - Requester now supports list and invoke requests when disconnected - Now uses timer for DSConnection lifecycle rather than a thread
2 parents 1881b33 + f71c602 commit 831d0f3

40 files changed

+483
-495
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ subprojects {
55
apply plugin: 'maven'
66

77
group 'org.iot-dsa'
8-
version '0.60.0'
8+
version '0.61.0'
99

1010
sourceCompatibility = 1.8
1111
targetCompatibility = 1.8

dslink-v2-poc/src/main/java/org/iot/dsa/dslink/poc/MainNode.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Collection;
44
import org.iot.dsa.DSRuntime;
55
import org.iot.dsa.dslink.DSMainNode;
6-
import org.iot.dsa.dslink.requester.SimpleListHandler;
76
import org.iot.dsa.node.DSBool;
87
import org.iot.dsa.node.DSDouble;
98
import org.iot.dsa.node.DSElement;

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public abstract class DSBrokerConnection extends DSLinkConnection {
1919
// Class Fields
2020
///////////////////////////////////////////////////////////////////////////
2121

22-
2322
protected static final String BROKER_ID = "Broker ID";
2423
protected static final String BROKER_FORMAT = "Broker Format";
2524
protected static final String BROKER_PATH = "Path In Broker";
@@ -52,6 +51,11 @@ public String getPathInBroker() {
5251
return brokerPath.getElement().toString();
5352
}
5453

54+
@Override
55+
public DSSession getSession() {
56+
return (DSSession) super.getSession();
57+
}
58+
5559
/**
5660
* For the sessions to update
5761
*/
@@ -94,6 +98,11 @@ protected void doConnect() {
9498
}
9599
}
96100

101+
@Override
102+
protected void doPing() {
103+
getSession().sendMessage();
104+
}
105+
97106
protected String getBrokerFormat() {
98107
return brokerFormat.get().toString();
99108
}
@@ -120,17 +129,6 @@ protected String getBrokerVersion() {
120129

121130
protected abstract void initializeConnection();
122131

123-
/**
124-
* Creates and starts a thread for running the connection lifecycle.
125-
*/
126-
@Override
127-
protected void onStable() {
128-
super.onStable();
129-
Thread t = new Thread(this, "Connection " + getName() + " Runner");
130-
t.setDaemon(true);
131-
t.start();
132-
}
133-
134132
protected void setBrokerFormat(String arg) {
135133
put(brokerFormat, DSString.valueOf(arg));
136134
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.iot.dsa.util.DSUtil;
1313

1414
/**
15-
* Links that also the root of the node tree. These links have sys and upstream children.
15+
* Links that are also the roots of a node tree. These links have sys and upstream children.
1616
*
1717
* @author Aaron Hansen
1818
*/
@@ -38,6 +38,11 @@ public class DSRootLink extends DSLink {
3838
// Public Methods
3939
///////////////////////////////////////////////////////////////////////////
4040

41+
@Override
42+
public DSLinkConnection getConnection() {
43+
return (DSLinkConnection) upstream.get();
44+
}
45+
4146
@Override
4247
public DSMainNode getMain() {
4348
return (DSMainNode) main.getNode();
@@ -47,11 +52,6 @@ public DSSysNode getSys() {
4752
return (DSSysNode) sys.get();
4853
}
4954

50-
@Override
51-
public DSLinkConnection getConnection() {
52-
return (DSLinkConnection) upstream.get();
53-
}
54-
5555
///////////////////////////////////////////////////////////////////////////
5656
// Protected Methods
5757
///////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)