diff --git a/3.7.0.VERSION b/3.7.5.VERSION similarity index 100% rename from 3.7.0.VERSION rename to 3.7.5.VERSION diff --git a/README.md b/README.md index 966344d..75b6a92 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ CIM是基于mina或者netty框架下的推送系统，我们平常使用第三 侣信专业版是基于CIM面向中小企业和者各类团队组织内部交流使用工具。具有丰富的功能，聊天，群组，部门组织，内部朋友圈等功能。它可以在局域网内使用保证沟通的信息安全，并且它是完全免费的，而且可以及时获得更新。 ## [http://farsunset.com](http://farsunset.com)
- - - + + +
--- @@ -73,5 +73,10 @@ CIM是基于mina或者netty框架下的推送系统，我们平常使用第三 5.修正文档中一些疏漏 - + +------------------------------------------------------------------------------------------- +版本:3.7.5/时间:2019-11-13 + +1.android sdk 优化，使用protobuf-lite版本替代较为臃肿的protobut-java版本 + diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws index 86e1411..09b3fb1 100644 --- a/cim-boot-server/cim-boot-server.iws +++ b/cim-boot-server/cim-boot-server.iws @@ -51,6 +51,7 @@ + @@ -116,6 +117,8 @@ + + diff --git a/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar b/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar index 1ae94b3..77045c5 100644 Binary files a/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar and b/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar differ diff --git a/cim-client-sdk/cim-android-sdk/.classpath b/cim-client-sdk/cim-android-sdk/.classpath index 8f7326f..b6fc356 100644 --- a/cim-client-sdk/cim-android-sdk/.classpath +++ b/cim-client-sdk/cim-android-sdk/.classpath @@ -2,7 +2,7 @@ - + diff --git a/cim-client-sdk/cim-android-sdk/libs/protobuf-java-3.7.0.jar b/cim-client-sdk/cim-android-sdk/libs/protobuf-java-3.7.0.jar deleted file mode 100644 index eebaefe..0000000 Binary files a/cim-client-sdk/cim-android-sdk/libs/protobuf-java-3.7.0.jar and /dev/null differ diff --git a/cim-client-sdk/cim-android-sdk/libs/protobuf-lite-3.0.0.jar b/cim-client-sdk/cim-android-sdk/libs/protobuf-lite-3.0.0.jar new file mode 100644 index 0000000..6b2385f Binary files /dev/null and b/cim-client-sdk/cim-android-sdk/libs/protobuf-lite-3.0.0.jar differ diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java index 9f00868..885f8de 100644 --- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java +++ b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java @@ -8,93 +8,87 @@ public final class MessageProto { public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); - } public interface ModelOrBuilder extends // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.android.model.proto.Model) - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.MessageLiteOrBuilder { /** - * int64 id = 1; + * optional int64 id = 1; */ long getId(); /** - * string action = 2; + * optional string action = 2; */ java.lang.String getAction(); /** - * string action = 2; + * optional string action = 2; */ com.google.protobuf.ByteString getActionBytes(); /** - * string content = 3; + * optional string content = 3; */ java.lang.String getContent(); /** - * string content = 3; + * optional string content = 3; */ com.google.protobuf.ByteString getContentBytes(); /** - * string sender = 4; + * optional string sender = 4; */ java.lang.String getSender(); /** - * string sender = 4; + * optional string sender = 4; */ com.google.protobuf.ByteString getSenderBytes(); /** - * string receiver = 5; + * optional string receiver = 5; */ java.lang.String getReceiver(); /** - * string receiver = 5; + * optional string receiver = 5; */ com.google.protobuf.ByteString getReceiverBytes(); /** - * string extra = 6; + * optional string extra = 6; */ java.lang.String getExtra(); /** - * string extra = 6; + * optional string extra = 6; */ com.google.protobuf.ByteString getExtraBytes(); /** - * string title = 7; + * optional string title = 7; */ java.lang.String getTitle(); /** - * string title = 7; + * optional string title = 7; */ com.google.protobuf.ByteString getTitleBytes(); /** - * string format = 8; + * optional string format = 8; */ java.lang.String getFormat(); /** - * string format = 8; + * optional string format = 8; */ com.google.protobuf.ByteString getFormatBytes(); /** - * int64 timestamp = 9; + * optional int64 timestamp = 9; */ long getTimestamp(); } @@ -102,14 +96,10 @@ public final class MessageProto { * Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model} */ public static final class Model extends - com.google.protobuf.GeneratedMessageV3 implements + com.google.protobuf.GeneratedMessageLite< + Model, Model.Builder> implements // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.android.model.proto.Model) ModelOrBuilder { - private static final long serialVersionUID = 0L; - // Use Model.newBuilder() to construct. - private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } private Model() { action_ = ""; content_ = ""; @@ -119,418 +109,407 @@ public final class MessageProto { title_ = ""; format_ = ""; } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Model( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - - id_ = input.readInt64(); - break; - } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - action_ = s; - break; - } - case 26: { - java.lang.String s = input.readStringRequireUtf8(); - - content_ = s; - break; - } - case 34: { - java.lang.String s = input.readStringRequireUtf8(); - - sender_ = s; - break; - } - case 42: { - java.lang.String s = input.readStringRequireUtf8(); - - receiver_ = s; - break; - } - case 50: { - java.lang.String s = input.readStringRequireUtf8(); - - extra_ = s; - break; - } - case 58: { - java.lang.String s = input.readStringRequireUtf8(); - - title_ = s; - break; - } - case 66: { - java.lang.String s = input.readStringRequireUtf8(); - - format_ = s; - break; - } - case 72: { - - timestamp_ = input.readInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.farsunset.cim.sdk.android.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.farsunset.cim.sdk.android.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.class, com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.Builder.class); - } - public static final int ID_FIELD_NUMBER = 1; private long id_; /** - * int64 id = 1; + * optional int64 id = 1; */ public long getId() { return id_; } - - public static final int ACTION_FIELD_NUMBER = 2; - private volatile java.lang.Object action_; /** - * string action = 2; + * optional int64 id = 1; */ - public java.lang.String getAction() { - java.lang.Object ref = action_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - action_ = s; - return s; - } + private void setId(long value) { + + id_ = value; } /** - * string action = 2; + * optional int64 id = 1; + */ + private void clearId() { + + id_ = 0L; + } + + public static final int ACTION_FIELD_NUMBER = 2; + private java.lang.String action_; + /** + * optional string action = 2; + */ + public java.lang.String getAction() { + return action_; + } + /** + * optional string action = 2; */ public com.google.protobuf.ByteString getActionBytes() { - java.lang.Object ref = action_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - action_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(action_); + } + /** + * optional string action = 2; + */ + private void setAction( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + action_ = value; + } + /** + * optional string action = 2; + */ + private void clearAction() { + + action_ = getDefaultInstance().getAction(); + } + /** + * optional string action = 2; + */ + private void setActionBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + action_ = value.toStringUtf8(); } public static final int CONTENT_FIELD_NUMBER = 3; - private volatile java.lang.Object content_; + private java.lang.String content_; /** - * string content = 3; + * optional string content = 3; */ public java.lang.String getContent() { - java.lang.Object ref = content_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - content_ = s; - return s; - } + return content_; } /** - * string content = 3; + * optional string content = 3; */ public com.google.protobuf.ByteString getContentBytes() { - java.lang.Object ref = content_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - content_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(content_); + } + /** + * optional string content = 3; + */ + private void setContent( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + content_ = value; + } + /** + * optional string content = 3; + */ + private void clearContent() { + + content_ = getDefaultInstance().getContent(); + } + /** + * optional string content = 3; + */ + private void setContentBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + content_ = value.toStringUtf8(); } public static final int SENDER_FIELD_NUMBER = 4; - private volatile java.lang.Object sender_; + private java.lang.String sender_; /** - * string sender = 4; + * optional string sender = 4; */ public java.lang.String getSender() { - java.lang.Object ref = sender_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - sender_ = s; - return s; - } + return sender_; } /** - * string sender = 4; + * optional string sender = 4; */ public com.google.protobuf.ByteString getSenderBytes() { - java.lang.Object ref = sender_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - sender_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(sender_); + } + /** + * optional string sender = 4; + */ + private void setSender( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + sender_ = value; + } + /** + * optional string sender = 4; + */ + private void clearSender() { + + sender_ = getDefaultInstance().getSender(); + } + /** + * optional string sender = 4; + */ + private void setSenderBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + sender_ = value.toStringUtf8(); } public static final int RECEIVER_FIELD_NUMBER = 5; - private volatile java.lang.Object receiver_; + private java.lang.String receiver_; /** - * string receiver = 5; + * optional string receiver = 5; */ public java.lang.String getReceiver() { - java.lang.Object ref = receiver_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - receiver_ = s; - return s; - } + return receiver_; } /** - * string receiver = 5; + * optional string receiver = 5; */ public com.google.protobuf.ByteString getReceiverBytes() { - java.lang.Object ref = receiver_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - receiver_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(receiver_); + } + /** + * optional string receiver = 5; + */ + private void setReceiver( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + receiver_ = value; + } + /** + * optional string receiver = 5; + */ + private void clearReceiver() { + + receiver_ = getDefaultInstance().getReceiver(); + } + /** + * optional string receiver = 5; + */ + private void setReceiverBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + receiver_ = value.toStringUtf8(); } public static final int EXTRA_FIELD_NUMBER = 6; - private volatile java.lang.Object extra_; + private java.lang.String extra_; /** - * string extra = 6; + * optional string extra = 6; */ public java.lang.String getExtra() { - java.lang.Object ref = extra_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - extra_ = s; - return s; - } + return extra_; } /** - * string extra = 6; + * optional string extra = 6; */ public com.google.protobuf.ByteString getExtraBytes() { - java.lang.Object ref = extra_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - extra_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(extra_); + } + /** + * optional string extra = 6; + */ + private void setExtra( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + extra_ = value; + } + /** + * optional string extra = 6; + */ + private void clearExtra() { + + extra_ = getDefaultInstance().getExtra(); + } + /** + * optional string extra = 6; + */ + private void setExtraBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + extra_ = value.toStringUtf8(); } public static final int TITLE_FIELD_NUMBER = 7; - private volatile java.lang.Object title_; + private java.lang.String title_; /** - * string title = 7; + * optional string title = 7; */ public java.lang.String getTitle() { - java.lang.Object ref = title_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - title_ = s; - return s; - } + return title_; } /** - * string title = 7; + * optional string title = 7; */ public com.google.protobuf.ByteString getTitleBytes() { - java.lang.Object ref = title_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - title_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(title_); + } + /** + * optional string title = 7; + */ + private void setTitle( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + title_ = value; + } + /** + * optional string title = 7; + */ + private void clearTitle() { + + title_ = getDefaultInstance().getTitle(); + } + /** + * optional string title = 7; + */ + private void setTitleBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + title_ = value.toStringUtf8(); } public static final int FORMAT_FIELD_NUMBER = 8; - private volatile java.lang.Object format_; + private java.lang.String format_; /** - * string format = 8; + * optional string format = 8; */ public java.lang.String getFormat() { - java.lang.Object ref = format_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - format_ = s; - return s; - } + return format_; } /** - * string format = 8; + * optional string format = 8; */ public com.google.protobuf.ByteString getFormatBytes() { - java.lang.Object ref = format_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - format_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(format_); + } + /** + * optional string format = 8; + */ + private void setFormat( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + format_ = value; + } + /** + * optional string format = 8; + */ + private void clearFormat() { + + format_ = getDefaultInstance().getFormat(); + } + /** + * optional string format = 8; + */ + private void setFormatBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + format_ = value.toStringUtf8(); } public static final int TIMESTAMP_FIELD_NUMBER = 9; private long timestamp_; /** - * int64 timestamp = 9; + * optional int64 timestamp = 9; */ public long getTimestamp() { return timestamp_; } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; + /** + * optional int64 timestamp = 9; + */ + private void setTimestamp(long value) { + + timestamp_ = value; + } + /** + * optional int64 timestamp = 9; + */ + private void clearTimestamp() { + + timestamp_ = 0L; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (id_ != 0L) { output.writeInt64(1, id_); } - if (!getActionBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, action_); + if (!action_.isEmpty()) { + output.writeString(2, getAction()); } - if (!getContentBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, content_); + if (!content_.isEmpty()) { + output.writeString(3, getContent()); } - if (!getSenderBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, sender_); + if (!sender_.isEmpty()) { + output.writeString(4, getSender()); } - if (!getReceiverBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 5, receiver_); + if (!receiver_.isEmpty()) { + output.writeString(5, getReceiver()); } - if (!getExtraBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, extra_); + if (!extra_.isEmpty()) { + output.writeString(6, getExtra()); } - if (!getTitleBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, title_); + if (!title_.isEmpty()) { + output.writeString(7, getTitle()); } - if (!getFormatBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 8, format_); + if (!format_.isEmpty()) { + output.writeString(8, getFormat()); } if (timestamp_ != 0L) { output.writeInt64(9, timestamp_); } - unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { - int size = memoizedSize; + int size = memoizedSerializedSize; if (size != -1) return size; size = 0; @@ -538,1018 +517,613 @@ public final class MessageProto { size += com.google.protobuf.CodedOutputStream .computeInt64Size(1, id_); } - if (!getActionBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, action_); + if (!action_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(2, getAction()); } - if (!getContentBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, content_); + if (!content_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(3, getContent()); } - if (!getSenderBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, sender_); + if (!sender_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(4, getSender()); } - if (!getReceiverBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, receiver_); + if (!receiver_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(5, getReceiver()); } - if (!getExtraBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, extra_); + if (!extra_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(6, getExtra()); } - if (!getTitleBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, title_); + if (!title_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(7, getTitle()); } - if (!getFormatBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, format_); + if (!format_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(8, getFormat()); } if (timestamp_ != 0L) { size += com.google.protobuf.CodedOutputStream .computeInt64Size(9, timestamp_); } - size += unknownFields.getSerializedSize(); - memoizedSize = size; + memoizedSerializedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof com.farsunset.cim.sdk.android.model.proto.MessageProto.Model)) { - return super.equals(obj); - } - com.farsunset.cim.sdk.android.model.proto.MessageProto.Model other = (com.farsunset.cim.sdk.android.model.proto.MessageProto.Model) obj; - - if (getId() - != other.getId()) return false; - if (!getAction() - .equals(other.getAction())) return false; - if (!getContent() - .equals(other.getContent())) return false; - if (!getSender() - .equals(other.getSender())) return false; - if (!getReceiver() - .equals(other.getReceiver())) return false; - if (!getExtra() - .equals(other.getExtra())) return false; - if (!getTitle() - .equals(other.getTitle())) return false; - if (!getFormat() - .equals(other.getFormat())) return false; - if (getTimestamp() - != other.getTimestamp()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getId()); - hash = (37 * hash) + ACTION_FIELD_NUMBER; - hash = (53 * hash) + getAction().hashCode(); - hash = (37 * hash) + CONTENT_FIELD_NUMBER; - hash = (53 * hash) + getContent().hashCode(); - hash = (37 * hash) + SENDER_FIELD_NUMBER; - hash = (53 * hash) + getSender().hashCode(); - hash = (37 * hash) + RECEIVER_FIELD_NUMBER; - hash = (53 * hash) + getReceiver().hashCode(); - hash = (37 * hash) + EXTRA_FIELD_NUMBER; - hash = (53 * hash) + getExtra().hashCode(); - hash = (37 * hash) + TITLE_FIELD_NUMBER; - hash = (53 * hash) + getTitle().hashCode(); - hash = (37 * hash) + FORMAT_FIELD_NUMBER; - hash = (53 * hash) + getFormat().hashCode(); - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTimestamp()); - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + return parseDelimitedFrom(DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input, extensionRegistry); } - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } public static Builder newBuilder(com.farsunset.cim.sdk.android.model.proto.MessageProto.Model prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } /** * Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements + com.google.protobuf.GeneratedMessageLite.Builder< + com.farsunset.cim.sdk.android.model.proto.MessageProto.Model, Builder> implements // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.android.model.proto.Model) com.farsunset.cim.sdk.android.model.proto.MessageProto.ModelOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.farsunset.cim.sdk.android.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.farsunset.cim.sdk.android.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.class, com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.Builder.class); - } - // Construct using com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + super(DEFAULT_INSTANCE); } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - id_ = 0L; - action_ = ""; - - content_ = ""; - - sender_ = ""; - - receiver_ = ""; - - extra_ = ""; - - title_ = ""; - - format_ = ""; - - timestamp_ = 0L; - - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return com.farsunset.cim.sdk.android.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.MessageProto.Model getDefaultInstanceForType() { - return com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.getDefaultInstance(); - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.MessageProto.Model build() { - com.farsunset.cim.sdk.android.model.proto.MessageProto.Model result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.MessageProto.Model buildPartial() { - com.farsunset.cim.sdk.android.model.proto.MessageProto.Model result = new com.farsunset.cim.sdk.android.model.proto.MessageProto.Model(this); - result.id_ = id_; - result.action_ = action_; - result.content_ = content_; - result.sender_ = sender_; - result.receiver_ = receiver_; - result.extra_ = extra_; - result.title_ = title_; - result.format_ = format_; - result.timestamp_ = timestamp_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.farsunset.cim.sdk.android.model.proto.MessageProto.Model) { - return mergeFrom((com.farsunset.cim.sdk.android.model.proto.MessageProto.Model)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(com.farsunset.cim.sdk.android.model.proto.MessageProto.Model other) { - if (other == com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.getDefaultInstance()) return this; - if (other.getId() != 0L) { - setId(other.getId()); - } - if (!other.getAction().isEmpty()) { - action_ = other.action_; - onChanged(); - } - if (!other.getContent().isEmpty()) { - content_ = other.content_; - onChanged(); - } - if (!other.getSender().isEmpty()) { - sender_ = other.sender_; - onChanged(); - } - if (!other.getReceiver().isEmpty()) { - receiver_ = other.receiver_; - onChanged(); - } - if (!other.getExtra().isEmpty()) { - extra_ = other.extra_; - onChanged(); - } - if (!other.getTitle().isEmpty()) { - title_ = other.title_; - onChanged(); - } - if (!other.getFormat().isEmpty()) { - format_ = other.format_; - onChanged(); - } - if (other.getTimestamp() != 0L) { - setTimestamp(other.getTimestamp()); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.farsunset.cim.sdk.android.model.proto.MessageProto.Model) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private long id_ ; /** - * int64 id = 1; + * optional int64 id = 1; */ public long getId() { - return id_; + return instance.getId(); } /** - * int64 id = 1; + * optional int64 id = 1; */ public Builder setId(long value) { - - id_ = value; - onChanged(); + copyOnWrite(); + instance.setId(value); return this; } /** - * int64 id = 1; + * optional int64 id = 1; */ public Builder clearId() { - - id_ = 0L; - onChanged(); + copyOnWrite(); + instance.clearId(); return this; } - private java.lang.Object action_ = ""; /** - * string action = 2; + * optional string action = 2; */ public java.lang.String getAction() { - java.lang.Object ref = action_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - action_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getAction(); } /** - * string action = 2; + * optional string action = 2; */ public com.google.protobuf.ByteString getActionBytes() { - java.lang.Object ref = action_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - action_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getActionBytes(); } /** - * string action = 2; + * optional string action = 2; */ public Builder setAction( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - action_ = value; - onChanged(); + copyOnWrite(); + instance.setAction(value); return this; } /** - * string action = 2; + * optional string action = 2; */ public Builder clearAction() { - - action_ = getDefaultInstance().getAction(); - onChanged(); + copyOnWrite(); + instance.clearAction(); return this; } /** - * string action = 2; + * optional string action = 2; */ public Builder setActionBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - action_ = value; - onChanged(); + copyOnWrite(); + instance.setActionBytes(value); return this; } - private java.lang.Object content_ = ""; /** - * string content = 3; + * optional string content = 3; */ public java.lang.String getContent() { - java.lang.Object ref = content_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - content_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getContent(); } /** - * string content = 3; + * optional string content = 3; */ public com.google.protobuf.ByteString getContentBytes() { - java.lang.Object ref = content_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - content_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getContentBytes(); } /** - * string content = 3; + * optional string content = 3; */ public Builder setContent( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - content_ = value; - onChanged(); + copyOnWrite(); + instance.setContent(value); return this; } /** - * string content = 3; + * optional string content = 3; */ public Builder clearContent() { - - content_ = getDefaultInstance().getContent(); - onChanged(); + copyOnWrite(); + instance.clearContent(); return this; } /** - * string content = 3; + * optional string content = 3; */ public Builder setContentBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - content_ = value; - onChanged(); + copyOnWrite(); + instance.setContentBytes(value); return this; } - private java.lang.Object sender_ = ""; /** - * string sender = 4; + * optional string sender = 4; */ public java.lang.String getSender() { - java.lang.Object ref = sender_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - sender_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getSender(); } /** - * string sender = 4; + * optional string sender = 4; */ public com.google.protobuf.ByteString getSenderBytes() { - java.lang.Object ref = sender_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - sender_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getSenderBytes(); } /** - * string sender = 4; + * optional string sender = 4; */ public Builder setSender( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - sender_ = value; - onChanged(); + copyOnWrite(); + instance.setSender(value); return this; } /** - * string sender = 4; + * optional string sender = 4; */ public Builder clearSender() { - - sender_ = getDefaultInstance().getSender(); - onChanged(); + copyOnWrite(); + instance.clearSender(); return this; } /** - * string sender = 4; + * optional string sender = 4; */ public Builder setSenderBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - sender_ = value; - onChanged(); + copyOnWrite(); + instance.setSenderBytes(value); return this; } - private java.lang.Object receiver_ = ""; /** - * string receiver = 5; + * optional string receiver = 5; */ public java.lang.String getReceiver() { - java.lang.Object ref = receiver_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - receiver_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getReceiver(); } /** - * string receiver = 5; + * optional string receiver = 5; */ public com.google.protobuf.ByteString getReceiverBytes() { - java.lang.Object ref = receiver_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - receiver_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getReceiverBytes(); } /** - * string receiver = 5; + * optional string receiver = 5; */ public Builder setReceiver( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - receiver_ = value; - onChanged(); + copyOnWrite(); + instance.setReceiver(value); return this; } /** - * string receiver = 5; + * optional string receiver = 5; */ public Builder clearReceiver() { - - receiver_ = getDefaultInstance().getReceiver(); - onChanged(); + copyOnWrite(); + instance.clearReceiver(); return this; } /** - * string receiver = 5; + * optional string receiver = 5; */ public Builder setReceiverBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - receiver_ = value; - onChanged(); + copyOnWrite(); + instance.setReceiverBytes(value); return this; } - private java.lang.Object extra_ = ""; /** - * string extra = 6; + * optional string extra = 6; */ public java.lang.String getExtra() { - java.lang.Object ref = extra_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - extra_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getExtra(); } /** - * string extra = 6; + * optional string extra = 6; */ public com.google.protobuf.ByteString getExtraBytes() { - java.lang.Object ref = extra_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - extra_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getExtraBytes(); } /** - * string extra = 6; + * optional string extra = 6; */ public Builder setExtra( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - extra_ = value; - onChanged(); + copyOnWrite(); + instance.setExtra(value); return this; } /** - * string extra = 6; + * optional string extra = 6; */ public Builder clearExtra() { - - extra_ = getDefaultInstance().getExtra(); - onChanged(); + copyOnWrite(); + instance.clearExtra(); return this; } /** - * string extra = 6; + * optional string extra = 6; */ public Builder setExtraBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - extra_ = value; - onChanged(); + copyOnWrite(); + instance.setExtraBytes(value); return this; } - private java.lang.Object title_ = ""; /** - * string title = 7; + * optional string title = 7; */ public java.lang.String getTitle() { - java.lang.Object ref = title_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - title_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getTitle(); } /** - * string title = 7; + * optional string title = 7; */ public com.google.protobuf.ByteString getTitleBytes() { - java.lang.Object ref = title_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - title_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getTitleBytes(); } /** - * string title = 7; + * optional string title = 7; */ public Builder setTitle( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - title_ = value; - onChanged(); + copyOnWrite(); + instance.setTitle(value); return this; } /** - * string title = 7; + * optional string title = 7; */ public Builder clearTitle() { - - title_ = getDefaultInstance().getTitle(); - onChanged(); + copyOnWrite(); + instance.clearTitle(); return this; } /** - * string title = 7; + * optional string title = 7; */ public Builder setTitleBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - title_ = value; - onChanged(); + copyOnWrite(); + instance.setTitleBytes(value); return this; } - private java.lang.Object format_ = ""; /** - * string format = 8; + * optional string format = 8; */ public java.lang.String getFormat() { - java.lang.Object ref = format_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - format_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getFormat(); } /** - * string format = 8; + * optional string format = 8; */ public com.google.protobuf.ByteString getFormatBytes() { - java.lang.Object ref = format_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - format_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getFormatBytes(); } /** - * string format = 8; + * optional string format = 8; */ public Builder setFormat( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - format_ = value; - onChanged(); + copyOnWrite(); + instance.setFormat(value); return this; } /** - * string format = 8; + * optional string format = 8; */ public Builder clearFormat() { - - format_ = getDefaultInstance().getFormat(); - onChanged(); + copyOnWrite(); + instance.clearFormat(); return this; } /** - * string format = 8; + * optional string format = 8; */ public Builder setFormatBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - format_ = value; - onChanged(); + copyOnWrite(); + instance.setFormatBytes(value); return this; } - private long timestamp_ ; /** - * int64 timestamp = 9; + * optional int64 timestamp = 9; */ public long getTimestamp() { - return timestamp_; + return instance.getTimestamp(); } /** - * int64 timestamp = 9; + * optional int64 timestamp = 9; */ public Builder setTimestamp(long value) { - - timestamp_ = value; - onChanged(); + copyOnWrite(); + instance.setTimestamp(value); return this; } /** - * int64 timestamp = 9; + * optional int64 timestamp = 9; */ public Builder clearTimestamp() { - - timestamp_ = 0L; - onChanged(); + copyOnWrite(); + instance.clearTimestamp(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.android.model.proto.Model) } + protected final Object dynamicMethod( + com.google.protobuf.GeneratedMessageLite.MethodToInvoke method, + Object arg0, Object arg1) { + switch (method) { + case NEW_MUTABLE_INSTANCE: { + return new com.farsunset.cim.sdk.android.model.proto.MessageProto.Model(); + } + case IS_INITIALIZED: { + return DEFAULT_INSTANCE; + } + case MAKE_IMMUTABLE: { + return null; + } + case NEW_BUILDER: { + return new Builder(); + } + case VISIT: { + Visitor visitor = (Visitor) arg0; + com.farsunset.cim.sdk.android.model.proto.MessageProto.Model other = (com.farsunset.cim.sdk.android.model.proto.MessageProto.Model) arg1; + id_ = visitor.visitLong(id_ != 0L, id_, + other.id_ != 0L, other.id_); + action_ = visitor.visitString(!action_.isEmpty(), action_, + !other.action_.isEmpty(), other.action_); + content_ = visitor.visitString(!content_.isEmpty(), content_, + !other.content_.isEmpty(), other.content_); + sender_ = visitor.visitString(!sender_.isEmpty(), sender_, + !other.sender_.isEmpty(), other.sender_); + receiver_ = visitor.visitString(!receiver_.isEmpty(), receiver_, + !other.receiver_.isEmpty(), other.receiver_); + extra_ = visitor.visitString(!extra_.isEmpty(), extra_, + !other.extra_.isEmpty(), other.extra_); + title_ = visitor.visitString(!title_.isEmpty(), title_, + !other.title_.isEmpty(), other.title_); + format_ = visitor.visitString(!format_.isEmpty(), format_, + !other.format_.isEmpty(), other.format_); + timestamp_ = visitor.visitLong(timestamp_ != 0L, timestamp_, + other.timestamp_ != 0L, other.timestamp_); + if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor + .INSTANCE) { + } + return this; + } + case MERGE_FROM_STREAM: { + com.google.protobuf.CodedInputStream input = + (com.google.protobuf.CodedInputStream) arg0; + com.google.protobuf.ExtensionRegistryLite extensionRegistry = + (com.google.protobuf.ExtensionRegistryLite) arg1; + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!input.skipField(tag)) { + done = true; + } + break; + } + case 8: { + + id_ = input.readInt64(); + break; + } + case 18: { + String s = input.readStringRequireUtf8(); + + action_ = s; + break; + } + case 26: { + String s = input.readStringRequireUtf8(); + + content_ = s; + break; + } + case 34: { + String s = input.readStringRequireUtf8(); + + sender_ = s; + break; + } + case 42: { + String s = input.readStringRequireUtf8(); + + receiver_ = s; + break; + } + case 50: { + String s = input.readStringRequireUtf8(); + + extra_ = s; + break; + } + case 58: { + String s = input.readStringRequireUtf8(); + + title_ = s; + break; + } + case 66: { + String s = input.readStringRequireUtf8(); + + format_ = s; + break; + } + case 72: { + + timestamp_ = input.readInt64(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw new RuntimeException(e.setUnfinishedMessage(this)); + } catch (java.io.IOException e) { + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); + } finally { + } + } + case GET_DEFAULT_INSTANCE: { + return DEFAULT_INSTANCE; + } + case GET_PARSER: { + if (PARSER == null) { synchronized (com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.class) { + if (PARSER == null) { + PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE); + } + } + } + return PARSER; + } + } + throw new UnsupportedOperationException(); + } + // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.android.model.proto.Model) private static final com.farsunset.cim.sdk.android.model.proto.MessageProto.Model DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.farsunset.cim.sdk.android.model.proto.MessageProto.Model(); + DEFAULT_INSTANCE = new Model(); + DEFAULT_INSTANCE.makeImmutable(); } public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public Model parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Model(input, extensionRegistry); - } - }; + private static volatile com.google.protobuf.Parser PARSER; public static com.google.protobuf.Parser parser() { - return PARSER; + return DEFAULT_INSTANCE.getParserForType(); } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.MessageProto.Model getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - } - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; static { - java.lang.String[] descriptorData = { - "\n\rMessage.proto\022)com.farsunset.cim.sdk.a" + - "ndroid.model.proto\"\227\001\n\005Model\022\n\n\002id\030\001 \001(\003" + - "\022\016\n\006action\030\002 \001(\t\022\017\n\007content\030\003 \001(\t\022\016\n\006sen" + - "der\030\004 \001(\t\022\020\n\010receiver\030\005 \001(\t\022\r\n\005extra\030\006 \001" + - "(\t\022\r\n\005title\030\007 \001(\t\022\016\n\006format\030\010 \001(\t\022\021\n\ttim" + - "estamp\030\t \001(\003B\016B\014MessageProtob\006proto3" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }, assigner); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor, - new java.lang.String[] { "Id", "Action", "Content", "Sender", "Receiver", "Extra", "Title", "Format", "Timestamp", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java index 14116c9..36a429a 100644 --- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java +++ b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java @@ -8,48 +8,42 @@ public final class ReplyBodyProto { public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); - } public interface ModelOrBuilder extends // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.android.model.proto.Model) - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.MessageLiteOrBuilder { /** - * string key = 1; + * optional string key = 1; */ java.lang.String getKey(); /** - * string key = 1; + * optional string key = 1; */ com.google.protobuf.ByteString getKeyBytes(); /** - * string code = 2; + * optional string code = 2; */ java.lang.String getCode(); /** - * string code = 2; + * optional string code = 2; */ com.google.protobuf.ByteString getCodeBytes(); /** - * string message = 3; + * optional string message = 3; */ java.lang.String getMessage(); /** - * string message = 3; + * optional string message = 3; */ com.google.protobuf.ByteString getMessageBytes(); /** - * int64 timestamp = 4; + * optional int64 timestamp = 4; */ long getTimestamp(); @@ -91,261 +85,205 @@ public final class ReplyBodyProto { * Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model} */ public static final class Model extends - com.google.protobuf.GeneratedMessageV3 implements + com.google.protobuf.GeneratedMessageLite< + Model, Model.Builder> implements // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.android.model.proto.Model) ModelOrBuilder { - private static final long serialVersionUID = 0L; - // Use Model.newBuilder() to construct. - private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } private Model() { key_ = ""; code_ = ""; message_ = ""; } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Model( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - key_ = s; - break; - } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - code_ = s; - break; - } - case 26: { - java.lang.String s = input.readStringRequireUtf8(); - - message_ = s; - break; - } - case 32: { - - timestamp_ = input.readInt64(); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - data_ = com.google.protobuf.MapField.newMapField( - DataDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000010; - } - com.google.protobuf.MapEntry - data__ = input.readMessage( - DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - data_.getMutableMap().put( - data__.getKey(), data__.getValue()); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @SuppressWarnings({"rawtypes"}) - @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 5: - return internalGetData(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.class, com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.Builder.class); - } - private int bitField0_; public static final int KEY_FIELD_NUMBER = 1; - private volatile java.lang.Object key_; + private java.lang.String key_; /** - * string key = 1; + * optional string key = 1; */ public java.lang.String getKey() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - key_ = s; - return s; - } + return key_; } /** - * string key = 1; + * optional string key = 1; */ public com.google.protobuf.ByteString getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(key_); + } + /** + * optional string key = 1; + */ + private void setKey( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + key_ = value; + } + /** + * optional string key = 1; + */ + private void clearKey() { + + key_ = getDefaultInstance().getKey(); + } + /** + * optional string key = 1; + */ + private void setKeyBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + key_ = value.toStringUtf8(); } public static final int CODE_FIELD_NUMBER = 2; - private volatile java.lang.Object code_; + private java.lang.String code_; /** - * string code = 2; + * optional string code = 2; */ public java.lang.String getCode() { - java.lang.Object ref = code_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - code_ = s; - return s; - } + return code_; } /** - * string code = 2; + * optional string code = 2; */ public com.google.protobuf.ByteString getCodeBytes() { - java.lang.Object ref = code_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - code_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(code_); + } + /** + * optional string code = 2; + */ + private void setCode( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + code_ = value; + } + /** + * optional string code = 2; + */ + private void clearCode() { + + code_ = getDefaultInstance().getCode(); + } + /** + * optional string code = 2; + */ + private void setCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + code_ = value.toStringUtf8(); } public static final int MESSAGE_FIELD_NUMBER = 3; - private volatile java.lang.Object message_; + private java.lang.String message_; /** - * string message = 3; + * optional string message = 3; */ public java.lang.String getMessage() { - java.lang.Object ref = message_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - message_ = s; - return s; - } + return message_; } /** - * string message = 3; + * optional string message = 3; */ public com.google.protobuf.ByteString getMessageBytes() { - java.lang.Object ref = message_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - message_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(message_); + } + /** + * optional string message = 3; + */ + private void setMessage( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + message_ = value; + } + /** + * optional string message = 3; + */ + private void clearMessage() { + + message_ = getDefaultInstance().getMessage(); + } + /** + * optional string message = 3; + */ + private void setMessageBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + message_ = value.toStringUtf8(); } public static final int TIMESTAMP_FIELD_NUMBER = 4; private long timestamp_; /** - * int64 timestamp = 4; + * optional int64 timestamp = 4; */ public long getTimestamp() { return timestamp_; } + /** + * optional int64 timestamp = 4; + */ + private void setTimestamp(long value) { + + timestamp_ = value; + } + /** + * optional int64 timestamp = 4; + */ + private void clearTimestamp() { + + timestamp_ = 0L; + } public static final int DATA_FIELD_NUMBER = 5; private static final class DataDefaultEntryHolder { - static final com.google.protobuf.MapEntry< + static final com.google.protobuf.MapEntryLite< java.lang.String, java.lang.String> defaultEntry = - com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite .newDefaultInstance( - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, ""); } - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> data_; - private com.google.protobuf.MapField + private com.google.protobuf.MapFieldLite< + java.lang.String, java.lang.String> data_ = + com.google.protobuf.MapFieldLite.emptyMapField(); + private com.google.protobuf.MapFieldLite internalGetData() { - if (data_ == null) { - return com.google.protobuf.MapField.emptyMapField( - DataDefaultEntryHolder.defaultEntry); + return data_; + } + private com.google.protobuf.MapFieldLite + internalGetMutableData() { + if (!data_.isMutable()) { + data_ = data_.mutableCopy(); } return data_; } public int getDataCount() { - return internalGetData().getMap().size(); + return internalGetData().size(); } /** * map<string, string> data = 5; @@ -354,7 +292,7 @@ public final class ReplyBodyProto { public boolean containsData( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetData().getMap().containsKey(key); + return internalGetData().containsKey(key); } /** * Use {@link #getDataMap()} instead. @@ -368,7 +306,8 @@ public final class ReplyBodyProto { */ public java.util.Map getDataMap() { - return internalGetData().getMap(); + return java.util.Collections.unmodifiableMap( + internalGetData()); } /** * map<string, string> data = 5; @@ -379,7 +318,7 @@ public final class ReplyBodyProto { java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + internalGetData(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** @@ -390,678 +329,299 @@ public final class ReplyBodyProto { java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + internalGetData(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; + /** + * map<string, string> data = 5; + */ + private java.util.Map + getMutableDataMap() { + return internalGetMutableData(); } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getKeyBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_); + if (!key_.isEmpty()) { + output.writeString(1, getKey()); } - if (!getCodeBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_); + if (!code_.isEmpty()) { + output.writeString(2, getCode()); } - if (!getMessageBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, message_); + if (!message_.isEmpty()) { + output.writeString(3, getMessage()); } if (timestamp_ != 0L) { output.writeInt64(4, timestamp_); } - com.google.protobuf.GeneratedMessageV3 - .serializeStringMapTo( - output, - internalGetData(), - DataDefaultEntryHolder.defaultEntry, - 5); - unknownFields.writeTo(output); + for (java.util.Map.Entry entry + : internalGetData().entrySet()) { + DataDefaultEntryHolder.defaultEntry.serializeTo( + output, 5, entry.getKey(), entry.getValue()); + } } - @java.lang.Override public int getSerializedSize() { - int size = memoizedSize; + int size = memoizedSerializedSize; if (size != -1) return size; size = 0; - if (!getKeyBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_); + if (!key_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(1, getKey()); } - if (!getCodeBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_); + if (!code_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(2, getCode()); } - if (!getMessageBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, message_); + if (!message_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(3, getMessage()); } if (timestamp_ != 0L) { size += com.google.protobuf.CodedOutputStream .computeInt64Size(4, timestamp_); } for (java.util.Map.Entry entry - : internalGetData().getMap().entrySet()) { - com.google.protobuf.MapEntry - data__ = DataDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, data__); + : internalGetData().entrySet()) { + size += DataDefaultEntryHolder.defaultEntry.computeMessageSize( + 5, entry.getKey(), entry.getValue()); } - size += unknownFields.getSerializedSize(); - memoizedSize = size; + memoizedSerializedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model)) { - return super.equals(obj); - } - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model other = (com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model) obj; - - if (!getKey() - .equals(other.getKey())) return false; - if (!getCode() - .equals(other.getCode())) return false; - if (!getMessage() - .equals(other.getMessage())) return false; - if (getTimestamp() - != other.getTimestamp()) return false; - if (!internalGetData().equals( - other.internalGetData())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + KEY_FIELD_NUMBER; - hash = (53 * hash) + getKey().hashCode(); - hash = (37 * hash) + CODE_FIELD_NUMBER; - hash = (53 * hash) + getCode().hashCode(); - hash = (37 * hash) + MESSAGE_FIELD_NUMBER; - hash = (53 * hash) + getMessage().hashCode(); - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTimestamp()); - if (!internalGetData().getMap().isEmpty()) { - hash = (37 * hash) + DATA_FIELD_NUMBER; - hash = (53 * hash) + internalGetData().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + return parseDelimitedFrom(DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input, extensionRegistry); } - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } public static Builder newBuilder(com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } /** * Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements + com.google.protobuf.GeneratedMessageLite.Builder< + com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model, Builder> implements // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.android.model.proto.Model) com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.ModelOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 5: - return internalGetData(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { - switch (number) { - case 5: - return internalGetMutableData(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.class, com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.Builder.class); - } - // Construct using com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + super(DEFAULT_INSTANCE); } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - key_ = ""; - code_ = ""; - - message_ = ""; - - timestamp_ = 0L; - - internalGetMutableData().clear(); - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model getDefaultInstanceForType() { - return com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.getDefaultInstance(); - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model build() { - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model buildPartial() { - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model result = new com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - result.key_ = key_; - result.code_ = code_; - result.message_ = message_; - result.timestamp_ = timestamp_; - result.data_ = internalGetData(); - result.data_.makeImmutable(); - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model) { - return mergeFrom((com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model other) { - if (other == com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.getDefaultInstance()) return this; - if (!other.getKey().isEmpty()) { - key_ = other.key_; - onChanged(); - } - if (!other.getCode().isEmpty()) { - code_ = other.code_; - onChanged(); - } - if (!other.getMessage().isEmpty()) { - message_ = other.message_; - onChanged(); - } - if (other.getTimestamp() != 0L) { - setTimestamp(other.getTimestamp()); - } - internalGetMutableData().mergeFrom( - other.internalGetData()); - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private java.lang.Object key_ = ""; /** - * string key = 1; + * optional string key = 1; */ public java.lang.String getKey() { - java.lang.Object ref = key_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - key_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getKey(); } /** - * string key = 1; + * optional string key = 1; */ public com.google.protobuf.ByteString getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getKeyBytes(); } /** - * string key = 1; + * optional string key = 1; */ public Builder setKey( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - key_ = value; - onChanged(); + copyOnWrite(); + instance.setKey(value); return this; } /** - * string key = 1; + * optional string key = 1; */ public Builder clearKey() { - - key_ = getDefaultInstance().getKey(); - onChanged(); + copyOnWrite(); + instance.clearKey(); return this; } /** - * string key = 1; + * optional string key = 1; */ public Builder setKeyBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - key_ = value; - onChanged(); + copyOnWrite(); + instance.setKeyBytes(value); return this; } - private java.lang.Object code_ = ""; /** - * string code = 2; + * optional string code = 2; */ public java.lang.String getCode() { - java.lang.Object ref = code_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - code_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getCode(); } /** - * string code = 2; + * optional string code = 2; */ public com.google.protobuf.ByteString getCodeBytes() { - java.lang.Object ref = code_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - code_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getCodeBytes(); } /** - * string code = 2; + * optional string code = 2; */ public Builder setCode( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - code_ = value; - onChanged(); + copyOnWrite(); + instance.setCode(value); return this; } /** - * string code = 2; + * optional string code = 2; */ public Builder clearCode() { - - code_ = getDefaultInstance().getCode(); - onChanged(); + copyOnWrite(); + instance.clearCode(); return this; } /** - * string code = 2; + * optional string code = 2; */ public Builder setCodeBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - code_ = value; - onChanged(); + copyOnWrite(); + instance.setCodeBytes(value); return this; } - private java.lang.Object message_ = ""; /** - * string message = 3; + * optional string message = 3; */ public java.lang.String getMessage() { - java.lang.Object ref = message_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - message_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getMessage(); } /** - * string message = 3; + * optional string message = 3; */ public com.google.protobuf.ByteString getMessageBytes() { - java.lang.Object ref = message_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - message_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getMessageBytes(); } /** - * string message = 3; + * optional string message = 3; */ public Builder setMessage( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - message_ = value; - onChanged(); + copyOnWrite(); + instance.setMessage(value); return this; } /** - * string message = 3; + * optional string message = 3; */ public Builder clearMessage() { - - message_ = getDefaultInstance().getMessage(); - onChanged(); + copyOnWrite(); + instance.clearMessage(); return this; } /** - * string message = 3; + * optional string message = 3; */ public Builder setMessageBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - message_ = value; - onChanged(); + copyOnWrite(); + instance.setMessageBytes(value); return this; } - private long timestamp_ ; /** - * int64 timestamp = 4; + * optional int64 timestamp = 4; */ public long getTimestamp() { - return timestamp_; + return instance.getTimestamp(); } /** - * int64 timestamp = 4; + * optional int64 timestamp = 4; */ public Builder setTimestamp(long value) { - - timestamp_ = value; - onChanged(); + copyOnWrite(); + instance.setTimestamp(value); return this; } /** - * int64 timestamp = 4; + * optional int64 timestamp = 4; */ public Builder clearTimestamp() { - - timestamp_ = 0L; - onChanged(); + copyOnWrite(); + instance.clearTimestamp(); return this; } - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> data_; - private com.google.protobuf.MapField - internalGetData() { - if (data_ == null) { - return com.google.protobuf.MapField.emptyMapField( - DataDefaultEntryHolder.defaultEntry); - } - return data_; - } - private com.google.protobuf.MapField - internalGetMutableData() { - onChanged();; - if (data_ == null) { - data_ = com.google.protobuf.MapField.newMapField( - DataDefaultEntryHolder.defaultEntry); - } - if (!data_.isMutable()) { - data_ = data_.copy(); - } - return data_; - } public int getDataCount() { - return internalGetData().getMap().size(); + return instance.getDataMap().size(); } /** * map<string, string> data = 5; @@ -1070,7 +630,24 @@ public final class ReplyBodyProto { public boolean containsData( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetData().getMap().containsKey(key); + return instance.getDataMap().containsKey(key); + } + + public Builder clearData() { + copyOnWrite(); + instance.getMutableDataMap().clear(); + return this; + } + /** + * map<string, string> data = 5; + */ + + public Builder removeData( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + copyOnWrite(); + instance.getMutableDataMap().remove(key); + return this; } /** * Use {@link #getDataMap()} instead. @@ -1082,9 +659,9 @@ public final class ReplyBodyProto { /** * map<string, string> data = 5; */ - public java.util.Map getDataMap() { - return internalGetData().getMap(); + return java.util.Collections.unmodifiableMap( + instance.getDataMap()); } /** * map<string, string> data = 5; @@ -1095,7 +672,7 @@ public final class ReplyBodyProto { java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + instance.getDataMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** @@ -1106,37 +683,12 @@ public final class ReplyBodyProto { java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + instance.getDataMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - - public Builder clearData() { - internalGetMutableData().getMutableMap() - .clear(); - return this; - } - /** - * map<string, string> data = 5; - */ - - public Builder removeData( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableData().getMutableMap() - .remove(key); - return this; - } - /** - * Use alternate mutation accessors instead. - */ - @java.lang.Deprecated - public java.util.Map - getMutableData() { - return internalGetMutableData().getMutableMap(); - } /** * map<string, string> data = 5; */ @@ -1145,124 +697,154 @@ public final class ReplyBodyProto { java.lang.String value) { if (key == null) { throw new java.lang.NullPointerException(); } if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableData().getMutableMap() - .put(key, value); + copyOnWrite(); + instance.getMutableDataMap().put(key, value); return this; } /** * map<string, string> data = 5; */ - public Builder putAllData( java.util.Map values) { - internalGetMutableData().getMutableMap() - .putAll(values); + copyOnWrite(); + instance.getMutableDataMap().putAll(values); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.android.model.proto.Model) } + protected final Object dynamicMethod( + com.google.protobuf.GeneratedMessageLite.MethodToInvoke method, + Object arg0, Object arg1) { + switch (method) { + case NEW_MUTABLE_INSTANCE: { + return new com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model(); + } + case IS_INITIALIZED: { + return DEFAULT_INSTANCE; + } + case MAKE_IMMUTABLE: { + data_.makeImmutable(); + return null; + } + case NEW_BUILDER: { + return new Builder(); + } + case VISIT: { + Visitor visitor = (Visitor) arg0; + com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model other = (com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model) arg1; + key_ = visitor.visitString(!key_.isEmpty(), key_, + !other.key_.isEmpty(), other.key_); + code_ = visitor.visitString(!code_.isEmpty(), code_, + !other.code_.isEmpty(), other.code_); + message_ = visitor.visitString(!message_.isEmpty(), message_, + !other.message_.isEmpty(), other.message_); + timestamp_ = visitor.visitLong(timestamp_ != 0L, timestamp_, + other.timestamp_ != 0L, other.timestamp_); + data_ = visitor.visitMap( + data_, other.internalGetData()); + if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor + .INSTANCE) { + bitField0_ |= other.bitField0_; + } + return this; + } + case MERGE_FROM_STREAM: { + com.google.protobuf.CodedInputStream input = + (com.google.protobuf.CodedInputStream) arg0; + com.google.protobuf.ExtensionRegistryLite extensionRegistry = + (com.google.protobuf.ExtensionRegistryLite) arg1; + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!input.skipField(tag)) { + done = true; + } + break; + } + case 10: { + String s = input.readStringRequireUtf8(); + + key_ = s; + break; + } + case 18: { + String s = input.readStringRequireUtf8(); + + code_ = s; + break; + } + case 26: { + String s = input.readStringRequireUtf8(); + + message_ = s; + break; + } + case 32: { + + timestamp_ = input.readInt64(); + break; + } + case 42: { + if (!data_.isMutable()) { + data_ = data_.mutableCopy(); + } + DataDefaultEntryHolder.defaultEntry.parseInto(data_, input, extensionRegistry); break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw new RuntimeException(e.setUnfinishedMessage(this)); + } catch (java.io.IOException e) { + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); + } finally { + } + } + case GET_DEFAULT_INSTANCE: { + return DEFAULT_INSTANCE; + } + case GET_PARSER: { + if (PARSER == null) { synchronized (com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.class) { + if (PARSER == null) { + PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE); + } + } + } + return PARSER; + } + } + throw new UnsupportedOperationException(); + } + // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.android.model.proto.Model) private static final com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model(); + DEFAULT_INSTANCE = new Model(); + DEFAULT_INSTANCE.makeImmutable(); } public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public Model parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Model(input, extensionRegistry); - } - }; + private static volatile com.google.protobuf.Parser PARSER; public static com.google.protobuf.Parser parser() { - return PARSER; + return DEFAULT_INSTANCE.getParserForType(); } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - } - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; static { - java.lang.String[] descriptorData = { - "\n\017ReplyBody.proto\022)com.farsunset.cim.sdk" + - ".android.model.proto\"\275\001\n\005Model\022\013\n\003key\030\001 " + - "\001(\t\022\014\n\004code\030\002 \001(\t\022\017\n\007message\030\003 \001(\t\022\021\n\tti" + - "mestamp\030\004 \001(\003\022H\n\004data\030\005 \003(\0132:.com.farsun" + - "set.cim.sdk.android.model.proto.Model.Da" + - "taEntry\032+\n\tDataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" + - "ue\030\002 \001(\t:\0028\001B\020B\016ReplyBodyProtob\006proto3" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }, assigner); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor, - new java.lang.String[] { "Key", "Code", "Message", "Timestamp", "Data", }); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor = - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor.getNestedTypes().get(0); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java index f37e9c8..7c36fc7 100644 --- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java +++ b/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java @@ -8,28 +8,22 @@ public final class SentBodyProto { public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); - } public interface ModelOrBuilder extends // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.android.model.proto.Model) - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.MessageLiteOrBuilder { /** - * string key = 1; + * optional string key = 1; */ java.lang.String getKey(); /** - * string key = 1; + * optional string key = 1; */ com.google.protobuf.ByteString getKeyBytes(); /** - * int64 timestamp = 2; + * optional int64 timestamp = 2; */ long getTimestamp(); @@ -71,179 +65,111 @@ public final class SentBodyProto { * Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model} */ public static final class Model extends - com.google.protobuf.GeneratedMessageV3 implements + com.google.protobuf.GeneratedMessageLite< + Model, Model.Builder> implements // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.android.model.proto.Model) ModelOrBuilder { - private static final long serialVersionUID = 0L; - // Use Model.newBuilder() to construct. - private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } private Model() { key_ = ""; } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Model( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - key_ = s; - break; - } - case 16: { - - timestamp_ = input.readInt64(); - break; - } - case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - data_ = com.google.protobuf.MapField.newMapField( - DataDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000004; - } - com.google.protobuf.MapEntry - data__ = input.readMessage( - DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - data_.getMutableMap().put( - data__.getKey(), data__.getValue()); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.farsunset.cim.sdk.android.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @SuppressWarnings({"rawtypes"}) - @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 3: - return internalGetData(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.farsunset.cim.sdk.android.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.class, com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.Builder.class); - } - private int bitField0_; public static final int KEY_FIELD_NUMBER = 1; - private volatile java.lang.Object key_; + private java.lang.String key_; /** - * string key = 1; + * optional string key = 1; */ public java.lang.String getKey() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - key_ = s; - return s; - } + return key_; } /** - * string key = 1; + * optional string key = 1; */ public com.google.protobuf.ByteString getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return com.google.protobuf.ByteString.copyFromUtf8(key_); + } + /** + * optional string key = 1; + */ + private void setKey( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + key_ = value; + } + /** + * optional string key = 1; + */ + private void clearKey() { + + key_ = getDefaultInstance().getKey(); + } + /** + * optional string key = 1; + */ + private void setKeyBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + key_ = value.toStringUtf8(); } public static final int TIMESTAMP_FIELD_NUMBER = 2; private long timestamp_; /** - * int64 timestamp = 2; + * optional int64 timestamp = 2; */ public long getTimestamp() { return timestamp_; } + /** + * optional int64 timestamp = 2; + */ + private void setTimestamp(long value) { + + timestamp_ = value; + } + /** + * optional int64 timestamp = 2; + */ + private void clearTimestamp() { + + timestamp_ = 0L; + } public static final int DATA_FIELD_NUMBER = 3; private static final class DataDefaultEntryHolder { - static final com.google.protobuf.MapEntry< + static final com.google.protobuf.MapEntryLite< java.lang.String, java.lang.String> defaultEntry = - com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite .newDefaultInstance( - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, ""); } - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> data_; - private com.google.protobuf.MapField + private com.google.protobuf.MapFieldLite< + java.lang.String, java.lang.String> data_ = + com.google.protobuf.MapFieldLite.emptyMapField(); + private com.google.protobuf.MapFieldLite internalGetData() { - if (data_ == null) { - return com.google.protobuf.MapField.emptyMapField( - DataDefaultEntryHolder.defaultEntry); + return data_; + } + private com.google.protobuf.MapFieldLite + internalGetMutableData() { + if (!data_.isMutable()) { + data_ = data_.mutableCopy(); } return data_; } public int getDataCount() { - return internalGetData().getMap().size(); + return internalGetData().size(); } /** * map<string, string> data = 3; @@ -252,7 +178,7 @@ public final class SentBodyProto { public boolean containsData( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetData().getMap().containsKey(key); + return internalGetData().containsKey(key); } /** * Use {@link #getDataMap()} instead. @@ -266,7 +192,8 @@ public final class SentBodyProto { */ public java.util.Map getDataMap() { - return internalGetData().getMap(); + return java.util.Collections.unmodifiableMap( + internalGetData()); } /** * map<string, string> data = 3; @@ -277,7 +204,7 @@ public final class SentBodyProto { java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + internalGetData(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** @@ -288,506 +215,205 @@ public final class SentBodyProto { java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + internalGetData(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; + /** + * map<string, string> data = 3; + */ + private java.util.Map + getMutableDataMap() { + return internalGetMutableData(); } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getKeyBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_); + if (!key_.isEmpty()) { + output.writeString(1, getKey()); } if (timestamp_ != 0L) { output.writeInt64(2, timestamp_); } - com.google.protobuf.GeneratedMessageV3 - .serializeStringMapTo( - output, - internalGetData(), - DataDefaultEntryHolder.defaultEntry, - 3); - unknownFields.writeTo(output); + for (java.util.Map.Entry entry + : internalGetData().entrySet()) { + DataDefaultEntryHolder.defaultEntry.serializeTo( + output, 3, entry.getKey(), entry.getValue()); + } } - @java.lang.Override public int getSerializedSize() { - int size = memoizedSize; + int size = memoizedSerializedSize; if (size != -1) return size; size = 0; - if (!getKeyBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_); + if (!key_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeStringSize(1, getKey()); } if (timestamp_ != 0L) { size += com.google.protobuf.CodedOutputStream .computeInt64Size(2, timestamp_); } for (java.util.Map.Entry entry - : internalGetData().getMap().entrySet()) { - com.google.protobuf.MapEntry - data__ = DataDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, data__); + : internalGetData().entrySet()) { + size += DataDefaultEntryHolder.defaultEntry.computeMessageSize( + 3, entry.getKey(), entry.getValue()); } - size += unknownFields.getSerializedSize(); - memoizedSize = size; + memoizedSerializedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model)) { - return super.equals(obj); - } - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model other = (com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model) obj; - - if (!getKey() - .equals(other.getKey())) return false; - if (getTimestamp() - != other.getTimestamp()) return false; - if (!internalGetData().equals( - other.internalGetData())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + KEY_FIELD_NUMBER; - hash = (53 * hash) + getKey().hashCode(); - hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTimestamp()); - if (!internalGetData().getMap().isEmpty()) { - hash = (37 * hash) + DATA_FIELD_NUMBER; - hash = (53 * hash) + internalGetData().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, data, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + return parseDelimitedFrom(DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageLite.parseFrom( + DEFAULT_INSTANCE, input, extensionRegistry); } - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } public static Builder newBuilder(com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } /** * Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements + com.google.protobuf.GeneratedMessageLite.Builder< + com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model, Builder> implements // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.android.model.proto.Model) com.farsunset.cim.sdk.android.model.proto.SentBodyProto.ModelOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.farsunset.cim.sdk.android.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 3: - return internalGetData(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { - switch (number) { - case 3: - return internalGetMutableData(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return com.farsunset.cim.sdk.android.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable - .ensureFieldAccessorsInitialized( - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.class, com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.Builder.class); - } - // Construct using com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + super(DEFAULT_INSTANCE); } - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - key_ = ""; - timestamp_ = 0L; - - internalGetMutableData().clear(); - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return com.farsunset.cim.sdk.android.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model getDefaultInstanceForType() { - return com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.getDefaultInstance(); - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model build() { - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model buildPartial() { - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model result = new com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - result.key_ = key_; - result.timestamp_ = timestamp_; - result.data_ = internalGetData(); - result.data_.makeImmutable(); - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model) { - return mergeFrom((com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model other) { - if (other == com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.getDefaultInstance()) return this; - if (!other.getKey().isEmpty()) { - key_ = other.key_; - onChanged(); - } - if (other.getTimestamp() != 0L) { - setTimestamp(other.getTimestamp()); - } - internalGetMutableData().mergeFrom( - other.internalGetData()); - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private java.lang.Object key_ = ""; /** - * string key = 1; + * optional string key = 1; */ public java.lang.String getKey() { - java.lang.Object ref = key_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - key_ = s; - return s; - } else { - return (java.lang.String) ref; - } + return instance.getKey(); } /** - * string key = 1; + * optional string key = 1; */ public com.google.protobuf.ByteString getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - key_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + return instance.getKeyBytes(); } /** - * string key = 1; + * optional string key = 1; */ public Builder setKey( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - key_ = value; - onChanged(); + copyOnWrite(); + instance.setKey(value); return this; } /** - * string key = 1; + * optional string key = 1; */ public Builder clearKey() { - - key_ = getDefaultInstance().getKey(); - onChanged(); + copyOnWrite(); + instance.clearKey(); return this; } /** - * string key = 1; + * optional string key = 1; */ public Builder setKeyBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - key_ = value; - onChanged(); + copyOnWrite(); + instance.setKeyBytes(value); return this; } - private long timestamp_ ; /** - * int64 timestamp = 2; + * optional int64 timestamp = 2; */ public long getTimestamp() { - return timestamp_; + return instance.getTimestamp(); } /** - * int64 timestamp = 2; + * optional int64 timestamp = 2; */ public Builder setTimestamp(long value) { - - timestamp_ = value; - onChanged(); + copyOnWrite(); + instance.setTimestamp(value); return this; } /** - * int64 timestamp = 2; + * optional int64 timestamp = 2; */ public Builder clearTimestamp() { - - timestamp_ = 0L; - onChanged(); + copyOnWrite(); + instance.clearTimestamp(); return this; } - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> data_; - private com.google.protobuf.MapField - internalGetData() { - if (data_ == null) { - return com.google.protobuf.MapField.emptyMapField( - DataDefaultEntryHolder.defaultEntry); - } - return data_; - } - private com.google.protobuf.MapField - internalGetMutableData() { - onChanged();; - if (data_ == null) { - data_ = com.google.protobuf.MapField.newMapField( - DataDefaultEntryHolder.defaultEntry); - } - if (!data_.isMutable()) { - data_ = data_.copy(); - } - return data_; - } public int getDataCount() { - return internalGetData().getMap().size(); + return instance.getDataMap().size(); } /** * map<string, string> data = 3; @@ -796,7 +422,24 @@ public final class SentBodyProto { public boolean containsData( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetData().getMap().containsKey(key); + return instance.getDataMap().containsKey(key); + } + + public Builder clearData() { + copyOnWrite(); + instance.getMutableDataMap().clear(); + return this; + } + /** + * map<string, string> data = 3; + */ + + public Builder removeData( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + copyOnWrite(); + instance.getMutableDataMap().remove(key); + return this; } /** * Use {@link #getDataMap()} instead. @@ -808,9 +451,9 @@ public final class SentBodyProto { /** * map<string, string> data = 3; */ - public java.util.Map getDataMap() { - return internalGetData().getMap(); + return java.util.Collections.unmodifiableMap( + instance.getDataMap()); } /** * map<string, string> data = 3; @@ -821,7 +464,7 @@ public final class SentBodyProto { java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + instance.getDataMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** @@ -832,37 +475,12 @@ public final class SentBodyProto { java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetData().getMap(); + instance.getDataMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - - public Builder clearData() { - internalGetMutableData().getMutableMap() - .clear(); - return this; - } - /** - * map<string, string> data = 3; - */ - - public Builder removeData( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableData().getMutableMap() - .remove(key); - return this; - } - /** - * Use alternate mutation accessors instead. - */ - @java.lang.Deprecated - public java.util.Map - getMutableData() { - return internalGetMutableData().getMutableMap(); - } /** * map<string, string> data = 3; */ @@ -871,124 +489,138 @@ public final class SentBodyProto { java.lang.String value) { if (key == null) { throw new java.lang.NullPointerException(); } if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableData().getMutableMap() - .put(key, value); + copyOnWrite(); + instance.getMutableDataMap().put(key, value); return this; } /** * map<string, string> data = 3; */ - public Builder putAllData( java.util.Map values) { - internalGetMutableData().getMutableMap() - .putAll(values); + copyOnWrite(); + instance.getMutableDataMap().putAll(values); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.android.model.proto.Model) } + protected final Object dynamicMethod( + com.google.protobuf.GeneratedMessageLite.MethodToInvoke method, + Object arg0, Object arg1) { + switch (method) { + case NEW_MUTABLE_INSTANCE: { + return new com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model(); + } + case IS_INITIALIZED: { + return DEFAULT_INSTANCE; + } + case MAKE_IMMUTABLE: { + data_.makeImmutable(); + return null; + } + case NEW_BUILDER: { + return new Builder(); + } + case VISIT: { + Visitor visitor = (Visitor) arg0; + com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model other = (com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model) arg1; + key_ = visitor.visitString(!key_.isEmpty(), key_, + !other.key_.isEmpty(), other.key_); + timestamp_ = visitor.visitLong(timestamp_ != 0L, timestamp_, + other.timestamp_ != 0L, other.timestamp_); + data_ = visitor.visitMap( + data_, other.internalGetData()); + if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor + .INSTANCE) { + bitField0_ |= other.bitField0_; + } + return this; + } + case MERGE_FROM_STREAM: { + com.google.protobuf.CodedInputStream input = + (com.google.protobuf.CodedInputStream) arg0; + com.google.protobuf.ExtensionRegistryLite extensionRegistry = + (com.google.protobuf.ExtensionRegistryLite) arg1; + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!input.skipField(tag)) { + done = true; + } + break; + } + case 10: { + String s = input.readStringRequireUtf8(); + + key_ = s; + break; + } + case 16: { + + timestamp_ = input.readInt64(); + break; + } + case 26: { + if (!data_.isMutable()) { + data_ = data_.mutableCopy(); + } + DataDefaultEntryHolder.defaultEntry.parseInto(data_, input, extensionRegistry); break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw new RuntimeException(e.setUnfinishedMessage(this)); + } catch (java.io.IOException e) { + throw new RuntimeException( + new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this)); + } finally { + } + } + case GET_DEFAULT_INSTANCE: { + return DEFAULT_INSTANCE; + } + case GET_PARSER: { + if (PARSER == null) { synchronized (com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.class) { + if (PARSER == null) { + PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE); + } + } + } + return PARSER; + } + } + throw new UnsupportedOperationException(); + } + // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.android.model.proto.Model) private static final com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model(); + DEFAULT_INSTANCE = new Model(); + DEFAULT_INSTANCE.makeImmutable(); } public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public Model parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Model(input, extensionRegistry); - } - }; + private static volatile com.google.protobuf.Parser PARSER; public static com.google.protobuf.Parser parser() { - return PARSER; + return DEFAULT_INSTANCE.getParserForType(); } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - } - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; static { - java.lang.String[] descriptorData = { - "\n\016SentBody.proto\022)com.farsunset.cim.sdk." + - "android.model.proto\"\236\001\n\005Model\022\013\n\003key\030\001 \001" + - "(\t\022\021\n\ttimestamp\030\002 \001(\003\022H\n\004data\030\003 \003(\0132:.co" + - "m.farsunset.cim.sdk.android.model.proto." + - "Model.DataEntry\032+\n\tDataEntry\022\013\n\003key\030\001 \001(" + - "\t\022\r\n\005value\030\002 \001(\t:\0028\001B\017B\rSentBodyProtob\006p" + - "roto3" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }, assigner); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor, - new java.lang.String[] { "Key", "Timestamp", "Data", }); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor = - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_descriptor.getNestedTypes().get(0); - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_com_farsunset_cim_sdk_android_model_proto_Model_DataEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java index 6391600..6cd74e9 100644 --- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java +++ b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java @@ -39,8 +39,8 @@ public class CIMLoggingFilter extends IoFilterAdapter { @Override public void exceptionCaught(NextFilter nextFilter, IoSession session, Throwable cause) { - logger.info("EXCEPTION" + getSessionInfo(session) + "\n{}", cause.getClass().getName()); - session.closeOnFlush(); + logger.error("EXCEPTION" + getSessionInfo(session) + "\n{}", cause); + nextFilter.exceptionCaught(session, cause); } @Override diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java index 05a9828..b428aff 100644 --- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java +++ b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java @@ -54,9 +54,16 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM private CIMRequestHandler outerRequestHandler; private IoAcceptor acceptor; private int port; - private final int IDLE_TIME = 120; // 秒 - private final int TIME_OUT = 10; // 秒 - private final int READ_BUFFER_SIZE = 1024; // byte + /* + * 读写空闲2分钟后 服务端 -> 客户端 发起心跳请求 + */ + private final int IDLE_HEART_REQUEST_TIME = 120; + + /* + * 发起心跳后等待客户端的心跳响应，超时10秒后断开连接 + */ + private final int HEART_RESPONSE_TIME_OUT = 10; + private final int READ_BUFFER_SIZE = 1024; public void bind() { @@ -70,9 +77,9 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM ((DefaultSocketSessionConfig) acceptor.getSessionConfig()).setKeepAlive(true); ((DefaultSocketSessionConfig) acceptor.getSessionConfig()).setTcpNoDelay(true); - KeepAliveFilter keepAliveFilter = new KeepAliveFilter(this, IdleStatus.WRITER_IDLE); - keepAliveFilter.setRequestInterval(IDLE_TIME); - keepAliveFilter.setRequestTimeout(TIME_OUT); + KeepAliveFilter keepAliveFilter = new KeepAliveFilter(this, IdleStatus.BOTH_IDLE); + keepAliveFilter.setRequestInterval(IDLE_HEART_REQUEST_TIME); + keepAliveFilter.setRequestTimeout(HEART_RESPONSE_TIME_OUT); keepAliveFilter.setForwardEvent(true); ExecutorService executor = Executors.newCachedThreadPool(runnable -> { @@ -159,6 +166,12 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM public boolean isResponse(IoSession arg0, Object arg1) { return arg1 instanceof HeartbeatResponse; } + + + @Override + public void exceptionCaught(IoSession session, Throwable cause) { + + } public Map getManagedSessions() { return acceptor.getManagedSessions(); diff --git a/cim-use-examples/cim-client-android/app/build.gradle b/cim-use-examples/cim-client-android/app/build.gradle index 72f3cbf..c8a7227 100644 --- a/cim-use-examples/cim-client-android/app/build.gradle +++ b/cim-use-examples/cim-client-android/app/build.gradle @@ -26,5 +26,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.google.protobuf:protobuf-java:3.7.0' + implementation 'com.google.protobuf:protobuf-lite:3.0.0' } diff --git a/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.7.0.jar b/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.7.0.jar deleted file mode 100644 index 4b9acfe..0000000 Binary files a/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.7.0.jar and /dev/null differ diff --git a/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.7.5.jar b/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.7.5.jar new file mode 100644 index 0000000..6b133f6 Binary files /dev/null and b/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-3.7.5.jar differ