Merge pull request #756 from hbs/udptcp-clients

Added retrieval of store/directory clients
senx · May 10, 2020 · ff5bc16 · ff5bc16
2 parents 9df6239 + c5088b7
commit ff5bc16
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/warp10/src/main/java/io/warp10/plugins/tcp/TCPClient.java b/warp10/src/main/java/io/warp10/plugins/tcp/TCPClient.java
@@ -1,5 +1,5 @@
 //
-//   Copyright 2018  SenX S.A.S.
+//   Copyright 2018-2020  SenX S.A.S.
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import io.warp10.script.WarpScriptStack;
 import io.warp10.script.WarpScriptStack.Macro;
 import io.warp10.script.WarpScriptStackRegistry;
+import io.warp10.warp.sdk.AbstractWarp10Plugin;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,7 +59,7 @@ public class TCPClient implements Runnable {
     remotePort = this.socket.getPort();
 
     this.reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), charset));
-    this.stack = new MemoryWarpScriptStack(null, null, new Properties());
+    this.stack = new MemoryWarpScriptStack(AbstractWarp10Plugin.getExposedStoreClient(), AbstractWarp10Plugin.getExposedDirectoryClient(), new Properties());
     this.stack.setAttribute(WarpScriptStack.ATTRIBUTE_NAME, "[Warp10TCPPlugin " + socket.getLocalPort() + "]");
     stack.maxLimits();
   }

diff --git a/warp10/src/main/java/io/warp10/plugins/tcp/TCPManager.java b/warp10/src/main/java/io/warp10/plugins/tcp/TCPManager.java
@@ -1,5 +1,5 @@
 //
-//   Copyright 2018  SenX S.A.S.
+//   Copyright 2018-2020  SenX S.A.S.
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 import io.warp10.script.MemoryWarpScriptStack;
 import io.warp10.script.WarpScriptStack.Macro;
 import io.warp10.script.WarpScriptStopException;
+import io.warp10.warp.sdk.AbstractWarp10Plugin;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -117,7 +119,7 @@ public TCPManager(Path p) throws Exception {
     in.close();
 
     warpscript = new String(baos.toByteArray(), StandardCharsets.UTF_8);
-    stack = new MemoryWarpScriptStack(null, null, new Properties());
+    stack = new MemoryWarpScriptStack(AbstractWarp10Plugin.getExposedStoreClient(), AbstractWarp10Plugin.getExposedDirectoryClient(), new Properties());
     stack.maxLimits();
 
     try {
@@ -189,7 +191,7 @@ private void initExecutors() {
 
     for (int i = 0; i < parallelism; i++) {
 
-      final MemoryWarpScriptStack stack = new MemoryWarpScriptStack(null, null, new Properties());
+      final MemoryWarpScriptStack stack = new MemoryWarpScriptStack(AbstractWarp10Plugin.getExposedStoreClient(), AbstractWarp10Plugin.getExposedDirectoryClient(), new Properties());
       stack.maxLimits();
 
       final LinkedBlockingQueue<List<Object>> queue = queues[Math.min(i, queues.length - 1)];

diff --git a/warp10/src/main/java/io/warp10/plugins/udp/UDPConsumer.java b/warp10/src/main/java/io/warp10/plugins/udp/UDPConsumer.java
@@ -1,5 +1,5 @@
 //
-//   Copyright 2018  SenX S.A.S.
+//   Copyright 2018-2020  SenX S.A.S.
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 import io.warp10.script.WarpScriptStack.Macro;
 import io.warp10.script.WarpScriptStackRegistry;
 import io.warp10.script.WarpScriptStopException;
+import io.warp10.warp.sdk.AbstractWarp10Plugin;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -97,7 +99,7 @@ public UDPConsumer(Path p) throws Exception {
     in.close();
 
     this.warpscript = new String(baos.toByteArray(), StandardCharsets.UTF_8);
-    this.stack = new MemoryWarpScriptStack(null, null, new Properties());
+    this.stack = new MemoryWarpScriptStack(AbstractWarp10Plugin.getExposedStoreClient(), AbstractWarp10Plugin.getExposedDirectoryClient(), new Properties());
     stack.maxLimits();
 
     try {
@@ -157,7 +159,7 @@ public void run() {
 
     for (int i = 0; i < this.parallelism; i++) {
 
-      final MemoryWarpScriptStack stack = new MemoryWarpScriptStack(null, null, new Properties());
+      final MemoryWarpScriptStack stack = new MemoryWarpScriptStack(AbstractWarp10Plugin.getExposedStoreClient(), AbstractWarp10Plugin.getExposedDirectoryClient(), new Properties());
       stack.setAttribute(WarpScriptStack.ATTRIBUTE_NAME, "[Warp10UDPPlugin " + socket.getLocalPort() + " #" + i + "]");
       stack.maxLimits();