diff --git a/pom.xml b/pom.xml
index 5a9d978..6e20e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.blueapron
kafka-connect-protobuf-converter
jar
- 1.2.0
+ 1.3.0
3.4.0
diff --git a/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java b/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
index 53f8aa5..9137734 100644
--- a/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
+++ b/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
@@ -5,7 +5,6 @@
import com.google.protobuf.Descriptors;
import com.google.protobuf.GeneratedMessageV3;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.MapEntry;
import com.google.protobuf.Message;
import org.apache.kafka.connect.data.Date;
import org.apache.kafka.connect.data.Field;
@@ -26,11 +25,24 @@
import java.util.Map;
import com.google.protobuf.util.Timestamps;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.BOOL;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.BYTES;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.DOUBLE;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.ENUM;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.FLOAT;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.INT32;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.INT64;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.MESSAGE;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.SINT32;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.SINT64;
+import static com.google.protobuf.Descriptors.FieldDescriptor.Type.STRING;
+
+
class ProtobufData {
- private final Class clazz;
private final Method newBuilder;
private final Schema schema;
private final String legacyName;
+ public static final Descriptors.FieldDescriptor.Type[] PROTO_TYPES_WITH_DEFAULTS = new Descriptors.FieldDescriptor.Type[] { INT32, INT64, SINT32, SINT64, FLOAT, DOUBLE, BOOL, STRING, BYTES, ENUM };
private HashMap connectProtoNameMap = new HashMap();
private GeneratedMessageV3.Builder getBuilder() {
@@ -69,8 +81,13 @@ private String getProtoFieldName(String descriptorForTypeName, String connectFie
return connectProtoNameMap.get(getProtoMapKey(descriptorForTypeName, connectFieldName));
}
+ private boolean isUnsetOneof(Descriptors.FieldDescriptor fieldDescriptor, Object value) {
+ return fieldDescriptor.getContainingOneof() != null &&
+ fieldDescriptor.getType() != MESSAGE &&
+ fieldDescriptor.getDefaultValue().equals(value);
+ }
+
ProtobufData(Class clazz, String legacyName) {
- this.clazz = clazz;
this.legacyName = legacyName;
try {
@@ -209,10 +226,6 @@ private boolean isProtobufDate(Schema schema) {
}
Object toConnectData(Schema schema, Object value) {
- if (value == null) {
- return null;
- }
-
try {
if (isProtobufTimestamp(schema)) {
com.google.protobuf.Timestamp timestamp = (com.google.protobuf.Timestamp) value;
@@ -311,14 +324,20 @@ Object toConnectData(Schema schema, Object value) {
case STRUCT: {
final Message message = (Message) value; // Validate type
+ if (message == message.getDefaultInstanceForType()) {
+ return null;
+ }
+
final Struct result = new Struct(schema.schema());
- final Map fieldsMap = message.getAllFields();
- for (Map.Entry pair : fieldsMap.entrySet()) {
- final Descriptors.FieldDescriptor fieldDescriptor = pair.getKey();
+
+ for (Descriptors.FieldDescriptor fieldDescriptor : message.getDescriptorForType().getFields()) {
final String fieldName = getConnectFieldName(fieldDescriptor);
final Field field = schema.field(fieldName);
- final Object obj = pair.getValue();
- result.put(fieldName, toConnectData(field.schema(), obj));
+
+ Object obj = message.getField(fieldDescriptor);
+ if (!isUnsetOneof(fieldDescriptor, obj)) {
+ result.put(fieldName, toConnectData(field.schema(), obj));
+ }
}
converted = result;
diff --git a/src/test/java/com/blueapron/connect/protobuf/NestedTestProtoOuterClass.java b/src/test/java/com/blueapron/connect/protobuf/NestedTestProtoOuterClass.java
index 1457caa..5e5935a 100644
--- a/src/test/java/com/blueapron/connect/protobuf/NestedTestProtoOuterClass.java
+++ b/src/test/java/com/blueapron/connect/protobuf/NestedTestProtoOuterClass.java
@@ -131,6 +131,19 @@ public interface UserIdOrBuilder extends
*/
int getOtherUserId();
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ boolean hasAnotherId();
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId getAnotherId();
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder getAnotherIdOrBuilder();
+
public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.UserIdCase getUserIdCase();
}
/**
@@ -187,6 +200,20 @@ private UserId(
userId_ = input.readInt32();
break;
}
+ case 26: {
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder subBuilder = null;
+ if (userIdCase_ == 3) {
+ subBuilder = ((com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_).toBuilder();
+ }
+ userId_ =
+ input.readMessage(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom((com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_);
+ userId_ = subBuilder.buildPartial();
+ }
+ userIdCase_ = 3;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -217,6 +244,7 @@ public enum UserIdCase
implements com.google.protobuf.Internal.EnumLite {
BA_COM_USER_ID(1),
OTHER_USER_ID(2),
+ ANOTHER_ID(3),
USERID_NOT_SET(0);
private final int value;
private UserIdCase(int value) {
@@ -234,75 +262,891 @@ public static UserIdCase forNumber(int value) {
switch (value) {
case 1: return BA_COM_USER_ID;
case 2: return OTHER_USER_ID;
+ case 3: return ANOTHER_ID;
case 0: return USERID_NOT_SET;
default: return null;
}
}
- public int getNumber() {
- return this.value;
- }
- };
+ public int getNumber() {
+ return this.value;
+ }
+ };
+
+ public UserIdCase
+ getUserIdCase() {
+ return UserIdCase.forNumber(
+ userIdCase_);
+ }
+
+ public static final int BA_COM_USER_ID_FIELD_NUMBER = 1;
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public java.lang.String getBaComUserId() {
+ java.lang.Object ref = "";
+ if (userIdCase_ == 1) {
+ ref = userId_;
+ }
+ 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();
+ if (userIdCase_ == 1) {
+ userId_ = s;
+ }
+ return s;
+ }
+ }
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public com.google.protobuf.ByteString
+ getBaComUserIdBytes() {
+ java.lang.Object ref = "";
+ if (userIdCase_ == 1) {
+ ref = userId_;
+ }
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ if (userIdCase_ == 1) {
+ userId_ = b;
+ }
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int OTHER_USER_ID_FIELD_NUMBER = 2;
+ /**
+ * int32 other_user_id = 2;
+ */
+ public int getOtherUserId() {
+ if (userIdCase_ == 2) {
+ return (java.lang.Integer) userId_;
+ }
+ return 0;
+ }
+
+ public static final int ANOTHER_ID_FIELD_NUMBER = 3;
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public boolean hasAnotherId() {
+ return userIdCase_ == 3;
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId getAnotherId() {
+ if (userIdCase_ == 3) {
+ return (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_;
+ }
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder getAnotherIdOrBuilder() {
+ if (userIdCase_ == 3) {
+ return (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_;
+ }
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
+ }
+
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (userIdCase_ == 1) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, userId_);
+ }
+ if (userIdCase_ == 2) {
+ output.writeInt32(
+ 2, (int)((java.lang.Integer) userId_));
+ }
+ if (userIdCase_ == 3) {
+ output.writeMessage(3, (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_);
+ }
+ unknownFields.writeTo(output);
+ }
+
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (userIdCase_ == 1) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, userId_);
+ }
+ if (userIdCase_ == 2) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(
+ 2, (int)((java.lang.Integer) userId_));
+ }
+ if (userIdCase_ == 3) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(3, (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId)) {
+ return super.equals(obj);
+ }
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId other = (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId) obj;
+
+ boolean result = true;
+ result = result && getUserIdCase().equals(
+ other.getUserIdCase());
+ if (!result) return false;
+ switch (userIdCase_) {
+ case 1:
+ result = result && getBaComUserId()
+ .equals(other.getBaComUserId());
+ break;
+ case 2:
+ result = result && (getOtherUserId()
+ == other.getOtherUserId());
+ break;
+ case 3:
+ result = result && getAnotherId()
+ .equals(other.getAnotherId());
+ break;
+ case 0:
+ default:
+ }
+ result = result && unknownFields.equals(other.unknownFields);
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ switch (userIdCase_) {
+ case 1:
+ hash = (37 * hash) + BA_COM_USER_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getBaComUserId().hashCode();
+ break;
+ case 2:
+ hash = (37 * hash) + OTHER_USER_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getOtherUserId();
+ break;
+ case 3:
+ hash = (37 * hash) + ANOTHER_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getAnotherId().hashCode();
+ break;
+ case 0:
+ default:
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ 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 blueapron.connect.protobuf.UserId}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:blueapron.connect.protobuf.UserId)
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserIdOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_UserId_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_UserId_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.class, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.Builder.class);
+ }
+
+ // Construct using com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ public Builder clear() {
+ super.clear();
+ userIdCase_ = 0;
+ userId_ = null;
+ return this;
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_UserId_descriptor;
+ }
+
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId getDefaultInstanceForType() {
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.getDefaultInstance();
+ }
+
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId build() {
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId buildPartial() {
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId result = new com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId(this);
+ if (userIdCase_ == 1) {
+ result.userId_ = userId_;
+ }
+ if (userIdCase_ == 2) {
+ result.userId_ = userId_;
+ }
+ if (userIdCase_ == 3) {
+ if (anotherIdBuilder_ == null) {
+ result.userId_ = userId_;
+ } else {
+ result.userId_ = anotherIdBuilder_.build();
+ }
+ }
+ result.userIdCase_ = userIdCase_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder clone() {
+ return (Builder) super.clone();
+ }
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.setField(field, value);
+ }
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return (Builder) super.clearField(field);
+ }
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return (Builder) super.clearOneof(oneof);
+ }
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return (Builder) super.setRepeatedField(field, index, value);
+ }
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.addRepeatedField(field, value);
+ }
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId) {
+ return mergeFrom((com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId other) {
+ if (other == com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.getDefaultInstance()) return this;
+ switch (other.getUserIdCase()) {
+ case BA_COM_USER_ID: {
+ userIdCase_ = 1;
+ userId_ = other.userId_;
+ onChanged();
+ break;
+ }
+ case OTHER_USER_ID: {
+ setOtherUserId(other.getOtherUserId());
+ break;
+ }
+ case ANOTHER_ID: {
+ mergeAnotherId(other.getAnotherId());
+ break;
+ }
+ case USERID_NOT_SET: {
+ break;
+ }
+ }
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int userIdCase_ = 0;
+ private java.lang.Object userId_;
+ public UserIdCase
+ getUserIdCase() {
+ return UserIdCase.forNumber(
+ userIdCase_);
+ }
+
+ public Builder clearUserId() {
+ userIdCase_ = 0;
+ userId_ = null;
+ onChanged();
+ return this;
+ }
+
+
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public java.lang.String getBaComUserId() {
+ java.lang.Object ref = "";
+ if (userIdCase_ == 1) {
+ ref = userId_;
+ }
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (userIdCase_ == 1) {
+ userId_ = s;
+ }
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public com.google.protobuf.ByteString
+ getBaComUserIdBytes() {
+ java.lang.Object ref = "";
+ if (userIdCase_ == 1) {
+ ref = userId_;
+ }
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ if (userIdCase_ == 1) {
+ userId_ = b;
+ }
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public Builder setBaComUserId(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ userIdCase_ = 1;
+ userId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public Builder clearBaComUserId() {
+ if (userIdCase_ == 1) {
+ userIdCase_ = 0;
+ userId_ = null;
+ onChanged();
+ }
+ return this;
+ }
+ /**
+ * string ba_com_user_id = 1;
+ */
+ public Builder setBaComUserIdBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+ userIdCase_ = 1;
+ userId_ = value;
+ onChanged();
+ return this;
+ }
+
+ /**
+ * int32 other_user_id = 2;
+ */
+ public int getOtherUserId() {
+ if (userIdCase_ == 2) {
+ return (java.lang.Integer) userId_;
+ }
+ return 0;
+ }
+ /**
+ * int32 other_user_id = 2;
+ */
+ public Builder setOtherUserId(int value) {
+ userIdCase_ = 2;
+ userId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * int32 other_user_id = 2;
+ */
+ public Builder clearOtherUserId() {
+ if (userIdCase_ == 2) {
+ userIdCase_ = 0;
+ userId_ = null;
+ onChanged();
+ }
+ return this;
+ }
+
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder> anotherIdBuilder_;
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public boolean hasAnotherId() {
+ return userIdCase_ == 3;
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId getAnotherId() {
+ if (anotherIdBuilder_ == null) {
+ if (userIdCase_ == 3) {
+ return (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_;
+ }
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
+ } else {
+ if (userIdCase_ == 3) {
+ return anotherIdBuilder_.getMessage();
+ }
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
+ }
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public Builder setAnotherId(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId value) {
+ if (anotherIdBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ userId_ = value;
+ onChanged();
+ } else {
+ anotherIdBuilder_.setMessage(value);
+ }
+ userIdCase_ = 3;
+ return this;
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public Builder setAnotherId(
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder builderForValue) {
+ if (anotherIdBuilder_ == null) {
+ userId_ = builderForValue.build();
+ onChanged();
+ } else {
+ anotherIdBuilder_.setMessage(builderForValue.build());
+ }
+ userIdCase_ = 3;
+ return this;
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public Builder mergeAnotherId(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId value) {
+ if (anotherIdBuilder_ == null) {
+ if (userIdCase_ == 3 &&
+ userId_ != com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance()) {
+ userId_ = com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.newBuilder((com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_)
+ .mergeFrom(value).buildPartial();
+ } else {
+ userId_ = value;
+ }
+ onChanged();
+ } else {
+ if (userIdCase_ == 3) {
+ anotherIdBuilder_.mergeFrom(value);
+ }
+ anotherIdBuilder_.setMessage(value);
+ }
+ userIdCase_ = 3;
+ return this;
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public Builder clearAnotherId() {
+ if (anotherIdBuilder_ == null) {
+ if (userIdCase_ == 3) {
+ userIdCase_ = 0;
+ userId_ = null;
+ onChanged();
+ }
+ } else {
+ if (userIdCase_ == 3) {
+ userIdCase_ = 0;
+ userId_ = null;
+ }
+ anotherIdBuilder_.clear();
+ }
+ return this;
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder getAnotherIdBuilder() {
+ return getAnotherIdFieldBuilder().getBuilder();
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder getAnotherIdOrBuilder() {
+ if ((userIdCase_ == 3) && (anotherIdBuilder_ != null)) {
+ return anotherIdBuilder_.getMessageOrBuilder();
+ } else {
+ if (userIdCase_ == 3) {
+ return (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_;
+ }
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
+ }
+ }
+ /**
+ * .blueapron.connect.protobuf.MessageId another_id = 3;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder>
+ getAnotherIdFieldBuilder() {
+ if (anotherIdBuilder_ == null) {
+ if (!(userIdCase_ == 3)) {
+ userId_ = com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
+ }
+ anotherIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder>(
+ (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) userId_,
+ getParentForChildren(),
+ isClean());
+ userId_ = null;
+ }
+ userIdCase_ = 3;
+ onChanged();;
+ return anotherIdBuilder_;
+ }
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFieldsProto3(unknownFields);
+ }
+
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:blueapron.connect.protobuf.UserId)
+ }
+
+ // @@protoc_insertion_point(class_scope:blueapron.connect.protobuf.UserId)
+ private static final com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId();
+ }
+
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ public UserId parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new UserId(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
+ public interface MessageIdOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:blueapron.connect.protobuf.MessageId)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string id = 1;
+ */
+ java.lang.String getId();
+ /**
+ * string id = 1;
+ */
+ com.google.protobuf.ByteString
+ getIdBytes();
+ }
+ /**
+ * Protobuf type {@code blueapron.connect.protobuf.MessageId}
+ */
+ public static final class MessageId extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:blueapron.connect.protobuf.MessageId)
+ MessageIdOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use MessageId.newBuilder() to construct.
+ private MessageId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private MessageId() {
+ id_ = "";
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private MessageId(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ 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;
+ default: {
+ if (!parseUnknownFieldProto3(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ id_ = s;
+ 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.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_MessageId_descriptor;
+ }
- public UserIdCase
- getUserIdCase() {
- return UserIdCase.forNumber(
- userIdCase_);
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_MessageId_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.class, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder.class);
}
- public static final int BA_COM_USER_ID_FIELD_NUMBER = 1;
+ public static final int ID_FIELD_NUMBER = 1;
+ private volatile java.lang.Object id_;
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
- public java.lang.String getBaComUserId() {
- java.lang.Object ref = "";
- if (userIdCase_ == 1) {
- ref = userId_;
- }
+ public java.lang.String getId() {
+ java.lang.Object ref = id_;
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();
- if (userIdCase_ == 1) {
- userId_ = s;
- }
+ id_ = s;
return s;
}
}
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
public com.google.protobuf.ByteString
- getBaComUserIdBytes() {
- java.lang.Object ref = "";
- if (userIdCase_ == 1) {
- ref = userId_;
- }
+ getIdBytes() {
+ java.lang.Object ref = id_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
- if (userIdCase_ == 1) {
- userId_ = b;
- }
+ id_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
- public static final int OTHER_USER_ID_FIELD_NUMBER = 2;
- /**
- * int32 other_user_id = 2;
- */
- public int getOtherUserId() {
- if (userIdCase_ == 2) {
- return (java.lang.Integer) userId_;
- }
- return 0;
- }
-
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
@@ -315,12 +1159,8 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- if (userIdCase_ == 1) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 1, userId_);
- }
- if (userIdCase_ == 2) {
- output.writeInt32(
- 2, (int)((java.lang.Integer) userId_));
+ if (!getIdBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
}
unknownFields.writeTo(output);
}
@@ -330,13 +1170,8 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (userIdCase_ == 1) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, userId_);
- }
- if (userIdCase_ == 2) {
- size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(
- 2, (int)((java.lang.Integer) userId_));
+ if (!getIdBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -348,27 +1183,14 @@ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId)) {
+ if (!(obj instanceof com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId)) {
return super.equals(obj);
}
- com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId other = (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId) obj;
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId other = (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) obj;
boolean result = true;
- result = result && getUserIdCase().equals(
- other.getUserIdCase());
- if (!result) return false;
- switch (userIdCase_) {
- case 1:
- result = result && getBaComUserId()
- .equals(other.getBaComUserId());
- break;
- case 2:
- result = result && (getOtherUserId()
- == other.getOtherUserId());
- break;
- case 0:
- default:
- }
+ result = result && getId()
+ .equals(other.getId());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -380,86 +1202,76 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- switch (userIdCase_) {
- case 1:
- hash = (37 * hash) + BA_COM_USER_ID_FIELD_NUMBER;
- hash = (53 * hash) + getBaComUserId().hashCode();
- break;
- case 2:
- hash = (37 * hash) + OTHER_USER_ID_FIELD_NUMBER;
- hash = (53 * hash) + getOtherUserId();
- break;
- case 0:
- default:
- }
+ hash = (37 * hash) + ID_FIELD_NUMBER;
+ hash = (53 * hash) + getId().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(byte[] data)
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(java.io.InputStream input)
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseDelimitedFrom(java.io.InputStream input)
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseDelimitedFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parseFrom(
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -471,7 +1283,7 @@ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId pa
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId prototype) {
+ public static Builder newBuilder(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
public Builder toBuilder() {
@@ -486,25 +1298,25 @@ protected Builder newBuilderForType(
return builder;
}
/**
- * Protobuf type {@code blueapron.connect.protobuf.UserId}
+ * Protobuf type {@code blueapron.connect.protobuf.MessageId}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:blueapron.connect.protobuf.UserId)
- com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserIdOrBuilder {
+ // @@protoc_insertion_point(builder_implements:blueapron.connect.protobuf.MessageId)
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageIdOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_UserId_descriptor;
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_MessageId_descriptor;
}
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_UserId_fieldAccessorTable
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_MessageId_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.class, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.Builder.class);
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.class, com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.Builder.class);
}
- // Construct using com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.newBuilder()
+ // Construct using com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -521,37 +1333,31 @@ private void maybeForceBuilderInitialization() {
}
public Builder clear() {
super.clear();
- userIdCase_ = 0;
- userId_ = null;
+ id_ = "";
+
return this;
}
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_UserId_descriptor;
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.internal_static_blueapron_connect_protobuf_MessageId_descriptor;
}
- public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId getDefaultInstanceForType() {
- return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.getDefaultInstance();
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId getDefaultInstanceForType() {
+ return com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance();
}
- public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId build() {
- com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId result = buildPartial();
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId build() {
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId buildPartial() {
- com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId result = new com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId(this);
- if (userIdCase_ == 1) {
- result.userId_ = userId_;
- }
- if (userIdCase_ == 2) {
- result.userId_ = userId_;
- }
- result.userIdCase_ = userIdCase_;
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId buildPartial() {
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId result = new com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId(this);
+ result.id_ = id_;
onBuilt();
return result;
}
@@ -583,30 +1389,19 @@ public Builder addRepeatedField(
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId) {
- return mergeFrom((com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId)other);
+ if (other instanceof com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) {
+ return mergeFrom((com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId other) {
- if (other == com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId.getDefaultInstance()) return this;
- switch (other.getUserIdCase()) {
- case BA_COM_USER_ID: {
- userIdCase_ = 1;
- userId_ = other.userId_;
- onChanged();
- break;
- }
- case OTHER_USER_ID: {
- setOtherUserId(other.getOtherUserId());
- break;
- }
- case USERID_NOT_SET: {
- break;
- }
+ public Builder mergeFrom(com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId other) {
+ if (other == com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId.getDefaultInstance()) return this;
+ if (!other.getId().isEmpty()) {
+ id_ = other.id_;
+ onChanged();
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -621,11 +1416,11 @@ public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId parsedMessage = null;
+ com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId) e.getUnfinishedMessage();
+ parsedMessage = (com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@@ -634,131 +1429,75 @@ public Builder mergeFrom(
}
return this;
}
- private int userIdCase_ = 0;
- private java.lang.Object userId_;
- public UserIdCase
- getUserIdCase() {
- return UserIdCase.forNumber(
- userIdCase_);
- }
-
- public Builder clearUserId() {
- userIdCase_ = 0;
- userId_ = null;
- onChanged();
- return this;
- }
-
+ private java.lang.Object id_ = "";
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
- public java.lang.String getBaComUserId() {
- java.lang.Object ref = "";
- if (userIdCase_ == 1) {
- ref = userId_;
- }
+ public java.lang.String getId() {
+ java.lang.Object ref = id_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
- if (userIdCase_ == 1) {
- userId_ = s;
- }
+ id_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
public com.google.protobuf.ByteString
- getBaComUserIdBytes() {
- java.lang.Object ref = "";
- if (userIdCase_ == 1) {
- ref = userId_;
- }
+ getIdBytes() {
+ java.lang.Object ref = id_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
- if (userIdCase_ == 1) {
- userId_ = b;
- }
+ id_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
- public Builder setBaComUserId(
+ public Builder setId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
- userIdCase_ = 1;
- userId_ = value;
+
+ id_ = value;
onChanged();
return this;
}
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
- public Builder clearBaComUserId() {
- if (userIdCase_ == 1) {
- userIdCase_ = 0;
- userId_ = null;
- onChanged();
- }
+ public Builder clearId() {
+
+ id_ = getDefaultInstance().getId();
+ onChanged();
return this;
}
/**
- * string ba_com_user_id = 1;
+ * string id = 1;
*/
- public Builder setBaComUserIdBytes(
+ public Builder setIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
- userIdCase_ = 1;
- userId_ = value;
- onChanged();
- return this;
- }
-
- /**
- * int32 other_user_id = 2;
- */
- public int getOtherUserId() {
- if (userIdCase_ == 2) {
- return (java.lang.Integer) userId_;
- }
- return 0;
- }
- /**
- * int32 other_user_id = 2;
- */
- public Builder setOtherUserId(int value) {
- userIdCase_ = 2;
- userId_ = value;
+
+ id_ = value;
onChanged();
return this;
}
- /**
- * int32 other_user_id = 2;
- */
- public Builder clearOtherUserId() {
- if (userIdCase_ == 2) {
- userIdCase_ = 0;
- userId_ = null;
- onChanged();
- }
- return this;
- }
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFieldsProto3(unknownFields);
@@ -770,39 +1509,39 @@ public final Builder mergeUnknownFields(
}
- // @@protoc_insertion_point(builder_scope:blueapron.connect.protobuf.UserId)
+ // @@protoc_insertion_point(builder_scope:blueapron.connect.protobuf.MessageId)
}
- // @@protoc_insertion_point(class_scope:blueapron.connect.protobuf.UserId)
- private static final com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId DEFAULT_INSTANCE;
+ // @@protoc_insertion_point(class_scope:blueapron.connect.protobuf.MessageId)
+ private static final com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId DEFAULT_INSTANCE;
static {
- DEFAULT_INSTANCE = new com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId();
+ DEFAULT_INSTANCE = new com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId();
}
- public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId getDefaultInstance() {
+ public static com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId getDefaultInstance() {
return DEFAULT_INSTANCE;
}
- private static final com.google.protobuf.Parser
- PARSER = new com.google.protobuf.AbstractParser() {
- public UserId parsePartialFrom(
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ public MessageId parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
- return new UserId(input, extensionRegistry);
+ return new MessageId(input, extensionRegistry);
}
};
- public static com.google.protobuf.Parser parser() {
+ public static com.google.protobuf.Parser parser() {
return PARSER;
}
@java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
+ public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.UserId getDefaultInstanceForType() {
+ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.MessageId getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@@ -3204,6 +3943,11 @@ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.NestedTestProto
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_blueapron_connect_protobuf_UserId_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_blueapron_connect_protobuf_MessageId_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_blueapron_connect_protobuf_MessageId_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_blueapron_connect_protobuf_ComplexType_descriptor;
private static final
@@ -3230,23 +3974,25 @@ public com.blueapron.connect.protobuf.NestedTestProtoOuterClass.NestedTestProto
java.lang.String[] descriptorData = {
"\n\025NestedTestProto.proto\022\032blueapron.conne" +
"ct.protobuf\032\037google/protobuf/timestamp.p" +
- "roto\"F\n\006UserId\022\030\n\016ba_com_user_id\030\001 \001(\tH\000" +
- "\022\027\n\rother_user_id\030\002 \001(\005H\000B\t\n\007user_id\"R\n\013" +
- "ComplexType\022\020\n\006one_id\030\001 \001(\tH\000\022\022\n\010other_i" +
- "d\030\002 \001(\005H\000\022\021\n\tis_active\030\003 \001(\010B\n\n\010some_val" +
- "\"\224\003\n\017NestedTestProto\0223\n\007user_id\030\001 \001(\0132\"." +
- "blueapron.connect.protobuf.UserId\022\021\n\tis_" +
- "active\030\002 \001(\010\022\032\n\022experiments_active\030\003 \003(\t" +
- "\022.\n\nupdated_at\030\004 \001(\0132\032.google.protobuf.T",
- "imestamp\0222\n\006status\030\005 \001(\0162\".blueapron.con" +
- "nect.protobuf.Status\022=\n\014complex_type\030\006 \001" +
- "(\0132\'.blueapron.connect.protobuf.ComplexT" +
- "ype\022J\n\010map_type\030\007 \003(\01328.blueapron.connec" +
- "t.protobuf.NestedTestProto.MapTypeEntry\032" +
- ".\n\014MapTypeEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " +
- "\001(\t:\0028\001*\"\n\006Status\022\n\n\006ACTIVE\020\000\022\014\n\010INACTIV" +
- "E\020\001B \n\036com.blueapron.connect.protobufb\006p" +
- "roto3"
+ "roto\"\203\001\n\006UserId\022\030\n\016ba_com_user_id\030\001 \001(\tH" +
+ "\000\022\027\n\rother_user_id\030\002 \001(\005H\000\022;\n\nanother_id" +
+ "\030\003 \001(\0132%.blueapron.connect.protobuf.Mess" +
+ "ageIdH\000B\t\n\007user_id\"\027\n\tMessageId\022\n\n\002id\030\001 " +
+ "\001(\t\"R\n\013ComplexType\022\020\n\006one_id\030\001 \001(\tH\000\022\022\n\010" +
+ "other_id\030\002 \001(\005H\000\022\021\n\tis_active\030\003 \001(\010B\n\n\010s" +
+ "ome_val\"\224\003\n\017NestedTestProto\0223\n\007user_id\030\001" +
+ " \001(\0132\".blueapron.connect.protobuf.UserId",
+ "\022\021\n\tis_active\030\002 \001(\010\022\032\n\022experiments_activ" +
+ "e\030\003 \003(\t\022.\n\nupdated_at\030\004 \001(\0132\032.google.pro" +
+ "tobuf.Timestamp\0222\n\006status\030\005 \001(\0162\".blueap" +
+ "ron.connect.protobuf.Status\022=\n\014complex_t" +
+ "ype\030\006 \001(\0132\'.blueapron.connect.protobuf.C" +
+ "omplexType\022J\n\010map_type\030\007 \003(\01328.blueapron" +
+ ".connect.protobuf.NestedTestProto.MapTyp" +
+ "eEntry\032.\n\014MapTypeEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v" +
+ "alue\030\002 \001(\t:\0028\001*\"\n\006Status\022\n\n\006ACTIVE\020\000\022\014\n\010" +
+ "INACTIVE\020\001B \n\036com.blueapron.connect.prot",
+ "obufb\006proto3"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -3266,15 +4012,21 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
internal_static_blueapron_connect_protobuf_UserId_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_blueapron_connect_protobuf_UserId_descriptor,
- new java.lang.String[] { "BaComUserId", "OtherUserId", "UserId", });
- internal_static_blueapron_connect_protobuf_ComplexType_descriptor =
+ new java.lang.String[] { "BaComUserId", "OtherUserId", "AnotherId", "UserId", });
+ internal_static_blueapron_connect_protobuf_MessageId_descriptor =
getDescriptor().getMessageTypes().get(1);
+ internal_static_blueapron_connect_protobuf_MessageId_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_blueapron_connect_protobuf_MessageId_descriptor,
+ new java.lang.String[] { "Id", });
+ internal_static_blueapron_connect_protobuf_ComplexType_descriptor =
+ getDescriptor().getMessageTypes().get(2);
internal_static_blueapron_connect_protobuf_ComplexType_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_blueapron_connect_protobuf_ComplexType_descriptor,
new java.lang.String[] { "OneId", "OtherId", "IsActive", "SomeVal", });
internal_static_blueapron_connect_protobuf_NestedTestProto_descriptor =
- getDescriptor().getMessageTypes().get(2);
+ getDescriptor().getMessageTypes().get(3);
internal_static_blueapron_connect_protobuf_NestedTestProto_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_blueapron_connect_protobuf_NestedTestProto_descriptor,
diff --git a/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java b/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java
index dbe6bdb..df947a5 100644
--- a/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java
+++ b/src/test/java/com/blueapron/connect/protobuf/ProtobufDataTest.java
@@ -91,6 +91,9 @@ private Schema getExpectedNestedTestProtoSchema() {
final SchemaBuilder userIdBuilder = SchemaBuilder.struct();
userIdBuilder.field("ba_com_user_id", SchemaBuilder.string().optional().build());
userIdBuilder.field("other_user_id", SchemaBuilder.int32().optional().build());
+ final SchemaBuilder messageIdBuilder = SchemaBuilder.struct();
+ messageIdBuilder.field("id", SchemaBuilder.string().optional().build());
+ userIdBuilder.field("another_id", messageIdBuilder.optional().build());
builder.field("user_id", userIdBuilder.optional().build());
builder.field("is_active", SchemaBuilder.bool().optional().build());
builder.field("experiments_active", SchemaBuilder.array(SchemaBuilder.string().optional().build()).optional().build());
@@ -225,6 +228,18 @@ public void testToConnectInt32() {
assertEquals(getExpectedSchemaAndValue(Schema.OPTIONAL_INT32_SCHEMA, expectedValue), result);
}
+ @Test
+ public void testToConnectInt32With0() {
+ Integer expectedValue = 0;
+ Int32Value.Builder builder = Int32Value.newBuilder();
+ builder.setValue(expectedValue);
+ Int32Value message = builder.build();
+
+ ProtobufData protobufData = new ProtobufData(Int32Value.class, LEGACY_NAME);
+ SchemaAndValue result = protobufData.toConnectData(message.toByteArray());
+ assertEquals(getExpectedSchemaAndValue(Schema.OPTIONAL_INT32_SCHEMA, expectedValue), result);
+ }
+
@Test
public void testToConnectInt32WithSint32() {
int expectedValue = 12;
@@ -308,6 +323,16 @@ public void testToConnectString() {
assertEquals(getExpectedSchemaAndValue(Schema.OPTIONAL_STRING_SCHEMA, expectedValue), result);
}
+ @Test
+ public void testToConnectEmptyString() {
+ String expectedValue = "";
+ StringValue message = createStringValueMessage(expectedValue);
+
+ ProtobufData protobufData = new ProtobufData(StringValue.class, LEGACY_NAME);
+ SchemaAndValue result = protobufData.toConnectData(message.toByteArray());
+ assertEquals(getExpectedSchemaAndValue(Schema.OPTIONAL_STRING_SCHEMA, expectedValue), result);
+ }
+
@Test
public void testToConnectTimestamp() throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
@@ -502,6 +527,19 @@ public void testFromConnectBoolean() throws InvalidProtocolBufferException {
assertEquals(value, message.getField(fieldDescriptor));
}
+ @Test
+ public void testFromConnectBooleanWithFalse() throws InvalidProtocolBufferException {
+ Boolean value = false;
+ Struct struct = wrapValueStruct(Schema.OPTIONAL_BOOLEAN_SCHEMA, value);
+
+ ProtobufData protobufData = new ProtobufData(BoolValue.class, LEGACY_NAME);
+ byte[] messageBytes = protobufData.fromConnectData(struct);
+ Message message = BoolValue.parseFrom(messageBytes);
+
+ Descriptors.FieldDescriptor fieldDescriptor = message.getDescriptorForType().findFieldByName(VALUE_FIELD_NAME);
+ assertEquals(value, message.getField(fieldDescriptor));
+ }
+
@Test
public void testFromConnectString() throws InvalidProtocolBufferException {
String value = "Hello";
@@ -517,6 +555,21 @@ public void testFromConnectString() throws InvalidProtocolBufferException {
assertEquals(value, message.getField(fieldDescriptor));
}
+ /*@Test
+ public void testFromConnectEmptyString() throws InvalidProtocolBufferException {
+ String value = "";
+ Struct struct = wrapValueStruct(Schema.OPTIONAL_STRING_SCHEMA, value);
+
+ ProtobufData protobufData = new ProtobufData(StringValue.class, LEGACY_NAME);
+ byte[] messageBytes = protobufData.fromConnectData(struct);
+ Message message = StringValue.parseFrom(messageBytes);
+
+ assertEquals(1, message.getAllFields().size());
+
+ Descriptors.FieldDescriptor fieldDescriptor = message.getDescriptorForType().findFieldByName(VALUE_FIELD_NAME);
+ assertEquals(value, message.getField(fieldDescriptor));
+ }*/
+
@Test
public void testFromConnectBytes() throws InvalidProtocolBufferException {
byte[] value = ByteBuffer.wrap("foo".getBytes()).array();
diff --git a/src/test/java/com/blueapron/connect/protobuf/protos/NestedTestProto.proto b/src/test/java/com/blueapron/connect/protobuf/protos/NestedTestProto.proto
index f970591..9983a48 100644
--- a/src/test/java/com/blueapron/connect/protobuf/protos/NestedTestProto.proto
+++ b/src/test/java/com/blueapron/connect/protobuf/protos/NestedTestProto.proto
@@ -10,9 +10,14 @@ message UserId {
oneof user_id {
string ba_com_user_id = 1;
int32 other_user_id = 2;
+ MessageId another_id = 3;
}
}
+message MessageId {
+ string id = 1;
+}
+
enum Status {
ACTIVE = 0;
INACTIVE = 1;