ZEPPELIN-206: provide shell genthrift.sh to generate java code and auto insert license header
Author: caofangkun <[email protected]> Closes #185 from caofangkun/zeppelin-206 and squashes the following commits: 347dbf7 [caofangkun] ZEPPELIN-206: modify pom.xml add relativePath 7a204dc [caofangkun] ZEPPELIN-206: update libthrift version from 0.9.0 to 0.9.2 498ad4d [caofangkun] ZEPPELIN-206: provide shell genthrift.sh to generate java code and auto insert license header Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/8ade54ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/8ade54ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/8ade54ee Branch: refs/heads/master Commit: 8ade54ee126c020607393ccd1af9713af8a975f2 Parents: ee8f64b Author: caofangkun <[email protected]> Authored: Fri Aug 7 14:39:13 2015 +0800 Committer: Lee moon soo <[email protected]> Committed: Thu Aug 13 08:37:35 2015 -0700 ---------------------------------------------------------------------- angular/pom.xml | 1 + cassandra/pom.xml | 1 + flink/pom.xml | 1 + hive/pom.xml | 1 + ignite/pom.xml | 1 + lens/pom.xml | 1 + markdown/pom.xml | 1 + pom.xml | 2 +- shell/pom.xml | 1 + spark/pom.xml | 1 + tajo/pom.xml | 1 + zeppelin-distribution/pom.xml | 1 + zeppelin-interpreter/pom.xml | 6 + .../thrift/RemoteInterpreterContext.java | 95 +- .../thrift/RemoteInterpreterEvent.java | 54 +- .../thrift/RemoteInterpreterEventType.java | 19 +- .../thrift/RemoteInterpreterResult.java | 77 +- .../thrift/RemoteInterpreterService.java | 1397 +++++++++++++++--- .../src/main/thrift/genthrift.sh | 28 + .../src/main/thrift/java_license_header.txt | 17 + zeppelin-server/pom.xml | 1 + zeppelin-web/pom.xml | 1 + zeppelin-zengine/pom.xml | 1 + 23 files changed, 1442 insertions(+), 267 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/angular/pom.xml ---------------------------------------------------------------------- diff --git a/angular/pom.xml b/angular/pom.xml index c508677..7aad95d 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 08f353f..860f3a7 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/flink/pom.xml ---------------------------------------------------------------------- diff --git a/flink/pom.xml b/flink/pom.xml index b6c790b..27d8034 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/hive/pom.xml ---------------------------------------------------------------------- diff --git a/hive/pom.xml b/hive/pom.xml index 9354a95..7562c58 100644 --- a/hive/pom.xml +++ b/hive/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/ignite/pom.xml ---------------------------------------------------------------------- diff --git a/ignite/pom.xml b/ignite/pom.xml index a3edfd5..91094a6 100644 --- a/ignite/pom.xml +++ b/ignite/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <artifactId>zeppelin-ignite</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/lens/pom.xml ---------------------------------------------------------------------- diff --git a/lens/pom.xml b/lens/pom.xml index 1426043..12f92a9 100644 --- a/lens/pom.xml +++ b/lens/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/markdown/pom.xml ---------------------------------------------------------------------- diff --git a/markdown/pom.xml b/markdown/pom.xml index 7631209..6004f16 100644 --- a/markdown/pom.xml +++ b/markdown/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 791681b..1c67f47 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ <properties> <slf4j.version>1.7.10</slf4j.version> <log4j.version>1.2.17</log4j.version> - <libthrift.version>0.9.0</libthrift.version> + <libthrift.version>0.9.2</libthrift.version> <gson.version>2.2</gson.version> <guava.version>15.0</guava.version> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index 118b6cb..9cc621c 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index d4c7fb5..aa07687 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -23,6 +23,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/tajo/pom.xml ---------------------------------------------------------------------- diff --git a/tajo/pom.xml b/tajo/pom.xml index 1161cc0..c08a0db 100644 --- a/tajo/pom.xml +++ b/tajo/pom.xml @@ -22,6 +22,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/zeppelin-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index 72d001c..6c7b3f0 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -24,6 +24,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <artifactId>zeppelin-distribution</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/zeppelin-interpreter/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index 3b6e49b..edfa5e3 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -25,6 +25,7 @@ <artifactId>zeppelin</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.6.0-incubating-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.apache.zeppelin</groupId> @@ -60,6 +61,11 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java index 7a757ab..a55d5de 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java @@ -1,5 +1,22 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * 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. + */ +/** + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +32,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,10 +46,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RemoteInterpreterContext implements org.apache.thrift.TBase<RemoteInterpreterContext, RemoteInterpreterContext._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7") +public class RemoteInterpreterContext implements org.apache.thrift.TBase<RemoteInterpreterContext, RemoteInterpreterContext._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteInterpreterContext> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteInterpreterContext"); private static final org.apache.thrift.protocol.TField NOTE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("noteId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -579,83 +601,120 @@ public class RemoteInterpreterContext implements org.apache.thrift.TBase<RemoteI @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_noteId = true && (isSetNoteId()); + list.add(present_noteId); + if (present_noteId) + list.add(noteId); + + boolean present_paragraphId = true && (isSetParagraphId()); + list.add(present_paragraphId); + if (present_paragraphId) + list.add(paragraphId); + + boolean present_paragraphTitle = true && (isSetParagraphTitle()); + list.add(present_paragraphTitle); + if (present_paragraphTitle) + list.add(paragraphTitle); + + boolean present_paragraphText = true && (isSetParagraphText()); + list.add(present_paragraphText); + if (present_paragraphText) + list.add(paragraphText); + + boolean present_config = true && (isSetConfig()); + list.add(present_config); + if (present_config) + list.add(config); + + boolean present_gui = true && (isSetGui()); + list.add(present_gui); + if (present_gui) + list.add(gui); + + boolean present_runners = true && (isSetRunners()); + list.add(present_runners); + if (present_runners) + list.add(runners); + + return list.hashCode(); } + @Override public int compareTo(RemoteInterpreterContext other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - RemoteInterpreterContext typedOther = (RemoteInterpreterContext)other; - lastComparison = Boolean.valueOf(isSetNoteId()).compareTo(typedOther.isSetNoteId()); + lastComparison = Boolean.valueOf(isSetNoteId()).compareTo(other.isSetNoteId()); if (lastComparison != 0) { return lastComparison; } if (isSetNoteId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.noteId, typedOther.noteId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.noteId, other.noteId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetParagraphId()).compareTo(typedOther.isSetParagraphId()); + lastComparison = Boolean.valueOf(isSetParagraphId()).compareTo(other.isSetParagraphId()); if (lastComparison != 0) { return lastComparison; } if (isSetParagraphId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphId, typedOther.paragraphId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphId, other.paragraphId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetParagraphTitle()).compareTo(typedOther.isSetParagraphTitle()); + lastComparison = Boolean.valueOf(isSetParagraphTitle()).compareTo(other.isSetParagraphTitle()); if (lastComparison != 0) { return lastComparison; } if (isSetParagraphTitle()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphTitle, typedOther.paragraphTitle); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphTitle, other.paragraphTitle); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetParagraphText()).compareTo(typedOther.isSetParagraphText()); + lastComparison = Boolean.valueOf(isSetParagraphText()).compareTo(other.isSetParagraphText()); if (lastComparison != 0) { return lastComparison; } if (isSetParagraphText()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphText, typedOther.paragraphText); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphText, other.paragraphText); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetConfig()).compareTo(typedOther.isSetConfig()); + lastComparison = Boolean.valueOf(isSetConfig()).compareTo(other.isSetConfig()); if (lastComparison != 0) { return lastComparison; } if (isSetConfig()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.config, typedOther.config); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.config, other.config); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetGui()).compareTo(typedOther.isSetGui()); + lastComparison = Boolean.valueOf(isSetGui()).compareTo(other.isSetGui()); if (lastComparison != 0) { return lastComparison; } if (isSetGui()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gui, typedOther.gui); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gui, other.gui); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRunners()).compareTo(typedOther.isSetRunners()); + lastComparison = Boolean.valueOf(isSetRunners()).compareTo(other.isSetRunners()); if (lastComparison != 0) { return lastComparison; } if (isSetRunners()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.runners, typedOther.runners); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.runners, other.runners); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java index b44ea96..96a49b5 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java @@ -1,5 +1,22 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * 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. + */ +/** + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +32,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,10 +46,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RemoteInterpreterEvent implements org.apache.thrift.TBase<RemoteInterpreterEvent, RemoteInterpreterEvent._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7") +public class RemoteInterpreterEvent implements org.apache.thrift.TBase<RemoteInterpreterEvent, RemoteInterpreterEvent._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteInterpreterEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteInterpreterEvent"); private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1); @@ -300,33 +322,45 @@ public class RemoteInterpreterEvent implements org.apache.thrift.TBase<RemoteInt @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + boolean present_data = true && (isSetData()); + list.add(present_data); + if (present_data) + list.add(data); + + return list.hashCode(); } + @Override public int compareTo(RemoteInterpreterEvent other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - RemoteInterpreterEvent typedOther = (RemoteInterpreterEvent)other; - lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType()); + lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType()); if (lastComparison != 0) { return lastComparison; } if (isSetType()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetData()).compareTo(typedOther.isSetData()); + lastComparison = Boolean.valueOf(isSetData()).compareTo(other.isSetData()); if (lastComparison != 0) { return lastComparison; } if (isSetData()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, typedOther.data); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data); if (lastComparison != 0) { return lastComparison; } @@ -411,7 +445,7 @@ public class RemoteInterpreterEvent implements org.apache.thrift.TBase<RemoteInt switch (schemeField.id) { case 1: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = RemoteInterpreterEventType.findByValue(iprot.readI32()); + struct.type = org.apache.zeppelin.interpreter.thrift.RemoteInterpreterEventType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -488,7 +522,7 @@ public class RemoteInterpreterEvent implements org.apache.thrift.TBase<RemoteInt TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.type = RemoteInterpreterEventType.findByValue(iprot.readI32()); + struct.type = org.apache.zeppelin.interpreter.thrift.RemoteInterpreterEventType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(1)) { http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java index abbc68f..9a7d142 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java @@ -1,5 +1,22 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * 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. + */ +/** + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8ade54ee/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java index 5a68bd0..36c0f25 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java @@ -1,5 +1,22 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * 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. + */ +/** + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +32,8 @@ import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,10 +46,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RemoteInterpreterResult implements org.apache.thrift.TBase<RemoteInterpreterResult, RemoteInterpreterResult._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7") +public class RemoteInterpreterResult implements org.apache.thrift.TBase<RemoteInterpreterResult, RemoteInterpreterResult._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteInterpreterResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteInterpreterResult"); private static final org.apache.thrift.protocol.TField CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("code", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -461,63 +483,90 @@ public class RemoteInterpreterResult implements org.apache.thrift.TBase<RemoteIn @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_code = true && (isSetCode()); + list.add(present_code); + if (present_code) + list.add(code); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type); + + boolean present_msg = true && (isSetMsg()); + list.add(present_msg); + if (present_msg) + list.add(msg); + + boolean present_config = true && (isSetConfig()); + list.add(present_config); + if (present_config) + list.add(config); + + boolean present_gui = true && (isSetGui()); + list.add(present_gui); + if (present_gui) + list.add(gui); + + return list.hashCode(); } + @Override public int compareTo(RemoteInterpreterResult other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - RemoteInterpreterResult typedOther = (RemoteInterpreterResult)other; - lastComparison = Boolean.valueOf(isSetCode()).compareTo(typedOther.isSetCode()); + lastComparison = Boolean.valueOf(isSetCode()).compareTo(other.isSetCode()); if (lastComparison != 0) { return lastComparison; } if (isSetCode()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, typedOther.code); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, other.code); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType()); + lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType()); if (lastComparison != 0) { return lastComparison; } if (isSetType()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMsg()).compareTo(typedOther.isSetMsg()); + lastComparison = Boolean.valueOf(isSetMsg()).compareTo(other.isSetMsg()); if (lastComparison != 0) { return lastComparison; } if (isSetMsg()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetConfig()).compareTo(typedOther.isSetConfig()); + lastComparison = Boolean.valueOf(isSetConfig()).compareTo(other.isSetConfig()); if (lastComparison != 0) { return lastComparison; } if (isSetConfig()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.config, typedOther.config); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.config, other.config); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetGui()).compareTo(typedOther.isSetGui()); + lastComparison = Boolean.valueOf(isSetGui()).compareTo(other.isSetGui()); if (lastComparison != 0) { return lastComparison; } if (isSetGui()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gui, typedOther.gui); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gui, other.gui); if (lastComparison != 0) { return lastComparison; }
