From 7e8721592d13c782d9028b6c52f4360980eb7d02 Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Thu, 4 May 2017 01:39:21 +0900 Subject: [PATCH 1/7] move some files of remote packages from zeppelin-interpreter to zeppelin-zengine --- .../apache/zeppelin/interpreter/remote/AppendOutputBuffer.java | 0 .../apache/zeppelin/interpreter/remote/AppendOutputRunner.java | 0 .../org/apache/zeppelin/interpreter/remote/ClientFactory.java | 0 .../zeppelin/interpreter/remote/InterpreterContextRunnerPool.java | 0 .../apache/zeppelin/interpreter/remote/RemoteAngularObject.java | 0 .../zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java | 0 .../org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java | 0 .../interpreter/remote/RemoteInterpreterContextRunner.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java | 0 .../interpreter/remote/RemoteInterpreterManagedProcess.java | 0 .../interpreter/remote/RemoteInterpreterProcessListener.java | 0 .../interpreter/remote/RemoteInterpreterRunningProcess.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterUtils.java | 0 .../zeppelin/interpreter/remote/AppendOutputRunnerTest.java | 0 .../zeppelin/interpreter/remote/RemoteAngularObjectTest.java | 0 .../interpreter/remote/RemoteInterpreterEventPollerTest.java | 0 .../interpreter/remote/RemoteInterpreterOutputTestStream.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterServerTest.java | 0 .../apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java | 0 .../apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java | 0 .../zeppelin/interpreter/remote/mock/MockInterpreterAngular.java | 0 .../apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java | 0 .../zeppelin/interpreter/remote/mock/MockInterpreterEnv.java | 0 .../interpreter/remote/mock/MockInterpreterOutputStream.java | 0 .../interpreter/remote/mock/MockInterpreterResourcePool.java | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterEnv.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java (100%) diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java similarity index 100% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java rename to zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterEnv.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterEnv.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterEnv.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterEnv.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java From b7e0b9436a55a2251af637b976222b7333556296 Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Thu, 4 May 2017 17:15:45 +0900 Subject: [PATCH 2/7] moved some files related remote interpreter and fix some minor things --- .../apache/zeppelin/interpreter/remote/AppendOutputBuffer.java | 0 .../apache/zeppelin/interpreter/remote/AppendOutputRunner.java | 0 .../org/apache/zeppelin/interpreter/remote/ClientFactory.java | 0 .../zeppelin/interpreter/remote/InterpreterContextRunnerPool.java | 0 .../apache/zeppelin/interpreter/remote/RemoteAngularObject.java | 0 .../interpreter/remote/RemoteInterpreterContextRunner.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java | 0 .../interpreter/remote/RemoteInterpreterProcessListener.java | 0 .../zeppelin/interpreter/remote/RemoteInterpreterUtils.java | 0 .../org/apache/zeppelin/resource/DistributedResourcePoolTest.java | 0 .../java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java (100%) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java (100%) rename {zeppelin-interpreter => zeppelin-zengine}/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java (100%) diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterContextRunner.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java similarity index 100% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java similarity index 100% rename from zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java rename to zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java From 0a881c1b3869e5005a99f55eae177caf5a85ee13 Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Thu, 4 May 2017 17:20:28 +0900 Subject: [PATCH 3/7] Removed unused package imported Removed unnecessary classes imported --- .../zeppelin/resource/ResourcePoolUtils.java | 1 - .../zeppelin/scheduler/RemoteScheduler.java | 1 - .../zeppelin/interpreter/InterpreterTest.java | 97 ++++++++++++++++++- 3 files changed, 93 insertions(+), 6 deletions(-) diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java index 1a7f606e9f9..a55cdf9edfe 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java @@ -19,7 +19,6 @@ import com.google.gson.Gson; import org.apache.zeppelin.interpreter.InterpreterGroup; -import org.apache.zeppelin.interpreter.remote.RemoteInterpreterManagedProcess; import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess; import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService; import org.slf4j.Logger; diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java index a4ab00e20db..f9ddc4e99c2 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java @@ -20,7 +20,6 @@ import org.apache.thrift.TException; import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.interpreter.InterpreterResult.Code; -import org.apache.zeppelin.interpreter.remote.RemoteInterpreterManagedProcess; import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess; import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client; import org.apache.zeppelin.scheduler.Job.Status; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java index a9ac1fc2686..d97c550d7b2 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java @@ -19,7 +19,6 @@ import java.util.Properties; -import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterA; import org.apache.zeppelin.user.AuthenticationInfo; import org.junit.Test; @@ -31,7 +30,37 @@ public class InterpreterTest { public void testDefaultProperty() { Properties p = new Properties(); p.put("p1", "v1"); - MockInterpreterA intp = new MockInterpreterA(p); + Interpreter intp = new Interpreter(p) { + @Override + public void open() { + + } + + @Override + public void close() { + + } + + @Override + public InterpreterResult interpret(String st, InterpreterContext context) { + return null; + } + + @Override + public void cancel(InterpreterContext context) { + + } + + @Override + public FormType getFormType() { + return null; + } + + @Override + public int getProgress(InterpreterContext context) { + return 0; + } + }; assertEquals(1, intp.getProperty().size()); assertEquals("v1", intp.getProperty().get("p1")); @@ -42,7 +71,37 @@ public void testDefaultProperty() { public void testOverriddenProperty() { Properties p = new Properties(); p.put("p1", "v1"); - MockInterpreterA intp = new MockInterpreterA(p); + Interpreter intp = new Interpreter(p) { + @Override + public void open() { + + } + + @Override + public void close() { + + } + + @Override + public InterpreterResult interpret(String st, InterpreterContext context) { + return null; + } + + @Override + public void cancel(InterpreterContext context) { + + } + + @Override + public FormType getFormType() { + return null; + } + + @Override + public int getProgress(InterpreterContext context) { + return 0; + } + }; Properties overriddenProperty = new Properties(); overriddenProperty.put("p1", "v2"); intp.setProperty(overriddenProperty); @@ -74,7 +133,37 @@ public void testPropertyWithReplacedContextFields() { Properties p = new Properties(); p.put("p1", "replName #{noteId}, #{paragraphTitle}, #{paragraphId}, #{paragraphText}, #{replName}, #{noteId}, #{user}," + " #{authenticationInfo}"); - MockInterpreterA intp = new MockInterpreterA(p); + Interpreter intp = new Interpreter(p) { + @Override + public void open() { + + } + + @Override + public void close() { + + } + + @Override + public InterpreterResult interpret(String st, InterpreterContext context) { + return null; + } + + @Override + public void cancel(InterpreterContext context) { + + } + + @Override + public FormType getFormType() { + return null; + } + + @Override + public int getProgress(InterpreterContext context) { + return 0; + } + }; intp.setUserName(user); String actual = intp.getProperty("p1"); InterpreterContext.remove(); From 5ac8dfbbd9eaa127137a4767cddd8e60ddd2f290 Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Sat, 6 May 2017 00:38:11 +0900 Subject: [PATCH 4/7] Moved RemoteInterpreterServer to zeppelin-interpreter --- .../remote/RemoteInterpreterServer.java | 2 +- .../interpreter/remote/RemoteInterpreterUtils.java | 9 ++++++++- .../remote/RemoteInterpreterServerTest.java | 0 .../interpreter/remote/RemoteInterpreter.java | 10 +--------- .../interpreter/remote/RemoteInterpreterTest.java | 14 +++++++------- 5 files changed, 17 insertions(+), 18 deletions(-) rename {zeppelin-zengine => zeppelin-interpreter}/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java (99%) rename {zeppelin-zengine => zeppelin-interpreter}/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java (100%) diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java similarity index 99% rename from zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 8f40ec4e55f..50881ca7b9d 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -218,7 +218,7 @@ protected RemoteInterpreterEventClient getEventClient() { private void setSystemProperty(Properties properties) { for (Object key : properties.keySet()) { - if (!RemoteInterpreter.isEnvString((String) key)) { + if (!RemoteInterpreterUtils.isEnvString((String) key)) { String value = properties.getProperty((String) key); if (value == null || value.isEmpty()) { System.clearProperty((String) key); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java index 8308222d9a8..4ee6690f7c4 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java @@ -17,7 +17,6 @@ package org.apache.zeppelin.interpreter.remote; -import org.apache.zeppelin.interpreter.InterpreterGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,4 +72,12 @@ public static String getInterpreterSettingId(String intpGrpId) { } return settingId; } + + public static boolean isEnvString(String key) { + if (key == null || key.length() == 0) { + return false; + } + + return key.matches("^[A-Z_0-9]*"); + } } diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java similarity index 100% rename from zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java rename to zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java index 123ad757418..ed8982b4a58 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java @@ -142,21 +142,13 @@ public RemoteInterpreter(Properties property, String sessionKey, String classNam private Map getEnvFromInterpreterProperty(Properties property) { Map env = new HashMap<>(); for (Object key : property.keySet()) { - if (isEnvString((String) key)) { + if (RemoteInterpreterUtils.isEnvString((String) key)) { env.put((String) key, property.getProperty((String) key)); } } return env; } - static boolean isEnvString(String key) { - if (key == null || key.length() == 0) { - return false; - } - - return key.matches("^[A-Z_0-9]*"); - } - @Override public String getClassName() { return className; diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java index ffcb8d5175c..2ba7a76cd73 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java @@ -854,13 +854,13 @@ public void should_push_local_angular_repo_to_remote() throws Exception { @Test public void testEnvStringPattern() { - assertFalse(RemoteInterpreter.isEnvString(null)); - assertFalse(RemoteInterpreter.isEnvString("")); - assertFalse(RemoteInterpreter.isEnvString("abcDEF")); - assertFalse(RemoteInterpreter.isEnvString("ABC-DEF")); - assertTrue(RemoteInterpreter.isEnvString("ABCDEF")); - assertTrue(RemoteInterpreter.isEnvString("ABC_DEF")); - assertTrue(RemoteInterpreter.isEnvString("ABC_DEF123")); + assertFalse(RemoteInterpreterUtils.isEnvString(null)); + assertFalse(RemoteInterpreterUtils.isEnvString("")); + assertFalse(RemoteInterpreterUtils.isEnvString("abcDEF")); + assertFalse(RemoteInterpreterUtils.isEnvString("ABC-DEF")); + assertTrue(RemoteInterpreterUtils.isEnvString("ABCDEF")); + assertTrue(RemoteInterpreterUtils.isEnvString("ABC_DEF")); + assertTrue(RemoteInterpreterUtils.isEnvString("ABC_DEF123")); } @Test From 99c093229655883a1d3aade5fab756f06a39285e Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Sat, 6 May 2017 00:40:10 +0900 Subject: [PATCH 5/7] Made DummyInterpreter --- .../interpreter/DummyInterpreter.java | 43 +++++++++++++ .../zeppelin/interpreter/InterpreterTest.java | 64 +------------------ 2 files changed, 45 insertions(+), 62 deletions(-) create mode 100644 zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java new file mode 100644 index 00000000000..df390ad771a --- /dev/null +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java @@ -0,0 +1,43 @@ +package org.apache.zeppelin.interpreter; + +import java.util.Properties; + +/** + * Created by jl on 06/05/2017. + */ +public class DummyInterpreter extends Interpreter { + + public DummyInterpreter(Properties property) { + super(property); + } + + @Override + public void open() { + + } + + @Override + public void close() { + + } + + @Override + public InterpreterResult interpret(String st, InterpreterContext context) { + return null; + } + + @Override + public void cancel(InterpreterContext context) { + + } + + @Override + public FormType getFormType() { + return null; + } + + @Override + public int getProgress(InterpreterContext context) { + return 0; + } +} diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java index d97c550d7b2..40ac2dc6cdf 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java @@ -30,37 +30,7 @@ public class InterpreterTest { public void testDefaultProperty() { Properties p = new Properties(); p.put("p1", "v1"); - Interpreter intp = new Interpreter(p) { - @Override - public void open() { - - } - - @Override - public void close() { - - } - - @Override - public InterpreterResult interpret(String st, InterpreterContext context) { - return null; - } - - @Override - public void cancel(InterpreterContext context) { - - } - - @Override - public FormType getFormType() { - return null; - } - - @Override - public int getProgress(InterpreterContext context) { - return 0; - } - }; + Interpreter intp = new DummyInterpreter(p); assertEquals(1, intp.getProperty().size()); assertEquals("v1", intp.getProperty().get("p1")); @@ -71,37 +41,7 @@ public int getProgress(InterpreterContext context) { public void testOverriddenProperty() { Properties p = new Properties(); p.put("p1", "v1"); - Interpreter intp = new Interpreter(p) { - @Override - public void open() { - - } - - @Override - public void close() { - - } - - @Override - public InterpreterResult interpret(String st, InterpreterContext context) { - return null; - } - - @Override - public void cancel(InterpreterContext context) { - - } - - @Override - public FormType getFormType() { - return null; - } - - @Override - public int getProgress(InterpreterContext context) { - return 0; - } - }; + Interpreter intp = new DummyInterpreter(p); Properties overriddenProperty = new Properties(); overriddenProperty.put("p1", "v2"); intp.setProperty(overriddenProperty); From e1425dfa86b4cea07362694ad80212bcb513b0dc Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Sat, 6 May 2017 01:40:40 +0900 Subject: [PATCH 6/7] Adopted DummyInterpreter --- .../zeppelin/interpreter/InterpreterTest.java | 32 +------------------ 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java index 40ac2dc6cdf..4141e95434e 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java @@ -73,37 +73,7 @@ public void testPropertyWithReplacedContextFields() { Properties p = new Properties(); p.put("p1", "replName #{noteId}, #{paragraphTitle}, #{paragraphId}, #{paragraphText}, #{replName}, #{noteId}, #{user}," + " #{authenticationInfo}"); - Interpreter intp = new Interpreter(p) { - @Override - public void open() { - - } - - @Override - public void close() { - - } - - @Override - public InterpreterResult interpret(String st, InterpreterContext context) { - return null; - } - - @Override - public void cancel(InterpreterContext context) { - - } - - @Override - public FormType getFormType() { - return null; - } - - @Override - public int getProgress(InterpreterContext context) { - return 0; - } - }; + Interpreter intp = new DummyInterpreter(p); intp.setUserName(user); String actual = intp.getProperty("p1"); InterpreterContext.remove(); From 80979913c73acca792b0038cd735f5060321b7a3 Mon Sep 17 00:00:00 2001 From: Jongyoul Lee Date: Sat, 6 May 2017 02:28:31 +0900 Subject: [PATCH 7/7] Removed author tag --- .../java/org/apache/zeppelin/interpreter/DummyInterpreter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java index df390ad771a..a7a6eb9b715 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/DummyInterpreter.java @@ -3,7 +3,7 @@ import java.util.Properties; /** - * Created by jl on 06/05/2017. + * */ public class DummyInterpreter extends Interpreter {