From ace82b5a51b3d7a3f624ede0e398322b4d557dd4 Mon Sep 17 00:00:00 2001
From: Rerngvit Yanggratoke <rerngvit.yanggratoke@combient.com>
Date: Mon, 4 Jul 2016 17:29:53 +0200
Subject: [PATCH] ### What is this PR for? This PR applies the new interpreter
 registration mechanism to KnitR and RRepl.

### What type of PR is it?
Improvement

### Todos
- Move interpreter registration properties from static block to interpreter-setting.json

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-921

### How should this be tested?
1. apply patch
2. rm -r interpreter/r
3. rm conf/interpreter.json
4. mvn clean package -DskipTests -Pspark-1.6 -Psparkr
5. bin/zeppelin-daemon.sh start
6. run some paragraph with simple R queries

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
---
 r/pom.xml                                          |  1 +
 .../org/apache/zeppelin/rinterpreter/KnitR.java    |  6 ------
 .../org/apache/zeppelin/rinterpreter/RRepl.java    |  6 ------
 r/src/main/resources/interpreter-setting.json      | 14 ++++++++++++++
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 r/src/main/resources/interpreter-setting.json

diff --git a/r/pom.xml b/r/pom.xml
index a6bec5284dc..fb5922b318f 100644
--- a/r/pom.xml
+++ b/r/pom.xml
@@ -200,6 +200,7 @@
             <exclude>**/derby.log</exclude>
             <exclude>**/metastore_db/</exclude>
             <exclude>**/README.md</exclude>
+            <exclude>**/interpreter-setting.json</exclude>
             <exclude>**/dependency-reduced-pom.xml</exclude>
           </excludes>
         </configuration>
diff --git a/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java b/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java
index e0af1d4698a..51a790cf385 100644
--- a/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java
+++ b/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java
@@ -34,12 +34,6 @@
 public class KnitR extends Interpreter implements WrappedInterpreter {
   KnitRInterpreter intp;
 
-  static {
-    Interpreter.register("knitr", "spark", KnitR.class.getName(),
-        RInterpreter.getProps()
-    );
-  }
-
   public KnitR(Properties property, Boolean startSpark) {
     super(property);
     intp = new KnitRInterpreter(property, startSpark);
diff --git a/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java b/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java
index 220b56e1285..0c46670c1d7 100644
--- a/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java
+++ b/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java
@@ -34,12 +34,6 @@
 public class RRepl extends Interpreter implements WrappedInterpreter {
   RReplInterpreter intp;
 
-  static {
-    Interpreter.register("r", "spark", RRepl.class.getName(),
-            RInterpreter.getProps()
-    );
-  }
-
   public RRepl(Properties property, Boolean startSpark) {
     super(property);
     intp = new RReplInterpreter(property, startSpark);
diff --git a/r/src/main/resources/interpreter-setting.json b/r/src/main/resources/interpreter-setting.json
new file mode 100644
index 00000000000..dee681423bb
--- /dev/null
+++ b/r/src/main/resources/interpreter-setting.json
@@ -0,0 +1,14 @@
+[
+  {
+    "group": "spark",
+    "name": "knitr",
+    "className": "org.apache.zeppelin.rinterpreter.KnitR",
+    "properties": null
+  },
+  {
+    "group": "spark",
+    "name": "r",
+    "className": "org.apache.zeppelin.rinterpreter.RRepl",
+    "properties": null
+  }
+]