Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[STORM-3702] Change thrift exception classes to contain getMessage() method #3337

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[STORM-3702] Change thrift exception classes to contain getMessage() method #3337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b07398
[STORM-3702] Separate exception classes, rename msg to message and se…
Sep 17, 2020
72bef0a
[STORM-3702] Thrift generated java and python code.
Sep 17, 2020
e25e8c8
[STORM-3702] Remove getMessage() method from Wrapped exception classes.
Sep 17, 2020
20594d1
[STORM-3702] Replace calls to TException.get_msg() to getMessage().
Sep 17, 2020
a1b5b37
[STORM-3702] Change clojure test to call TException.getMessage()
Sep 17, 2020
87cff88
[STORM-3702] DRPCExecutionException needs wrapping still.
Sep 17, 2020
bad51f3
[STORM-3702] Deprecate Wrapped exceptions whose base TException has b…
Sep 17, 2020
4ec5ba2
[STORM-3702] Regen using thrift 0.13.
Sep 18, 2020
b9cd4b7
[STORM-3702] Regen only java exceptions in camel case.
Sep 22, 2020
fca9114
[STORM-3702] Regen using thrift 0.18.1
rzo1 Dec 6, 2023
ae808bc
Merge remote-tracking branch 'origin/master' into storm3702
rzo1 Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions storm-client/src/genthrift.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
rm -rf gen-javabean gen-py py
rm -rf jvm/org/apache/storm/generated
thrift --gen java:beans,nocamel,generated_annotations=undated --gen py:utf8strings storm.thrift
thrift --gen java:beans,generated_annotations=undated storm_exception.thrift
for file in gen-javabean/org/apache/storm/generated/* ; do
cat java_license_header.txt ${file} | sed -e 's/org\.apache\.thrift/org.apache.storm.thrift/g' > ${file}.tmp
mv -f ${file}.tmp ${file}
Expand Down
2 changes: 1 addition & 1 deletion storm-client/src/jvm/org/apache/storm/StormSubmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private static void submitTopologyInDistributeMode(String name, StormTopology to
}
LOG.info("Finished submitting topology: {}", name);
} catch (InvalidTopologyException e) {
LOG.error("Topology submission exception: {}", e.get_msg());
LOG.error("Topology submission exception: {}", e.getMessage());
throw e;
} catch (AlreadyAliveException e) {
LOG.error("Topology already alive exception", e);
Expand Down
108 changes: 54 additions & 54 deletions storm-client/src/jvm/org/apache/storm/generated/AlreadyAliveException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
public class AlreadyAliveException extends org.apache.storm.thrift.TException implements org.apache.storm.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
private static final org.apache.storm.thrift.protocol.TStruct STRUCT_DESC = new org.apache.storm.thrift.protocol.TStruct("AlreadyAliveException");

private static final org.apache.storm.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("msg", org.apache.storm.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.storm.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.storm.thrift.protocol.TField("message", org.apache.storm.thrift.protocol.TType.STRING, (short)1);

private static final org.apache.storm.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AlreadyAliveExceptionStandardSchemeFactory();
private static final org.apache.storm.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AlreadyAliveExceptionTupleSchemeFactory();

private @org.apache.storm.thrift.annotation.Nullable java.lang.String msg; // required
private @org.apache.storm.thrift.annotation.Nullable java.lang.String message; // required

/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
MSG((short)1, "msg");
MESSAGE((short)1, "message");

private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();

Expand All @@ -53,8 +53,8 @@ public enum _Fields implements org.apache.storm.thrift.TFieldIdEnum {
@org.apache.storm.thrift.annotation.Nullable
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
case 1: // MSG
return MSG;
case 1: // MESSAGE
return MESSAGE;
default:
return null;
}
Expand Down Expand Up @@ -101,7 +101,7 @@ public java.lang.String getFieldName() {
public static final java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> metaDataMap;
static {
java.util.Map<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.storm.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.MSG, new org.apache.storm.thrift.meta_data.FieldMetaData("msg", org.apache.storm.thrift.TFieldRequirementType.REQUIRED,
tmpMap.put(_Fields.MESSAGE, new org.apache.storm.thrift.meta_data.FieldMetaData("message", org.apache.storm.thrift.TFieldRequirementType.REQUIRED,
new org.apache.storm.thrift.meta_data.FieldValueMetaData(org.apache.storm.thrift.protocol.TType.STRING)));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.storm.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlreadyAliveException.class, metaDataMap);
Expand All @@ -111,18 +111,18 @@ public AlreadyAliveException() {
}

public AlreadyAliveException(
java.lang.String msg)
java.lang.String message)
{
this();
this.msg = msg;
this.message = message;
}

/**
* Performs a deep copy on <i>other</i>.
*/
public AlreadyAliveException(AlreadyAliveException other) {
if (other.is_set_msg()) {
this.msg = other.msg;
if (other.isSetMessage()) {
this.message = other.message;
}
}

Expand All @@ -133,41 +133,41 @@ public AlreadyAliveException deepCopy() {

@Override
public void clear() {
this.msg = null;
this.message = null;
}

@org.apache.storm.thrift.annotation.Nullable
public java.lang.String get_msg() {
return this.msg;
public java.lang.String getMessage() {
return this.message;
}

public void set_msg(@org.apache.storm.thrift.annotation.Nullable java.lang.String msg) {
this.msg = msg;
public void setMessage(@org.apache.storm.thrift.annotation.Nullable java.lang.String message) {
this.message = message;
}

public void unset_msg() {
this.msg = null;
public void unsetMessage() {
this.message = null;
}

/** Returns true if field msg is set (has been assigned a value) and false otherwise */
public boolean is_set_msg() {
return this.msg != null;
/** Returns true if field message is set (has been assigned a value) and false otherwise */
public boolean isSetMessage() {
return this.message != null;
}

public void set_msg_isSet(boolean value) {
public void setMessageIsSet(boolean value) {
if (!value) {
this.msg = null;
this.message = null;
}
}

@Override
public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nullable java.lang.Object value) {
switch (field) {
case MSG:
case MESSAGE:
if (value == null) {
unset_msg();
unsetMessage();
} else {
set_msg((java.lang.String)value);
setMessage((java.lang.String)value);
}
break;

Expand All @@ -178,8 +178,8 @@ public void setFieldValue(_Fields field, @org.apache.storm.thrift.annotation.Nul
@Override
public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case MSG:
return get_msg();
case MESSAGE:
return getMessage();

}
throw new java.lang.IllegalStateException();
Expand All @@ -193,8 +193,8 @@ public boolean isSet(_Fields field) {
}

switch (field) {
case MSG:
return is_set_msg();
case MESSAGE:
return isSetMessage();
}
throw new java.lang.IllegalStateException();
}
Expand All @@ -212,12 +212,12 @@ public boolean equals(AlreadyAliveException that) {
if (this == that)
return true;

boolean this_present_msg = true && this.is_set_msg();
boolean that_present_msg = true && that.is_set_msg();
if (this_present_msg || that_present_msg) {
if (!(this_present_msg && that_present_msg))
boolean this_present_message = true && this.isSetMessage();
boolean that_present_message = true && that.isSetMessage();
if (this_present_message || that_present_message) {
if (!(this_present_message && that_present_message))
return false;
if (!this.msg.equals(that.msg))
if (!this.message.equals(that.message))
return false;
}

Expand All @@ -228,9 +228,9 @@ public boolean equals(AlreadyAliveException that) {
public int hashCode() {
int hashCode = 1;

hashCode = hashCode * 8191 + ((is_set_msg()) ? 131071 : 524287);
if (is_set_msg())
hashCode = hashCode * 8191 + msg.hashCode();
hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
if (isSetMessage())
hashCode = hashCode * 8191 + message.hashCode();

return hashCode;
}
Expand All @@ -243,12 +243,12 @@ public int compareTo(AlreadyAliveException other) {

int lastComparison = 0;

lastComparison = java.lang.Boolean.compare(is_set_msg(), other.is_set_msg());
lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_msg()) {
lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (isSetMessage()) {
lastComparison = org.apache.storm.thrift.TBaseHelper.compareTo(this.message, other.message);
if (lastComparison != 0) {
return lastComparison;
}
Expand Down Expand Up @@ -277,11 +277,11 @@ public java.lang.String toString() {
java.lang.StringBuilder sb = new java.lang.StringBuilder("AlreadyAliveException(");
boolean first = true;

sb.append("msg:");
if (this.msg == null) {
sb.append("message:");
if (this.message == null) {
sb.append("null");
} else {
sb.append(this.msg);
sb.append(this.message);
}
first = false;
sb.append(")");
Expand All @@ -290,8 +290,8 @@ public java.lang.String toString() {

public void validate() throws org.apache.storm.thrift.TException {
// check for required fields
if (!is_set_msg()) {
throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
if (!isSetMessage()) {
throw new org.apache.storm.thrift.protocol.TProtocolException("Required field 'message' is unset! Struct:" + toString());
}

// check for sub-struct validity
Expand Down Expand Up @@ -333,10 +333,10 @@ public void read(org.apache.storm.thrift.protocol.TProtocol iprot, AlreadyAliveE
break;
}
switch (schemeField.id) {
case 1: // MSG
case 1: // MESSAGE
if (schemeField.type == org.apache.storm.thrift.protocol.TType.STRING) {
struct.msg = iprot.readString();
struct.set_msg_isSet(true);
struct.message = iprot.readString();
struct.setMessageIsSet(true);
} else {
org.apache.storm.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
Expand All @@ -355,9 +355,9 @@ public void write(org.apache.storm.thrift.protocol.TProtocol oprot, AlreadyAlive
struct.validate();

oprot.writeStructBegin(STRUCT_DESC);
if (struct.msg != null) {
oprot.writeFieldBegin(MSG_FIELD_DESC);
oprot.writeString(struct.msg);
if (struct.message != null) {
oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
oprot.writeString(struct.message);
oprot.writeFieldEnd();
}
oprot.writeFieldStop();
Expand All @@ -378,14 +378,14 @@ private static class AlreadyAliveExceptionTupleScheme extends org.apache.storm.t
@Override
public void write(org.apache.storm.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
org.apache.storm.thrift.protocol.TTupleProtocol oprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
oprot.writeString(struct.msg);
oprot.writeString(struct.message);
}

@Override
public void read(org.apache.storm.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.storm.thrift.TException {
org.apache.storm.thrift.protocol.TTupleProtocol iprot = (org.apache.storm.thrift.protocol.TTupleProtocol) prot;
struct.msg = iprot.readString();
struct.set_msg_isSet(true);
struct.message = iprot.readString();
struct.setMessageIsSet(true);
}
}

Expand Down
Loading