Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
save InterpreterResult.msg as list of strings
- Loading branch information
Showing
5 changed files
with
129 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...src/main/java/org/apache/zeppelin/notebook/typeadapter/InterpreterResultDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * 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.typeadapter; | ||
|
|
||
| import com.google.gson.JsonDeserializationContext; | ||
| import com.google.gson.JsonDeserializer; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonParseException; | ||
|
|
||
| import org.apache.zeppelin.interpreter.InterpreterResult; | ||
| import org.apache.commons.lang.StringUtils; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.Type; | ||
| import java.lang.reflect.InvocationTargetException; | ||
|
|
||
| /** | ||
| * Custom deserializer for InterpreterResult | ||
| */ | ||
| public class InterpreterResultDeserializer implements JsonDeserializer<InterpreterResult> { | ||
| @Override | ||
| public InterpreterResult deserialize(JsonElement json, Type typeOfT, | ||
| JsonDeserializationContext context) throws JsonParseException { | ||
| JsonObject jsonObject = (JsonObject) json; | ||
|
|
||
| JsonElement codeObject = jsonObject.get("code"); | ||
| InterpreterResult.Code code = InterpreterResult.Code.ERROR; | ||
| if (codeObject.isJsonPrimitive()) { | ||
| code = context.deserialize(codeObject, InterpreterResult.Code.class); | ||
| } | ||
|
|
||
| JsonElement typeObject = jsonObject.get("type"); | ||
| InterpreterResult.Type type = InterpreterResult.Type.NULL; | ||
| if (typeObject.isJsonPrimitive()) { | ||
| type = context.deserialize(typeObject, InterpreterResult.Type.class); | ||
| } | ||
|
|
||
| JsonElement msgObject = jsonObject.get("msg"); | ||
| String msg = ""; | ||
| if (msgObject != null) { | ||
| if (msgObject.isJsonArray()) { | ||
| String[] value = context.deserialize(msgObject, String[].class); | ||
| msg = StringUtils.join(value, "\n"); | ||
| } else if (msgObject.isJsonPrimitive()) { | ||
| msg = msgObject.getAsJsonPrimitive().getAsString(); | ||
| } | ||
| } | ||
|
|
||
| return new InterpreterResult(code, type, msg); | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
...e/src/main/java/org/apache/zeppelin/notebook/typeadapter/InterpreterResultSerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * 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.typeadapter; | ||
|
|
||
| import com.google.gson.JsonSerializationContext; | ||
| import com.google.gson.JsonSerializer; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
|
|
||
| import org.apache.zeppelin.interpreter.InterpreterResult; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.Type; | ||
|
|
||
| /** | ||
| * Custom serializer for InterpreterResult | ||
| */ | ||
| public class InterpreterResultSerializer implements JsonSerializer<InterpreterResult> { | ||
| @Override | ||
| public JsonElement serialize(InterpreterResult src, Type typeOfSrc, | ||
| JsonSerializationContext context) { | ||
| JsonObject json = new JsonObject(); | ||
| json.add("code", context.serialize(src.code())); | ||
| json.add("type", context.serialize(src.type())); | ||
| String msg = src.message(); | ||
| if (msg != null) { | ||
| json.add("msg", context.serialize(msg.split("\n"))); | ||
| } | ||
| return json; | ||
| } | ||
| } |