diff --git a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java index 66dac1b54f2..a44b6ef6604 100644 --- a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java +++ b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java @@ -76,23 +76,6 @@ public class IgniteInterpreter extends Interpreter { static final String IGNITE_CFG_URL = "ignite.config.url"; - static { - Interpreter.register( - "ignite", - "ignite", - IgniteInterpreter.class.getName(), - true, - new InterpreterPropertyBuilder() - .add(IGNITE_ADDRESSES, "127.0.0.1:47500..47509", - "Coma separated list of addresses " - + "(e.g. 127.0.0.1:47500 or 127.0.0.1:47500..47509)") - .add(IGNITE_CLIENT_MODE, "true", "Client mode. true or false") - .add(IGNITE_CFG_URL, "", "Configuration URL. Overrides all other settings.") - .add(IGNITE_PEER_CLASS_LOADING_ENABLED, "true", - "Peer class loading enabled. true or false") - .build()); - } - private Logger logger = LoggerFactory.getLogger(IgniteInterpreter.class); private Ignite ignite; private ByteArrayOutputStream out; diff --git a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java index 9a651f8816f..03ea4f8816b 100644 --- a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java +++ b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java @@ -57,17 +57,6 @@ public class IgniteSqlInterpreter extends Interpreter { static final String IGNITE_JDBC_URL = "ignite.jdbc.url"; - static { - Interpreter.register( - "ignitesql", - "ignite", - IgniteSqlInterpreter.class.getName(), - new InterpreterPropertyBuilder() - .add(IGNITE_JDBC_URL, - "jdbc:ignite:cfg://default-ignite-jdbc.xml", "Ignite JDBC connection URL.") - .build()); - } - private Logger logger = LoggerFactory.getLogger(IgniteSqlInterpreter.class); private Connection conn; diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json new file mode 100644 index 00000000000..92cf75b4223 --- /dev/null +++ b/ignite/src/main/resources/interpreter-setting.json @@ -0,0 +1,46 @@ +[ + { + "group": "ignite", + "name": "ignite", + "className": "org.apache.zeppelin.ignite.IgniteInterpreter", + "properties": { + "ignite.addresses": { + "envName": null, + "propertyName": "ignite.addresses", + "defaultValue": "127.0.0.1:47500..47509", + "description": "Comma separated list of addresses (e.g. 127.0.0.1:47500 or 127.0.0.1:47500..47509)" + }, + "ignite.clientMode": { + "envName": null, + "propertyName": "ignite.clientMode", + "defaultValue": "true", + "description": "Client mode. true or false" + }, + "ignite.config.url": { + "envName": null, + "propertyName": "ignite.config.url", + "defaultValue": "", + "description": "Configuration URL. Overrides all other settings." + }, + "ignite.peerClassLoadingEnabled": { + "envName": null, + "propertyName": "ignite.peerClassLoadingEnabled", + "defaultValue": "true", + "description": "Peer class loading enabled. True or false" + } + } + }, + { + "group": "ignite", + "name": "ignitesql", + "className": "org.apache.zeppelin.ignite.IgniteSqlInterpreter", + "properties": { + "ignite.jdbc.url": { + "envName": null, + "propertyName": "ignite.jdbc.url", + "defaultValue": "jdbc:ignite:cfg://default-ignite-jdbc.xml", + "description": "Ignite JDBC connection URL." + } + } + } +] diff --git a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java index c2e13ec88b0..9cb5eafe345 100644 --- a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java +++ b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java @@ -64,6 +64,7 @@ public void setUp() { props.setProperty(IgniteSqlInterpreter.IGNITE_JDBC_URL, "jdbc:ignite:cfg://cache=person@default-ignite-jdbc.xml"); props.setProperty(IgniteInterpreter.IGNITE_CLIENT_MODE, "false"); props.setProperty(IgniteInterpreter.IGNITE_PEER_CLASS_LOADING_ENABLED, "false"); + props.setProperty(IgniteInterpreter.IGNITE_ADDRESSES, HOST); intp = new IgniteInterpreter(props); intp.open();