http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RunParagraphsEvent.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RunParagraphsEvent.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RunParagraphsEvent.java index 62ead29..1387635 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RunParagraphsEvent.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RunParagraphsEvent.java @@ -1,68 +1,66 @@ /** - * 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 + * 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 * - * <p>http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * <p>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 + * 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) * - * <p>DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * - * @generated + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ package org.apache.zeppelin.interpreter.thrift; -import java.util.ArrayList; -import java.util.BitSet; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; + import org.apache.thrift.scheme.TupleScheme; +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; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +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; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2018-8-9") -public class RunParagraphsEvent - implements org.apache.thrift.TBase<RunParagraphsEvent, RunParagraphsEvent._Fields>, - java.io.Serializable, - Cloneable, - Comparable<RunParagraphsEvent> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = - new org.apache.thrift.protocol.TStruct("RunParagraphsEvent"); - - 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); - private static final org.apache.thrift.protocol.TField PARAGRAPH_IDS_FIELD_DESC = - new org.apache.thrift.protocol.TField( - "paragraphIds", org.apache.thrift.protocol.TType.LIST, (short) 2); - private static final org.apache.thrift.protocol.TField PARAGRAPH_INDICES_FIELD_DESC = - new org.apache.thrift.protocol.TField( - "paragraphIndices", org.apache.thrift.protocol.TType.LIST, (short) 3); - private static final org.apache.thrift.protocol.TField CUR_PARAGRAPH_ID_FIELD_DESC = - new org.apache.thrift.protocol.TField( - "curParagraphId", org.apache.thrift.protocol.TType.STRING, (short) 4); - - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = - new HashMap<Class<? extends IScheme>, SchemeFactory>(); +public class RunParagraphsEvent implements org.apache.thrift.TBase<RunParagraphsEvent, RunParagraphsEvent._Fields>, java.io.Serializable, Cloneable, Comparable<RunParagraphsEvent> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RunParagraphsEvent"); + + 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); + private static final org.apache.thrift.protocol.TField PARAGRAPH_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("paragraphIds", org.apache.thrift.protocol.TType.LIST, (short)2); + private static final org.apache.thrift.protocol.TField PARAGRAPH_INDICES_FIELD_DESC = new org.apache.thrift.protocol.TField("paragraphIndices", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final org.apache.thrift.protocol.TField CUR_PARAGRAPH_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("curParagraphId", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { schemes.put(StandardScheme.class, new RunParagraphsEventStandardSchemeFactory()); schemes.put(TupleScheme.class, new RunParagraphsEventTupleSchemeFactory()); @@ -73,15 +71,12 @@ public class RunParagraphsEvent public List<Integer> paragraphIndices; // required public String curParagraphId; // required - /** - * The set of fields this struct contains, along with convenience methods for finding and - * manipulating them. - */ + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NOTE_ID((short) 1, "noteId"), - PARAGRAPH_IDS((short) 2, "paragraphIds"), - PARAGRAPH_INDICES((short) 3, "paragraphIndices"), - CUR_PARAGRAPH_ID((short) 4, "curParagraphId"); + NOTE_ID((short)1, "noteId"), + PARAGRAPH_IDS((short)2, "paragraphIds"), + PARAGRAPH_INDICES((short)3, "paragraphIndices"), + CUR_PARAGRAPH_ID((short)4, "curParagraphId"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -91,9 +86,11 @@ public class RunParagraphsEvent } } - /** Find the _Fields constant that matches fieldId, or null if its not found. */ + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ public static _Fields findByThriftId(int fieldId) { - switch (fieldId) { + switch(fieldId) { case 1: // NOTE_ID return NOTE_ID; case 2: // PARAGRAPH_IDS @@ -107,15 +104,19 @@ public class RunParagraphsEvent } } - /** Find the _Fields constant that matches fieldId, throwing an exception if it is not found. */ + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) - throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } - /** Find the _Fields constant that matches name, or null if its not found. */ + /** + * Find the _Fields constant that matches name, or null if its not found. + */ public static _Fields findByName(String name) { return byName.get(name); } @@ -139,54 +140,31 @@ public class RunParagraphsEvent // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = - new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put( - _Fields.NOTE_ID, - new org.apache.thrift.meta_data.FieldMetaData( - "noteId", - org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData( - org.apache.thrift.protocol.TType.STRING))); - tmpMap.put( - _Fields.PARAGRAPH_IDS, - new org.apache.thrift.meta_data.FieldMetaData( - "paragraphIds", - org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData( - org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData( - org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put( - _Fields.PARAGRAPH_INDICES, - new org.apache.thrift.meta_data.FieldMetaData( - "paragraphIndices", - org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData( - org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData( - org.apache.thrift.protocol.TType.I32)))); - tmpMap.put( - _Fields.CUR_PARAGRAPH_ID, - new org.apache.thrift.meta_data.FieldMetaData( - "curParagraphId", - org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData( - org.apache.thrift.protocol.TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NOTE_ID, new org.apache.thrift.meta_data.FieldMetaData("noteId", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PARAGRAPH_IDS, new org.apache.thrift.meta_data.FieldMetaData("paragraphIds", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.PARAGRAPH_INDICES, new org.apache.thrift.meta_data.FieldMetaData("paragraphIndices", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); + tmpMap.put(_Fields.CUR_PARAGRAPH_ID, new org.apache.thrift.meta_data.FieldMetaData("curParagraphId", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap( - RunParagraphsEvent.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RunParagraphsEvent.class, metaDataMap); } - public RunParagraphsEvent() {} + public RunParagraphsEvent() { + } public RunParagraphsEvent( - String noteId, - List<String> paragraphIds, - List<Integer> paragraphIndices, - String curParagraphId) { + String noteId, + List<String> paragraphIds, + List<Integer> paragraphIndices, + String curParagraphId) + { this(); this.noteId = noteId; this.paragraphIds = paragraphIds; @@ -194,7 +172,9 @@ public class RunParagraphsEvent this.curParagraphId = curParagraphId; } - /** Performs a deep copy on <i>other</i>. */ + /** + * Performs a deep copy on <i>other</i>. + */ public RunParagraphsEvent(RunParagraphsEvent other) { if (other.isSetNoteId()) { this.noteId = other.noteId; @@ -315,9 +295,7 @@ public class RunParagraphsEvent this.paragraphIndices = null; } - /** - * Returns true if field paragraphIndices is set (has been assigned a value) and false otherwise - */ + /** Returns true if field paragraphIndices is set (has been assigned a value) and false otherwise */ public boolean isSetParagraphIndices() { return this.paragraphIndices != null; } @@ -354,115 +332,125 @@ public class RunParagraphsEvent public void setFieldValue(_Fields field, Object value) { switch (field) { - case NOTE_ID: - if (value == null) { - unsetNoteId(); - } else { - setNoteId((String) value); - } - break; + case NOTE_ID: + if (value == null) { + unsetNoteId(); + } else { + setNoteId((String)value); + } + break; - case PARAGRAPH_IDS: - if (value == null) { - unsetParagraphIds(); - } else { - setParagraphIds((List<String>) value); - } - break; + case PARAGRAPH_IDS: + if (value == null) { + unsetParagraphIds(); + } else { + setParagraphIds((List<String>)value); + } + break; - case PARAGRAPH_INDICES: - if (value == null) { - unsetParagraphIndices(); - } else { - setParagraphIndices((List<Integer>) value); - } - break; + case PARAGRAPH_INDICES: + if (value == null) { + unsetParagraphIndices(); + } else { + setParagraphIndices((List<Integer>)value); + } + break; + + case CUR_PARAGRAPH_ID: + if (value == null) { + unsetCurParagraphId(); + } else { + setCurParagraphId((String)value); + } + break; - case CUR_PARAGRAPH_ID: - if (value == null) { - unsetCurParagraphId(); - } else { - setCurParagraphId((String) value); - } - break; } } public Object getFieldValue(_Fields field) { switch (field) { - case NOTE_ID: - return getNoteId(); + case NOTE_ID: + return getNoteId(); + + case PARAGRAPH_IDS: + return getParagraphIds(); - case PARAGRAPH_IDS: - return getParagraphIds(); + case PARAGRAPH_INDICES: + return getParagraphIndices(); - case PARAGRAPH_INDICES: - return getParagraphIndices(); + case CUR_PARAGRAPH_ID: + return getCurParagraphId(); - case CUR_PARAGRAPH_ID: - return getCurParagraphId(); } throw new IllegalStateException(); } - /** - * Returns true if field corresponding to fieldID is set (has been assigned a value) and false - * otherwise - */ + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); } switch (field) { - case NOTE_ID: - return isSetNoteId(); - case PARAGRAPH_IDS: - return isSetParagraphIds(); - case PARAGRAPH_INDICES: - return isSetParagraphIndices(); - case CUR_PARAGRAPH_ID: - return isSetCurParagraphId(); + case NOTE_ID: + return isSetNoteId(); + case PARAGRAPH_IDS: + return isSetParagraphIds(); + case PARAGRAPH_INDICES: + return isSetParagraphIndices(); + case CUR_PARAGRAPH_ID: + return isSetCurParagraphId(); } throw new IllegalStateException(); } @Override public boolean equals(Object that) { - if (that == null) return false; - if (that instanceof RunParagraphsEvent) return this.equals((RunParagraphsEvent) that); + if (that == null) + return false; + if (that instanceof RunParagraphsEvent) + return this.equals((RunParagraphsEvent)that); return false; } public boolean equals(RunParagraphsEvent that) { - if (that == null) return false; + if (that == null) + return false; boolean this_present_noteId = true && this.isSetNoteId(); boolean that_present_noteId = true && that.isSetNoteId(); if (this_present_noteId || that_present_noteId) { - if (!(this_present_noteId && that_present_noteId)) return false; - if (!this.noteId.equals(that.noteId)) return false; + if (!(this_present_noteId && that_present_noteId)) + return false; + if (!this.noteId.equals(that.noteId)) + return false; } boolean this_present_paragraphIds = true && this.isSetParagraphIds(); boolean that_present_paragraphIds = true && that.isSetParagraphIds(); if (this_present_paragraphIds || that_present_paragraphIds) { - if (!(this_present_paragraphIds && that_present_paragraphIds)) return false; - if (!this.paragraphIds.equals(that.paragraphIds)) return false; + if (!(this_present_paragraphIds && that_present_paragraphIds)) + return false; + if (!this.paragraphIds.equals(that.paragraphIds)) + return false; } boolean this_present_paragraphIndices = true && this.isSetParagraphIndices(); boolean that_present_paragraphIndices = true && that.isSetParagraphIndices(); if (this_present_paragraphIndices || that_present_paragraphIndices) { - if (!(this_present_paragraphIndices && that_present_paragraphIndices)) return false; - if (!this.paragraphIndices.equals(that.paragraphIndices)) return false; + if (!(this_present_paragraphIndices && that_present_paragraphIndices)) + return false; + if (!this.paragraphIndices.equals(that.paragraphIndices)) + return false; } boolean this_present_curParagraphId = true && this.isSetCurParagraphId(); boolean that_present_curParagraphId = true && that.isSetCurParagraphId(); if (this_present_curParagraphId || that_present_curParagraphId) { - if (!(this_present_curParagraphId && that_present_curParagraphId)) return false; - if (!this.curParagraphId.equals(that.curParagraphId)) return false; + if (!(this_present_curParagraphId && that_present_curParagraphId)) + return false; + if (!this.curParagraphId.equals(that.curParagraphId)) + return false; } return true; @@ -474,19 +462,23 @@ public class RunParagraphsEvent boolean present_noteId = true && (isSetNoteId()); list.add(present_noteId); - if (present_noteId) list.add(noteId); + if (present_noteId) + list.add(noteId); boolean present_paragraphIds = true && (isSetParagraphIds()); list.add(present_paragraphIds); - if (present_paragraphIds) list.add(paragraphIds); + if (present_paragraphIds) + list.add(paragraphIds); boolean present_paragraphIndices = true && (isSetParagraphIndices()); list.add(present_paragraphIndices); - if (present_paragraphIndices) list.add(paragraphIndices); + if (present_paragraphIndices) + list.add(paragraphIndices); boolean present_curParagraphId = true && (isSetCurParagraphId()); list.add(present_curParagraphId); - if (present_curParagraphId) list.add(curParagraphId); + if (present_curParagraphId) + list.add(curParagraphId); return list.hashCode(); } @@ -514,20 +506,17 @@ public class RunParagraphsEvent return lastComparison; } if (isSetParagraphIds()) { - lastComparison = - org.apache.thrift.TBaseHelper.compareTo(this.paragraphIds, other.paragraphIds); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphIds, other.paragraphIds); if (lastComparison != 0) { return lastComparison; } } - lastComparison = - Boolean.valueOf(isSetParagraphIndices()).compareTo(other.isSetParagraphIndices()); + lastComparison = Boolean.valueOf(isSetParagraphIndices()).compareTo(other.isSetParagraphIndices()); if (lastComparison != 0) { return lastComparison; } if (isSetParagraphIndices()) { - lastComparison = - org.apache.thrift.TBaseHelper.compareTo(this.paragraphIndices, other.paragraphIndices); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paragraphIndices, other.paragraphIndices); if (lastComparison != 0) { return lastComparison; } @@ -537,8 +526,7 @@ public class RunParagraphsEvent return lastComparison; } if (isSetCurParagraphId()) { - lastComparison = - org.apache.thrift.TBaseHelper.compareTo(this.curParagraphId, other.curParagraphId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.curParagraphId, other.curParagraphId); if (lastComparison != 0) { return lastComparison; } @@ -554,8 +542,7 @@ public class RunParagraphsEvent schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) - throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -606,20 +593,15 @@ public class RunParagraphsEvent private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write( - new org.apache.thrift.protocol.TCompactProtocol( - new org.apache.thrift.transport.TIOStreamTransport(out))); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } - private void readObject(java.io.ObjectInputStream in) - throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - read( - new org.apache.thrift.protocol.TCompactProtocol( - new org.apache.thrift.transport.TIOStreamTransport(in))); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } @@ -633,13 +615,13 @@ public class RunParagraphsEvent private static class RunParagraphsEventStandardScheme extends StandardScheme<RunParagraphsEvent> { - public void read(org.apache.thrift.protocol.TProtocol iprot, RunParagraphsEvent struct) - throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, RunParagraphsEvent struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); - while (true) { + while (true) + { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -647,7 +629,7 @@ public class RunParagraphsEvent if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.noteId = iprot.readString(); struct.setNoteIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -657,14 +639,15 @@ public class RunParagraphsEvent org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); struct.paragraphIds = new ArrayList<String>(_list8.size); String _elem9; - for (int _i10 = 0; _i10 < _list8.size; ++_i10) { + for (int _i10 = 0; _i10 < _list8.size; ++_i10) + { _elem9 = iprot.readString(); struct.paragraphIds.add(_elem9); } iprot.readListEnd(); } struct.setParagraphIdsIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -674,14 +657,15 @@ public class RunParagraphsEvent org.apache.thrift.protocol.TList _list11 = iprot.readListBegin(); struct.paragraphIndices = new ArrayList<Integer>(_list11.size); int _elem12; - for (int _i13 = 0; _i13 < _list11.size; ++_i13) { + for (int _i13 = 0; _i13 < _list11.size; ++_i13) + { _elem12 = iprot.readI32(); struct.paragraphIndices.add(_elem12); } iprot.readListEnd(); } struct.setParagraphIndicesIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -689,7 +673,7 @@ public class RunParagraphsEvent if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.curParagraphId = iprot.readString(); struct.setCurParagraphIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -704,8 +688,7 @@ public class RunParagraphsEvent struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, RunParagraphsEvent struct) - throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, RunParagraphsEvent struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -717,10 +700,9 @@ public class RunParagraphsEvent if (struct.paragraphIds != null) { oprot.writeFieldBegin(PARAGRAPH_IDS_FIELD_DESC); { - oprot.writeListBegin( - new org.apache.thrift.protocol.TList( - org.apache.thrift.protocol.TType.STRING, struct.paragraphIds.size())); - for (String _iter14 : struct.paragraphIds) { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.paragraphIds.size())); + for (String _iter14 : struct.paragraphIds) + { oprot.writeString(_iter14); } oprot.writeListEnd(); @@ -730,10 +712,9 @@ public class RunParagraphsEvent if (struct.paragraphIndices != null) { oprot.writeFieldBegin(PARAGRAPH_INDICES_FIELD_DESC); { - oprot.writeListBegin( - new org.apache.thrift.protocol.TList( - org.apache.thrift.protocol.TType.I32, struct.paragraphIndices.size())); - for (int _iter15 : struct.paragraphIndices) { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.paragraphIndices.size())); + for (int _iter15 : struct.paragraphIndices) + { oprot.writeI32(_iter15); } oprot.writeListEnd(); @@ -748,6 +729,7 @@ public class RunParagraphsEvent oprot.writeFieldStop(); oprot.writeStructEnd(); } + } private static class RunParagraphsEventTupleSchemeFactory implements SchemeFactory { @@ -759,8 +741,7 @@ public class RunParagraphsEvent private static class RunParagraphsEventTupleScheme extends TupleScheme<RunParagraphsEvent> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RunParagraphsEvent struct) - throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, RunParagraphsEvent struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.isSetNoteId()) { @@ -782,7 +763,8 @@ public class RunParagraphsEvent if (struct.isSetParagraphIds()) { { oprot.writeI32(struct.paragraphIds.size()); - for (String _iter16 : struct.paragraphIds) { + for (String _iter16 : struct.paragraphIds) + { oprot.writeString(_iter16); } } @@ -790,7 +772,8 @@ public class RunParagraphsEvent if (struct.isSetParagraphIndices()) { { oprot.writeI32(struct.paragraphIndices.size()); - for (int _iter17 : struct.paragraphIndices) { + for (int _iter17 : struct.paragraphIndices) + { oprot.writeI32(_iter17); } } @@ -801,8 +784,7 @@ public class RunParagraphsEvent } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RunParagraphsEvent struct) - throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, RunParagraphsEvent struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { @@ -811,12 +793,11 @@ public class RunParagraphsEvent } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list18 = - new org.apache.thrift.protocol.TList( - org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.paragraphIds = new ArrayList<String>(_list18.size); String _elem19; - for (int _i20 = 0; _i20 < _list18.size; ++_i20) { + for (int _i20 = 0; _i20 < _list18.size; ++_i20) + { _elem19 = iprot.readString(); struct.paragraphIds.add(_elem19); } @@ -825,12 +806,11 @@ public class RunParagraphsEvent } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list21 = - new org.apache.thrift.protocol.TList( - org.apache.thrift.protocol.TType.I32, iprot.readI32()); + org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); struct.paragraphIndices = new ArrayList<Integer>(_list21.size); int _elem22; - for (int _i23 = 0; _i23 < _list21.size; ++_i23) { + for (int _i23 = 0; _i23 < _list21.size; ++_i23) + { _elem22 = iprot.readI32(); struct.paragraphIndices.add(_elem22); } @@ -843,4 +823,6 @@ public class RunParagraphsEvent } } } + } +
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/InterpreterOutputStream.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/InterpreterOutputStream.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/InterpreterOutputStream.java index 063d559..258a65d 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/InterpreterOutputStream.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/InterpreterOutputStream.java @@ -17,14 +17,15 @@ package org.apache.zeppelin.interpreter.util; -import java.io.IOException; import org.apache.zeppelin.interpreter.InterpreterOutput; import org.slf4j.Logger; +import java.io.IOException; + /** * Output Stream integrated with InterpreterOutput. * - * <p>Can be used to channel output from interpreters. + * Can be used to channel output from interpreters. */ public class InterpreterOutputStream extends LogOutputStream { private Logger logger; @@ -48,8 +49,8 @@ public class InterpreterOutputStream extends LogOutputStream { if (ignoreLeadingNewLinesFromScalaReporter && b == '\n') { StackTraceElement[] stacks = Thread.currentThread().getStackTrace(); for (StackTraceElement stack : stacks) { - if (stack.getClassName().equals("scala.tools.nsc.interpreter.ReplReporter") - && stack.getMethodName().equals("error")) { + if (stack.getClassName().equals("scala.tools.nsc.interpreter.ReplReporter") && + stack.getMethodName().equals("error")) { // ignore. Please see ZEPPELIN-2067 return; } @@ -64,12 +65,12 @@ public class InterpreterOutputStream extends LogOutputStream { } @Override - public void write(byte[] b) throws IOException { + public void write(byte [] b) throws IOException { write(b, 0, b.length); } @Override - public void write(byte[] b, int off, int len) throws IOException { + public void write(byte [] b, int off, int len) throws IOException { for (int i = off; i < len; i++) { write(b[i]); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/LogOutputStream.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/LogOutputStream.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/LogOutputStream.java index 57405e0..e77f441 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/LogOutputStream.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/util/LogOutputStream.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.io.OutputStream; /** - * Minor modification of LogOutputStream of apache commons exec. LogOutputStream of apache commons - * exec has one issue that method flush doesn't throw IOException, so that SparkOutputStream can not - * extend it correctly. + * Minor modification of LogOutputStream of apache commons exec. + * LogOutputStream of apache commons exec has one issue that method flush doesn't throw IOException, + * so that SparkOutputStream can not extend it correctly. */ public abstract class LogOutputStream extends OutputStream { private static final int INTIAL_SIZE = 132; @@ -61,6 +61,7 @@ public abstract class LogOutputStream extends OutputStream { if (this.buffer.size() > 0) { this.processBuffer(); } + } @Override @@ -98,6 +99,7 @@ public abstract class LogOutputStream extends OutputStream { --remaining; } } + } protected void processBuffer() { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ByteBufferInputStream.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ByteBufferInputStream.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ByteBufferInputStream.java index 2f75967..efccb6a 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ByteBufferInputStream.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ByteBufferInputStream.java @@ -21,7 +21,10 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; -/** InputStream from bytebuffer */ + +/** + * InputStream from bytebuffer + */ public class ByteBufferInputStream extends InputStream { ByteBuffer buf; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/DistributedResourcePool.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/DistributedResourcePool.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/DistributedResourcePool.java index 8a3d7e2..ba31f01 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/DistributedResourcePool.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/DistributedResourcePool.java @@ -16,7 +16,9 @@ */ package org.apache.zeppelin.resource; -/** distributed resource pool */ +/** + * distributed resource pool + */ public class DistributedResourcePool extends LocalResourcePool { private final ResourcePoolConnector connector; @@ -38,7 +40,6 @@ public class DistributedResourcePool extends LocalResourcePool { /** * get resource by name. - * * @param name * @param remote false only return from local resource * @return null if resource not found. @@ -64,7 +65,6 @@ public class DistributedResourcePool extends LocalResourcePool { /** * get resource by name. - * * @param name * @param remote false only return from local resource * @return null if resource not found. @@ -77,12 +77,10 @@ public class DistributedResourcePool extends LocalResourcePool { } if (remote) { - ResourceSet resources = - connector - .getAllResources() - .filterByNoteId(noteId) - .filterByParagraphId(paragraphId) - .filterByName(name); + ResourceSet resources = connector.getAllResources() + .filterByNoteId(noteId) + .filterByParagraphId(paragraphId) + .filterByName(name); if (resources.isEmpty()) { return null; @@ -101,7 +99,6 @@ public class DistributedResourcePool extends LocalResourcePool { /** * Get all resource from the pool - * * @param remote false only return local resource * @return */ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/LocalResourcePool.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/LocalResourcePool.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/LocalResourcePool.java index 30d5689..7ae2273 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/LocalResourcePool.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/LocalResourcePool.java @@ -20,13 +20,17 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -/** ResourcePool */ +/** + * ResourcePool + */ public class LocalResourcePool implements ResourcePool { private final String resourcePoolId; - private final Map<ResourceId, Resource> resources = - Collections.synchronizedMap(new HashMap<ResourceId, Resource>()); + private final Map<ResourceId, Resource> resources = Collections.synchronizedMap( + new HashMap<ResourceId, Resource>()); - /** @param id unique id */ + /** + * @param id unique id + */ public LocalResourcePool(String id) { resourcePoolId = id; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/RemoteResource.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/RemoteResource.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/RemoteResource.java index e05e98c..874c1cb 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/RemoteResource.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/RemoteResource.java @@ -19,7 +19,9 @@ package org.apache.zeppelin.resource; import com.google.gson.Gson; import org.apache.zeppelin.common.JsonSerializable; -/** Resource that can retrieve data from remote */ +/** + * Resource that can retrieve data from remote + */ public class RemoteResource extends Resource implements JsonSerializable { private static final Gson gson = new Gson(); @@ -58,21 +60,24 @@ public class RemoteResource extends Resource implements JsonSerializable { /** * Call a method of the object that this remote resource holds - * * @param methodName name of method to call * @param paramTypes method parameter types * @param params method parameter values * @return return value of the method. Null if return value is not serializable */ @Override - public Object invokeMethod(String methodName, Class[] paramTypes, Object[] params) { + public Object invokeMethod( + String methodName, Class [] paramTypes, Object [] params) { ResourceId resourceId = getResourceId(); - return resourcePoolConnector.invokeMethod(resourceId, methodName, paramTypes, params); + return resourcePoolConnector.invokeMethod( + resourceId, + methodName, + paramTypes, + params); } /** * Call a method of the object that this remote resource holds and save return value as a resource - * * @param methodName name of method to call * @param paramTypes method parameter types * @param params method parameter values @@ -81,11 +86,14 @@ public class RemoteResource extends Resource implements JsonSerializable { */ @Override public Resource invokeMethod( - String methodName, Class[] paramTypes, Object[] params, String returnResourceName) { + String methodName, Class [] paramTypes, Object [] params, String returnResourceName) { ResourceId resourceId = getResourceId(); - Resource resource = - resourcePoolConnector.invokeMethod( - resourceId, methodName, paramTypes, params, returnResourceName); + Resource resource = resourcePoolConnector.invokeMethod( + resourceId, + methodName, + paramTypes, + params, + returnResourceName); return resource; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/Resource.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/Resource.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/Resource.java index c83a510..ec95ffb 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/Resource.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/Resource.java @@ -17,6 +17,10 @@ package org.apache.zeppelin.resource; import com.google.gson.Gson; +import org.apache.zeppelin.common.JsonSerializable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -25,11 +29,10 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Method; import java.nio.ByteBuffer; -import org.apache.zeppelin.common.JsonSerializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -/** Information and reference to the resource */ +/** + * Information and reference to the resource + */ public class Resource implements JsonSerializable { private static final Gson gson = new Gson(); @@ -39,11 +42,12 @@ public class Resource implements JsonSerializable { private final ResourceId resourceId; private final String className; + /** * Create local resource * * @param resourceId - * @param r must not be null + * @param r must not be null */ Resource(LocalResourcePool pool, ResourceId resourceId, Object r) { this.r = r; @@ -74,7 +78,9 @@ public class Resource implements JsonSerializable { return className; } - /** @return null when this is remote resource and not serializable. */ + /** + * @return null when this is remote resource and not serializable. + */ public Object get() { if (isLocal() || isSerializable()) { return r; @@ -105,18 +111,22 @@ public class Resource implements JsonSerializable { return true; } + /** * Call a method of the object that this resource holds * * @param methodName name of method to call * @param paramTypes method parameter types - * @param params method parameter values + * @param params method parameter values * @return return value of the method */ - public Object invokeMethod(String methodName, Class[] paramTypes, Object[] params) { + public Object invokeMethod( + String methodName, Class[] paramTypes, Object[] params) { if (r != null) { try { - Method method = r.getClass().getMethod(methodName, paramTypes); + Method method = r.getClass().getMethod( + methodName, + paramTypes); method.setAccessible(true); Object ret = method.invoke(r, params); return ret; @@ -132,9 +142,9 @@ public class Resource implements JsonSerializable { /** * Call a method of the object that this resource holds and save return value as a resource * - * @param methodName name of method to call - * @param paramTypes method parameter types - * @param params method parameter values + * @param methodName name of method to call + * @param paramTypes method parameter types + * @param params method parameter values * @param returnResourceName name of resource that return value will be saved * @return Resource that holds return value */ @@ -142,10 +152,20 @@ public class Resource implements JsonSerializable { String methodName, Class[] paramTypes, Object[] params, String returnResourceName) { if (r != null) { try { - Method method = r.getClass().getMethod(methodName, paramTypes); + Method method = r.getClass().getMethod( + methodName, + paramTypes); Object ret = method.invoke(r, params); - pool.put(resourceId.getNoteId(), resourceId.getParagraphId(), returnResourceName, ret); - return pool.get(resourceId.getNoteId(), resourceId.getParagraphId(), returnResourceName); + pool.put( + resourceId.getNoteId(), + resourceId.getParagraphId(), + returnResourceName, + ret + ); + return pool.get( + resourceId.getNoteId(), + resourceId.getParagraphId(), + returnResourceName); } catch (Exception e) { logException(e); return null; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceId.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceId.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceId.java index 6afee96..bef9e3f 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceId.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceId.java @@ -19,7 +19,9 @@ package org.apache.zeppelin.resource; import com.google.gson.Gson; import org.apache.zeppelin.common.JsonSerializable; -/** Identifying resource */ +/** + * Identifying resource + */ public class ResourceId implements JsonSerializable { private static final Gson gson = new Gson(); @@ -67,10 +69,8 @@ public class ResourceId implements JsonSerializable { public boolean equals(Object o) { if (o instanceof ResourceId) { ResourceId r = (ResourceId) o; - return equals(r.name, name) - && equals(r.resourcePoolId, resourcePoolId) - && equals(r.noteId, noteId) - && equals(r.paragraphId, paragraphId); + return equals(r.name, name) && equals(r.resourcePoolId, resourcePoolId) && + equals(r.noteId, noteId) && equals(r.paragraphId, paragraphId); } else { return false; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePool.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePool.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePool.java index 6eb4cfe..12b4d7a 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePool.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePool.java @@ -16,18 +16,18 @@ */ package org.apache.zeppelin.resource; -/** Interface for ResourcePool */ +/** + * Interface for ResourcePool + */ public interface ResourcePool { /** * Get unique id of the resource pool - * * @return */ String id(); /** * Get resource from name - * * @param name Resource name * @return null if resource not found */ @@ -35,7 +35,6 @@ public interface ResourcePool { /** * Get resource from name - * * @param noteId * @param paragraphId * @param name Resource name @@ -45,22 +44,21 @@ public interface ResourcePool { /** * Get all resources - * * @return */ ResourceSet getAll(); /** * Put an object into resource pool - * * @param name * @param object */ void put(String name, Object object); /** - * Put an object into resource pool Given noteId and paragraphId is identifying resource along - * with name. Object will be automatically removed on related note or paragraph removal. + * Put an object into resource pool + * Given noteId and paragraphId is identifying resource along with name. + * Object will be automatically removed on related note or paragraph removal. * * @param noteId * @param paragraphId @@ -71,7 +69,6 @@ public interface ResourcePool { /** * Remove object - * * @param name Resource name to remove * @return removed Resource. null if resource not found */ @@ -79,7 +76,6 @@ public interface ResourcePool { /** * Remove object - * * @param noteId * @param paragraphId * @param name Resource name to remove http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolConnector.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolConnector.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolConnector.java index 0def33f..169229b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolConnector.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolConnector.java @@ -16,30 +16,35 @@ */ package org.apache.zeppelin.resource; -/** Connect resource pools running in remote process */ +/** + * Connect resource pools running in remote process + */ public interface ResourcePoolConnector { /** * Get list of resources from all other resource pools in remote processes - * * @return */ ResourceSet getAllResources(); /** * Read remote object - * * @return */ Object readResource(ResourceId id); /** * Invoke method of Resource and get return - * * @return */ - Object invokeMethod(ResourceId id, String methodName, Class[] paramTypes, Object[] params); + Object invokeMethod( + ResourceId id, + String methodName, + Class[] paramTypes, + Object[] params); - /** Invoke method, put result into resource pool and return */ + /** + * Invoke method, put result into resource pool and return + */ Resource invokeMethod( ResourceId id, String methodName, http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceSet.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceSet.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceSet.java index 5690cbb..01d3c70 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceSet.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourceSet.java @@ -17,12 +17,15 @@ 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; -import org.apache.zeppelin.common.JsonSerializable; -/** List of resources */ +/** + * List of resources + */ public class ResourceSet extends LinkedList<Resource> implements JsonSerializable { private static final Gson gson = new Gson(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/WellKnownResourceName.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/WellKnownResourceName.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/WellKnownResourceName.java index 49adec6..4613c62 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/WellKnownResourceName.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/WellKnownResourceName.java @@ -16,13 +16,14 @@ */ package org.apache.zeppelin.resource; -/** Well known resource names in ResourcePool */ +/** + * Well known resource names in ResourcePool + */ public enum WellKnownResourceName { - ZeppelinReplResult("zeppelin.repl.result"), // last object of repl - ZeppelinTableResult("zeppelin.paragraph.result.table"); // paragraph run result + ZeppelinReplResult("zeppelin.repl.result"), // last object of repl + ZeppelinTableResult("zeppelin.paragraph.result.table"); // paragraph run result String name; - WellKnownResourceName(String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java index a867e9a..c09af6d 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java @@ -21,14 +21,18 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -/** */ +/** + * + */ public class ExecutorFactory { private static ExecutorFactory _executor; private static Long _executorLock = new Long(0); Map<String, ExecutorService> executor = new HashMap<>(); - public ExecutorFactory() {} + public ExecutorFactory() { + + } public static ExecutorFactory singleton() { if (_executor == null) { @@ -68,9 +72,10 @@ public class ExecutorFactory { } } + public void shutdownAll() { synchronized (executor) { - for (String name : executor.keySet()) { + for (String name : executor.keySet()){ shutdown(name); } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java index ac326d1..fd467b6 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java @@ -22,12 +22,15 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ExecutorService; + import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.scheduler.Job.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** FIFOScheduler runs submitted job sequentially */ +/** + * FIFOScheduler runs submitted job sequentially + */ public class FIFOScheduler implements Scheduler { List<Job> queue = new LinkedList<>(); private ExecutorService executor; @@ -72,6 +75,8 @@ public class FIFOScheduler implements Scheduler { return ret; } + + @Override public void submit(Job job) { job.setStatus(Status.PENDING); @@ -81,6 +86,7 @@ public class FIFOScheduler implements Scheduler { } } + @Override public Job removeFromWaitingQueue(String jobId) { synchronized (queue) { @@ -115,57 +121,54 @@ public class FIFOScheduler implements Scheduler { } final Scheduler scheduler = this; - this.executor.execute( - new Runnable() { - @Override - public void run() { - if (runningJob.isAborted()) { - runningJob.setStatus(Status.ABORT); - runningJob.aborted = false; - synchronized (queue) { - queue.notify(); - } - return; - } - - runningJob.setStatus(Status.RUNNING); - if (listener != null) { - listener.jobStarted(scheduler, runningJob); - } - runningJob.run(); - Object jobResult = runningJob.getReturn(); - if (runningJob.isAborted()) { - runningJob.setStatus(Status.ABORT); - LOGGER.debug( - "Job Aborted, " + runningJob.getId() + ", " + runningJob.getErrorMessage()); - } else if (runningJob.getException() != null) { - LOGGER.debug("Job Error, " + runningJob.getId() + ", " + runningJob.getReturn()); - runningJob.setStatus(Status.ERROR); - } else if (jobResult != null - && jobResult instanceof InterpreterResult - && ((InterpreterResult) jobResult).code() == InterpreterResult.Code.ERROR) { - LOGGER.debug("Job Error, " + runningJob.getId() + ", " + runningJob.getReturn()); - runningJob.setStatus(Status.ERROR); - } else { - LOGGER.debug( - "Job Finished, " - + runningJob.getId() - + ", Result: " - + runningJob.getReturn()); - runningJob.setStatus(Status.FINISHED); - } - - if (listener != null) { - listener.jobFinished(scheduler, runningJob); - } - // reset aborted flag to allow retry - runningJob.aborted = false; - runningJob = null; - synchronized (queue) { - queue.notify(); - } + this.executor.execute(new Runnable() { + @Override + public void run() { + if (runningJob.isAborted()) { + runningJob.setStatus(Status.ABORT); + runningJob.aborted = false; + synchronized (queue) { + queue.notify(); } - }); + return; + } + + runningJob.setStatus(Status.RUNNING); + if (listener != null) { + listener.jobStarted(scheduler, runningJob); + } + runningJob.run(); + Object jobResult = runningJob.getReturn(); + if (runningJob.isAborted()) { + runningJob.setStatus(Status.ABORT); + LOGGER.debug("Job Aborted, " + runningJob.getId() + ", " + + runningJob.getErrorMessage()); + } else if (runningJob.getException() != null) { + LOGGER.debug("Job Error, " + runningJob.getId() + ", " + + runningJob.getReturn()); + runningJob.setStatus(Status.ERROR); + } else if (jobResult != null && jobResult instanceof InterpreterResult + && ((InterpreterResult) jobResult).code() == InterpreterResult.Code.ERROR) { + LOGGER.debug("Job Error, " + runningJob.getId() + ", " + + runningJob.getReturn()); + runningJob.setStatus(Status.ERROR); + } else { + LOGGER.debug("Job Finished, " + runningJob.getId() + ", Result: " + + runningJob.getReturn()); + runningJob.setStatus(Status.FINISHED); + } + + if (listener != null) { + listener.jobFinished(scheduler, runningJob); + } + // reset aborted flag to allow retry + runningJob.aborted = false; + runningJob = null; + synchronized (queue) { + queue.notify(); + } + } + }); } } } @@ -177,4 +180,5 @@ public class FIFOScheduler implements Scheduler { queue.notify(); } } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java index 074776b..61c54ae 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java @@ -17,20 +17,25 @@ package org.apache.zeppelin.scheduler; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; import org.apache.commons.lang.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; + + /** - * Skeletal implementation of the Job concept. - designed for inheritance - should be run on a - * separate thread - maintains internal state: it's status - supports listeners who are updated on - * status change + * Skeletal implementation of the Job concept. + * - designed for inheritance + * - should be run on a separate thread + * - maintains internal state: it's status + * - supports listeners who are updated on status change * - * <p>Job class is serialized/deserialized and used server<->client communication and saving/loading - * jobs from disk. Changing/adding/deleting non transitive field name need consideration of that. + * Job class is serialized/deserialized and used server<->client communication + * and saving/loading jobs from disk. + * Changing/adding/deleting non transitive field name need consideration of that. */ public abstract class Job<T> { private static Logger LOGGER = LoggerFactory.getLogger(Job.class); @@ -39,18 +44,16 @@ public abstract class Job<T> { /** * Job status. * - * <p>UNKNOWN - Job is not found in remote READY - Job is not running, ready to run. PENDING - Job - * is submitted to scheduler. but not running yet RUNNING - Job is running. FINISHED - Job - * finished run. with success ERROR - Job finished run. with error ABORT - Job finished by abort + * UNKNOWN - Job is not found in remote + * READY - Job is not running, ready to run. + * PENDING - Job is submitted to scheduler. but not running yet + * RUNNING - Job is running. + * FINISHED - Job finished run. with success + * ERROR - Job finished run. with error + * ABORT - Job finished by abort */ public enum Status { - UNKNOWN, - READY, - PENDING, - RUNNING, - FINISHED, - ERROR, - ABORT; + UNKNOWN, READY, PENDING, RUNNING, FINISHED, ERROR, ABORT; public boolean isReady() { return this == READY; @@ -120,7 +123,9 @@ public abstract class Job<T> { return status; } - /** just set status without notifying to listeners for spell. */ + /** + * just set status without notifying to listeners for spell. + */ public void setStatusWithoutNotification(Status status) { this.status = status; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java index dda4520..dba2004 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java @@ -17,7 +17,9 @@ package org.apache.zeppelin.scheduler; -/** Listener for job execution. */ +/** + * Listener for job execution. + */ public interface JobListener<T extends Job> { void onProgressUpdate(T job, int progress); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java index b0faecf..3d6ce12 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java @@ -25,7 +25,8 @@ import org.slf4j.LoggerFactory; * * @see Job#progress() * @see JobListener#onProgressUpdate(org.apache.zeppelin.scheduler.Job, int) - * <p>TODO(moon) : add description. + * + * TODO(moon) : add description. */ public class JobProgressPoller extends Thread { public static final long DEFAULT_INTERVAL_MSEC = 500; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobWithProgressPoller.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobWithProgressPoller.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobWithProgressPoller.java index 8e6332e..d15e5e7 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobWithProgressPoller.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobWithProgressPoller.java @@ -17,13 +17,15 @@ package org.apache.zeppelin.scheduler; + public abstract class JobWithProgressPoller<T> extends Job<T> { private transient JobProgressPoller progressPoller; private long progressUpdateIntervalMs; - public JobWithProgressPoller( - String jobId, String jobName, JobListener listener, long progressUpdateIntervalMs) { + + public JobWithProgressPoller(String jobId, String jobName, JobListener listener, + long progressUpdateIntervalMs) { super(jobId, jobName, listener); this.progressUpdateIntervalMs = progressUpdateIntervalMs; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java index 9e0d986..6f67cd7 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java @@ -22,11 +22,14 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ExecutorService; + import org.apache.zeppelin.scheduler.Job.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** Parallel scheduler runs submitted job concurrently. */ +/** + * Parallel scheduler runs submitted job concurrently. + */ public class ParallelScheduler implements Scheduler { List<Job> queue = new LinkedList<>(); List<Job> running = new LinkedList<>(); @@ -38,8 +41,8 @@ public class ParallelScheduler implements Scheduler { static Logger LOGGER = LoggerFactory.getLogger(ParallelScheduler.class); - public ParallelScheduler( - String name, ExecutorService executor, SchedulerListener listener, int maxConcurrency) { + public ParallelScheduler(String name, ExecutorService executor, SchedulerListener listener, + int maxConcurrency) { this.name = name; this.executor = executor; this.listener = listener; @@ -88,6 +91,8 @@ public class ParallelScheduler implements Scheduler { return ret; } + + @Override public void submit(Job job) { job.setStatus(Status.PENDING); @@ -178,6 +183,7 @@ public class ParallelScheduler implements Scheduler { } } + @Override public void stop() { terminate = true; @@ -185,4 +191,5 @@ public class ParallelScheduler implements Scheduler { queue.notify(); } } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Scheduler.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Scheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Scheduler.java index c0d9399..3055727 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Scheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Scheduler.java @@ -19,7 +19,9 @@ package org.apache.zeppelin.scheduler; import java.util.Collection; -/** Interface for scheduler */ +/** + * Interface for scheduler + */ public interface Scheduler extends Runnable { String getName(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java index 51be949..b629ef7 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java @@ -20,10 +20,14 @@ package org.apache.zeppelin.scheduler; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ExecutorService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** Factory class for creating schedulers */ +/** + * Factory class for creating schedulers + * + */ public class SchedulerFactory implements SchedulerListener { private static final Logger logger = LoggerFactory.getLogger(SchedulerFactory.class); protected ExecutorService executor; @@ -103,10 +107,12 @@ public class SchedulerFactory implements SchedulerListener { @Override public void jobStarted(Scheduler scheduler, Job job) { logger.info("Job " + job.getId() + " started by scheduler " + scheduler.getName()); + } @Override public void jobFinished(Scheduler scheduler, Job job) { logger.info("Job " + job.getId() + " finished by scheduler " + scheduler.getName()); + } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java index ef7b272..9a6b3ed 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java @@ -17,7 +17,9 @@ package org.apache.zeppelin.scheduler; -/** TODO(moon) : add description. */ +/** + * TODO(moon) : add description. + */ public interface SchedulerListener { void jobStarted(Scheduler scheduler, Job job); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ColumnDef.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ColumnDef.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ColumnDef.java index dbb1355..a2fac20 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ColumnDef.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ColumnDef.java @@ -18,9 +18,13 @@ package org.apache.zeppelin.tabledata; import java.io.Serializable; -/** Column definition */ +/** + * Column definition + */ public class ColumnDef implements Serializable { - /** Type */ + /** + * Type + */ public enum TYPE { STRING, LONG, http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/GraphEntity.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/GraphEntity.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/GraphEntity.java index 0eafa34..320b144 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/GraphEntity.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/GraphEntity.java @@ -19,17 +19,25 @@ package org.apache.zeppelin.tabledata; import java.util.Map; -/** The base network entity */ +/** + * The base network entity + * + */ public abstract class GraphEntity { private long id; - /** The data of the entity */ + /** + * The data of the entity + * + */ private Map<String, Object> data; - /** The primary type of the entity */ + /** + * The primary type of the entity + */ private String label; - + public GraphEntity() {} public GraphEntity(long id, Map<String, Object> data, String label) { @@ -62,4 +70,5 @@ public abstract class GraphEntity { public void setLabel(String label) { this.label = label; } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/InterpreterResultTableData.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/InterpreterResultTableData.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/InterpreterResultTableData.java index 8fcedd2..e11ad45 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/InterpreterResultTableData.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/InterpreterResultTableData.java @@ -16,16 +16,19 @@ */ package org.apache.zeppelin.tabledata; +import org.apache.zeppelin.interpreter.InterpreterResultMessage; + import java.io.Serializable; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import org.apache.zeppelin.interpreter.InterpreterResultMessage; -/** Table data with interpreter result type 'TABLE' */ +/** + * Table data with interpreter result type 'TABLE' + */ public class InterpreterResultTableData implements TableData, Serializable { private final InterpreterResultMessage msg; - ColumnDef[] columnDef; + ColumnDef [] columnDef; List<Row> rows = new LinkedList<>(); public InterpreterResultTableData(InterpreterResultMessage msg) { @@ -42,12 +45,13 @@ public class InterpreterResultTableData implements TableData, Serializable { } for (int r = 1; r < lines.length; r++) { - Object[] row = lines[r].split("\t"); + Object [] row = lines[r].split("\t"); rows.add(new Row(row)); } } } + @Override public ColumnDef[] columns() { return columnDef; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Node.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Node.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Node.java index 1f5a716..2efabc4 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Node.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Node.java @@ -20,14 +20,20 @@ package org.apache.zeppelin.tabledata; import java.util.Map; import java.util.Set; -/** The Zeppelin Node Entity */ +/** + * The Zeppelin Node Entity + * + */ public class Node extends GraphEntity { - /** The labels (types) attached to a node */ + /** + * The labels (types) attached to a node + */ private Set<String> labels; public Node() {} + public Node(long id, Map<String, Object> data, Set<String> labels) { super(id, data, labels.iterator().next()); } @@ -39,4 +45,5 @@ public class Node extends GraphEntity { public void setLabels(Set<String> labels) { this.labels = labels; } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ProxyRowIterator.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ProxyRowIterator.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ProxyRowIterator.java index f8e60ab..8a59098 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ProxyRowIterator.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/ProxyRowIterator.java @@ -16,10 +16,13 @@ */ package org.apache.zeppelin.tabledata; -import java.util.Iterator; import org.apache.zeppelin.resource.Resource; -/** Proxy row iterator */ +import java.util.Iterator; + +/** + * Proxy row iterator + */ public class ProxyRowIterator implements Iterator<Row> { private final Resource rows; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Relationship.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Relationship.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Relationship.java index 950ab8b..aa8ddb7 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Relationship.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Relationship.java @@ -19,18 +19,26 @@ package org.apache.zeppelin.tabledata; import java.util.Map; -/** The Zeppelin Relationship entity */ +/** + * The Zeppelin Relationship entity + * + */ public class Relationship extends GraphEntity { - /** Source node ID */ + /** + * Source node ID + */ private long source; - /** End node ID */ + /** + * End node ID + */ private long target; public Relationship() {} - public Relationship(long id, Map<String, Object> data, long source, long target, String label) { + public Relationship(long id, Map<String, Object> data, long source, + long target, String label) { super(id, data, label); this.setSource(source); this.setTarget(target); @@ -51,4 +59,5 @@ public class Relationship extends GraphEntity { public void setTarget(long endNodeId) { this.target = endNodeId; } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Row.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Row.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Row.java index 70207c1..9dcf2db 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Row.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/Row.java @@ -18,15 +18,17 @@ package org.apache.zeppelin.tabledata; import java.io.Serializable; -/** Row representation of table data */ +/** + * Row representation of table data + */ public class Row implements Serializable { private final Object[] data; - public Row(Object[] data) { + public Row(Object [] data) { this.data = data; } - public Object[] get() { + public Object [] get() { return data; } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableData.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableData.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableData.java index b2fd9b0..ed254c5 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableData.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableData.java @@ -18,18 +18,18 @@ package org.apache.zeppelin.tabledata; import java.util.Iterator; -/** Abstract representation of table data */ +/** + * Abstract representation of table data + */ public interface TableData { /** * Get column definitions - * * @return */ - ColumnDef[] columns(); + ColumnDef [] columns(); /** * Get row iterator - * * @param * @return */ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataException.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataException.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataException.java index 7258650..d465f1a 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataException.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataException.java @@ -18,7 +18,9 @@ package org.apache.zeppelin.tabledata; import java.io.IOException; -/** TableDataException */ +/** + * TableDataException + */ public class TableDataException extends IOException { public TableDataException(String s) { super(s); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataProxy.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataProxy.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataProxy.java index c1b3748..1926528 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataProxy.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/tabledata/TableDataProxy.java @@ -16,10 +16,13 @@ */ package org.apache.zeppelin.tabledata; -import java.util.Iterator; import org.apache.zeppelin.resource.Resource; -/** Proxy TableData for ResourcePool */ +import java.util.Iterator; + +/** + * Proxy TableData for ResourcePool + */ public class TableDataProxy implements TableData { private final Resource resource; @@ -29,7 +32,8 @@ public class TableDataProxy implements TableData { @Override public ColumnDef[] columns() { - return (ColumnDef[]) resource.invokeMethod("columns", null, null); + return (ColumnDef[]) resource.invokeMethod( + "columns", null, null); } @Override http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java index 027f4c8..455fd8b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java @@ -15,17 +15,23 @@ * limitations under the License. */ + package org.apache.zeppelin.user; -import com.google.gson.Gson; + import java.util.ArrayList; import java.util.List; + import org.apache.commons.lang.StringUtils; import org.apache.zeppelin.common.JsonSerializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** * */ +import com.google.gson.Gson; + +/*** + * + */ public class AuthenticationInfo implements JsonSerializable { private static final Logger LOG = LoggerFactory.getLogger(AuthenticationInfo.class); private static final Gson gson = new Gson(); @@ -34,8 +40,8 @@ public class AuthenticationInfo implements JsonSerializable { List<String> roles; String ticket; UserCredentials userCredentials; - public static final AuthenticationInfo ANONYMOUS = - new AuthenticationInfo("anonymous", null, "anonymous"); + public static final AuthenticationInfo ANONYMOUS = new AuthenticationInfo("anonymous", null, + "anonymous"); public AuthenticationInfo() {} @@ -43,8 +49,7 @@ public class AuthenticationInfo implements JsonSerializable { this.user = user; } - /** - * * + /*** * * @param user * @param ticket @@ -105,17 +110,15 @@ public class AuthenticationInfo implements JsonSerializable { public static boolean isAnonymous(AuthenticationInfo subject) { if (subject == null) { - LOG.warn( - "Subject is null, assuming anonymous. " - + "Not recommended to use subject as null except in tests"); + LOG.warn("Subject is null, assuming anonymous. " + + "Not recommended to use subject as null except in tests"); return true; } return subject.isAnonymous(); } public boolean isAnonymous() { - return ANONYMOUS.equals(this) - || "anonymous".equalsIgnoreCase(this.getUser()) + return ANONYMOUS.equals(this) || "anonymous".equalsIgnoreCase(this.getUser()) || StringUtils.isEmpty(this.getUser()); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java index 7379793..f952866 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/UserCredentials.java @@ -20,7 +20,9 @@ package org.apache.zeppelin.user; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -/** User Credentials POJO */ +/** + * User Credentials POJO + */ public class UserCredentials { private Map<String, UsernamePassword> userCredentials = new ConcurrentHashMap<>(); @@ -42,6 +44,8 @@ public class UserCredentials { @Override public String toString() { - return "UserCredentials{" + "userCredentials=" + userCredentials + '}'; + return "UserCredentials{" + + "userCredentials=" + userCredentials + + '}'; } }
