Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master' into ZEPPELIN-2403

Browse source 
# Conflicts:
#	zeppelin-server/src/main/java/org/apache/zeppelin/rest/InterpreterRestApi.java
#	zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/UpdateInterpreterSettingRequest.java
#	zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
This commit is contained in:
isys.mreshetov 2017-07-05 09:04:40 +05:00
commit 7be8ddffab
77 changed files with 969 additions and 349 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/_includes/themes/zeppelin/_navigation.html
View file

@ -36,7 +36,7 @@
<li>
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Usage<b class="caret"></b></a>
<ul class="dropdown-menu">
<ul class="dropdown-menu scrollable-menu">
<li class="title"><span>Dynamic Form</span></li>
<li><a href="{{BASE_PATH}}/usage/dynamic_form/intro.html">What is Dynamic Form?</a></li>
<li role="separator" class="divider"></li>
@ -75,7 +75,7 @@
<li>
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Setup<b class="caret"></b></a>
<ul class="dropdown-menu">
<ul class="dropdown-menu scrollable-menu">
<li class="title"><span>Basics</span></li>
<li><a href="{{BASE_PATH}}/setup/basics/how_to_build.html">How to Build Zeppelin</a></li>
<li><a href="{{BASE_PATH}}/setup/basics/multi_user_support.html">Multi-user Support</a></li>

26
zeppelin-interpreter/src/main/java/org/apache/zeppelin/common/JsonSerializable.java Normal file
View file

@ -0,0 +1,26 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.zeppelin.common;
/**
* Interface for class that can be serialized to json
*/
public interface JsonSerializable {
String toJson();
}

14
zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java
View file

@ -18,6 +18,8 @@
package org.apache.zeppelin.dep;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.sonatype.aether.repository.Authentication;
import org.sonatype.aether.repository.Proxy;
@ -25,7 +27,9 @@ import org.sonatype.aether.repository.Proxy;
*
*
*/
public class Repository {
public class Repository implements JsonSerializable {
private static final Gson gson = new Gson();
private boolean snapshot = false;
private String id;
private String url;
@ -98,4 +102,12 @@ public class Repository {
}
return null;
}
public String toJson() {
return gson.toJson(this);
}
public static Repository fromJson(String json) {
return gson.fromJson(json, Repository.class);
}
}

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObject.java
View file

