Skip to content

Commit b812cab

Browse files
author
Aaron
committed
- Another topic refactor.
- DSNode subscription refactor. - DynamicActions -> VirtualActions
1 parent 1ad9a55 commit b812cab

File tree

22 files changed

+662
-307
lines changed

22 files changed

+662
-307
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class MainNode extends DSMainNode implements Runnable {
5353
///////////////////////////////////////////////////////////////////////////
5454

5555
@Override
56-
public DSInfo getDynamicAction(DSInfo target, String name) {
56+
public DSInfo getVirtualAction(DSInfo target, String name) {
5757
if (target == incrementingInt) {
5858
if (name.equals("Reset")) {
5959
return actionInfo(name, new DSAction.Parameterless() {
@@ -75,17 +75,17 @@ public ActionResult invoke(DSInfo target, ActionInvocation invocation) {
7575
});
7676
}
7777
}
78-
return super.getDynamicAction(target, name);
78+
return super.getVirtualAction(target, name);
7979
}
8080

8181
@Override
82-
public void getDynamicActions(DSInfo target, Collection<String> bucket) {
82+
public void getVirtualActions(DSInfo target, Collection<String> bucket) {
8383
if (target == incrementingInt) {
8484
bucket.add("Reset");
8585
} else if (target.get() == this) {
8686
bucket.add("Foobar");
8787
}
88-
super.getDynamicActions(target, bucket);
88+
super.getVirtualActions(target, bucket);
8989
}
9090

9191
@Override

‎dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/DSTarget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private void advance(int nameIndex) {
156156
node = (DSNode) target;
157157
targetInfo = node.getInfo(names[nameIndex]);
158158
} else {
159-
targetInfo = node.getDynamicAction(targetInfo, names[nameIndex]);
159+
targetInfo = node.getVirtualAction(targetInfo, names[nameIndex]);
160160
}
161161
if (targetInfo == null) {
162162
//TODO - need to undo this

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.iot.dsa.node.action.DSAction;
2727
import org.iot.dsa.node.event.DSIEvent;
2828
import org.iot.dsa.node.event.DSISubscriber;
29-
import org.iot.dsa.node.event.DSITopic;
29+
import org.iot.dsa.node.event.DSISubscription;
3030
import org.iot.dsa.node.event.DSNodeTopic;
3131
import org.iot.dsa.security.DSPermission;
3232

@@ -64,6 +64,7 @@ public class DSInboundList extends DSInboundRequest
6464
private OutboundListResponse response;
6565
private int state = STATE_INIT;
6666
private boolean stream = true;
67+
private DSISubscription subscription;
6768
private DSTarget target;
6869
private Update updateHead;
6970
private Update updateTail;
@@ -127,8 +128,9 @@ public boolean isOpen() {
127128

128129
@Override
129130
public void onClose() {
130-
if (node != null) {
131-
node.unsubscribe(null, null, this);
131+
if (subscription != null) {
132+
subscription.close();
133+
subscription = null;
132134
}
133135
}
134136

@@ -145,6 +147,12 @@ public void onClose(Integer requestId) {
145147
doClose();
146148
}
147149

150+
@Override
151+
public void onClosed(DSISubscription subscription) {
152+
subscription = null;
153+
close();
154+
}
155+
148156
@Override
149157
public void onEvent(DSNode node, DSInfo child, DSIEvent event) {
150158
switch ((DSNodeTopic) event.getTopic()) {
@@ -165,11 +173,6 @@ public void onEvent(DSNode node, DSInfo child, DSIEvent event) {
165173
}
166174
}
167175

168-
@Override
169-
public void onUnsubscribed(DSITopic topic, DSNode node, DSInfo child) {
170-
close();
171-
}
172-
173176
@Override
174177
public void run() {
175178
try {
@@ -185,7 +188,7 @@ public void run() {
185188
}
186189
if (info.isNode()) {
187190
node = info.getNode();
188-
node.subscribe(null, null, null, this);
191+
this.subscription = node.subscribe(null, null, null, this);
189192
}
190193
response = this;
191194
}
@@ -366,10 +369,10 @@ protected String encodeName(String name, StringBuilder buf) {
366369
*/
367370
protected void encodeUpdate(Update update, MessageWriter writer, StringBuilder buf) {
368371
if (update instanceof AddUpdate) {
369-
encodeChild(((AddUpdate)update).child, writer);
372+
encodeChild(((AddUpdate) update).child, writer);
370373
} else {
371374
writer.getWriter().beginMap()
372-
.key("name").value(encodeName(((RemoveUpdate)update).name, buf))
375+
.key("name").value(encodeName(((RemoveUpdate) update).name, buf))
373376
.key("change").value("remove")
374377
.endMap();
375378
}

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.iot.dsa.node.DSStatus;
1616
import org.iot.dsa.node.event.DSIEvent;
1717
import org.iot.dsa.node.event.DSISubscriber;
18+
import org.iot.dsa.node.event.DSISubscription;
1819
import org.iot.dsa.node.event.DSITopic;
1920
import org.iot.dsa.time.DSTime;
2021

@@ -40,6 +41,7 @@ public class DSInboundSubscription extends DSInboundRequest
4041
private boolean open = true;
4142
private int qos = 0;
4243
private Integer sid;
44+
private DSISubscription subscription;
4345
private Update updateHead;
4446
private Update updateTail;
4547

@@ -117,7 +119,8 @@ public void onEvent(DSNode node, DSInfo child, DSIEvent event) {
117119
}
118120

119121
@Override
120-
public void onUnsubscribed(DSITopic topic, DSNode node, DSInfo info) {
122+
public void onClosed(DSISubscription subscription) {
123+
this.subscription = null;
121124
close();
122125
}
123126

@@ -218,13 +221,13 @@ protected void init() {
218221
DSIObject obj = path.getTarget();
219222
if (obj instanceof DSNode) {
220223
node = (DSNode) obj;
221-
node.subscribe(DSNode.VALUE_CHANGED, null, null, this);
224+
this.subscription = node.subscribe(DSNode.VALUE_CHANGED, null, null, this);
222225
onEvent(node, null, DSNode.VALUE_CHANGED);
223226
} else {
224227
DSInfo info = path.getTargetInfo();
225228
node = path.getNode();
226229
child = info;
227-
node.subscribe(DSNode.VALUE_CHANGED, info, null, this);
230+
this.subscription = node.subscribe(DSNode.VALUE_CHANGED, info, null, this);
228231
onEvent(node, info, DSNode.VALUE_CHANGED);
229232
}
230233
}
@@ -308,15 +311,16 @@ void onClose() {
308311
open = false;
309312
}
310313
try {
311-
if (closeHandler != null) {
312-
closeHandler.onClose(getSubscriptionId());
314+
if (subscription != null) {
315+
subscription.close();
316+
subscription = null;
313317
}
314318
} catch (Exception x) {
315319
manager.debug(manager.getPath(), x);
316320
}
317321
try {
318-
if (node != null) {
319-
node.unsubscribe(DSNode.VALUE_CHANGED, child, this);
322+
if (closeHandler != null) {
323+
closeHandler.onClose(getSubscriptionId());
320324
}
321325
} catch (Exception x) {
322326
manager.debug(manager.getPath(), x);

‎dslink-v2/src/main/java/org/iot/dsa/node/DSInfo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ public Iterator<ApiObject> getChildren() {
149149
DSNode node;
150150
if (isNode()) {
151151
node = getNode();
152-
node.getDynamicActions(this, actions);
152+
node.getVirtualActions(this, actions);
153153
} else {
154154
node = getParent();
155-
node.getDynamicActions(this, actions);
155+
node.getVirtualActions(this, actions);
156156
}
157157
for (String s : actions) {
158-
info = node.getDynamicAction(this, s);
158+
info = node.getVirtualAction(this, s);
159159
if (info != null) {
160160
ret.add(info);
161161
}
@@ -538,7 +538,7 @@ int getFlags() {
538538
/**
539539
* Whether or not the info is for a dynamic action.
540540
*/
541-
boolean isDynamic() {
541+
boolean isVirtual() {
542542
return false;
543543
}
544544

0 commit comments

Comments
 (0)