@ -22,6 +22,8 @@ import java.util.List;
import java.util.Objects;
import java.util.concurrent.ExecutorService;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.scheduler.ExecutorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -33,8 +35,9 @@ import org.slf4j.LoggerFactory;
*
* @param <T>
*/
public class AngularObject<T> {
public class AngularObject<T> implements JsonSerializable {
private static final Logger LOGGER = LoggerFactory.getLogger(AngularObject.class);
private static final Gson gson = new Gson();
private String name;
private T object;
@ -63,7 +66,7 @@ public class AngularObject<T> {
* @param paragraphId paragraphId belongs to. can be null
* @param listener event listener
*/
protected AngularObject(String name, T o, String noteId, String paragraphId,
public AngularObject(String name, T o, String noteId, String paragraphId,
AngularObjectListener listener) {
this.name = name;
this.noteId = noteId;
@ -253,4 +256,12 @@ public class AngularObject<T> {
sb.append('}');
return sb.toString();
}
public String toJson() {
return gson.toJson(this);
}
public static AngularObject fromJson(String json) {
return gson.fromJson(json, AngularObject.class);
}
}

35
zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java
View file

@ -25,8 +25,12 @@ import org.apache.zeppelin.display.ui.Select;
import org.apache.zeppelin.display.ui.TextBox;
import java.io.Serializable;
import java.util.*;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**
@ -96,7 +100,7 @@ public class GUI implements Serializable {
}
public List<Object> checkbox(String id, Collection<Object> defaultChecked,
ParamOption[] options) {
ParamOption[] options) {
Collection<Object> checked = (Collection<Object>) params.get(id);
if (checked == null) {
checked = defaultChecked;
@ -124,6 +128,31 @@ public class GUI implements Serializable {
this.forms = new LinkedHashMap<>();
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
GUI gui = (GUI) o;
if (params != null ? !params.equals(gui.params) : gui.params != null) {
return false;
}
return forms != null ? forms.equals(gui.forms) : gui.forms == null;
}
@Override
public int hashCode() {
int result = params != null ? params.hashCode() : 0;
result = 31 * result + (forms != null ? forms.hashCode() : 0);
return result;
}
public String toJson() {
return gson.toJson(this);
}

67
zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java
View file

@ -18,6 +18,7 @@
package org.apache.zeppelin.display;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.display.ui.*;
import org.apache.zeppelin.display.ui.OptionInput.ParamOption;
@ -37,13 +38,13 @@ public class Input<T> implements Serializable {
// in future.
public static final RuntimeTypeAdapterFactory TypeAdapterFactory =
RuntimeTypeAdapterFactory.of(Input.class, "type")
.registerSubtype(TextBox.class, "TextBox")
.registerSubtype(Select.class, "Select")
.registerSubtype(CheckBox.class, "CheckBox")
.registerSubtype(OldInput.OldTextBox.class, "input")
.registerSubtype(OldInput.OldSelect.class, "select")
.registerSubtype(OldInput.OldCheckBox.class, "checkbox")
.registerSubtype(OldInput.class, null);
.registerSubtype(TextBox.class, "TextBox")
.registerSubtype(Select.class, "Select")
.registerSubtype(CheckBox.class, "CheckBox")
.registerSubtype(OldInput.OldTextBox.class, "input")
.registerSubtype(OldInput.OldSelect.class, "select")
.registerSubtype(OldInput.OldCheckBox.class, "checkbox")
.registerSubtype(OldInput.class, null);
protected String name;
protected String displayName;
@ -86,6 +87,44 @@ public class Input<T> implements Serializable {
return argument;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Input<?> input = (Input<?>) o;
if (hidden != input.hidden) {
return false;
}
if (name != null ? !name.equals(input.name) : input.name != null) {
return false;
}
if (displayName != null ? !displayName.equals(input.displayName) : input.displayName != null) {
return false;
}
if (defaultValue != null ?
!defaultValue.equals(input.defaultValue) : input.defaultValue != null) {
return false;
}
return argument != null ? argument.equals(input.argument) : input.argument == null;
}
@Override
public int hashCode() {
int result = name != null ? name.hashCode() : 0;
result = 31 * result + (displayName != null ? displayName.hashCode() : 0);
result = 31 * result + (defaultValue != null ? defaultValue.hashCode() : 0);
result = 31 * result + (hidden ? 1 : 0);
result = 31 * result + (argument != null ? argument.hashCode() : 0);
return result;
}
public static TextBox textbox(String name, String defaultValue) {
return new TextBox(name, defaultValue);
}
@ -276,7 +315,7 @@ public class Input<T> implements Serializable {
delimiter = DEFAULT_DELIMITER;
}
Collection<Object> checked = value instanceof Collection ? (Collection<Object>) value
: Arrays.asList((Object[]) value);
: Arrays.asList((Object[]) value);
List<Object> validChecked = new LinkedList<>();
for (Object o : checked) { // filter out obsolete checked values
for (ParamOption option : optionInput.getOptions()) {
@ -316,22 +355,22 @@ public class Input<T> implements Serializable {
}
public static String[] split(String str, char split) {
return split(str, new String[] {String.valueOf(split)}, false);
return split(str, new String[]{String.valueOf(split)}, false);
}
public static String[] split(String str, String[] splitters, boolean includeSplitter) {
String escapeSeq = "\"',;${}";
char escapeChar = '\\';
String[] blockStart = new String[] {"\"", "'", "${", "N_(", "N_<"};
String[] blockEnd = new String[] {"\"", "'", "}", "N_)", "N_>"};
String[] blockStart = new String[]{"\"", "'", "${", "N_(", "N_<"};
String[] blockEnd = new String[]{"\"", "'", "}", "N_)", "N_>"};
return split(str, escapeSeq, escapeChar, blockStart, blockEnd, splitters, includeSplitter);
}
public static String[] split(String str, String escapeSeq, char escapeChar, String[] blockStart,
String[] blockEnd, String[] splitters, boolean includeSplitter) {
String[] blockEnd, String[] splitters, boolean includeSplitter) {
List<String> splits = new ArrayList<>();
@ -442,7 +481,7 @@ public class Input<T> implements Serializable {
// check if block is started
for (int b = 0; b < blockStart.length; b++) {
if (curString.substring(lastEscapeOffset + 1)
.endsWith(getBlockStr(blockStart[b])) == true) {
.endsWith(getBlockStr(blockStart[b])) == true) {
blockStack.add(0, b); // block is started
blockStartPos = i;
break;
@ -453,7 +492,7 @@ public class Input<T> implements Serializable {
if (curString.length() > 0) {
splits.add(curString.toString().trim());
}
return splits.toArray(new String[] {});
return splits.toArray(new String[]{});
}

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/helium/HeliumPackage.java
View file

@ -16,7 +16,10 @@
*/
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import org.apache.zeppelin.annotation.Experimental;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.dep.Repository;
import java.util.Map;
@ -24,7 +27,9 @@ import java.util.Map;
* Helium package definition
*/
@Experimental
public class HeliumPackage {
public class HeliumPackage implements JsonSerializable {
private static final Gson gson = new Gson();
private HeliumType type;
private String name; // user friendly name of this application
private String description; // description
@ -129,4 +134,12 @@ public class HeliumPackage {
}
public Map<String, Object> getConfig() { return config; }
public String toJson() {
return gson.toJson(this);
}
public static HeliumPackage fromJson(String json) {
return gson.fromJson(json, HeliumPackage.class);
}
}

14
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java
View file

@ -20,6 +20,8 @@ package org.apache.zeppelin.interpreter;
import java.io.IOException;
import java.io.Serializable;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -28,8 +30,10 @@ import java.util.*;
/**
* Interpreter result template.
*/
public class InterpreterResult implements Serializable {
public class InterpreterResult implements Serializable, JsonSerializable {
transient Logger logger = LoggerFactory.getLogger(InterpreterResult.class);
private static final Gson gson = new Gson();
/**
* Type of result after code execution.
*/
@ -109,6 +113,14 @@ public class InterpreterResult implements Serializable {
return msg;
}
public String toJson() {
return gson.toJson(this);
}
public static InterpreterResult fromJson(String json) {
return gson.fromJson(json, InterpreterResult.class);
}
public String toString() {
StringBuilder sb = new StringBuilder();
Type prevType = null;

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/RemoteZeppelinServerResource.java
View file

@ -17,10 +17,15 @@
package org.apache.zeppelin.interpreter;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
/**
* Remote Zeppelin Server Resource
*/
public class RemoteZeppelinServerResource {
public class RemoteZeppelinServerResource implements JsonSerializable {
private static final Gson gson = new Gson();
/**
* Resource Type for Zeppelin Server
*/
@ -55,4 +60,12 @@ public class RemoteZeppelinServerResource {
public void setData(Object data) {
this.data = data;
}
public String toJson() {
return gson.toJson(this);
}
public static RemoteZeppelinServerResource fromJson(String json) {
return gson.fromJson(json, RemoteZeppelinServerResource.class);
}
}

14
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InvokeResourceMethodEventMessage.java
View file

@ -16,12 +16,16 @@
*/
package org.apache.zeppelin.interpreter.remote;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.resource.ResourceId;
/**
* message payload to invoke method of resource in the resourcepool
*/
public class InvokeResourceMethodEventMessage {
public class InvokeResourceMethodEventMessage implements JsonSerializable {
private static final Gson gson = new Gson();
public final ResourceId resourceId;
public final String methodName;
public final String[] paramClassnames;
@ -91,4 +95,12 @@ public class InvokeResourceMethodEventMessage {
return false;
}
}
public String toJson() {
return gson.toJson(this);
}
public static InvokeResourceMethodEventMessage fromJson(String json) {
return gson.fromJson(json, InvokeResourceMethodEventMessage.class);
}
}

19
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
View file

@ -85,7 +85,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
*/
public void angularObjectAdd(AngularObject object) {
sendEvent(new RemoteInterpreterEvent(
RemoteInterpreterEventType.ANGULAR_OBJECT_ADD, gson.toJson(object)));
RemoteInterpreterEventType.ANGULAR_OBJECT_ADD, object.toJson()));
}
/**
@ -93,7 +93,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
*/
public void angularObjectUpdate(AngularObject object) {
sendEvent(new RemoteInterpreterEvent(
RemoteInterpreterEventType.ANGULAR_OBJECT_UPDATE, gson.toJson(object)));
RemoteInterpreterEventType.ANGULAR_OBJECT_UPDATE, object.toJson()));
}
/**
@ -146,10 +146,9 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
}
// send request
Gson gson = new Gson();
sendEvent(new RemoteInterpreterEvent(
RemoteInterpreterEventType.RESOURCE_GET,
gson.toJson(resourceId)));
resourceId.toJson()));
// wait for response
while (!getResourceResponse.containsKey(resourceId)) {
@ -198,11 +197,9 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
}
}
// send request
Gson gson = new Gson();
sendEvent(new RemoteInterpreterEvent(
RemoteInterpreterEventType.RESOURCE_INVOKE_METHOD,
gson.toJson(invokeMethod)));
invokeMethod.toJson()));
// wait for response
while (!getInvokeResponse.containsKey(invokeMethod)) {
try {
@ -252,11 +249,9 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
}
}
// send request
Gson gson = new Gson();
sendEvent(new RemoteInterpreterEvent(
RemoteInterpreterEventType.RESOURCE_INVOKE_METHOD,
gson.toJson(invokeMethod)));
invokeMethod.toJson()));
// wait for response
while (!getInvokeResponse.containsKey(invokeMethod)) {
try {
@ -279,7 +274,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
ResourceSet resourceSet = new ResourceSet();
for (String res : resources) {
RemoteResource resource = gson.fromJson(res, RemoteResource.class);
RemoteResource resource = RemoteResource.fromJson(res);
resource.setResourcePoolConnector(this);
resourceSet.add(resource);
}
@ -296,7 +291,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
* @param object java serialized of the object
*/
public void putResponseGetResource(String resourceId, ByteBuffer object) {
ResourceId rid = gson.fromJson(resourceId, ResourceId.class);
ResourceId rid = ResourceId.fromJson(resourceId);
logger.debug("Response resource {} from RemoteInterpreter", rid.getName());

19
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
View file

@ -130,12 +130,11 @@ public class RemoteInterpreterEventPoller extends Thread {
if (event.getType() == RemoteInterpreterEventType.NO_OP) {
continue;
} else if (event.getType() == RemoteInterpreterEventType.ANGULAR_OBJECT_ADD) {
AngularObject angularObject = gson.fromJson(event.getData(), AngularObject.class);
AngularObject angularObject = AngularObject.fromJson(event.getData());
angularObjectRegistry.add(angularObject.getName(),
angularObject.get(), angularObject.getNoteId(), angularObject.getParagraphId());
} else if (event.getType() == RemoteInterpreterEventType.ANGULAR_OBJECT_UPDATE) {
AngularObject angularObject = gson.fromJson(event.getData(),
AngularObject.class);
AngularObject angularObject = AngularObject.fromJson(event.getData());
AngularObject localAngularObject = angularObjectRegistry.get(
angularObject.getName(), angularObject.getNoteId(), angularObject.getParagraphId());
if (localAngularObject instanceof RemoteAngularObject) {
@ -146,7 +145,7 @@ public class RemoteInterpreterEventPoller extends Thread {
localAngularObject.set(angularObject.get());
}
} else if (event.getType() == RemoteInterpreterEventType.ANGULAR_OBJECT_REMOVE) {
AngularObject angularObject = gson.fromJson(event.getData(), AngularObject.class);
AngularObject angularObject = AngularObject.fromJson(event.getData());
angularObjectRegistry.remove(angularObject.getName(), angularObject.getNoteId(),
angularObject.getParagraphId());
} else if (event.getType() == RemoteInterpreterEventType.RUN_INTERPRETER_CONTEXT_RUNNER) {
@ -161,14 +160,14 @@ public class RemoteInterpreterEventPoller extends Thread {
sendResourcePoolResponseGetAll(resourceSet);
} else if (event.getType() == RemoteInterpreterEventType.RESOURCE_GET) {
String resourceIdString = event.getData();
ResourceId resourceId = gson.fromJson(resourceIdString, ResourceId.class);
ResourceId resourceId = ResourceId.fromJson(resourceIdString);
logger.debug("RESOURCE_GET {} {}", resourceId.getResourcePoolId(), resourceId.getName());
Object o = getResource(resourceId);
sendResourceResponseGet(resourceId, o);
} else if (event.getType() == RemoteInterpreterEventType.RESOURCE_INVOKE_METHOD) {
String message = event.getData();
InvokeResourceMethodEventMessage invokeMethodMessage =
gson.fromJson(message, InvokeResourceMethodEventMessage.class);
InvokeResourceMethodEventMessage.fromJson(message);
Object ret = invokeResourceMethod(invokeMethodMessage);
sendInvokeMethodResult(invokeMethodMessage, ret);
} else if (event.getType() == RemoteInterpreterEventType.OUTPUT_APPEND) {
@ -237,8 +236,8 @@ public class RemoteInterpreterEventPoller extends Thread {
appListener.onStatusChange(noteId, paragraphId, appId, status);
} else if (event.getType() == RemoteInterpreterEventType.REMOTE_ZEPPELIN_SERVER_RESOURCE) {
RemoteZeppelinServerResource reqResourceBody = gson.fromJson(
event.getData(), RemoteZeppelinServerResource.class);
RemoteZeppelinServerResource reqResourceBody = RemoteZeppelinServerResource.fromJson(
event.getData());
progressRemoteZeppelinControlEvent(
reqResourceBody.getResourceType(), listener, reqResourceBody);
@ -326,7 +325,7 @@ public class RemoteInterpreterEventPoller extends Thread {
resResource.setData(remoteRunners);
try {
eventClient.onReceivedZeppelinResource(gson.toJson(resResource));
eventClient.onReceivedZeppelinResource(resResource.toJson());
} catch (Exception e) {
clientBroken = true;
logger.error("Can't get RemoteInterpreterEvent", e);
@ -398,7 +397,7 @@ public class RemoteInterpreterEventPoller extends Thread {
List<String> resourceList = client.resourcePoolGetAll();
Gson gson = new Gson();
for (String res : resourceList) {
resourceSet.add(gson.fromJson(res, Resource.class));
resourceSet.add(Resource.fromJson(res));
}
} catch (Exception e) {
logger.error(e.getMessage(), e);

17
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
View file

@ -355,9 +355,7 @@ public class RemoteInterpreterServer
@Override
public void onReceivedZeppelinResource(String responseJson) throws TException {
RemoteZeppelinServerResource response = gson.fromJson(
responseJson, RemoteZeppelinServerResource.class);
RemoteZeppelinServerResource response = RemoteZeppelinServerResource.fromJson(responseJson);
if (response == null) {
throw new TException("Bad response for remote resource");
}
@ -609,7 +607,7 @@ public class RemoteInterpreterServer
ric.getReplName(),
ric.getParagraphTitle(),
ric.getParagraphText(),
gson.fromJson(ric.getAuthenticationInfo(), AuthenticationInfo.class),
AuthenticationInfo.fromJson(ric.getAuthenticationInfo()),
(Map<String, Object>) gson.fromJson(ric.getConfig(),
new TypeToken<Map<String, Object>>() {}.getType()),
GUI.fromJson(ric.getGui()),
@ -942,11 +940,8 @@ public class RemoteInterpreterServer
}
ResourceSet resourceSet = resourcePool.getAll(false);
Gson gson = new Gson();
for (Resource r : resourceSet) {
result.add(gson.toJson(r));
result.add(r.toJson());
}
return result;
@ -981,7 +976,7 @@ public class RemoteInterpreterServer
public ByteBuffer resourceInvokeMethod(
String noteId, String paragraphId, String resourceName, String invokeMessage) {
InvokeResourceMethodEventMessage message =
gson.fromJson(invokeMessage, InvokeResourceMethodEventMessage.class);
InvokeResourceMethodEventMessage.fromJson(invokeMessage);
Resource resource = resourcePool.get(noteId, paragraphId, resourceName, false);
if (resource == null || resource.get() == null) {
@ -1030,7 +1025,7 @@ public class RemoteInterpreterServer
public void resourceResponseInvokeMethod(
String invokeResourceMethodEventMessage, ByteBuffer object) throws TException {
InvokeResourceMethodEventMessage message =
gson.fromJson(invokeResourceMethodEventMessage, InvokeResourceMethodEventMessage.class);
InvokeResourceMethodEventMessage.fromJson(invokeResourceMethodEventMessage);
if (message.shouldPutResultIntoResourcePool()) {
Resource resource = resourcePool.get(
@ -1102,7 +1097,7 @@ public class RemoteInterpreterServer
logger.warn("Application instance {} is already running");
return new RemoteApplicationResult(true, "");
}
HeliumPackage pkgInfo = gson.fromJson(packageInfo, HeliumPackage.class);
HeliumPackage pkgInfo = HeliumPackage.fromJson(packageInfo);
ApplicationContext context = getApplicationContext(
pkgInfo, noteId, paragraphId, applicationInstanceId);
try {

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/RemoteResource.java
View file

@ -16,10 +16,15 @@
*/
package org.apache.zeppelin.resource;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
/**
* Resource that can retrieve data from remote
*/
public class RemoteResource extends Resource {
public class RemoteResource extends Resource implements JsonSerializable {
private static final Gson gson = new Gson();
ResourcePoolConnector resourcePoolConnector;
RemoteResource(ResourceId resourceId, Object r) {
@ -91,4 +96,12 @@ public class RemoteResource extends Resource {
returnResourceName);
return resource;
}
public String toJson() {
return gson.toJson(this);
}
public static RemoteResource fromJson(String json) {
return gson.fromJson(json, RemoteResource.class);
}
}

14
zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/Resource.java
View file

@ -16,6 +16,8 @@
*/
package org.apache.zeppelin.resource;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -26,7 +28,9 @@ import java.nio.ByteBuffer;
/**
* Information and reference to the resource
*/
public class Resource {
public class Resource implements JsonSerializable {
private static final Gson gson = new Gson();
private final transient Object r;
private final transient LocalResourcePool pool;
private final boolean serializable;
@ -203,4 +207,12 @@ public class Resource {
Logger logger = LoggerFactory.getLogger(Resource.class);
logger.error(e.getMessage(), e);
}
public String toJson() {
return gson.toJson(this);
}
public static Resource fromJson(String json) {
return gson.fromJson(json, Resource.class);
}
}

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceId.java
View file

@ -16,10 +16,15 @@
*/
package org.apache.zeppelin.resource;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
/**
* Identifying resource
*/
public class ResourceId {
public class ResourceId implements JsonSerializable {
private static final Gson gson = new Gson();
private final String resourcePoolId;
private final String name;
private final String noteId;
@ -80,4 +85,12 @@ public class ResourceId {
return false;
}
}
public String toJson() {
return gson.toJson(this);
}
public static ResourceId fromJson(String json) {
return gson.fromJson(json, ResourceId.class);
}
}

7
zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java
View file

@ -17,7 +17,6 @@
package org.apache.zeppelin.resource;
import com.google.gson.Gson;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService;
@ -59,9 +58,8 @@ public class ResourcePoolUtils {
continue;
}
List<String> resourceList = client.resourcePoolGetAll();
Gson gson = new Gson();
for (String res : resourceList) {
resourceSet.add(gson.fromJson(res, Resource.class));
resourceSet.add(Resource.fromJson(res));
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
@ -108,9 +106,8 @@ public class ResourcePoolUtils {
try {
client = remoteInterpreterProcess.getClient();
List<String> resourceList = client.resourcePoolGetAll();
Gson gson = new Gson();
for (String res : resourceList) {
resourceSet.add(gson.fromJson(res, Resource.class));
resourceSet.add(Resource.fromJson(res));
}
if (noteId != null) {

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceSet.java
View file

@ -16,6 +16,9 @@
*/
package org.apache.zeppelin.resource;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.Collection;
import java.util.LinkedList;
import java.util.regex.Pattern;
@ -23,7 +26,9 @@ import java.util.regex.Pattern;
/**
* List of resources
*/
public class ResourceSet extends LinkedList<Resource> {
public class ResourceSet extends LinkedList<Resource> implements JsonSerializable {
private static final Gson gson = new Gson();
public ResourceSet(Collection<Resource> resources) {
super(resources);
@ -102,4 +107,12 @@ public class ResourceSet extends LinkedList<Resource> {
return false;
}
}
public String toJson() {
return gson.toJson(this);
}
public static ResourceSet fromJson(String json) {
return gson.fromJson(json, ResourceSet.class);
}
}

16
zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java
View file

@ -18,19 +18,23 @@
package org.apache.zeppelin.user;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.google.gson.Gson;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/***
*
*/
public class AuthenticationInfo {
public class AuthenticationInfo implements JsonSerializable {
private static final Logger LOG = LoggerFactory.getLogger(AuthenticationInfo.class);
private static final Gson gson = new Gson();
String user;
List<String> roles;
String ticket;
@ -115,4 +119,12 @@ public class AuthenticationInfo {
return ANONYMOUS.equals(this) || "anonymous".equalsIgnoreCase(this.getUser())
|| StringUtils.isEmpty(this.getUser());
}
public String toJson() {
return gson.toJson(this);
}
public static AuthenticationInfo fromJson(String json) {
return gson.fromJson(json, AuthenticationInfo.class);
}
}

3
zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/Credentials.java
View file

@ -20,6 +20,7 @@ package org.apache.zeppelin.user;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.zeppelin.common.JsonSerializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -118,7 +119,7 @@ public class Credentials {
fis.close();
String json = sb.toString();
CredentialsInfoSaving info = gson.fromJson(json, CredentialsInfoSaving.class);
CredentialsInfoSaving info = CredentialsInfoSaving.fromJson(json);
this.credentialsMap = info.credentialsMap;
} catch (IOException e) {
LOG.error("Error loading credentials file", e);

15
zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/CredentialsInfoSaving.java
View file

@ -17,11 +17,24 @@
package org.apache.zeppelin.user;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.Map;
/**
* Helper class to save credentials
*/
public class CredentialsInfoSaving {
public class CredentialsInfoSaving implements JsonSerializable {
private static final Gson gson = new Gson();
public Map<String, UserCredentials> credentialsMap;
public String toJson() {
return gson.toJson(this);
}
public static CredentialsInfoSaving fromJson(String json) {
return gson.fromJson(json, CredentialsInfoSaving.class);
}
}

49
zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/GUITest.java
View file

@ -117,4 +117,53 @@ public class GUITest {
assertTrue(gui2.forms.get("checkbox_1") instanceof CheckBox);
assertEquals(options, ((CheckBox) gui2.forms.get("checkbox_1")).getOptions());
}
// load old json file and will convert it into new forms of Input
@Test
public void testOldGson_3() throws IOException {
String oldJson = "{\n" +
" \"params\": {\n" +
" \"maxAge\": \"35\"\n" +
" },\n" +
" \"forms\": {\n" +
" \"maxAge\": {\n" +
" \"name\": \"maxAge\",\n" +
" \"defaultValue\": \"30\",\n" +
" \"hidden\": false\n" +
" }\n" +
" }\n" +
" }";
GUI gui = GUI.fromJson(oldJson);
assertEquals(1, gui.forms.size());
assertTrue(gui.forms.get("maxAge") instanceof TextBox);
assertEquals("30", gui.forms.get("maxAge").getDefaultValue());
oldJson = "{\n" +
" \"params\": {\n" +
" \"marital\": \"single\"\n" +
" },\n" +
" \"forms\": {\n" +
" \"marital\": {\n" +
" \"name\": \"marital\",\n" +
" \"defaultValue\": \"single\",\n" +
" \"options\": [\n" +
" {\n" +
" \"value\": \"single\"\n" +
" },\n" +
" {\n" +
" \"value\": \"divorced\"\n" +
" },\n" +
" {\n" +
" \"value\": \"married\"\n" +
" }\n" +
" ],\n" +
" \"hidden\": false\n" +
" }\n" +
" }\n" +
" }";
gui = GUI.fromJson(oldJson);
assertEquals(1, gui.forms.size());
assertTrue(gui.forms.get("marital") instanceof Select);
assertEquals("single", gui.forms.get("marital").getDefaultValue());
}
}

4
zeppelin-interpreter/src/test/java/org/apache/zeppelin/helium/HeliumPackageTest.java
View file

@ -43,7 +43,7 @@ public class HeliumPackageTest {
" }\n" +
"}";
HeliumPackage p = gson.fromJson(examplePackage, HeliumPackage.class);
HeliumPackage p = HeliumPackage.fromJson(examplePackage);
assertEquals(p.getSpellInfo().getMagic(), "%echo");
assertEquals(p.getSpellInfo().getUsage(), "%echo <TEXT>");
}
@ -70,7 +70,7 @@ public class HeliumPackageTest {
" }\n" +
"}";
HeliumPackage p = gson.fromJson(examplePackage, HeliumPackage.class);
HeliumPackage p = HeliumPackage.fromJson(examplePackage);
Map<String, Object> config = p.getConfig();
Map<String, Object> accessToken = (Map<String, Object>) config.get("access-token");

20
zeppelin-server/src/main/java/org/apache/zeppelin/realm/ZeppelinHubRealm.java
View file

@ -37,6 +37,7 @@ import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.notebook.repo.zeppelinhub.model.UserSessionContainer;
import org.apache.zeppelin.notebook.repo.zeppelinhub.websocket.utils.ZeppelinhubUtils;
import org.apache.zeppelin.server.ZeppelinServer;
@ -62,7 +63,6 @@ public class ZeppelinHubRealm extends AuthorizingRealm {
private static final AtomicInteger INSTANCE_COUNT = new AtomicInteger();
private final HttpClient httpClient;
private final Gson gson;
private String zeppelinhubUrl;
private String name;
@ -73,7 +73,6 @@ public class ZeppelinHubRealm extends AuthorizingRealm {
//TODO(anthonyc): think about more setting for this HTTP client.
// eg: if user uses proxy etcetc...
httpClient = new HttpClient();
gson = new Gson();
name = getClass().getName() + "_" + INSTANCE_COUNT.getAndIncrement();
}
@ -150,9 +149,9 @@ public class ZeppelinHubRealm extends AuthorizingRealm {
User account = null;
try {
account = gson.fromJson(responseBody, User.class);
account = User.fromJson(responseBody);
} catch (JsonParseException e) {
LOG.error("Cannot deserialize ZeppelinHub response to User instance", e);
LOG.error("Cannot fromJson ZeppelinHub response to User instance", e);
throw new AuthenticationException("Cannot login to ZeppelinHub");
}
@ -200,12 +199,21 @@ public class ZeppelinHubRealm extends AuthorizingRealm {
}
/**
* Helper class that will be use to deserialize ZeppelinHub response.
* Helper class that will be use to fromJson ZeppelinHub response.
*/
protected class User {
protected static class User implements JsonSerializable {
private static final Gson gson = new Gson();
public String login;
public String email;
public String name;
public String toJson() {
return gson.toJson(this);
}
public static User fromJson(String json) {
return gson.fromJson(json, User.class);
}
}
public void onLoginSuccess(String username, String session) {

2
zeppelin-server/src/main/java/org/apache/zeppelin/rest/HeliumRestApi.java
View file

@ -134,7 +134,7 @@ public class HeliumRestApi {
return new JsonResponse(Response.Status.NOT_FOUND, "Paragraph " + paragraphId + " not found")
.build();
}
HeliumPackage pkg = gson.fromJson(heliumPackage, HeliumPackage.class);
HeliumPackage pkg = HeliumPackage.fromJson(heliumPackage);
String appId = helium.getApplicationFactory().loadAndRun(pkg, paragraph);
return new JsonResponse(Response.Status.OK, "", appId).build();

10
zeppelin-server/src/main/java/org/apache/zeppelin/rest/InterpreterRestApi.java
View file

@ -64,8 +64,6 @@ public class InterpreterRestApi {
private InterpreterSettingManager interpreterSettingManager;
private NotebookServer notebookServer;
Gson gson = new Gson();
public InterpreterRestApi() {
}
@ -117,7 +115,7 @@ public class InterpreterRestApi {
public Response newSettings(String message) {
try {
NewInterpreterSettingRequest request =
gson.fromJson(message, NewInterpreterSettingRequest.class);
NewInterpreterSettingRequest.fromJson(message);
if (request == null) {
return new JsonResponse<>(Status.BAD_REQUEST).build();
}
@ -142,7 +140,7 @@ public class InterpreterRestApi {
try {
UpdateInterpreterSettingRequest request =
gson.fromJson(message, UpdateInterpreterSettingRequest.class);
UpdateInterpreterSettingRequest.fromJson(message);
interpreterSettingManager
.setPropertyAndRestart(settingId, request.getOption(), request.getProperties(),
request.getDependencies());
@ -185,7 +183,7 @@ public class InterpreterRestApi {
InterpreterSetting setting = interpreterSettingManager.get(settingId);
try {
RestartInterpreterRequest request = gson.fromJson(message, RestartInterpreterRequest.class);
RestartInterpreterRequest request = RestartInterpreterRequest.fromJson(message);
String noteId = request == null ? null : request.getNoteId();
if (null == noteId) {
@ -237,7 +235,7 @@ public class InterpreterRestApi {
@ZeppelinApi
public Response addRepository(String message) {
try {
Repository request = gson.fromJson(message, Repository.class);
Repository request = Repository.fromJson(message);
interpreterSettingManager.addRepository(request.getId(), request.getUrl(),
request.isSnapshot(), request.getAuthentication(), request.getProxy());
logger.info("New repository {} added", request.getId());

7
zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRepoRestApi.java
View file

@ -39,7 +39,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
/**
@ -52,7 +51,6 @@ public class NotebookRepoRestApi {
private static final Logger LOG = LoggerFactory.getLogger(NotebookRepoRestApi.class);
private Gson gson = new Gson();
private NotebookRepoSync noteRepos;
private NotebookServer notebookWsServer;
@ -91,8 +89,7 @@ public class NotebookRepoRestApi {
/**
* Update a specific note repo.
*
* @param message
* @param settingId
* @param payload
* @return
*/
@PUT
@ -104,7 +101,7 @@ public class NotebookRepoRestApi {
AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
NotebookRepoSettingsRequest newSettings = NotebookRepoSettingsRequest.EMPTY;
try {
newSettings = gson.fromJson(payload, NotebookRepoSettingsRequest.class);
newSettings = NotebookRepoSettingsRequest.fromJson(payload);
} catch (JsonSyntaxException e) {
LOG.error("Cannot update notebook repo settings", e);
return new JsonResponse<>(Status.NOT_ACCEPTABLE, "",

22
zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
View file

@ -332,14 +332,16 @@ public class NotebookRestApi {
public Response createNote(String message) throws IOException {
String user = SecurityUtils.getPrincipal();
LOG.info("Create new note by JSON {}", message);
NewNoteRequest request = gson.fromJson(message, NewNoteRequest.class);
NewNoteRequest request = NewNoteRequest.fromJson(message);
AuthenticationInfo subject = new AuthenticationInfo(user);
Note note = notebook.createNote(subject);
List<NewParagraphRequest> initialParagraphs = request.getParagraphs();
if (initialParagraphs != null) {
for (NewParagraphRequest paragraphRequest : initialParagraphs) {
Paragraph p = note.addNewParagraph(subject);
initParagraph(p, paragraphRequest, user);
if (request != null) {
List<NewParagraphRequest> initialParagraphs = request.getParagraphs();
if (initialParagraphs != null) {
for (NewParagraphRequest paragraphRequest : initialParagraphs) {
Paragraph p = note.addNewParagraph(subject);
initParagraph(p, paragraphRequest, user);
}
}
}
note.addNewParagraph(subject); // add one paragraph to the last
@ -394,7 +396,7 @@ public class NotebookRestApi {
throws IOException, CloneNotSupportedException, IllegalArgumentException {
LOG.info("clone note by JSON {}", message);
checkIfUserCanWrite(noteId, "Insufficient privileges you cannot clone this note");
NewNoteRequest request = gson.fromJson(message, NewNoteRequest.class);
NewNoteRequest request = NewNoteRequest.fromJson(message);
String newNoteName = null;
if (request != null) {
newNoteName = request.getName();
@ -425,7 +427,7 @@ public class NotebookRestApi {
checkIfNoteIsNotNull(note);
checkIfUserCanWrite(noteId, "Insufficient privileges you cannot add paragraph to this note");
NewParagraphRequest request = gson.fromJson(message, NewParagraphRequest.class);
NewParagraphRequest request = NewParagraphRequest.fromJson(message);
AuthenticationInfo subject = new AuthenticationInfo(user);
Paragraph p;
Double indexDouble = request.getIndex();
@ -785,7 +787,7 @@ public class NotebookRestApi {
throws IOException, IllegalArgumentException {
LOG.info("Register cron job note={} request cron msg={}", noteId, message);
CronRequest request = gson.fromJson(message, CronRequest.class);
CronRequest request = CronRequest.fromJson(message);
Note note = notebook.getNote(noteId);
checkIfNoteIsNotNull(note);
@ -935,7 +937,7 @@ public class NotebookRestApi {
// handle params if presented
if (!StringUtils.isEmpty(message)) {
RunParagraphWithParametersRequest request =
gson.fromJson(message, RunParagraphWithParametersRequest.class);
RunParagraphWithParametersRequest.fromJson(message);
Map<String, Object> paramsForUpdating = request.getParams();
if (paramsForUpdating != null) {
paragraph.settings.getParams().putAll(paramsForUpdating);

14
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/CronRequest.java
View file

@ -19,13 +19,17 @@ package org.apache.zeppelin.rest.message;
import java.util.Map;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.interpreter.InterpreterOption;
/**
* CronRequest rest api request message
*
*/
public class CronRequest {
public class CronRequest implements JsonSerializable {
private static final Gson gson = new Gson();
String cron;
public CronRequest (){
@ -35,4 +39,12 @@ public class CronRequest {
public String getCronString() {
return cron;
}
public String toJson() {
return gson.toJson(this);
}
public static CronRequest fromJson(String json) {
return gson.fromJson(json, CronRequest.class);
}
}

13
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewInterpreterSettingRequest.java
View file

@ -20,6 +20,8 @@ package org.apache.zeppelin.rest.message;
import java.util.List;
import java.util.Map;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.dep.Dependency;
import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterProperty;
@ -27,7 +29,8 @@ import org.apache.zeppelin.interpreter.InterpreterProperty;
/**
* NewInterpreterSetting rest api request message
*/
public class NewInterpreterSettingRequest {
public class NewInterpreterSettingRequest implements JsonSerializable {
private static final Gson gson = new Gson();
private String name;
private String group;
@ -58,4 +61,12 @@ public class NewInterpreterSettingRequest {
public InterpreterOption getOption() {
return option;
}
public String toJson() {
return gson.toJson(this);
}
public static NewInterpreterSettingRequest fromJson(String json) {
return gson.fromJson(json, NewInterpreterSettingRequest.class);
}
}

14
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNoteRequest.java
View file

@ -20,13 +20,17 @@ package org.apache.zeppelin.rest.message;
import java.util.List;
import java.util.Map;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.interpreter.InterpreterOption;
/**
* NewNoteRequest rest api request message
*
*/
public class NewNoteRequest {
public class NewNoteRequest implements JsonSerializable {
private static final Gson gson = new Gson();
String name;
List<NewParagraphRequest> paragraphs;
@ -41,4 +45,12 @@ public class NewNoteRequest {
public List<NewParagraphRequest> getParagraphs() {
return paragraphs;
}
public String toJson() {
return gson.toJson(this);
}
public static NewNoteRequest fromJson(String json) {
return gson.fromJson(json, NewNoteRequest.class);
}
}

15
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewParagraphRequest.java
View file

@ -17,6 +17,9 @@
package org.apache.zeppelin.rest.message;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.HashMap;
/**
@ -27,7 +30,9 @@ import java.util.HashMap;
* table,pieChart,multibarChart,stackedAreaChart,lineChart,scatterChart
* colWidth (optional), e.g. 12.0
*/
public class NewParagraphRequest {
public class NewParagraphRequest implements JsonSerializable {
private static final Gson gson = new Gson();
String title;
String text;
Double index;
@ -50,4 +55,12 @@ public class NewParagraphRequest {
}
public HashMap< String, Object > getConfig() { return config; }
public String toJson() {
return gson.toJson(this);
}
public static NewParagraphRequest fromJson(String json) {
return gson.fromJson(json, NewParagraphRequest.class);
}
}

13
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NotebookRepoSettingsRequest.java
View file

@ -19,12 +19,15 @@ package org.apache.zeppelin.rest.message;
import java.util.Collections;
import java.util.Map;
import com.google.gson.Gson;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
/**
* Represent payload of a notebook repo settings.
*/
public class NotebookRepoSettingsRequest {
public class NotebookRepoSettingsRequest implements JsonSerializable {
private static final Gson gson = new Gson();
public static final NotebookRepoSettingsRequest EMPTY = new NotebookRepoSettingsRequest();
@ -46,4 +49,12 @@ public class NotebookRepoSettingsRequest {
}
return repoSetting.isEmpty();
}
public String toJson() {
return gson.toJson(this);
}
public static NotebookRepoSettingsRequest fromJson(String json) {
return gson.fromJson(json, NotebookRepoSettingsRequest.class);
}
}

15
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/RestartInterpreterRequest.java
View file

@ -17,10 +17,15 @@
package org.apache.zeppelin.rest.message;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
/**
* RestartInterpreter rest api request message
*/
public class RestartInterpreterRequest {
public class RestartInterpreterRequest implements JsonSerializable {
private static final Gson gson = new Gson();
String noteId;
public RestartInterpreterRequest() {
@ -30,4 +35,12 @@ public class RestartInterpreterRequest {
public String getNoteId() {
return noteId;
}
public String toJson() {
return gson.toJson(this);
}
public static RestartInterpreterRequest fromJson(String json) {
return gson.fromJson(json, RestartInterpreterRequest.class);
}
}

15
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/RunParagraphWithParametersRequest.java
View file

@ -17,12 +17,17 @@
package org.apache.zeppelin.rest.message;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.Map;
/**
* RunParagraphWithParametersRequest rest api request message
*/
public class RunParagraphWithParametersRequest {
public class RunParagraphWithParametersRequest implements JsonSerializable {
private static final Gson gson = new Gson();
Map<String, Object> params;
public RunParagraphWithParametersRequest() {
@ -32,4 +37,12 @@ public class RunParagraphWithParametersRequest {
public Map<String, Object> getParams() {
return params;
}
public String toJson() {
return gson.toJson(this);
}
public static RunParagraphWithParametersRequest fromJson(String json) {
return gson.fromJson(json, RunParagraphWithParametersRequest.class);
}
}

14
zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/UpdateInterpreterSettingRequest.java
View file

@ -20,6 +20,8 @@ package org.apache.zeppelin.rest.message;
import java.util.List;
import java.util.Map;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.dep.Dependency;
import org.apache.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterProperty;
@ -27,7 +29,9 @@ import org.apache.zeppelin.interpreter.InterpreterProperty;
/**
* UpdateInterpreterSetting rest api request message
*/
public class UpdateInterpreterSettingRequest {
public class UpdateInterpreterSettingRequest implements JsonSerializable {
private static final Gson gson = new Gson();
Map<String, InterpreterProperty> properties;
List<Dependency> dependencies;
InterpreterOption option;
@ -50,4 +54,12 @@ public class UpdateInterpreterSettingRequest {
public InterpreterOption getOption() {
return option;
}
public String toJson() {
return gson.toJson(this);
}
public static UpdateInterpreterSettingRequest fromJson(String json) {
return gson.fromJson(json, UpdateInterpreterSettingRequest.class);
}
}

4
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -115,7 +115,7 @@ public class NotebookServer extends WebSocketServlet
private static final Logger LOG = LoggerFactory.getLogger(NotebookServer.class);
Gson gson = new GsonBuilder()
private static Gson gson = new GsonBuilder()
.registerTypeAdapterFactory(new NotebookTypeAdapterFactory<Paragraph>(Paragraph.class) {
@Override
protected void beforeWrite(Paragraph source, JsonElement toSerialize) {
@ -2432,7 +2432,7 @@ public class NotebookServer extends WebSocketServlet
try {
watcher.send(
WatcherMessage.builder(noteId).subject(subject).message(serializeMessage(message))
.build().serialize());
.build().toJson());
} catch (IOException e) {
LOG.error("Cannot broadcast message to watcher", e);
}

2
zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
View file

@ -54,7 +54,6 @@ import org.hamcrest.TypeSafeMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
@ -68,7 +67,6 @@ public abstract class AbstractTestRestApi {
protected static final boolean wasRunning = checkIfServerIsRunning();
static boolean pySpark = false;
static boolean sparkR = false;
static Gson gson = new Gson();
static boolean isRunningWithAuth = false;
private static File shiroIni = null;

3
zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
View file

@ -39,14 +39,11 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import com.google.gson.Gson;
/**
* Test against spark cluster.
* Spark cluster is started by CI server using testing/startSparkCluster.sh
*/
public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
Gson gson = new Gson();
AuthenticationInfo anonymous;
@BeforeClass

12
zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
View file

@ -129,19 +129,19 @@ public class NotebookServerTest extends AbstractTestRestApi {
notebookServer.onOpen(sock2);
verify(sock1, times(0)).send(anyString()); // getNote, getAngularObject
// open the same notebook from sockets
notebookServer.onMessage(sock1, gson.toJson(new Message(OP.GET_NOTE).put("id", note1.getId())));
notebookServer.onMessage(sock2, gson.toJson(new Message(OP.GET_NOTE).put("id", note1.getId())));
notebookServer.onMessage(sock1, new Message(OP.GET_NOTE).put("id", note1.getId()).toJson());
notebookServer.onMessage(sock2, new Message(OP.GET_NOTE).put("id", note1.getId()).toJson());
reset(sock1);
reset(sock2);
// update object from sock1
notebookServer.onMessage(sock1, gson.toJson(
notebookServer.onMessage(sock1,
new Message(OP.ANGULAR_OBJECT_UPDATED)
.put("noteId", note1.getId())
.put("name", "object1")
.put("value", "value1")
.put("interpreterGroupId", interpreterGroup.getId())));
.put("interpreterGroupId", interpreterGroup.getId()).toJson());
// expect object is broadcasted except for where the update is created
@ -379,10 +379,10 @@ public class NotebookServerTest extends AbstractTestRestApi {
defaultInterpreterId = settings.get(1).getId();
}
// create note from sock1
notebookServer.onMessage(sock1, gson.toJson(
notebookServer.onMessage(sock1,
new Message(OP.NEW_NOTE)
.put("name", noteName)
.put("defaultInterpreterId", defaultInterpreterId)));
.put("defaultInterpreterId", defaultInterpreterId).toJson());
// expect the events are broadcasted properly
verify(sock1, times(2)).send(anyString());

12
zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
View file

@ -42,8 +42,7 @@ limitations under the License.
The interpreter will be instantiated
<span class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle"
data-toggle="dropdown"
>
data-toggle="dropdown">
{{getInterpreterRunningOption(setting.id)}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@ -125,7 +124,11 @@ limitations under the License.
</li>
</ul>
</span>
process.
process
<a class="fa fa-info-circle interpreter-binding-mode-info-link"
aria-hidden="true"
uib-tooltip="Can manage interpreter sessions differently by setting this option. Click this button to learn more"
ng-href="{{getInterpreterBindingModeDocsLink()}}" target="_blank"></a>
<span ng-if="getInterpreterRunningOption(setting.id) === 'Per User' && ticket.principal !== 'anonymous'">
<span ng-if="getPerNoteOption(setting.id) === 'shared'">
<button type="button" class="btn btn-default btn-xs"
@ -136,9 +139,6 @@ limitations under the License.
</span>
</span>
</div>
<div class="col-md-6">
&nbsp;
</div>
</div>
<div class="row interpreter"
style="margin-top: 6px;"

5
zeppelin-web/src/app/interpreter/interpreter.controller.js
View file

@ -769,5 +769,10 @@ function InterpreterCtrl($rootScope, $scope, $http, baseUrlSrv, ngToast, $timeou
})
}
$scope.getInterpreterBindingModeDocsLink = function() {
const currentVersion = $rootScope.zeppelinVersion
return `https://zeppelin.apache.org/docs/${currentVersion}/usage/interpreter/interpreter_binding_mode.html`
}
init()
}

7
zeppelin-web/src/app/interpreter/interpreter.css
View file

@ -123,3 +123,10 @@
margin-top: 0px !important;
margin-bottom: 0px !important;
}
.interpreter-binding-mode-info-link {
color: #3071a9;
vertical-align: middle;
margin-left: 2px;
text-decoration: none !important;
}

15
zeppelin-web/src/app/interpreter/interpreter.html
View file

@ -234,7 +234,11 @@ limitations under the License.
</li>
</ul>
</span>
process.
process
<a class="fa fa-info-circle interpreter-binding-mode-info-link"
aria-hidden="true"
uib-tooltip="Can manage interpreter sessions differently by setting this option. Click this button to learn more"
ng-href="{{getInterpreterBindingModeDocsLink()}}" target="_blank"></a>
<span ng-if="getInterpreterRunningOption(setting.id) === 'Per User' && ticket.principal !== 'anonymous'">
<span ng-if="getPerNoteOption(setting.id) === 'shared'">
<button type="button" class="btn btn-default btn-xs"
@ -246,9 +250,6 @@ limitations under the License.
</span>
</span>
</div>
<div class="col-md-6">
&nbsp;
</div>
</div>
<div class="row interpreter"
style="margin-top: 6px;"
@ -296,7 +297,11 @@ limitations under the License.
</li>
</ul>
</span>
process.
process
<a class="fa fa-info-circle interpreter-binding-mode-info-link"
aria-hidden="true"
uib-tooltip="Can manage interpreter sessions differently by setting this option. Click this button to learn more"
ng-href="{{getInterpreterBindingModeDocsLink()}}" target="_blank"></a>
<button type="button" class="btn btn-default btn-xs"
ng-disabled="!valueform.$visible"
ng-click="setPerNoteOption(setting.id, 'shared')"

13
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java
View file

@ -20,6 +20,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.resource.DistributedResourcePool;
@ -45,7 +46,6 @@ public class Helium {
private final String registryPaths;
private final File registryCacheDir;
private final Gson gson;
private final HeliumBundleFactory bundleFactory;
private final HeliumApplicationFactory applicationFactory;
@ -63,13 +63,6 @@ public class Helium {
this.registryCacheDir = registryCacheDir;
this.bundleFactory = bundleFactory;
this.applicationFactory = applicationFactory;
GsonBuilder builder = new GsonBuilder();
builder.setPrettyPrinting();
builder.registerTypeAdapter(
HeliumRegistry.class, new HeliumRegistrySerializer());
gson = builder.create();
heliumConf = loadConf(heliumConfPath);
}
@ -124,7 +117,7 @@ public class Helium {
return conf;
} else {
String jsonString = FileUtils.readFileToString(heliumConfFile);
HeliumConf conf = gson.fromJson(jsonString, HeliumConf.class);
HeliumConf conf = HeliumConf.fromJson(jsonString);
return conf;
}
}
@ -133,7 +126,7 @@ public class Helium {
String jsonString;
synchronized (registry) {
clearNotExistsPackages();
jsonString = gson.toJson(heliumConf);
jsonString = heliumConf.toJson();
}
File heliumConfFile = new File(heliumConfPath);

4
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
View file

@ -16,7 +16,6 @@
*/
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import org.apache.thrift.TException;
import org.apache.zeppelin.interpreter.*;
import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
@ -38,7 +37,6 @@ import java.util.concurrent.ExecutorService;
public class HeliumApplicationFactory implements ApplicationEventListener, NotebookEventListener {
private final Logger logger = LoggerFactory.getLogger(HeliumApplicationFactory.class);
private final ExecutorService executor;
private final Gson gson = new Gson();
private Notebook notebook;
private ApplicationEventListener applicationEventListener;
@ -117,7 +115,7 @@ public class HeliumApplicationFactory implements ApplicationEventListener, Noteb
try {
appStatusChange(paragraph, appState.getId(), ApplicationState.Status.LOADING);
String pkgInfo = gson.toJson(pkg);
String pkgInfo = pkg.toJson();
String appId = appState.getId();
client = intpProcess.getClient();

9
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
View file

@ -589,8 +589,7 @@ public class HeliumBundleFactory {
}
}
}
Gson gson = new Gson();
return gson.fromJson(sb.toString(), WebpackResult.class);
return WebpackResult.fromJson(sb.toString());
} catch (IOException e) {
logger.error(e.getMessage(), e);
return new WebpackResult();
@ -609,11 +608,9 @@ public class HeliumBundleFactory {
if (!packageJson.isFile()) {
return null;
}
Gson gson = new Gson();
try {
NpmPackage npmPackage = gson.fromJson(
FileUtils.readFileToString(packageJson),
NpmPackage.class);
NpmPackage npmPackage = NpmPackage.fromJson(
FileUtils.readFileToString(packageJson));
String[] nameVersion = new String[2];
nameVersion[0] = npmPackage.name;

19
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java
View file

@ -16,12 +16,21 @@
*/
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.*;
/**
* Helium config. This object will be persisted to conf/helium.conf
*/
public class HeliumConf {
public class HeliumConf implements JsonSerializable {
private static final Gson gson = new GsonBuilder()
.setPrettyPrinting()
.registerTypeAdapter(HeliumRegistry.class, new HeliumRegistrySerializer())
.create();
// enabled packages {name, version}
private Map<String, String> enabled = Collections.synchronizedMap(new HashMap<String, String>());
@ -91,4 +100,12 @@ public class HeliumConf {
public void setBundleDisplayOrder(List<String> orderedPackageList) {
bundleDisplayOrder = Collections.synchronizedList(orderedPackageList);
}
public String toJson() {
return gson.toJson(this);
}
public static HeliumConf fromJson(String json) {
return gson.fromJson(json, HeliumConf.class);
}
}

15
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/NpmPackage.java
View file

@ -16,13 +16,26 @@
*/
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.Map;
/**
* To read package.json
*/
public class NpmPackage {
public class NpmPackage implements JsonSerializable {
private static final Gson gson = new Gson();
public String name;
public String version;
public Map<String, String> dependencies;
public String toJson() {
return gson.toJson(this);
}
public static NpmPackage fromJson(String json) {
return gson.fromJson(json, NpmPackage.class);
}
}

15
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/WebpackResult.java
View file

@ -16,10 +16,23 @@
*/
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
/**
* Represetns webpack json format result
*/
public class WebpackResult {
public class WebpackResult implements JsonSerializable {
private static final Gson gson = new Gson();
public final String [] errors = new String[0];
public final String [] warnings = new String[0];
public String toJson() {
return gson.toJson(this);
}
public static WebpackResult fromJson(String json) {
return gson.fromJson(json, WebpackResult.class);
}
}

78
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file

@ -18,70 +18,35 @@
package org.apache.zeppelin.interpreter;
import com.google.common.base.Joiner;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.StandardCharsets;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.internal.StringMap;
import com.google.gson.reflect.TypeToken;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.NullArgumentException;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonatype.aether.RepositoryException;
import org.sonatype.aether.repository.Authentication;
import org.sonatype.aether.repository.Proxy;
import org.sonatype.aether.repository.RemoteRepository;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import org.apache.zeppelin.dep.Dependency;
import org.apache.zeppelin.dep.DependencyResolver;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.AngularObjectRegistryListener;
import org.apache.zeppelin.helium.ApplicationEventListener;
import org.apache.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcessListener;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Job.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonatype.aether.RepositoryException;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
/**
* Manage interpreters.
@ -95,9 +60,6 @@ public class InterpreterFactory implements InterpreterGroupFactory {
private ZeppelinConfiguration conf;
private final InterpreterSettingManager interpreterSettingManager;
private Gson gson;
private AngularObjectRegistryListener angularObjectRegistryListener;
private final RemoteInterpreterProcessListener remoteInterpreterProcessListener;
private final ApplicationEventListener appEventListener;
@ -120,10 +82,6 @@ public class InterpreterFactory implements InterpreterGroupFactory {
this.appEventListener = appEventListener;
this.shiroEnabled = shiroEnabled;
GsonBuilder builder = new GsonBuilder();
builder.setPrettyPrinting();
gson = builder.create();
this.interpreterSettingManager = interpreterSettingManager;
//TODO(jl): Fix it not to use InterpreterGroupFactory
interpreterSettingManager.setInterpreterGroupFactory(this);

16
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
View file

@ -17,6 +17,9 @@
package org.apache.zeppelin.interpreter;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.zeppelin.common.JsonSerializable;
import org.sonatype.aether.repository.RemoteRepository;
import java.util.List;
@ -25,8 +28,19 @@ import java.util.Map;
/**
*
*/
public class InterpreterInfoSaving {
public class InterpreterInfoSaving implements JsonSerializable {
private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
public Map<String, InterpreterSetting> interpreterSettings;
public Map<String, List<String>> interpreterBindings;
public List<RemoteRepository> interpreterRepositories;
public String toJson() {
return gson.toJson(this);
}
public static InterpreterInfoSaving fromJson(String json) {
return gson.fromJson(json, InterpreterInfoSaving.class);
}
}

8
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
View file

@ -50,6 +50,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
@ -161,11 +162,12 @@ public class InterpreterSettingManager {
return;
}
InterpreterInfoSaving infoSaving;
try (BufferedReader json =
try (BufferedReader jsonReader =
Files.newBufferedReader(interpreterBindingPath, StandardCharsets.UTF_8)) {
JsonParser jsonParser = new JsonParser();
JsonObject jsonObject = jsonParser.parse(json).getAsJsonObject();
JsonObject jsonObject = jsonParser.parse(jsonReader).getAsJsonObject();
infoSaving = gson.fromJson(jsonObject.toString(), InterpreterInfoSaving.class);
for (String k : infoSaving.interpreterSettings.keySet()) {
InterpreterSetting setting = infoSaving.interpreterSettings.get(k);
@ -246,7 +248,7 @@ public class InterpreterSettingManager {
info.interpreterSettings = interpreterSettings;
info.interpreterRepositories = interpreterRepositories;
jsonString = gson.toJson(info);
jsonString = info.toJson();
}
if (!Files.exists(interpreterBindingPath)) {

4
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
View file

@ -515,8 +515,8 @@ public class RemoteInterpreter extends Interpreter {
private RemoteInterpreterContext convert(InterpreterContext ic) {
return new RemoteInterpreterContext(ic.getNoteId(), ic.getParagraphId(), ic.getReplName(),
ic.getParagraphTitle(), ic.getParagraphText(), gson.toJson(ic.getAuthenticationInfo()),
gson.toJson(ic.getConfig()), gson.toJson(ic.getGui()), gson.toJson(ic.getRunners()));
ic.getParagraphTitle(), ic.getParagraphText(), ic.getAuthenticationInfo().toJson(),
gson.toJson(ic.getConfig()), ic.getGui().toJson(), gson.toJson(ic.getRunners()));
}
private InterpreterResult convert(RemoteInterpreterResult result) {

80
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
View file

@ -26,8 +26,12 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import com.google.common.annotations.VisibleForTesting;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
@ -35,6 +39,7 @@ import org.apache.zeppelin.display.Input;
import org.apache.zeppelin.interpreter.*;
import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.notebook.json.NotebookTypeAdapterFactory;
import org.apache.zeppelin.notebook.repo.NotebookRepo;
import org.apache.zeppelin.notebook.utility.IdHashes;
import org.apache.zeppelin.resource.ResourcePoolUtils;
@ -52,12 +57,26 @@ import com.google.gson.Gson;
/**
* Binded interpreters for a note
*/
public class Note implements Serializable, ParagraphJobListener {
public class Note implements ParagraphJobListener, JsonSerializable {
private static final Logger logger = LoggerFactory.getLogger(Note.class);
private static final long serialVersionUID = 7920699076577612429L;
private static final Gson gson = new GsonBuilder()
.registerTypeAdapterFactory(Input.TypeAdapterFactory)
.create();
private static Gson gson = new GsonBuilder()
.setPrettyPrinting()
.registerTypeAdapterFactory(new NotebookTypeAdapterFactory<Paragraph>(Paragraph.class) {
@Override
protected void beforeWrite(Paragraph source, JsonElement toSerialize) {
Map<String, ParagraphRuntimeInfo> runtimeInfos = source.getRuntimeInfos();
if (runtimeInfos != null) {
JsonElement jsonTree = gson.toJsonTree(runtimeInfos);
if (toSerialize instanceof JsonObject) {
JsonObject jsonObj = (JsonObject) toSerialize;
jsonObj.add("runtimeInfos", jsonTree);
}
}
}
}).setDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
.registerTypeAdapter(Date.class, new NotebookImportDeserializer())
.registerTypeAdapterFactory(Input.TypeAdapterFactory).create();
// threadpool for delayed persist of note
private static final ScheduledThreadPoolExecutor delayedPersistThreadPool =
@ -323,7 +342,7 @@ public class Note implements Serializable, ParagraphJobListener {
try {
Gson gson = new Gson();
String resultJson = gson.toJson(srcParagraph.getReturn());
InterpreterResult result = gson.fromJson(resultJson, InterpreterResult.class);
InterpreterResult result = InterpreterResult.fromJson(resultJson);
newParagraph.setReturn(result, null);
} catch (Exception e) {
// 'result' part of Note consists of exception, instead of actual interpreter results
@ -898,11 +917,6 @@ public class Note implements Serializable, ParagraphJobListener {
}
public static Note fromJson(String json) {
GsonBuilder gsonBuilder =
new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.registerTypeAdapter(Date.class, new NotebookImportDeserializer())
.create();
Note note = gson.fromJson(json, Note.class);
convertOldInput(note);
return note;
@ -913,4 +927,50 @@ public class Note implements Serializable, ParagraphJobListener {
p.settings.convertOldInput();
}
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Note note = (Note) o;
if (paragraphs != null ? !paragraphs.equals(note.paragraphs) : note.paragraphs != null) {
return false;
}
//TODO(zjffdu) exclude name because FolderView.index use Note as key and consider different name
//as same note
// if (name != null ? !name.equals(note.name) : note.name != null) return false;
if (id != null ? !id.equals(note.id) : note.id != null) {
return false;
}
if (angularObjects != null ?
!angularObjects.equals(note.angularObjects) : note.angularObjects != null) {
return false;
}
if (config != null ? !config.equals(note.config) : note.config != null) {
return false;
}
return info != null ? info.equals(note.info) : note.info == null;
}
@Override
public int hashCode() {
int result = paragraphs != null ? paragraphs.hashCode() : 0;
// result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + (id != null ? id.hashCode() : 0);
result = 31 * result + (angularObjects != null ? angularObjects.hashCode() : 0);
result = 31 * result + (config != null ? config.hashCode() : 0);
result = 31 * result + (info != null ? info.hashCode() : 0);
return result;
}
@VisibleForTesting
public static Gson getGson() {
return gson;
}
}

14
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
View file

@ -182,14 +182,11 @@ public class Notebook implements NoteEventListener {
* @throws IOException, IllegalArgumentException
*/
public String exportNote(String noteId) throws IOException, IllegalArgumentException {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.create();
Note note = getNote(noteId);
if (note == null) {
throw new IllegalArgumentException(noteId + " not found");
}
return gson.toJson(note);
return note.toJson();
}
/**
@ -202,16 +199,9 @@ public class Notebook implements NoteEventListener {
*/
public Note importNote(String sourceJson, String noteName, AuthenticationInfo subject)
throws IOException {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson =
gsonBuilder.registerTypeAdapter(Date.class, new NotebookImportDeserializer()).create();
JsonReader reader = new JsonReader(new StringReader(sourceJson));
reader.setLenient(true);
Note newNote;
try {
Note oldNote = gson.fromJson(reader, Note.class);
Note oldNote = Note.fromJson(sourceJson);
convertFromSingleResultToMultipleResultsFormat(oldNote);
newNote = createNote(subject);
if (noteName != null)

3
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorization.java
View file

@ -110,8 +110,7 @@ public class NotebookAuthorization {
fis.close();
String json = sb.toString();
NotebookAuthorizationInfoSaving info = gson.fromJson(json,
NotebookAuthorizationInfoSaving.class);
NotebookAuthorizationInfoSaving info = NotebookAuthorizationInfoSaving.fromJson(json);
authInfo = info.authInfo;
}

16
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorizationInfoSaving.java
View file

@ -17,12 +17,26 @@
package org.apache.zeppelin.notebook;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.Map;
import java.util.Set;
/**
* Only used for saving NotebookAuthorization info
*/
public class NotebookAuthorizationInfoSaving {
public class NotebookAuthorizationInfoSaving implements JsonSerializable {
private static final Gson gson = new Gson();
public Map<String, Map<String, Set<String>>> authInfo;
public String toJson() {
return gson.toJson(this);
}
public static NotebookAuthorizationInfoSaving fromJson(String json) {
return gson.fromJson(json, NotebookAuthorizationInfoSaving.class);
}
}

3
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
View file

@ -36,7 +36,8 @@ public class NotebookImportDeserializer implements JsonDeserializer<Date> {
private static final String[] DATE_FORMATS = new String[] {
"yyyy-MM-dd'T'HH:mm:ssZ",
"MMM d, yyyy h:mm:ss a",
"MMM dd, yyyy HH:mm:ss"
"MMM dd, yyyy HH:mm:ss",
"yyyy-MM-dd HH:mm:ss.SSS"
};
@Override

71
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
View file

@ -20,6 +20,7 @@ package org.apache.zeppelin.notebook;
import com.google.common.collect.Maps;
import com.google.common.base.Strings;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.completer.CompletionType;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
@ -49,7 +50,7 @@ import com.google.common.annotations.VisibleForTesting;
/**
* Paragraph is a representation of an execution unit.
*/
public class Paragraph extends Job implements Serializable, Cloneable {
public class Paragraph extends Job implements Cloneable, JsonSerializable {
private static final long serialVersionUID = -6328572073497992016L;
@ -755,4 +756,72 @@ public class Paragraph extends Job implements Serializable, Cloneable {
public Map<String, ParagraphRuntimeInfo> getRuntimeInfos() {
return runtimeInfos;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
if (!super.equals(o)) {
return false;
}
Paragraph paragraph = (Paragraph) o;
if (title != null ? !title.equals(paragraph.title) : paragraph.title != null) {
return false;
}
if (text != null ? !text.equals(paragraph.text) : paragraph.text != null) {
return false;
}
if (user != null ? !user.equals(paragraph.user) : paragraph.user != null) {
return false;
}
if (dateUpdated != null ?
!dateUpdated.equals(paragraph.dateUpdated) : paragraph.dateUpdated != null) {
return false;
}
if (config != null ? !config.equals(paragraph.config) : paragraph.config != null) {
return false;
}
if (settings != null ? !settings.equals(paragraph.settings) : paragraph.settings != null) {
return false;
}
if (results != null ? !results.equals(paragraph.results) : paragraph.results != null) {
return false;
}
if (result != null ? !result.equals(paragraph.result) : paragraph.result != null) {
return false;
}
return runtimeInfos != null ?
runtimeInfos.equals(paragraph.runtimeInfos) : paragraph.runtimeInfos == null;
}
@Override
public int hashCode() {
int result1 = super.hashCode();
result1 = 31 * result1 + (title != null ? title.hashCode() : 0);
result1 = 31 * result1 + (text != null ? text.hashCode() : 0);
result1 = 31 * result1 + (user != null ? user.hashCode() : 0);
result1 = 31 * result1 + (dateUpdated != null ? dateUpdated.hashCode() : 0);
result1 = 31 * result1 + (config != null ? config.hashCode() : 0);
result1 = 31 * result1 + (settings != null ? settings.hashCode() : 0);
result1 = 31 * result1 + (results != null ? results.hashCode() : 0);
result1 = 31 * result1 + (result != null ? result.hashCode() : 0);
result1 = 31 * result1 + (runtimeInfos != null ? runtimeInfos.hashCode() : 0);
return result1;
}
public String toJson() {
return Note.getGson().toJson(this);
}
public static Paragraph fromJson(String json) {
return Note.getGson().fromJson(json, Paragraph.class);
}
}

82
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/json/NotebookTypeAdapterFactory.java Normal file
View file

@ -0,0 +1,82 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.zeppelin.notebook.json;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
/**
* Custom adapter type factory
* Modify the jsonObject before serailaization/deserialization
* @param <C> the type whose json is to be customized for serialization/deserialization
*/
public class NotebookTypeAdapterFactory<C> implements TypeAdapterFactory {
private final Class<C> customizedClass;
public NotebookTypeAdapterFactory(Class<C> customizedClass) {
this.customizedClass = customizedClass;
}
@SuppressWarnings("unchecked")
// we use a runtime check to guarantee that 'C' and 'T' are equal
public final <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
return type.getRawType() == customizedClass ? (TypeAdapter<T>) customizeTypeAdapter(gson,
(TypeToken<C>) type) : null;
}
private TypeAdapter<C> customizeTypeAdapter(Gson gson, TypeToken<C> type) {
final TypeAdapter<C> delegate = gson.getDelegateAdapter(this, type);
final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
return new TypeAdapter<C>() {
@Override
public void write(JsonWriter out, C value) throws IOException {
JsonElement tree = delegate.toJsonTree(value);
beforeWrite(value, tree);
elementAdapter.write(out, tree);
}
@Override
public C read(JsonReader in) throws IOException {
JsonElement tree = elementAdapter.read(in);
afterRead(tree);
return delegate.fromJsonTree(tree);
}
};
}
/**
* Override this to change {@code toSerialize} before it is written to the
* outgoing JSON stream.
*/
protected void beforeWrite(C source, JsonElement toSerialize) {
}
/**
* Override this to change {@code deserialized} before it parsed into the
* application type.
*/
protected void afterRead(JsonElement deserialized) {
}
}

15
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java
View file

@ -25,7 +25,6 @@ import java.io.Writer;
import java.net.URISyntaxException;
import java.security.InvalidKeyException;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -35,15 +34,12 @@ import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.notebook.NoteInfo;
import org.apache.zeppelin.notebook.NotebookImportDeserializer;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.microsoft.azure.storage.CloudStorageAccount;
import com.microsoft.azure.storage.StorageException;
import com.microsoft.azure.storage.file.CloudFile;
@ -132,12 +128,6 @@ public class AzureNotebookRepo implements NotebookRepo {
String json = IOUtils.toString(ins,
conf.getString(ZeppelinConfiguration.ConfVars.ZEPPELIN_ENCODING));
ins.close();
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.registerTypeAdapter(Date.class, new NotebookImportDeserializer())
.create();
Note note = Note.fromJson(json);
for (Paragraph p : note.getParagraphs()) {
@ -156,10 +146,7 @@ public class AzureNotebookRepo implements NotebookRepo {
@Override
public void save(Note note, AuthenticationInfo subject) throws IOException {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.create();
String json = gson.toJson(note);
String json = note.toJson();
ByteArrayOutputStream output = new ByteArrayOutputStream();
Writer writer = new OutputStreamWriter(output);

11
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/MongoNotebookRepo.java
View file

@ -1,7 +1,5 @@
package org.apache.zeppelin.notebook.repo;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.mongodb.MongoBulkWriteException;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI;
@ -18,7 +16,6 @@ import com.mongodb.client.model.UpdateOptions;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.notebook.NoteInfo;
import org.apache.zeppelin.notebook.NotebookImportDeserializer;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.notebook.ApplicationState;
import org.apache.zeppelin.scheduler.Job;
@ -164,10 +161,7 @@ public class MongoNotebookRepo implements NotebookRepo {
// document to JSON
String json = doc.toJson();
// JSON to note
Gson gson = new GsonBuilder()
.registerTypeAdapter(Date.class, new NotebookImportDeserializer())
.create();
Note note = gson.fromJson(json, Note.class);
Note note = Note.fromJson(json);
for (Paragraph p : note.getParagraphs()) {
if (p.getStatus() == Job.Status.PENDING || p.getStatus() == Job.Status.RUNNING) {
@ -192,8 +186,7 @@ public class MongoNotebookRepo implements NotebookRepo {
*/
private Document noteToDocument(Note note) {
// note to JSON
Gson gson = new GsonBuilder().create();
String json = gson.toJson(note);
String json = note.toJson();
// JSON to document
Document doc = Document.parse(json);
// set object id as note id

14
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java
View file

@ -24,7 +24,6 @@ import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -36,7 +35,6 @@ import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.notebook.NoteInfo;
import org.apache.zeppelin.notebook.NotebookImportDeserializer;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.user.AuthenticationInfo;
@ -61,8 +59,6 @@ import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
/**
* Backend for storing Notebooks on S3
@ -186,11 +182,6 @@ public class S3NotebookRepo implements NotebookRepo {
}
private Note getNote(String key) throws IOException {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.registerTypeAdapter(Date.class, new NotebookImportDeserializer())
.create();
S3Object s3object;
try {
s3object = s3client.getObject(new GetObjectRequest(bucketName, key));
@ -226,10 +217,7 @@ public class S3NotebookRepo implements NotebookRepo {
@Override
public void save(Note note, AuthenticationInfo subject) throws IOException {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.create();
String json = gson.toJson(note);
String json = note.toJson();
String key = user + "/" + "notebook" + "/" + note.getId() + "/" + "note.json";
File file = File.createTempFile("note", "json");

11
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
View file

@ -43,7 +43,6 @@ import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import org.apache.zeppelin.notebook.ApplicationState;
import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.notebook.NoteInfo;
import org.apache.zeppelin.notebook.NotebookImportDeserializer;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.user.AuthenticationInfo;
@ -51,8 +50,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
/**
*
@ -164,8 +161,7 @@ public class VFSNotebookRepo implements NotebookRepo {
if (!noteJson.exists()) {
throw new IOException(noteJson.getName().toString() + " not found");
}
FileContent content = noteJson.getContent();
InputStream ins = content.getInputStream();
String json = IOUtils.toString(ins, conf.getString(ConfVars.ZEPPELIN_ENCODING));
@ -222,10 +218,7 @@ public class VFSNotebookRepo implements NotebookRepo {
@Override
public synchronized void save(Note note, AuthenticationInfo subject) throws IOException {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.create();
String json = gson.toJson(note);
String json = note.toJson();
FileObject rootDir = getRootDir();

20
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
View file

@ -48,8 +48,6 @@ import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
/**
* Zeppelin websocket client.
@ -59,7 +57,6 @@ public class ZeppelinClient {
private static final Logger LOG = LoggerFactory.getLogger(ZeppelinClient.class);
private final URI zeppelinWebsocketUrl;
private final WebSocketClient wsClient;
private static Gson gson;
// Keep track of current open connection per notebook.
private ConcurrentHashMap<String, Session> notesConnection;
// Listen to every note actions.
@ -99,7 +96,6 @@ public class ZeppelinClient {
private ZeppelinClient(String zeppelinUrl, String token, ZeppelinConfiguration conf) {
zeppelinWebsocketUrl = URI.create(zeppelinUrl);
wsClient = createNewWebsocketClient();
gson = new Gson();
notesConnection = new ConcurrentHashMap<>();
schedulerService = SchedulerService.getInstance();
authModule = Authentication.initialize(token, conf);
@ -177,7 +173,7 @@ public class ZeppelinClient {
zeppelinMsg.ticket = authModule.getTicket();
zeppelinMsg.roles = authModule.getRoles();
}
String msg = gson.toJson(zeppelinMsg);
String msg = zeppelinMsg.toJson();
return msg;
}
@ -189,14 +185,12 @@ public class ZeppelinClient {
if (StringUtils.isBlank(zeppelinMessage)) {
return null;
}
Message msg;
try {
msg = gson.fromJson(zeppelinMessage, Message.class);
} catch (JsonSyntaxException ex) {
LOG.error("Cannot deserialize zeppelin message", ex);
msg = null;
return Message.fromJson(zeppelinMessage);
} catch (Exception e) {
LOG.error("Fail to parse zeppelinMessage", e);
return null;
}
return msg;
}
private Session openWatcherSession() {
@ -316,7 +310,7 @@ public class ZeppelinClient {
if (StringUtils.isEmpty(token)) {
relayToAllZeppelinHub(hubMsg, noteId);
} else {
client.relayToZeppelinHub(hubMsg.serialize(), token);
client.relayToZeppelinHub(hubMsg.toJson(), token);
}
}
@ -336,7 +330,7 @@ public class ZeppelinClient {
if (noteAuth.isReader(noteId, userAndRoles)) {
token = userTokens.get(user);
hubMsg.meta.put("token", token);
client.relayToZeppelinHub(hubMsg.serialize(), token);
client.relayToZeppelinHub(hubMsg.toJson(), token);
}
}
}

2
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClient.java
View file

@ -195,7 +195,7 @@ public class ZeppelinhubClient {
}
public void handleMsgFromZeppelinHub(String message) {
ZeppelinhubMessage hubMsg = ZeppelinhubMessage.deserialize(message);
ZeppelinhubMessage hubMsg = ZeppelinhubMessage.fromJson(message);
if (hubMsg.equals(ZeppelinhubMessage.EMPTY)) {
LOG.error("Cannot handle ZeppelinHub message is empty");
return;

7
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/listener/WatcherWebsocket.java
View file

@ -27,15 +27,12 @@ import org.eclipse.jetty.websocket.api.WebSocketListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
/**
* Zeppelin Watcher that will forward user note to ZeppelinHub.
*
*/
public class WatcherWebsocket implements WebSocketListener {
private static final Logger LOG = LoggerFactory.getLogger(ZeppelinWebsocket.class);
private static final Gson GSON = new Gson();
private static final String watcherPrincipal = "watcher";
public Session connection;
@ -59,7 +56,7 @@ public class WatcherWebsocket implements WebSocketListener {
Message watcherMsg = new Message(OP.WATCHER);
watcherMsg.principal = watcherPrincipal;
watcherMsg.ticket = TicketContainer.instance.getTicket(watcherPrincipal);
session.getRemote().sendStringByFuture(GSON.toJson(watcherMsg));
session.getRemote().sendStringByFuture(watcherMsg.toJson());
}
@Override
@ -69,7 +66,7 @@ public class WatcherWebsocket implements WebSocketListener {
@Override
public void onWebSocketText(String message) {
WatcherMessage watcherMsg = GSON.fromJson(message, WatcherMessage.class);
WatcherMessage watcherMsg = WatcherMessage.fromJson(message);
if (StringUtils.isBlank(watcherMsg.noteId)) {
return;
}

9
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/protocol/ZeppelinhubMessage.java
View file

@ -19,6 +19,7 @@ package org.apache.zeppelin.notebook.repo.zeppelinhub.websocket.protocol;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.common.JsonSerializable;
import org.apache.zeppelin.notebook.repo.zeppelinhub.websocket.Client;
import org.apache.zeppelin.notebook.socket.Message;
import org.apache.zeppelin.notebook.socket.Message.OP;
@ -33,7 +34,7 @@ import com.google.gson.JsonSyntaxException;
* Zeppelinhub message class.
*
*/
public class ZeppelinhubMessage {
public class ZeppelinhubMessage implements JsonSerializable {
private static final Gson gson = new Gson();
private static final Logger LOG = LoggerFactory.getLogger(Client.class);
public static final ZeppelinhubMessage EMPTY = new ZeppelinhubMessage();
@ -64,11 +65,11 @@ public class ZeppelinhubMessage {
return new ZeppelinhubMessage(zeppelinMsg.op, zeppelinMsg.data, meta);
}
public String serialize() {
public String toJson() {
return gson.toJson(this, ZeppelinhubMessage.class);
}
public static ZeppelinhubMessage deserialize(String zeppelinhubMessage) {
public static ZeppelinhubMessage fromJson(String zeppelinhubMessage) {
if (StringUtils.isBlank(zeppelinhubMessage)) {
return EMPTY;
}
@ -76,7 +77,7 @@ public class ZeppelinhubMessage {
try {
msg = gson.fromJson(zeppelinhubMessage, ZeppelinhubMessage.class);
} catch (JsonSyntaxException ex) {
LOG.error("Cannot deserialize zeppelinhub message", ex);
LOG.error("Cannot fromJson zeppelinhub message", ex);
msg = EMPTY;
}
return msg;

12
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java
View file

@ -37,37 +37,37 @@ public class ZeppelinhubUtils {
public static String liveMessage(String token) {
if (StringUtils.isBlank(token)) {
LOG.error("Cannot create Live message: token is null or empty");
return ZeppelinhubMessage.EMPTY.serialize();
return ZeppelinhubMessage.EMPTY.toJson();
}
HashMap<String, Object> data = new HashMap<>();
data.put("token", token);
return ZeppelinhubMessage
.newMessage(ZeppelinHubOp.LIVE, data, new HashMap<String, String>())
.serialize();
.toJson();
}
public static String deadMessage(String token) {
if (StringUtils.isBlank(token)) {
LOG.error("Cannot create Dead message: token is null or empty");
return ZeppelinhubMessage.EMPTY.serialize();
return ZeppelinhubMessage.EMPTY.toJson();
}
HashMap<String, Object> data = new HashMap<>();
data.put("token", token);
return ZeppelinhubMessage
.newMessage(ZeppelinHubOp.DEAD, data, new HashMap<String, String>())
.serialize();
.toJson();
}
public static String pingMessage(String token) {
if (StringUtils.isBlank(token)) {
LOG.error("Cannot create Ping message: token is null or empty");
return ZeppelinhubMessage.EMPTY.serialize();
return ZeppelinhubMessage.EMPTY.toJson();
}
HashMap<String, Object> data = new HashMap<>();
data.put("token", token);
return ZeppelinhubMessage
.newMessage(ZeppelinHubOp.PING, data, new HashMap<String, String>())
.serialize();
.toJson();
}
public static ZeppelinHubOp toZeppelinHubOp(String text) {

14
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java
View file

@ -17,13 +17,16 @@
package org.apache.zeppelin.notebook.socket;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
import java.util.HashMap;
import java.util.Map;
/**
* Zeppelin websocket massage template class.
*/
public class Message {
public class Message implements JsonSerializable {
/**
* Representation of event type.
*/
@ -179,6 +182,7 @@ public class Message {
PARAS_INFO // [s-c] paragraph runtime infos
}
private static final Gson gson = new Gson();
public static final Message EMPTY = new Message(null);
public OP op;
@ -212,4 +216,12 @@ public class Message {
sb.append('}');
return sb.toString();
}
public String toJson() {
return gson.toJson(this);
}
public static Message fromJson(String json) {
return gson.fromJson(json, Message.class);
}
}

11
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/WatcherMessage.java
View file

@ -17,11 +17,12 @@
package org.apache.zeppelin.notebook.socket;
import com.google.gson.Gson;
import org.apache.zeppelin.common.JsonSerializable;
/**
* Zeppelin websocket massage template class for watcher socket.
*/
public class WatcherMessage {
public class WatcherMessage implements JsonSerializable {
public String message;
public String noteId;
@ -39,10 +40,14 @@ public class WatcherMessage {
this.subject = builder.subject;
}
public String serialize() {
public String toJson() {
return gson.toJson(this);
}
public static WatcherMessage fromJson(String json) {
return gson.fromJson(json, WatcherMessage.class);
}
/**
* Simple builder.
*/

21
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
View file

@ -39,7 +39,6 @@ import org.apache.zeppelin.dep.Dependency;
import org.apache.zeppelin.dep.DependencyResolver;
import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.notebook.JobListenerFactory;
import org.apache.zeppelin.notebook.Note;
@ -49,21 +48,22 @@ import org.apache.zeppelin.notebook.repo.NotebookRepo;
import org.apache.zeppelin.notebook.repo.VFSNotebookRepo;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.search.SearchService;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.quartz.SchedulerException;
import org.sonatype.aether.RepositoryException;
import static org.junit.Assert.*;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
import org.mockito.Mock;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
public class InterpreterFactoryTest {
@ -347,8 +347,7 @@ public class InterpreterFactoryTest {
byte[] encoded = Files.readAllBytes(Paths.get(confFilePath));
String json = new String(encoded, "UTF-8");
Gson gson = new Gson();
InterpreterInfoSaving infoSaving = gson.fromJson(json, InterpreterInfoSaving.class);
InterpreterInfoSaving infoSaving = InterpreterInfoSaving.fromJson(json);
Map<String, InterpreterSetting> interpreterSettings = infoSaving.interpreterSettings;
for (String key : interpreterSettings.keySet()) {
InterpreterSetting setting = interpreterSettings.get(key);

30
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
View file

@ -17,6 +17,10 @@
package org.apache.zeppelin.notebook;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.ui.TextBox;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterFactory;
import org.apache.zeppelin.interpreter.InterpreterResult;
@ -32,6 +36,8 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import java.util.Date;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -233,4 +239,28 @@ public class NoteTest {
assertNotEquals(System.identityHashCode(baseParagraph), System.identityHashCode(user2Paragraph));
assertNotEquals(System.identityHashCode(user1Paragraph), System.identityHashCode(user2Paragraph));
}
public void testNoteJson() {
Note note = new Note(repo, interpreterFactory, interpreterSettingManager, jobListenerFactory, index, credentials, noteEventListener);
note.setName("/test_note");
note.getConfig().put("config_1", "value_1");
note.getInfo().put("info_1", "value_1");
String pText = "%spark sc.version";
Paragraph p = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
p.dateUpdated = new Date();
p.setText(pText);
p.setResult("1.6.2");
p.settings.getForms().put("textbox_1", new TextBox("name", "default_name"));
p.settings.getParams().put("textbox_1", "my_name");
note.getAngularObjects().put("ao_1", Lists.newArrayList(new AngularObject("name_1", "value_1", note.getId(), p.getId(), null)));
// test Paragraph Json
Paragraph p2 = Paragraph.fromJson(p.toJson());
assertEquals(p2.settings, p.settings);
assertEquals(p2, p);
// test Note Json
Note note2 = Note.fromJson(note.toJson());
assertEquals(note2, note);
}
}

10
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
View file

@ -195,7 +195,15 @@ public class NotebookTest implements JobListenerFactory{
assertEquals(notes.size(), 2);
assertEquals(notes.get(1).getId(), copiedNote.getId());
assertEquals(notes.get(1).getName(), copiedNote.getName());
assertEquals(notes.get(1).getParagraphs(), copiedNote.getParagraphs());
// format has make some changes due to
// Notebook.convertFromSingleResultToMultipleResultsFormat
assertEquals(notes.get(1).getParagraphs().size(), copiedNote.getParagraphs().size());
assertEquals(notes.get(1).getParagraphs().get(0).getText(),
copiedNote.getParagraphs().get(0).getText());
assertEquals(notes.get(1).getParagraphs().get(0).settings,
copiedNote.getParagraphs().get(0).settings);
assertEquals(notes.get(1).getParagraphs().get(0).title,
copiedNote.getParagraphs().get(0).title);
// delete the notebook
for (String note : noteNames) {

8
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/protocol/ZeppelinhubMessageTest.java
View file

@ -17,7 +17,7 @@ public class ZeppelinhubMessageTest {
public void testThatCanSerializeZeppelinHubMessage() {
Map<String,String> meta = Maps.newHashMap();
meta.put("key1", "val1");
String zeppelinHubMsg = ZeppelinhubMessage.newMessage(OP.LIST_NOTES, "my data", meta).serialize();
String zeppelinHubMsg = ZeppelinhubMessage.newMessage(OP.LIST_NOTES, "my data", meta).toJson();
assertEquals(msg, zeppelinHubMsg);
}
@ -27,7 +27,7 @@ public class ZeppelinhubMessageTest {
Map<String,String> meta = Maps.newHashMap();
meta.put("key1", "val1");
ZeppelinhubMessage expected = ZeppelinhubMessage.newMessage(OP.LIST_NOTES.toString(), "my data", meta);
ZeppelinhubMessage zeppelinHubMsg = ZeppelinhubMessage.deserialize(msg);
ZeppelinhubMessage zeppelinHubMsg = ZeppelinhubMessage.fromJson(msg);
assertEquals(expected.op, zeppelinHubMsg.op);
assertEquals(expected.data, zeppelinHubMsg.data);
@ -36,8 +36,8 @@ public class ZeppelinhubMessageTest {
@Test
public void testThatInvalidStringReturnEmptyZeppelinhubMessage() {
assertEquals(ZeppelinhubMessage.EMPTY, ZeppelinhubMessage.deserialize(""));
assertEquals(ZeppelinhubMessage.EMPTY, ZeppelinhubMessage.deserialize("dwfewewrewr"));
assertEquals(ZeppelinhubMessage.EMPTY, ZeppelinhubMessage.fromJson(""));
assertEquals(ZeppelinhubMessage.EMPTY, ZeppelinhubMessage.fromJson("dwfewewrewr"));
}
}

12
zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
View file

@ -147,10 +147,10 @@ public class DistributedResourcePoolTest {
intp2.interpret("put key2 value2", context);
ret = intp1.interpret("getAll", context);
assertEquals(2, gson.fromJson(ret.message().get(0).getData(), ResourceSet.class).size());
assertEquals(2, ResourceSet.fromJson(ret.message().get(0).getData()).size());
ret = intp2.interpret("getAll", context);
assertEquals(2, gson.fromJson(ret.message().get(0).getData(), ResourceSet.class).size());
assertEquals(2, ResourceSet.fromJson(ret.message().get(0).getData()).size());
ret = intp1.interpret("get key1", context);
assertEquals("value1", gson.fromJson(ret.message().get(0).getData(), String.class));
@ -173,7 +173,7 @@ public class DistributedResourcePoolTest {
ResourceSet remoteSet = new ResourceSet();
Gson gson = new Gson();
for (Resource s : set) {
RemoteResource remoteResource = gson.fromJson(gson.toJson(s), RemoteResource.class);
RemoteResource remoteResource = RemoteResource.fromJson(s.toJson());
remoteResource.setResourcePoolConnector(this);
remoteSet.add(remoteResource);
}
@ -278,14 +278,14 @@ public class DistributedResourcePoolTest {
// make sure no resources are automatically created
ret = intp1.interpret("getAll", context);
assertEquals(2, gson.fromJson(ret.message().get(0).getData(), ResourceSet.class).size());
assertEquals(2, ResourceSet.fromJson(ret.message().get(0).getData()).size());
// invoke method in local resource pool and save result
ret = intp1.interpret("invoke key1 length ret1", context);
assertEquals("3", ret.message().get(0).getData());
ret = intp1.interpret("getAll", context);
assertEquals(3, gson.fromJson(ret.message().get(0).getData(), ResourceSet.class).size());
assertEquals(3, ResourceSet.fromJson(ret.message().get(0).getData()).size());
ret = intp1.interpret("get ret1", context);
assertEquals("3", gson.fromJson(ret.message().get(0).getData(), String.class));
@ -295,7 +295,7 @@ public class DistributedResourcePoolTest {
assertEquals("5", ret.message().get(0).getData());
ret = intp1.interpret("getAll", context);
assertEquals(4, gson.fromJson(ret.message().get(0).getData(), ResourceSet.class).size());
assertEquals(4, ResourceSet.fromJson(ret.message().get(0).getData()).size());
ret = intp1.interpret("get ret2", context);
assertEquals("5", gson.fromJson(ret.message().get(0).getData(), String.class));