diff --git a/README.md b/README.md index 0334c8d9c..a73926d2b 100644 --- a/README.md +++ b/README.md @@ -101,13 +101,13 @@ If you are using Maven, you need to add the following dependency: com.yoti yoti-sdk-api - 4.4.0 + 4.5.0-SNAPSHOT ``` If you are using Gradle, here is the dependency to add: -`compile group: 'com.yoti', name: 'yoti-sdk-api', version: '4.4.0'` +`compile group: 'com.yoti', name: 'yoti-sdk-api', version: '4.5.0-SNAPSHOT'` You will find all classes packaged under `com.yoti.api` diff --git a/examples/doc-scan/pom.xml b/examples/doc-scan/pom.xml index 303a7cbed..4707f639f 100644 --- a/examples/doc-scan/pom.xml +++ b/examples/doc-scan/pom.xml @@ -53,7 +53,7 @@ com.yoti yoti-sdk-api - 4.4.0 + 4.5.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index da4c82e46..ddd6f32e4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.yoti yoti-sdk pom - 4.4.0 + 4.5.0-SNAPSHOT Yoti SDK Java SDK for simple integration with the Yoti platform https://github.com/getyoti/yoti-java-sdk diff --git a/yoti-sdk-api/pom.xml b/yoti-sdk-api/pom.xml index 3e663bfea..15cb8616a 100644 --- a/yoti-sdk-api/pom.xml +++ b/yoti-sdk-api/pom.xml @@ -11,7 +11,7 @@ com.yoti yoti-sdk-parent - 4.4.0 + 4.5.0-SNAPSHOT ../yoti-sdk-parent diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/call/YotiConstants.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/call/YotiConstants.java index ee2cffe8f..6558c8e9e 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/call/YotiConstants.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/call/YotiConstants.java @@ -30,7 +30,7 @@ private YotiConstants() {} public static final String CONTENT_TYPE_JPEG = "image/jpeg"; public static final String JAVA = "Java"; - public static final String SDK_VERSION = JAVA + "-4.4.0"; + public static final String SDK_VERSION = JAVA + "-4.5.0-SNAPSHOT"; public static final String SIGNATURE_ALGORITHM = "SHA256withRSA"; public static final String ASYMMETRIC_CIPHER = "RSA/NONE/PKCS1Padding"; public static final String SYMMETRIC_CIPHER = "AES/CBC/PKCS7Padding"; diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttrProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttrProto.java index cb91ecef2..465b964cf 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttrProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttrProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Attribute.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class AttrProto { @@ -22,7 +23,7 @@ public interface AttributeOrBuilder extends * string name = 1; * @return The name. */ - java.lang.String getName(); + String getName(); /** * string name = 1; * @return The bytes for name. @@ -45,17 +46,17 @@ public interface AttributeOrBuilder extends * .attrpubapi_v1.ContentType content_type = 3; * @return The contentType. */ - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType(); + ContentTypeProto.ContentType getContentType(); /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - java.util.List + java.util.List getAnchorsList(); /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getAnchors(int index); + Anchor getAnchors(int index); /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ @@ -63,23 +64,23 @@ public interface AttributeOrBuilder extends /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - java.util.List + java.util.List getAnchorsOrBuilderList(); /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder getAnchorsOrBuilder( + AnchorOrBuilder getAnchorsOrBuilder( int index); /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - java.util.List + java.util.List getUserMetadataList(); /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getUserMetadata(int index); + UserMetadata getUserMetadata(int index); /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ @@ -87,12 +88,12 @@ com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder getAnchorsOrBuild /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - java.util.List + java.util.List getUserMetadataOrBuilderList(); /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder getUserMetadataOrBuilder( + UserMetadataOrBuilder getUserMetadataOrBuilder( int index); /** @@ -104,17 +105,17 @@ com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder getUserMeta * .attrpubapi_v1.Metadata metadata = 6; * @return The metadata. */ - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getMetadata(); + Metadata getMetadata(); /** * .attrpubapi_v1.Metadata metadata = 6; */ - com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder getMetadataOrBuilder(); + MetadataOrBuilder getMetadataOrBuilder(); /** * string ephemeral_id = 7; * @return The ephemeralId. */ - java.lang.String getEphemeralId(); + String getEphemeralId(); /** * string ephemeral_id = 7; * @return The bytes for ephemeralId. @@ -143,144 +144,43 @@ private Attribute() { ephemeralId_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new Attribute(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Attribute( - 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(); - - name_ = s; - break; - } - case 18: { - - value_ = input.readBytes(); - break; - } - case 24: { - int rawValue = input.readEnum(); - - contentType_ = rawValue; - break; - } - case 34: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - anchors_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - anchors_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.parser(), extensionRegistry)); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - userMetadata_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - userMetadata_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.parser(), extensionRegistry)); - break; - } - case 50: { - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder subBuilder = null; - if (metadata_ != null) { - subBuilder = metadata_.toBuilder(); - } - metadata_ = input.readMessage(com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metadata_); - metadata_ = subBuilder.buildPartial(); - } - - break; - } - case 58: { - java.lang.String s = input.readStringRequireUtf8(); - - ephemeralId_ = s; - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - anchors_ = java.util.Collections.unmodifiableList(anchors_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - userMetadata_ = java.util.Collections.unmodifiableList(userMetadata_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Attribute_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Attribute_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Attribute_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_Attribute_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.class, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder.class); + Attribute.class, Builder.class); } + private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile Object name_ = ""; /** * string name = 1; * @return The name. */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getName() { + Object ref = name_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); name_ = s; return s; } @@ -289,14 +189,14 @@ public java.lang.String getName() { * string name = 1; * @return The bytes for name. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { + Object ref = name_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); name_ = b; return b; } else { @@ -305,156 +205,158 @@ public java.lang.String getName() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString value_; + private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; /** * bytes value = 2; * @return The value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValue() { return value_; } public static final int CONTENT_TYPE_FIELD_NUMBER = 3; - private int contentType_; + private int contentType_ = 0; /** * .attrpubapi_v1.ContentType content_type = 3; * @return The enum numeric value on the wire for contentType. */ - @java.lang.Override public int getContentTypeValue() { + @Override public int getContentTypeValue() { return contentType_; } /** * .attrpubapi_v1.ContentType content_type = 3; * @return The contentType. */ - @java.lang.Override public com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType result = com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.valueOf(contentType_); - return result == null ? com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNRECOGNIZED : result; + @Override public ContentTypeProto.ContentType getContentType() { + ContentTypeProto.ContentType result = ContentTypeProto.ContentType.forNumber(contentType_); + return result == null ? ContentTypeProto.ContentType.UNRECOGNIZED : result; } public static final int ANCHORS_FIELD_NUMBER = 4; - private java.util.List anchors_; + @SuppressWarnings("serial") + private java.util.List anchors_; /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - @java.lang.Override - public java.util.List getAnchorsList() { + @Override + public java.util.List getAnchorsList() { return anchors_; } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getAnchorsOrBuilderList() { return anchors_; } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - @java.lang.Override + @Override public int getAnchorsCount() { return anchors_.size(); } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getAnchors(int index) { + @Override + public Anchor getAnchors(int index) { return anchors_.get(index); } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder getAnchorsOrBuilder( + @Override + public AnchorOrBuilder getAnchorsOrBuilder( int index) { return anchors_.get(index); } public static final int USER_METADATA_FIELD_NUMBER = 5; - private java.util.List userMetadata_; + @SuppressWarnings("serial") + private java.util.List userMetadata_; /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - @java.lang.Override - public java.util.List getUserMetadataList() { + @Override + public java.util.List getUserMetadataList() { return userMetadata_; } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getUserMetadataOrBuilderList() { return userMetadata_; } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - @java.lang.Override + @Override public int getUserMetadataCount() { return userMetadata_.size(); } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getUserMetadata(int index) { + @Override + public UserMetadata getUserMetadata(int index) { return userMetadata_.get(index); } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder getUserMetadataOrBuilder( + @Override + public UserMetadataOrBuilder getUserMetadataOrBuilder( int index) { return userMetadata_.get(index); } public static final int METADATA_FIELD_NUMBER = 6; - private com.yoti.api.client.spi.remote.proto.AttrProto.Metadata metadata_; + private Metadata metadata_; /** * .attrpubapi_v1.Metadata metadata = 6; * @return Whether the metadata field is set. */ - @java.lang.Override + @Override public boolean hasMetadata() { - return metadata_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * .attrpubapi_v1.Metadata metadata = 6; * @return The metadata. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getMetadata() { - return metadata_ == null ? com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.getDefaultInstance() : metadata_; + @Override + public Metadata getMetadata() { + return metadata_ == null ? Metadata.getDefaultInstance() : metadata_; } /** * .attrpubapi_v1.Metadata metadata = 6; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder getMetadataOrBuilder() { - return getMetadata(); + @Override + public MetadataOrBuilder getMetadataOrBuilder() { + return metadata_ == null ? Metadata.getDefaultInstance() : metadata_; } public static final int EPHEMERAL_ID_FIELD_NUMBER = 7; - private volatile java.lang.Object ephemeralId_; + @SuppressWarnings("serial") + private volatile Object ephemeralId_ = ""; /** * string ephemeral_id = 7; * @return The ephemeralId. */ - @java.lang.Override - public java.lang.String getEphemeralId() { - java.lang.Object ref = ephemeralId_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getEphemeralId() { + Object ref = ephemeralId_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); ephemeralId_ = s; return s; } @@ -463,14 +365,14 @@ public java.lang.String getEphemeralId() { * string ephemeral_id = 7; * @return The bytes for ephemeralId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getEphemeralIdBytes() { - java.lang.Object ref = ephemeralId_; - if (ref instanceof java.lang.String) { + Object ref = ephemeralId_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); ephemeralId_ = b; return b; } else { @@ -479,7 +381,7 @@ public java.lang.String getEphemeralId() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -489,7 +391,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { @@ -498,7 +400,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!value_.isEmpty()) { output.writeBytes(2, value_); } - if (contentType_ != com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNDEFINED.getNumber()) { + if (contentType_ != ContentTypeProto.ContentType.UNDEFINED.getNumber()) { output.writeEnum(3, contentType_); } for (int i = 0; i < anchors_.size(); i++) { @@ -507,16 +409,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < userMetadata_.size(); i++) { output.writeMessage(5, userMetadata_.get(i)); } - if (metadata_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(6, getMetadata()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ephemeralId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, ephemeralId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -529,7 +431,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, value_); } - if (contentType_ != com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNDEFINED.getNumber()) { + if (contentType_ != ContentTypeProto.ContentType.UNDEFINED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(3, contentType_); } @@ -541,27 +443,27 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, userMetadata_.get(i)); } - if (metadata_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(6, getMetadata()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ephemeralId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, ephemeralId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttrProto.Attribute)) { + if (!(obj instanceof Attribute)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute other = (com.yoti.api.client.spi.remote.proto.AttrProto.Attribute) obj; + Attribute other = (Attribute) obj; if (!getName() .equals(other.getName())) return false; @@ -579,11 +481,11 @@ public boolean equals(final java.lang.Object obj) { } if (!getEphemeralId() .equals(other.getEphemeralId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -610,74 +512,76 @@ public int hashCode() { } hash = (37 * hash) + EPHEMERAL_ID_FIELD_NUMBER; hash = (53 * hash) + getEphemeralId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom(byte[] data) + public static Attribute parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom(java.io.InputStream input) + public static Attribute parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute 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.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseDelimitedFrom(java.io.InputStream input) + + public static Attribute parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseDelimitedFrom( + + public static Attribute 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.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom( + public static Attribute parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -685,23 +589,23 @@ public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parseFrom .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute prototype) { + public static Builder newBuilder(Attribute prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -711,18 +615,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.Attribute) - com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder { + AttributeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Attribute_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Attribute_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Attribute_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_Attribute_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.class, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder.class); + Attribute.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.newBuilder() @@ -731,7 +635,7 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -740,141 +644,160 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { getAnchorsFieldBuilder(); getUserMetadataFieldBuilder(); + getMetadataFieldBuilder(); } } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - value_ = com.google.protobuf.ByteString.EMPTY; - contentType_ = 0; - if (anchorsBuilder_ == null) { anchors_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + anchors_ = null; anchorsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); if (userMetadataBuilder_ == null) { userMetadata_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + userMetadata_ = null; userMetadataBuilder_.clear(); } - if (metadataBuilder_ == null) { - metadata_ = null; - } else { - metadata_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + metadata_ = null; + if (metadataBuilder_ != null) { + metadataBuilder_.dispose(); metadataBuilder_ = null; } ephemeralId_ = ""; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Attribute_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Attribute_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance(); + @Override + public Attribute getDefaultInstanceForType() { + return Attribute.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute build() { - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute result = buildPartial(); + @Override + public Attribute build() { + Attribute result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute buildPartial() { - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute result = new com.yoti.api.client.spi.remote.proto.AttrProto.Attribute(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.value_ = value_; - result.contentType_ = contentType_; + @Override + public Attribute buildPartial() { + Attribute result = new Attribute(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(Attribute result) { if (anchorsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { anchors_ = java.util.Collections.unmodifiableList(anchors_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.anchors_ = anchors_; } else { result.anchors_ = anchorsBuilder_.build(); } if (userMetadataBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000010) != 0)) { userMetadata_ = java.util.Collections.unmodifiableList(userMetadata_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000010); } result.userMetadata_ = userMetadata_; } else { result.userMetadata_ = userMetadataBuilder_.build(); } - if (metadataBuilder_ == null) { - result.metadata_ = metadata_; - } else { - result.metadata_ = metadataBuilder_.build(); + } + + private void buildPartial0(Attribute result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; } - result.ephemeralId_ = ephemeralId_; - onBuilt(); - return result; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.value_ = value_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.contentType_ = contentType_; + } + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000020) != 0)) { + result.metadata_ = metadataBuilder_ == null + ? metadata_ + : metadataBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.ephemeralId_ = ephemeralId_; + } + result.bitField0_ |= to_bitField0_; } - @java.lang.Override + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttrProto.Attribute) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttrProto.Attribute)other); + if (other instanceof Attribute) { + return mergeFrom((Attribute)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute other) { - if (other == com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance()) return this; + public Builder mergeFrom(Attribute other) { + if (other == Attribute.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getValue() != com.google.protobuf.ByteString.EMPTY) { @@ -887,7 +810,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Attribut if (!other.anchors_.isEmpty()) { if (anchors_.isEmpty()) { anchors_ = other.anchors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureAnchorsIsMutable(); anchors_.addAll(other.anchors_); @@ -900,7 +823,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Attribut anchorsBuilder_.dispose(); anchorsBuilder_ = null; anchors_ = other.anchors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); anchorsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getAnchorsFieldBuilder() : null; @@ -913,7 +836,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Attribut if (!other.userMetadata_.isEmpty()) { if (userMetadata_.isEmpty()) { userMetadata_ = other.userMetadata_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000010); } else { ensureUserMetadataIsMutable(); userMetadata_.addAll(other.userMetadata_); @@ -926,7 +849,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Attribut userMetadataBuilder_.dispose(); userMetadataBuilder_ = null; userMetadata_ = other.userMetadata_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000010); userMetadataBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getUserMetadataFieldBuilder() : null; @@ -940,53 +863,120 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Attribut } if (!other.getEphemeralId().isEmpty()) { ephemeralId_ = other.ephemeralId_; + bitField0_ |= 0x00000040; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + value_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + contentType_ = input.readEnum(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: { + Anchor m = + input.readMessage( + Anchor.parser(), + extensionRegistry); + if (anchorsBuilder_ == null) { + ensureAnchorsIsMutable(); + anchors_.add(m); + } else { + anchorsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: { + UserMetadata m = + input.readMessage( + UserMetadata.parser(), + extensionRegistry); + if (userMetadataBuilder_ == null) { + ensureUserMetadataIsMutable(); + userMetadata_.add(m); + } else { + userMetadataBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: { + input.readMessage( + getMetadataFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + ephemeralId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000040; + break; + } // case 58 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttrProto.Attribute) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private java.lang.Object name_ = ""; + private Object name_ = ""; /** * string name = 1; * @return The name. */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { + public String getName() { + Object ref = name_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); name_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -995,11 +985,11 @@ public java.lang.String getName() { */ public com.google.protobuf.ByteString getNameBytes() { - java.lang.Object ref = name_; + Object ref = name_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); name_ = b; return b; } else { @@ -1012,12 +1002,10 @@ public java.lang.String getName() { * @return This builder for chaining. */ public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1026,8 +1014,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1038,12 +1026,10 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1053,7 +1039,7 @@ public Builder setNameBytes( * bytes value = 2; * @return The value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValue() { return value_; } @@ -1063,11 +1049,9 @@ public com.google.protobuf.ByteString getValue() { * @return This builder for chaining. */ public Builder setValue(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } value_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1076,7 +1060,7 @@ public Builder setValue(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearValue() { - + bitField0_ = (bitField0_ & ~0x00000002); value_ = getDefaultInstance().getValue(); onChanged(); return this; @@ -1087,7 +1071,7 @@ public Builder clearValue() { * .attrpubapi_v1.ContentType content_type = 3; * @return The enum numeric value on the wire for contentType. */ - @java.lang.Override public int getContentTypeValue() { + @Override public int getContentTypeValue() { return contentType_; } /** @@ -1096,8 +1080,8 @@ public Builder clearValue() { * @return This builder for chaining. */ public Builder setContentTypeValue(int value) { - contentType_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1105,22 +1089,21 @@ public Builder setContentTypeValue(int value) { * .attrpubapi_v1.ContentType content_type = 3; * @return The contentType. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType result = com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.valueOf(contentType_); - return result == null ? com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNRECOGNIZED : result; + @Override + public ContentTypeProto.ContentType getContentType() { + ContentTypeProto.ContentType result = ContentTypeProto.ContentType.forNumber(contentType_); + return result == null ? ContentTypeProto.ContentType.UNRECOGNIZED : result; } /** * .attrpubapi_v1.ContentType content_type = 3; * @param value The contentType to set. * @return This builder for chaining. */ - public Builder setContentType(com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType value) { + public Builder setContentType(ContentTypeProto.ContentType value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; contentType_ = value.getNumber(); onChanged(); return this; @@ -1130,28 +1113,28 @@ public Builder setContentType(com.yoti.api.client.spi.remote.proto.ContentTypePr * @return This builder for chaining. */ public Builder clearContentType() { - + bitField0_ = (bitField0_ & ~0x00000004); contentType_ = 0; onChanged(); return this; } - private java.util.List anchors_ = + private java.util.List anchors_ = java.util.Collections.emptyList(); private void ensureAnchorsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - anchors_ = new java.util.ArrayList(anchors_); - bitField0_ |= 0x00000001; + if (!((bitField0_ & 0x00000008) != 0)) { + anchors_ = new java.util.ArrayList(anchors_); + bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder> anchorsBuilder_; + Anchor, Anchor.Builder, AnchorOrBuilder> anchorsBuilder_; /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public java.util.List getAnchorsList() { + public java.util.List getAnchorsList() { if (anchorsBuilder_ == null) { return java.util.Collections.unmodifiableList(anchors_); } else { @@ -1171,7 +1154,7 @@ public int getAnchorsCount() { /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getAnchors(int index) { + public Anchor getAnchors(int index) { if (anchorsBuilder_ == null) { return anchors_.get(index); } else { @@ -1182,7 +1165,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getAnchors(int inde * repeated .attrpubapi_v1.Anchor anchors = 4; */ public Builder setAnchors( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor value) { + int index, Anchor value) { if (anchorsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1199,7 +1182,7 @@ public Builder setAnchors( * repeated .attrpubapi_v1.Anchor anchors = 4; */ public Builder setAnchors( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder builderForValue) { + int index, Anchor.Builder builderForValue) { if (anchorsBuilder_ == null) { ensureAnchorsIsMutable(); anchors_.set(index, builderForValue.build()); @@ -1212,7 +1195,7 @@ public Builder setAnchors( /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public Builder addAnchors(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor value) { + public Builder addAnchors(Anchor value) { if (anchorsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1229,7 +1212,7 @@ public Builder addAnchors(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor * repeated .attrpubapi_v1.Anchor anchors = 4; */ public Builder addAnchors( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor value) { + int index, Anchor value) { if (anchorsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1246,7 +1229,7 @@ public Builder addAnchors( * repeated .attrpubapi_v1.Anchor anchors = 4; */ public Builder addAnchors( - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder builderForValue) { + Anchor.Builder builderForValue) { if (anchorsBuilder_ == null) { ensureAnchorsIsMutable(); anchors_.add(builderForValue.build()); @@ -1260,7 +1243,7 @@ public Builder addAnchors( * repeated .attrpubapi_v1.Anchor anchors = 4; */ public Builder addAnchors( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder builderForValue) { + int index, Anchor.Builder builderForValue) { if (anchorsBuilder_ == null) { ensureAnchorsIsMutable(); anchors_.add(index, builderForValue.build()); @@ -1274,7 +1257,7 @@ public Builder addAnchors( * repeated .attrpubapi_v1.Anchor anchors = 4; */ public Builder addAllAnchors( - java.lang.Iterable values) { + Iterable values) { if (anchorsBuilder_ == null) { ensureAnchorsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1291,7 +1274,7 @@ public Builder addAllAnchors( public Builder clearAnchors() { if (anchorsBuilder_ == null) { anchors_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { anchorsBuilder_.clear(); @@ -1314,14 +1297,14 @@ public Builder removeAnchors(int index) { /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder getAnchorsBuilder( + public Anchor.Builder getAnchorsBuilder( int index) { return getAnchorsFieldBuilder().getBuilder(index); } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder getAnchorsOrBuilder( + public AnchorOrBuilder getAnchorsOrBuilder( int index) { if (anchorsBuilder_ == null) { return anchors_.get(index); } else { @@ -1331,7 +1314,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder getAnchors /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public java.util.List + public java.util.List getAnchorsOrBuilderList() { if (anchorsBuilder_ != null) { return anchorsBuilder_.getMessageOrBuilderList(); @@ -1342,33 +1325,33 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder getAnchors /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder addAnchorsBuilder() { + public Anchor.Builder addAnchorsBuilder() { return getAnchorsFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.getDefaultInstance()); + Anchor.getDefaultInstance()); } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder addAnchorsBuilder( + public Anchor.Builder addAnchorsBuilder( int index) { return getAnchorsFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.getDefaultInstance()); + index, Anchor.getDefaultInstance()); } /** * repeated .attrpubapi_v1.Anchor anchors = 4; */ - public java.util.List + public java.util.List getAnchorsBuilderList() { return getAnchorsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder> + Anchor, Anchor.Builder, AnchorOrBuilder> getAnchorsFieldBuilder() { if (anchorsBuilder_ == null) { anchorsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder>( + Anchor, Anchor.Builder, AnchorOrBuilder>( anchors_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); anchors_ = null; @@ -1376,22 +1359,22 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder addAnchorsB return anchorsBuilder_; } - private java.util.List userMetadata_ = + private java.util.List userMetadata_ = java.util.Collections.emptyList(); private void ensureUserMetadataIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - userMetadata_ = new java.util.ArrayList(userMetadata_); - bitField0_ |= 0x00000002; + if (!((bitField0_ & 0x00000010) != 0)) { + userMetadata_ = new java.util.ArrayList(userMetadata_); + bitField0_ |= 0x00000010; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder> userMetadataBuilder_; + UserMetadata, UserMetadata.Builder, UserMetadataOrBuilder> userMetadataBuilder_; /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public java.util.List getUserMetadataList() { + public java.util.List getUserMetadataList() { if (userMetadataBuilder_ == null) { return java.util.Collections.unmodifiableList(userMetadata_); } else { @@ -1411,7 +1394,7 @@ public int getUserMetadataCount() { /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getUserMetadata(int index) { + public UserMetadata getUserMetadata(int index) { if (userMetadataBuilder_ == null) { return userMetadata_.get(index); } else { @@ -1422,7 +1405,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getUserMetada * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ public Builder setUserMetadata( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata value) { + int index, UserMetadata value) { if (userMetadataBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1439,7 +1422,7 @@ public Builder setUserMetadata( * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ public Builder setUserMetadata( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder builderForValue) { + int index, UserMetadata.Builder builderForValue) { if (userMetadataBuilder_ == null) { ensureUserMetadataIsMutable(); userMetadata_.set(index, builderForValue.build()); @@ -1452,7 +1435,7 @@ public Builder setUserMetadata( /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public Builder addUserMetadata(com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata value) { + public Builder addUserMetadata(UserMetadata value) { if (userMetadataBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1469,7 +1452,7 @@ public Builder addUserMetadata(com.yoti.api.client.spi.remote.proto.AttrProto.Us * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ public Builder addUserMetadata( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata value) { + int index, UserMetadata value) { if (userMetadataBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1486,7 +1469,7 @@ public Builder addUserMetadata( * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ public Builder addUserMetadata( - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder builderForValue) { + UserMetadata.Builder builderForValue) { if (userMetadataBuilder_ == null) { ensureUserMetadataIsMutable(); userMetadata_.add(builderForValue.build()); @@ -1500,7 +1483,7 @@ public Builder addUserMetadata( * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ public Builder addUserMetadata( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder builderForValue) { + int index, UserMetadata.Builder builderForValue) { if (userMetadataBuilder_ == null) { ensureUserMetadataIsMutable(); userMetadata_.add(index, builderForValue.build()); @@ -1514,7 +1497,7 @@ public Builder addUserMetadata( * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ public Builder addAllUserMetadata( - java.lang.Iterable values) { + Iterable values) { if (userMetadataBuilder_ == null) { ensureUserMetadataIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1531,7 +1514,7 @@ public Builder addAllUserMetadata( public Builder clearUserMetadata() { if (userMetadataBuilder_ == null) { userMetadata_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { userMetadataBuilder_.clear(); @@ -1554,14 +1537,14 @@ public Builder removeUserMetadata(int index) { /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder getUserMetadataBuilder( + public UserMetadata.Builder getUserMetadataBuilder( int index) { return getUserMetadataFieldBuilder().getBuilder(index); } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder getUserMetadataOrBuilder( + public UserMetadataOrBuilder getUserMetadataOrBuilder( int index) { if (userMetadataBuilder_ == null) { return userMetadata_.get(index); } else { @@ -1571,7 +1554,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder getU /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public java.util.List + public java.util.List getUserMetadataOrBuilderList() { if (userMetadataBuilder_ != null) { return userMetadataBuilder_.getMessageOrBuilderList(); @@ -1582,33 +1565,33 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder getU /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder addUserMetadataBuilder() { + public UserMetadata.Builder addUserMetadataBuilder() { return getUserMetadataFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.getDefaultInstance()); + UserMetadata.getDefaultInstance()); } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder addUserMetadataBuilder( + public UserMetadata.Builder addUserMetadataBuilder( int index) { return getUserMetadataFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.getDefaultInstance()); + index, UserMetadata.getDefaultInstance()); } /** * repeated .attrpubapi_v1.UserMetadata user_metadata = 5; */ - public java.util.List + public java.util.List getUserMetadataBuilderList() { return getUserMetadataFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder> + UserMetadata, UserMetadata.Builder, UserMetadataOrBuilder> getUserMetadataFieldBuilder() { if (userMetadataBuilder_ == null) { userMetadataBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder>( + UserMetadata, UserMetadata.Builder, UserMetadataOrBuilder>( userMetadata_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); userMetadata_ = null; @@ -1616,23 +1599,23 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder addUs return userMetadataBuilder_; } - private com.yoti.api.client.spi.remote.proto.AttrProto.Metadata metadata_; + private Metadata metadata_; private com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata, com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder> metadataBuilder_; + Metadata, Metadata.Builder, MetadataOrBuilder> metadataBuilder_; /** * .attrpubapi_v1.Metadata metadata = 6; * @return Whether the metadata field is set. */ public boolean hasMetadata() { - return metadataBuilder_ != null || metadata_ != null; + return ((bitField0_ & 0x00000020) != 0); } /** * .attrpubapi_v1.Metadata metadata = 6; * @return The metadata. */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getMetadata() { + public Metadata getMetadata() { if (metadataBuilder_ == null) { - return metadata_ == null ? com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.getDefaultInstance() : metadata_; + return metadata_ == null ? Metadata.getDefaultInstance() : metadata_; } else { return metadataBuilder_.getMessage(); } @@ -1640,93 +1623,95 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getMetadata() { /** * .attrpubapi_v1.Metadata metadata = 6; */ - public Builder setMetadata(com.yoti.api.client.spi.remote.proto.AttrProto.Metadata value) { + public Builder setMetadata(Metadata value) { if (metadataBuilder_ == null) { if (value == null) { throw new NullPointerException(); } metadata_ = value; - onChanged(); } else { metadataBuilder_.setMessage(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** * .attrpubapi_v1.Metadata metadata = 6; */ public Builder setMetadata( - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder builderForValue) { + Metadata.Builder builderForValue) { if (metadataBuilder_ == null) { metadata_ = builderForValue.build(); - onChanged(); } else { metadataBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** * .attrpubapi_v1.Metadata metadata = 6; */ - public Builder mergeMetadata(com.yoti.api.client.spi.remote.proto.AttrProto.Metadata value) { + public Builder mergeMetadata(Metadata value) { if (metadataBuilder_ == null) { - if (metadata_ != null) { - metadata_ = - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.newBuilder(metadata_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000020) != 0) && + metadata_ != null && + metadata_ != Metadata.getDefaultInstance()) { + getMetadataBuilder().mergeFrom(value); } else { metadata_ = value; } - onChanged(); } else { metadataBuilder_.mergeFrom(value); } - + if (metadata_ != null) { + bitField0_ |= 0x00000020; + onChanged(); + } return this; } /** * .attrpubapi_v1.Metadata metadata = 6; */ public Builder clearMetadata() { - if (metadataBuilder_ == null) { - metadata_ = null; - onChanged(); - } else { - metadata_ = null; + bitField0_ = (bitField0_ & ~0x00000020); + metadata_ = null; + if (metadataBuilder_ != null) { + metadataBuilder_.dispose(); metadataBuilder_ = null; } - + onChanged(); return this; } /** * .attrpubapi_v1.Metadata metadata = 6; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder getMetadataBuilder() { - + public Metadata.Builder getMetadataBuilder() { + bitField0_ |= 0x00000020; onChanged(); return getMetadataFieldBuilder().getBuilder(); } /** * .attrpubapi_v1.Metadata metadata = 6; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder getMetadataOrBuilder() { + public MetadataOrBuilder getMetadataOrBuilder() { if (metadataBuilder_ != null) { return metadataBuilder_.getMessageOrBuilder(); } else { return metadata_ == null ? - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.getDefaultInstance() : metadata_; + Metadata.getDefaultInstance() : metadata_; } } /** * .attrpubapi_v1.Metadata metadata = 6; */ private com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata, com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder> + Metadata, Metadata.Builder, MetadataOrBuilder> getMetadataFieldBuilder() { if (metadataBuilder_ == null) { metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata, com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder>( + Metadata, Metadata.Builder, MetadataOrBuilder>( getMetadata(), getParentForChildren(), isClean()); @@ -1735,21 +1720,21 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder getMetad return metadataBuilder_; } - private java.lang.Object ephemeralId_ = ""; + private Object ephemeralId_ = ""; /** * string ephemeral_id = 7; * @return The ephemeralId. */ - public java.lang.String getEphemeralId() { - java.lang.Object ref = ephemeralId_; - if (!(ref instanceof java.lang.String)) { + public String getEphemeralId() { + Object ref = ephemeralId_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); ephemeralId_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -1758,11 +1743,11 @@ public java.lang.String getEphemeralId() { */ public com.google.protobuf.ByteString getEphemeralIdBytes() { - java.lang.Object ref = ephemeralId_; + Object ref = ephemeralId_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); ephemeralId_ = b; return b; } else { @@ -1775,12 +1760,10 @@ public java.lang.String getEphemeralId() { * @return This builder for chaining. */ public Builder setEphemeralId( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } ephemeralId_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -1789,8 +1772,8 @@ public Builder setEphemeralId( * @return This builder for chaining. */ public Builder clearEphemeralId() { - ephemeralId_ = getDefaultInstance().getEphemeralId(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } @@ -1801,22 +1784,20 @@ public Builder clearEphemeralId() { */ public Builder setEphemeralIdBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); ephemeralId_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1827,23 +1808,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.Attribute) - private static final com.yoti.api.client.spi.remote.proto.AttrProto.Attribute DEFAULT_INSTANCE; + private static final Attribute DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttrProto.Attribute(); + DEFAULT_INSTANCE = new Attribute(); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getDefaultInstance() { + public static Attribute getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public Attribute parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Attribute(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1851,13 +1843,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getDefaultInstanceForType() { + @Override + public Attribute getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1871,7 +1863,7 @@ public interface MetadataOrBuilder extends * string superseded_time_stamp = 1; * @return The supersededTimeStamp. */ - java.lang.String getSupersededTimeStamp(); + String getSupersededTimeStamp(); /** * string superseded_time_stamp = 1; * @return The bytes for supersededTimeStamp. @@ -1920,109 +1912,42 @@ private Metadata() { receiptId_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new Metadata(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Metadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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(); - - supersededTimeStamp_ = s; - break; - } - case 16: { - - deletable_ = input.readBool(); - break; - } - case 26: { - - receiptId_ = input.readBytes(); - break; - } - case 32: { - - revoked_ = input.readBool(); - break; - } - case 40: { - - locked_ = input.readBool(); - 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.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Metadata_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Metadata_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Metadata_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_Metadata_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.class, com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder.class); + Metadata.class, Builder.class); } public static final int SUPERSEDED_TIME_STAMP_FIELD_NUMBER = 1; - private volatile java.lang.Object supersededTimeStamp_; + @SuppressWarnings("serial") + private volatile Object supersededTimeStamp_ = ""; /** * string superseded_time_stamp = 1; * @return The supersededTimeStamp. */ - @java.lang.Override - public java.lang.String getSupersededTimeStamp() { - java.lang.Object ref = supersededTimeStamp_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getSupersededTimeStamp() { + Object ref = supersededTimeStamp_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); supersededTimeStamp_ = s; return s; } @@ -2031,14 +1956,14 @@ public java.lang.String getSupersededTimeStamp() { * string superseded_time_stamp = 1; * @return The bytes for supersededTimeStamp. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSupersededTimeStampBytes() { - java.lang.Object ref = supersededTimeStamp_; - if (ref instanceof java.lang.String) { + Object ref = supersededTimeStamp_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); supersededTimeStamp_ = b; return b; } else { @@ -2047,51 +1972,51 @@ public java.lang.String getSupersededTimeStamp() { } public static final int DELETABLE_FIELD_NUMBER = 2; - private boolean deletable_; + private boolean deletable_ = false; /** * bool deletable = 2; * @return The deletable. */ - @java.lang.Override + @Override public boolean getDeletable() { return deletable_; } public static final int RECEIPT_ID_FIELD_NUMBER = 3; - private com.google.protobuf.ByteString receiptId_; + private com.google.protobuf.ByteString receiptId_ = com.google.protobuf.ByteString.EMPTY; /** * bytes receipt_id = 3; * @return The receiptId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getReceiptId() { return receiptId_; } public static final int REVOKED_FIELD_NUMBER = 4; - private boolean revoked_; + private boolean revoked_ = false; /** * bool revoked = 4; * @return The revoked. */ - @java.lang.Override + @Override public boolean getRevoked() { return revoked_; } public static final int LOCKED_FIELD_NUMBER = 5; - private boolean locked_; + private boolean locked_ = false; /** * bool locked = 5; * @return The locked. */ - @java.lang.Override + @Override public boolean getLocked() { return locked_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -2101,7 +2026,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(supersededTimeStamp_)) { @@ -2119,10 +2044,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (locked_ != false) { output.writeBool(5, locked_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -2147,20 +2072,20 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(5, locked_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttrProto.Metadata)) { + if (!(obj instanceof Metadata)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata other = (com.yoti.api.client.spi.remote.proto.AttrProto.Metadata) obj; + Metadata other = (Metadata) obj; if (!getSupersededTimeStamp() .equals(other.getSupersededTimeStamp())) return false; @@ -2172,11 +2097,11 @@ public boolean equals(final java.lang.Object obj) { != other.getRevoked()) return false; if (getLocked() != other.getLocked()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -2196,74 +2121,76 @@ public int hashCode() { hash = (37 * hash) + LOCKED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getLocked()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom(byte[] data) + public static Metadata parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom(java.io.InputStream input) + public static Metadata parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata 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.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseDelimitedFrom(java.io.InputStream input) + + public static Metadata parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseDelimitedFrom( + + public static Metadata 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.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( + public static Metadata parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2271,23 +2198,23 @@ public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttrProto.Metadata prototype) { + public static Builder newBuilder(Metadata prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -2297,129 +2224,136 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.Metadata) - com.yoti.api.client.spi.remote.proto.AttrProto.MetadataOrBuilder { + MetadataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Metadata_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Metadata_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Metadata_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_Metadata_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.class, com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.Builder.class); + Metadata.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; supersededTimeStamp_ = ""; - deletable_ = false; - receiptId_ = com.google.protobuf.ByteString.EMPTY; - revoked_ = false; - locked_ = false; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Metadata_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Metadata_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.getDefaultInstance(); + @Override + public Metadata getDefaultInstanceForType() { + return Metadata.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata build() { - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata result = buildPartial(); + @Override + public Metadata build() { + Metadata result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata buildPartial() { - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata result = new com.yoti.api.client.spi.remote.proto.AttrProto.Metadata(this); - result.supersededTimeStamp_ = supersededTimeStamp_; - result.deletable_ = deletable_; - result.receiptId_ = receiptId_; - result.revoked_ = revoked_; - result.locked_ = locked_; + @Override + public Metadata buildPartial() { + Metadata result = new Metadata(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(Metadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.supersededTimeStamp_ = supersededTimeStamp_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.deletable_ = deletable_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.receiptId_ = receiptId_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.revoked_ = revoked_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.locked_ = locked_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttrProto.Metadata) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttrProto.Metadata)other); + if (other instanceof Metadata) { + return mergeFrom((Metadata)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Metadata other) { - if (other == com.yoti.api.client.spi.remote.proto.AttrProto.Metadata.getDefaultInstance()) return this; + public Builder mergeFrom(Metadata other) { + if (other == Metadata.getDefaultInstance()) return this; if (!other.getSupersededTimeStamp().isEmpty()) { supersededTimeStamp_ = other.supersededTimeStamp_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getDeletable() != false) { @@ -2434,50 +2368,89 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Metadata if (other.getLocked() != false) { setLocked(other.getLocked()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttrProto.Metadata parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + supersededTimeStamp_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + deletable_ = input.readBool(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + receiptId_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 32: { + revoked_ = input.readBool(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 40: { + locked_ = input.readBool(); + bitField0_ |= 0x00000010; + break; + } // case 40 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttrProto.Metadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; - private java.lang.Object supersededTimeStamp_ = ""; + private Object supersededTimeStamp_ = ""; /** * string superseded_time_stamp = 1; * @return The supersededTimeStamp. */ - public java.lang.String getSupersededTimeStamp() { - java.lang.Object ref = supersededTimeStamp_; - if (!(ref instanceof java.lang.String)) { + public String getSupersededTimeStamp() { + Object ref = supersededTimeStamp_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); supersededTimeStamp_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -2486,11 +2459,11 @@ public java.lang.String getSupersededTimeStamp() { */ public com.google.protobuf.ByteString getSupersededTimeStampBytes() { - java.lang.Object ref = supersededTimeStamp_; + Object ref = supersededTimeStamp_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); supersededTimeStamp_ = b; return b; } else { @@ -2503,12 +2476,10 @@ public java.lang.String getSupersededTimeStamp() { * @return This builder for chaining. */ public Builder setSupersededTimeStamp( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } supersededTimeStamp_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2517,8 +2488,8 @@ public Builder setSupersededTimeStamp( * @return This builder for chaining. */ public Builder clearSupersededTimeStamp() { - supersededTimeStamp_ = getDefaultInstance().getSupersededTimeStamp(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2529,12 +2500,10 @@ public Builder clearSupersededTimeStamp() { */ public Builder setSupersededTimeStampBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); supersededTimeStamp_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2544,7 +2513,7 @@ public Builder setSupersededTimeStampBytes( * bool deletable = 2; * @return The deletable. */ - @java.lang.Override + @Override public boolean getDeletable() { return deletable_; } @@ -2554,8 +2523,9 @@ public boolean getDeletable() { * @return This builder for chaining. */ public Builder setDeletable(boolean value) { - + deletable_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2564,7 +2534,7 @@ public Builder setDeletable(boolean value) { * @return This builder for chaining. */ public Builder clearDeletable() { - + bitField0_ = (bitField0_ & ~0x00000002); deletable_ = false; onChanged(); return this; @@ -2575,7 +2545,7 @@ public Builder clearDeletable() { * bytes receipt_id = 3; * @return The receiptId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getReceiptId() { return receiptId_; } @@ -2585,11 +2555,9 @@ public com.google.protobuf.ByteString getReceiptId() { * @return This builder for chaining. */ public Builder setReceiptId(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } receiptId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2598,7 +2566,7 @@ public Builder setReceiptId(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearReceiptId() { - + bitField0_ = (bitField0_ & ~0x00000004); receiptId_ = getDefaultInstance().getReceiptId(); onChanged(); return this; @@ -2609,7 +2577,7 @@ public Builder clearReceiptId() { * bool revoked = 4; * @return The revoked. */ - @java.lang.Override + @Override public boolean getRevoked() { return revoked_; } @@ -2619,8 +2587,9 @@ public boolean getRevoked() { * @return This builder for chaining. */ public Builder setRevoked(boolean value) { - + revoked_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2629,7 +2598,7 @@ public Builder setRevoked(boolean value) { * @return This builder for chaining. */ public Builder clearRevoked() { - + bitField0_ = (bitField0_ & ~0x00000008); revoked_ = false; onChanged(); return this; @@ -2640,7 +2609,7 @@ public Builder clearRevoked() { * bool locked = 5; * @return The locked. */ - @java.lang.Override + @Override public boolean getLocked() { return locked_; } @@ -2650,8 +2619,9 @@ public boolean getLocked() { * @return This builder for chaining. */ public Builder setLocked(boolean value) { - + locked_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2660,18 +2630,18 @@ public Builder setLocked(boolean value) { * @return This builder for chaining. */ public Builder clearLocked() { - + bitField0_ = (bitField0_ & ~0x00000010); locked_ = false; onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2682,23 +2652,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.Metadata) - private static final com.yoti.api.client.spi.remote.proto.AttrProto.Metadata DEFAULT_INSTANCE; + private static final Metadata DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttrProto.Metadata(); + DEFAULT_INSTANCE = new Metadata(); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getDefaultInstance() { + public static Metadata getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public Metadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Metadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2706,13 +2687,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Metadata getDefaultInstanceForType() { + @Override + public Metadata getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2755,7 +2736,7 @@ public interface AnchorOrBuilder extends * string sub_type = 4; * @return The subType. */ - java.lang.String getSubType(); + String getSubType(); /** * string sub_type = 4; * @return The bytes for subType. @@ -2779,7 +2760,7 @@ public interface AnchorOrBuilder extends * string associated_source = 7; * @return The associatedSource. */ - java.lang.String getAssociatedSource(); + String getAssociatedSource(); /** * string associated_source = 7; * @return The bytes for associatedSource. @@ -2801,7 +2782,7 @@ private Anchor(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private Anchor() { artifactLink_ = com.google.protobuf.ByteString.EMPTY; - originServerCerts_ = java.util.Collections.emptyList(); + originServerCerts_ = emptyList(com.google.protobuf.ByteString.class); artifactSignature_ = com.google.protobuf.ByteString.EMPTY; subType_ = ""; signature_ = com.google.protobuf.ByteString.EMPTY; @@ -2809,130 +2790,46 @@ private Anchor() { associatedSource_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new Anchor(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Anchor( - 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: { - - artifactLink_ = input.readBytes(); - break; - } - case 18: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - originServerCerts_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - originServerCerts_.add(input.readBytes()); - break; - } - case 26: { - - artifactSignature_ = input.readBytes(); - break; - } - case 34: { - java.lang.String s = input.readStringRequireUtf8(); - - subType_ = s; - break; - } - case 42: { - - signature_ = input.readBytes(); - break; - } - case 50: { - - signedTimeStamp_ = input.readBytes(); - break; - } - case 58: { - java.lang.String s = input.readStringRequireUtf8(); - - associatedSource_ = s; - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - originServerCerts_ = java.util.Collections.unmodifiableList(originServerCerts_); // C - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Anchor_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Anchor_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Anchor_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_Anchor_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.class, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder.class); + Anchor.class, Builder.class); } public static final int ARTIFACT_LINK_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString artifactLink_; + private com.google.protobuf.ByteString artifactLink_ = com.google.protobuf.ByteString.EMPTY; /** * bytes artifact_link = 1; * @return The artifactLink. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getArtifactLink() { return artifactLink_; } public static final int ORIGIN_SERVER_CERTS_FIELD_NUMBER = 2; - private java.util.List originServerCerts_; + @SuppressWarnings("serial") + private com.google.protobuf.Internal.ProtobufList originServerCerts_ = + emptyList(com.google.protobuf.ByteString.class); /** * repeated bytes origin_server_certs = 2; * @return A list containing the originServerCerts. */ - @java.lang.Override + @Override public java.util.List getOriginServerCertsList() { return originServerCerts_; @@ -2954,31 +2851,32 @@ public com.google.protobuf.ByteString getOriginServerCerts(int index) { } public static final int ARTIFACT_SIGNATURE_FIELD_NUMBER = 3; - private com.google.protobuf.ByteString artifactSignature_; + private com.google.protobuf.ByteString artifactSignature_ = com.google.protobuf.ByteString.EMPTY; /** * bytes artifact_signature = 3; * @return The artifactSignature. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getArtifactSignature() { return artifactSignature_; } public static final int SUB_TYPE_FIELD_NUMBER = 4; - private volatile java.lang.Object subType_; + @SuppressWarnings("serial") + private volatile Object subType_ = ""; /** * string sub_type = 4; * @return The subType. */ - @java.lang.Override - public java.lang.String getSubType() { - java.lang.Object ref = subType_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getSubType() { + Object ref = subType_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); subType_ = s; return s; } @@ -2987,14 +2885,14 @@ public java.lang.String getSubType() { * string sub_type = 4; * @return The bytes for subType. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSubTypeBytes() { - java.lang.Object ref = subType_; - if (ref instanceof java.lang.String) { + Object ref = subType_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); subType_ = b; return b; } else { @@ -3003,42 +2901,43 @@ public java.lang.String getSubType() { } public static final int SIGNATURE_FIELD_NUMBER = 5; - private com.google.protobuf.ByteString signature_; + private com.google.protobuf.ByteString signature_ = com.google.protobuf.ByteString.EMPTY; /** * bytes signature = 5; * @return The signature. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSignature() { return signature_; } public static final int SIGNED_TIME_STAMP_FIELD_NUMBER = 6; - private com.google.protobuf.ByteString signedTimeStamp_; + private com.google.protobuf.ByteString signedTimeStamp_ = com.google.protobuf.ByteString.EMPTY; /** * bytes signed_time_stamp = 6; * @return The signedTimeStamp. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSignedTimeStamp() { return signedTimeStamp_; } public static final int ASSOCIATED_SOURCE_FIELD_NUMBER = 7; - private volatile java.lang.Object associatedSource_; + @SuppressWarnings("serial") + private volatile Object associatedSource_ = ""; /** * string associated_source = 7; * @return The associatedSource. */ - @java.lang.Override - public java.lang.String getAssociatedSource() { - java.lang.Object ref = associatedSource_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getAssociatedSource() { + Object ref = associatedSource_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); associatedSource_ = s; return s; } @@ -3047,14 +2946,14 @@ public java.lang.String getAssociatedSource() { * string associated_source = 7; * @return The bytes for associatedSource. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getAssociatedSourceBytes() { - java.lang.Object ref = associatedSource_; - if (ref instanceof java.lang.String) { + Object ref = associatedSource_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); associatedSource_ = b; return b; } else { @@ -3063,7 +2962,7 @@ public java.lang.String getAssociatedSource() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -3073,7 +2972,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!artifactLink_.isEmpty()) { @@ -3097,10 +2996,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(associatedSource_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, associatedSource_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -3137,20 +3036,20 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(associatedSource_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, associatedSource_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttrProto.Anchor)) { + if (!(obj instanceof Anchor)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor other = (com.yoti.api.client.spi.remote.proto.AttrProto.Anchor) obj; + Anchor other = (Anchor) obj; if (!getArtifactLink() .equals(other.getArtifactLink())) return false; @@ -3166,11 +3065,11 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getSignedTimeStamp())) return false; if (!getAssociatedSource() .equals(other.getAssociatedSource())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -3193,74 +3092,76 @@ public int hashCode() { hash = (53 * hash) + getSignedTimeStamp().hashCode(); hash = (37 * hash) + ASSOCIATED_SOURCE_FIELD_NUMBER; hash = (53 * hash) + getAssociatedSource().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom(byte[] data) + public static Anchor parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom(java.io.InputStream input) + public static Anchor parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor 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.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseDelimitedFrom(java.io.InputStream input) + + public static Anchor parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseDelimitedFrom( + + public static Anchor 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.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( + public static Anchor parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3268,23 +3169,23 @@ public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor prototype) { + public static Builder newBuilder(Anchor prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -3294,145 +3195,150 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.Anchor) - com.yoti.api.client.spi.remote.proto.AttrProto.AnchorOrBuilder { + AnchorOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Anchor_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Anchor_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Anchor_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_Anchor_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.class, com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.Builder.class); + Anchor.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; artifactLink_ = com.google.protobuf.ByteString.EMPTY; - - originServerCerts_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + originServerCerts_ = emptyList(com.google.protobuf.ByteString.class); artifactSignature_ = com.google.protobuf.ByteString.EMPTY; - subType_ = ""; - signature_ = com.google.protobuf.ByteString.EMPTY; - signedTimeStamp_ = com.google.protobuf.ByteString.EMPTY; - associatedSource_ = ""; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_Anchor_descriptor; + return AttrProto.internal_static_attrpubapi_v1_Anchor_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.getDefaultInstance(); + @Override + public Anchor getDefaultInstanceForType() { + return Anchor.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor build() { - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor result = buildPartial(); + @Override + public Anchor build() { + Anchor result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor buildPartial() { - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor result = new com.yoti.api.client.spi.remote.proto.AttrProto.Anchor(this); - int from_bitField0_ = bitField0_; - result.artifactLink_ = artifactLink_; - if (((bitField0_ & 0x00000001) != 0)) { - originServerCerts_ = java.util.Collections.unmodifiableList(originServerCerts_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.originServerCerts_ = originServerCerts_; - result.artifactSignature_ = artifactSignature_; - result.subType_ = subType_; - result.signature_ = signature_; - result.signedTimeStamp_ = signedTimeStamp_; - result.associatedSource_ = associatedSource_; + @Override + public Anchor buildPartial() { + Anchor result = new Anchor(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(Anchor result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.artifactLink_ = artifactLink_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + originServerCerts_.makeImmutable(); + result.originServerCerts_ = originServerCerts_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.artifactSignature_ = artifactSignature_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.subType_ = subType_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.signature_ = signature_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.signedTimeStamp_ = signedTimeStamp_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.associatedSource_ = associatedSource_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttrProto.Anchor) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttrProto.Anchor)other); + if (other instanceof Anchor) { + return mergeFrom((Anchor)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor other) { - if (other == com.yoti.api.client.spi.remote.proto.AttrProto.Anchor.getDefaultInstance()) return this; + public Builder mergeFrom(Anchor other) { + if (other == Anchor.getDefaultInstance()) return this; if (other.getArtifactLink() != com.google.protobuf.ByteString.EMPTY) { setArtifactLink(other.getArtifactLink()); } if (!other.originServerCerts_.isEmpty()) { if (originServerCerts_.isEmpty()) { originServerCerts_ = other.originServerCerts_; - bitField0_ = (bitField0_ & ~0x00000001); + originServerCerts_.makeImmutable(); + bitField0_ |= 0x00000002; } else { ensureOriginServerCertsIsMutable(); originServerCerts_.addAll(other.originServerCerts_); @@ -3444,6 +3350,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor o } if (!other.getSubType().isEmpty()) { subType_ = other.subType_; + bitField0_ |= 0x00000008; onChanged(); } if (other.getSignature() != com.google.protobuf.ByteString.EMPTY) { @@ -3454,34 +3361,84 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.Anchor o } if (!other.getAssociatedSource().isEmpty()) { associatedSource_ = other.associatedSource_; + bitField0_ |= 0x00000040; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttrProto.Anchor parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + artifactLink_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + com.google.protobuf.ByteString v = input.readBytes(); + ensureOriginServerCertsIsMutable(); + originServerCerts_.add(v); + break; + } // case 18 + case 26: { + artifactSignature_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + subType_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + signature_ = input.readBytes(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: { + signedTimeStamp_ = input.readBytes(); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + associatedSource_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000040; + break; + } // case 58 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttrProto.Anchor) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -3491,7 +3448,7 @@ public Builder mergeFrom( * bytes artifact_link = 1; * @return The artifactLink. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getArtifactLink() { return artifactLink_; } @@ -3501,11 +3458,9 @@ public com.google.protobuf.ByteString getArtifactLink() { * @return This builder for chaining. */ public Builder setArtifactLink(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } artifactLink_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3514,18 +3469,18 @@ public Builder setArtifactLink(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearArtifactLink() { - + bitField0_ = (bitField0_ & ~0x00000001); artifactLink_ = getDefaultInstance().getArtifactLink(); onChanged(); return this; } - private java.util.List originServerCerts_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.ProtobufList originServerCerts_ = emptyList(com.google.protobuf.ByteString.class); private void ensureOriginServerCertsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - originServerCerts_ = new java.util.ArrayList(originServerCerts_); - bitField0_ |= 0x00000001; - } + if (!originServerCerts_.isModifiable()) { + originServerCerts_ = makeMutableCopy(originServerCerts_); + } + bitField0_ |= 0x00000002; } /** * repeated bytes origin_server_certs = 2; @@ -3533,8 +3488,8 @@ private void ensureOriginServerCertsIsMutable() { */ public java.util.List getOriginServerCertsList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(originServerCerts_) : originServerCerts_; + originServerCerts_.makeImmutable(); + return originServerCerts_; } /** * repeated bytes origin_server_certs = 2; @@ -3559,11 +3514,10 @@ public com.google.protobuf.ByteString getOriginServerCerts(int index) { */ public Builder setOriginServerCerts( int index, com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - ensureOriginServerCertsIsMutable(); + if (value == null) { throw new NullPointerException(); } + ensureOriginServerCertsIsMutable(); originServerCerts_.set(index, value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3573,11 +3527,10 @@ public Builder setOriginServerCerts( * @return This builder for chaining. */ public Builder addOriginServerCerts(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - ensureOriginServerCertsIsMutable(); + if (value == null) { throw new NullPointerException(); } + ensureOriginServerCertsIsMutable(); originServerCerts_.add(value); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3587,10 +3540,11 @@ public Builder addOriginServerCerts(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder addAllOriginServerCerts( - java.lang.Iterable values) { + Iterable values) { ensureOriginServerCertsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( values, originServerCerts_); + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3599,8 +3553,8 @@ public Builder addAllOriginServerCerts( * @return This builder for chaining. */ public Builder clearOriginServerCerts() { - originServerCerts_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + originServerCerts_ = emptyList(com.google.protobuf.ByteString.class); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -3610,7 +3564,7 @@ public Builder clearOriginServerCerts() { * bytes artifact_signature = 3; * @return The artifactSignature. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getArtifactSignature() { return artifactSignature_; } @@ -3620,11 +3574,9 @@ public com.google.protobuf.ByteString getArtifactSignature() { * @return This builder for chaining. */ public Builder setArtifactSignature(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } artifactSignature_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -3633,27 +3585,27 @@ public Builder setArtifactSignature(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearArtifactSignature() { - + bitField0_ = (bitField0_ & ~0x00000004); artifactSignature_ = getDefaultInstance().getArtifactSignature(); onChanged(); return this; } - private java.lang.Object subType_ = ""; + private Object subType_ = ""; /** * string sub_type = 4; * @return The subType. */ - public java.lang.String getSubType() { - java.lang.Object ref = subType_; - if (!(ref instanceof java.lang.String)) { + public String getSubType() { + Object ref = subType_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); subType_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -3662,11 +3614,11 @@ public java.lang.String getSubType() { */ public com.google.protobuf.ByteString getSubTypeBytes() { - java.lang.Object ref = subType_; + Object ref = subType_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); subType_ = b; return b; } else { @@ -3679,12 +3631,10 @@ public java.lang.String getSubType() { * @return This builder for chaining. */ public Builder setSubType( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } subType_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -3693,8 +3643,8 @@ public Builder setSubType( * @return This builder for chaining. */ public Builder clearSubType() { - subType_ = getDefaultInstance().getSubType(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -3705,12 +3655,10 @@ public Builder clearSubType() { */ public Builder setSubTypeBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); subType_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -3720,7 +3668,7 @@ public Builder setSubTypeBytes( * bytes signature = 5; * @return The signature. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSignature() { return signature_; } @@ -3730,11 +3678,9 @@ public com.google.protobuf.ByteString getSignature() { * @return This builder for chaining. */ public Builder setSignature(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } signature_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -3743,7 +3689,7 @@ public Builder setSignature(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSignature() { - + bitField0_ = (bitField0_ & ~0x00000010); signature_ = getDefaultInstance().getSignature(); onChanged(); return this; @@ -3754,7 +3700,7 @@ public Builder clearSignature() { * bytes signed_time_stamp = 6; * @return The signedTimeStamp. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSignedTimeStamp() { return signedTimeStamp_; } @@ -3764,11 +3710,9 @@ public com.google.protobuf.ByteString getSignedTimeStamp() { * @return This builder for chaining. */ public Builder setSignedTimeStamp(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } signedTimeStamp_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -3777,27 +3721,27 @@ public Builder setSignedTimeStamp(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSignedTimeStamp() { - + bitField0_ = (bitField0_ & ~0x00000020); signedTimeStamp_ = getDefaultInstance().getSignedTimeStamp(); onChanged(); return this; } - private java.lang.Object associatedSource_ = ""; + private Object associatedSource_ = ""; /** * string associated_source = 7; * @return The associatedSource. */ - public java.lang.String getAssociatedSource() { - java.lang.Object ref = associatedSource_; - if (!(ref instanceof java.lang.String)) { + public String getAssociatedSource() { + Object ref = associatedSource_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); associatedSource_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -3806,11 +3750,11 @@ public java.lang.String getAssociatedSource() { */ public com.google.protobuf.ByteString getAssociatedSourceBytes() { - java.lang.Object ref = associatedSource_; + Object ref = associatedSource_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); associatedSource_ = b; return b; } else { @@ -3823,12 +3767,10 @@ public java.lang.String getAssociatedSource() { * @return This builder for chaining. */ public Builder setAssociatedSource( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } associatedSource_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -3837,8 +3779,8 @@ public Builder setAssociatedSource( * @return This builder for chaining. */ public Builder clearAssociatedSource() { - associatedSource_ = getDefaultInstance().getAssociatedSource(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } @@ -3849,22 +3791,20 @@ public Builder clearAssociatedSource() { */ public Builder setAssociatedSourceBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); associatedSource_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -3875,23 +3815,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.Anchor) - private static final com.yoti.api.client.spi.remote.proto.AttrProto.Anchor DEFAULT_INSTANCE; + private static final Anchor DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttrProto.Anchor(); + DEFAULT_INSTANCE = new Anchor(); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getDefaultInstance() { + public static Anchor getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public Anchor parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Anchor(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3899,13 +3850,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Anchor getDefaultInstanceForType() { + @Override + public Anchor getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3919,7 +3870,7 @@ public interface UserMetadataOrBuilder extends * string key = 1; * @return The key. */ - java.lang.String getKey(); + String getKey(); /** * string key = 1; * @return The bytes for key. @@ -3931,7 +3882,7 @@ public interface UserMetadataOrBuilder extends * string value = 2; * @return The value. */ - java.lang.String getValue(); + String getValue(); /** * string value = 2; * @return The bytes for value. @@ -3956,95 +3907,42 @@ private UserMetadata() { value_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new UserMetadata(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private UserMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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(); - - value_ = s; - 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.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_UserMetadata_descriptor; + return AttrProto.internal_static_attrpubapi_v1_UserMetadata_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_UserMetadata_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_UserMetadata_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.class, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder.class); + UserMetadata.class, Builder.class); } public static final int KEY_FIELD_NUMBER = 1; - private volatile java.lang.Object key_; + @SuppressWarnings("serial") + private volatile Object key_ = ""; /** * string key = 1; * @return The key. */ - @java.lang.Override - public java.lang.String getKey() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getKey() { + Object ref = key_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); key_ = s; return s; } @@ -4053,14 +3951,14 @@ public java.lang.String getKey() { * string key = 1; * @return The bytes for key. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getKeyBytes() { - java.lang.Object ref = key_; - if (ref instanceof java.lang.String) { + Object ref = key_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); key_ = b; return b; } else { @@ -4069,20 +3967,21 @@ public java.lang.String getKey() { } public static final int VALUE_FIELD_NUMBER = 2; - private volatile java.lang.Object value_; + @SuppressWarnings("serial") + private volatile Object value_ = ""; /** * string value = 2; * @return The value. */ - @java.lang.Override - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getValue() { + Object ref = value_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); value_ = s; return s; } @@ -4091,14 +3990,14 @@ public java.lang.String getValue() { * string value = 2; * @return The bytes for value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { + Object ref = value_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); value_ = b; return b; } else { @@ -4107,7 +4006,7 @@ public java.lang.String getValue() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -4117,7 +4016,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(key_)) { @@ -4126,10 +4025,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, value_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -4141,30 +4040,30 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, value_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata)) { + if (!(obj instanceof UserMetadata)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata other = (com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata) obj; + UserMetadata other = (UserMetadata) obj; if (!getKey() .equals(other.getKey())) return false; if (!getValue() .equals(other.getValue())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -4175,74 +4074,76 @@ public int hashCode() { hash = (53 * hash) + getKey().hashCode(); hash = (37 * hash) + VALUE_FIELD_NUMBER; hash = (53 * hash) + getValue().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom(byte[] data) + public static UserMetadata parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom(java.io.InputStream input) + public static UserMetadata parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata 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.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseDelimitedFrom(java.io.InputStream input) + + public static UserMetadata parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseDelimitedFrom( + + public static UserMetadata 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.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseFrom( + public static UserMetadata parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4250,23 +4151,23 @@ public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parseF .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata prototype) { + public static Builder newBuilder(UserMetadata prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -4276,170 +4177,199 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.UserMetadata) - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadataOrBuilder { + UserMetadataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_UserMetadata_descriptor; + return AttrProto.internal_static_attrpubapi_v1_UserMetadata_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_UserMetadata_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_UserMetadata_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.class, com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.Builder.class); + UserMetadata.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; key_ = ""; - value_ = ""; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_UserMetadata_descriptor; + return AttrProto.internal_static_attrpubapi_v1_UserMetadata_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.getDefaultInstance(); + @Override + public UserMetadata getDefaultInstanceForType() { + return UserMetadata.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata build() { - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata result = buildPartial(); + @Override + public UserMetadata build() { + UserMetadata result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata buildPartial() { - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata result = new com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata(this); - result.key_ = key_; - result.value_ = value_; + @Override + public UserMetadata buildPartial() { + UserMetadata result = new UserMetadata(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(UserMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.key_ = key_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.value_ = value_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata)other); + if (other instanceof UserMetadata) { + return mergeFrom((UserMetadata)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata other) { - if (other == com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata.getDefaultInstance()) return this; + public Builder mergeFrom(UserMetadata other) { + if (other == UserMetadata.getDefaultInstance()) return this; if (!other.getKey().isEmpty()) { key_ = other.key_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getValue().isEmpty()) { value_ = other.value_; + bitField0_ |= 0x00000002; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + key_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + value_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; - private java.lang.Object key_ = ""; + private Object key_ = ""; /** * string key = 1; * @return The key. */ - public java.lang.String getKey() { - java.lang.Object ref = key_; - if (!(ref instanceof java.lang.String)) { + public String getKey() { + Object ref = key_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); key_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -4448,11 +4378,11 @@ public java.lang.String getKey() { */ public com.google.protobuf.ByteString getKeyBytes() { - java.lang.Object ref = key_; + Object ref = key_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); key_ = b; return b; } else { @@ -4465,12 +4395,10 @@ public java.lang.String getKey() { * @return This builder for chaining. */ public Builder setKey( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } key_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4479,8 +4407,8 @@ public Builder setKey( * @return This builder for chaining. */ public Builder clearKey() { - key_ = getDefaultInstance().getKey(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -4491,31 +4419,29 @@ public Builder clearKey() { */ public Builder setKeyBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); key_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } - private java.lang.Object value_ = ""; + private Object value_ = ""; /** * string value = 2; * @return The value. */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (!(ref instanceof java.lang.String)) { + public String getValue() { + Object ref = value_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); value_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -4524,11 +4450,11 @@ public java.lang.String getValue() { */ public com.google.protobuf.ByteString getValueBytes() { - java.lang.Object ref = value_; + Object ref = value_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); value_ = b; return b; } else { @@ -4541,12 +4467,10 @@ public java.lang.String getValue() { * @return This builder for chaining. */ public Builder setValue( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } value_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -4555,8 +4479,8 @@ public Builder setValue( * @return This builder for chaining. */ public Builder clearValue() { - value_ = getDefaultInstance().getValue(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -4567,22 +4491,20 @@ public Builder clearValue() { */ public Builder setValueBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); value_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -4593,23 +4515,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.UserMetadata) - private static final com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata DEFAULT_INSTANCE; + private static final UserMetadata DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata(); + DEFAULT_INSTANCE = new UserMetadata(); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getDefaultInstance() { + public static UserMetadata getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public UserMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -4617,13 +4550,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.UserMetadata getDefaultInstanceForType() { + @Override + public UserMetadata getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4636,12 +4569,12 @@ public interface MultiValueOrBuilder extends /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - java.util.List + java.util.List getValuesList(); /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getValues(int index); + MultiValue.Value getValues(int index); /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ @@ -4649,12 +4582,12 @@ public interface MultiValueOrBuilder extends /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - java.util.List + java.util.List getValuesOrBuilderList(); /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder getValuesOrBuilder( + MultiValue.ValueOrBuilder getValuesOrBuilder( int index); } /** @@ -4673,79 +4606,24 @@ private MultiValue() { values_ = java.util.Collections.emptyList(); } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new MultiValue(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private MultiValue( - 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: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - values_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.parser(), extensionRegistry)); - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = java.util.Collections.unmodifiableList(values_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_descriptor; + return AttrProto.internal_static_attrpubapi_v1_MultiValue_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_MultiValue_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.class, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Builder.class); + MultiValue.class, Builder.class); } public interface ValueOrBuilder extends @@ -4761,7 +4639,7 @@ public interface ValueOrBuilder extends * .attrpubapi_v1.ContentType content_type = 1; * @return The contentType. */ - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType(); + ContentTypeProto.ContentType getContentType(); /** * bytes data = 2; @@ -4786,111 +4664,57 @@ private Value() { data_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new Value(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Value( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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: { - int rawValue = input.readEnum(); - - contentType_ = rawValue; - break; - } - case 18: { - - data_ = input.readBytes(); - 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.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_descriptor; + return AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.class, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder.class); + Value.class, Builder.class); } public static final int CONTENT_TYPE_FIELD_NUMBER = 1; - private int contentType_; + private int contentType_ = 0; /** * .attrpubapi_v1.ContentType content_type = 1; * @return The enum numeric value on the wire for contentType. */ - @java.lang.Override public int getContentTypeValue() { + @Override public int getContentTypeValue() { return contentType_; } /** * .attrpubapi_v1.ContentType content_type = 1; * @return The contentType. */ - @java.lang.Override public com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType result = com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.valueOf(contentType_); - return result == null ? com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNRECOGNIZED : result; + @Override public ContentTypeProto.ContentType getContentType() { + ContentTypeProto.ContentType result = ContentTypeProto.ContentType.forNumber(contentType_); + return result == null ? ContentTypeProto.ContentType.UNRECOGNIZED : result; } public static final int DATA_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString data_; + private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY; /** * bytes data = 2; * @return The data. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getData() { return data_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -4900,25 +4724,25 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (contentType_ != com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNDEFINED.getNumber()) { + if (contentType_ != ContentTypeProto.ContentType.UNDEFINED.getNumber()) { output.writeEnum(1, contentType_); } if (!data_.isEmpty()) { output.writeBytes(2, data_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; size = 0; - if (contentType_ != com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNDEFINED.getNumber()) { + if (contentType_ != ContentTypeProto.ContentType.UNDEFINED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, contentType_); } @@ -4926,29 +4750,29 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, data_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value)) { + if (!(obj instanceof Value)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value other = (com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value) obj; + Value other = (Value) obj; if (contentType_ != other.contentType_) return false; if (!getData() .equals(other.getData())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -4959,74 +4783,76 @@ public int hashCode() { hash = (53 * hash) + contentType_; hash = (37 * hash) + DATA_FIELD_NUMBER; hash = (53 * hash) + getData().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom(byte[] data) + public static Value parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom(java.io.InputStream input) + public static Value parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value 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.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseDelimitedFrom(java.io.InputStream input) + + public static Value parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseDelimitedFrom( + + public static Value 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.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parseFrom( + public static Value parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5034,23 +4860,23 @@ public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value pa .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value prototype) { + public static Builder newBuilder(Value prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -5060,159 +4886,186 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.MultiValue.Value) - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder { + ValueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_descriptor; + return AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.class, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder.class); + Value.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; contentType_ = 0; - data_ = com.google.protobuf.ByteString.EMPTY; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_descriptor; + return AttrProto.internal_static_attrpubapi_v1_MultiValue_Value_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.getDefaultInstance(); + @Override + public Value getDefaultInstanceForType() { + return Value.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value build() { - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value result = buildPartial(); + @Override + public Value build() { + Value result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value buildPartial() { - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value result = new com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value(this); - result.contentType_ = contentType_; - result.data_ = data_; + @Override + public Value buildPartial() { + Value result = new Value(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(Value result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.contentType_ = contentType_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.data_ = data_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value)other); + if (other instanceof Value) { + return mergeFrom((Value)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value other) { - if (other == com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.getDefaultInstance()) return this; + public Builder mergeFrom(Value other) { + if (other == Value.getDefaultInstance()) return this; if (other.contentType_ != 0) { setContentTypeValue(other.getContentTypeValue()); } if (other.getData() != com.google.protobuf.ByteString.EMPTY) { setData(other.getData()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + contentType_ = input.readEnum(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + data_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; private int contentType_ = 0; /** * .attrpubapi_v1.ContentType content_type = 1; * @return The enum numeric value on the wire for contentType. */ - @java.lang.Override public int getContentTypeValue() { + @Override public int getContentTypeValue() { return contentType_; } /** @@ -5221,8 +5074,8 @@ public Builder mergeFrom( * @return This builder for chaining. */ public Builder setContentTypeValue(int value) { - contentType_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -5230,22 +5083,21 @@ public Builder setContentTypeValue(int value) { * .attrpubapi_v1.ContentType content_type = 1; * @return The contentType. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType result = com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.valueOf(contentType_); - return result == null ? com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNRECOGNIZED : result; + @Override + public ContentTypeProto.ContentType getContentType() { + ContentTypeProto.ContentType result = ContentTypeProto.ContentType.forNumber(contentType_); + return result == null ? ContentTypeProto.ContentType.UNRECOGNIZED : result; } /** * .attrpubapi_v1.ContentType content_type = 1; * @param value The contentType to set. * @return This builder for chaining. */ - public Builder setContentType(com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType value) { + public Builder setContentType(ContentTypeProto.ContentType value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; contentType_ = value.getNumber(); onChanged(); return this; @@ -5255,7 +5107,7 @@ public Builder setContentType(com.yoti.api.client.spi.remote.proto.ContentTypePr * @return This builder for chaining. */ public Builder clearContentType() { - + bitField0_ = (bitField0_ & ~0x00000001); contentType_ = 0; onChanged(); return this; @@ -5266,7 +5118,7 @@ public Builder clearContentType() { * bytes data = 2; * @return The data. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getData() { return data_; } @@ -5276,11 +5128,9 @@ public com.google.protobuf.ByteString getData() { * @return This builder for chaining. */ public Builder setData(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } data_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -5289,18 +5139,18 @@ public Builder setData(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearData() { - + bitField0_ = (bitField0_ & ~0x00000002); data_ = getDefaultInstance().getData(); onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -5311,23 +5161,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.MultiValue.Value) - private static final com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value DEFAULT_INSTANCE; + private static final Value DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value(); + DEFAULT_INSTANCE = new Value(); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getDefaultInstance() { + public static Value getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Value(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -5335,60 +5196,61 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getDefaultInstanceForType() { + @Override + public Value getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } public static final int VALUES_FIELD_NUMBER = 1; - private java.util.List values_; + @SuppressWarnings("serial") + private java.util.List values_; /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - @java.lang.Override - public java.util.List getValuesList() { + @Override + public java.util.List getValuesList() { return values_; } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getValuesOrBuilderList() { return values_; } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - @java.lang.Override + @Override public int getValuesCount() { return values_.size(); } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getValues(int index) { + @Override + public Value getValues(int index) { return values_.get(index); } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder getValuesOrBuilder( + @Override + public ValueOrBuilder getValuesOrBuilder( int index) { return values_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -5398,16 +5260,16 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < values_.size(); i++) { output.writeMessage(1, values_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -5417,28 +5279,28 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, values_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue)) { + if (!(obj instanceof MultiValue)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue other = (com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue) obj; + MultiValue other = (MultiValue) obj; if (!getValuesList() .equals(other.getValuesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -5449,74 +5311,76 @@ public int hashCode() { hash = (37 * hash) + VALUES_FIELD_NUMBER; hash = (53 * hash) + getValuesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom(byte[] data) + public static MultiValue parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom(java.io.InputStream input) + public static MultiValue parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue 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.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseDelimitedFrom(java.io.InputStream input) + + public static MultiValue parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseDelimitedFrom( + + public static MultiValue 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.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFrom( + public static MultiValue parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5524,23 +5388,23 @@ public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parseFro .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue prototype) { + public static Builder newBuilder(MultiValue prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -5550,72 +5414,74 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.MultiValue) - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValueOrBuilder { + MultiValueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_descriptor; + return AttrProto.internal_static_attrpubapi_v1_MultiValue_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_fieldAccessorTable + return AttrProto.internal_static_attrpubapi_v1_MultiValue_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.class, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Builder.class); + MultiValue.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getValuesFieldBuilder(); - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; if (valuesBuilder_ == null) { values_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + values_ = null; valuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.internal_static_attrpubapi_v1_MultiValue_descriptor; + return AttrProto.internal_static_attrpubapi_v1_MultiValue_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.getDefaultInstance(); + @Override + public MultiValue getDefaultInstanceForType() { + return MultiValue.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue build() { - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue result = buildPartial(); + @Override + public MultiValue build() { + MultiValue result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue buildPartial() { - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue result = new com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue(this); - int from_bitField0_ = bitField0_; + @Override + public MultiValue buildPartial() { + MultiValue result = new MultiValue(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(MultiValue result) { if (valuesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); @@ -5625,54 +5491,56 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue buildPartial() } else { result.values_ = valuesBuilder_.build(); } - onBuilt(); - return result; } - @java.lang.Override + private void buildPartial0(MultiValue result) { + int from_bitField0_ = bitField0_; + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue)other); + if (other instanceof MultiValue) { + return mergeFrom((MultiValue)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue other) { - if (other == com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.getDefaultInstance()) return this; + public Builder mergeFrom(MultiValue other) { + if (other == MultiValue.getDefaultInstance()) return this; if (valuesBuilder_ == null) { if (!other.values_.isEmpty()) { if (values_.isEmpty()) { @@ -5699,52 +5567,78 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttrProto.MultiVal } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + Value m = + input.readMessage( + Value.parser(), + extensionRegistry); + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + values_.add(m); + } else { + valuesBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private java.util.List values_ = + private java.util.List values_ = java.util.Collections.emptyList(); private void ensureValuesIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - values_ = new java.util.ArrayList(values_); + values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder> valuesBuilder_; + Value, Value.Builder, ValueOrBuilder> valuesBuilder_; /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public java.util.List getValuesList() { + public java.util.List getValuesList() { if (valuesBuilder_ == null) { return java.util.Collections.unmodifiableList(values_); } else { @@ -5764,7 +5658,7 @@ public int getValuesCount() { /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getValues(int index) { + public Value getValues(int index) { if (valuesBuilder_ == null) { return values_.get(index); } else { @@ -5775,7 +5669,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value getValues * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ public Builder setValues( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value value) { + int index, Value value) { if (valuesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5792,7 +5686,7 @@ public Builder setValues( * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ public Builder setValues( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder builderForValue) { + int index, Value.Builder builderForValue) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); values_.set(index, builderForValue.build()); @@ -5805,7 +5699,7 @@ public Builder setValues( /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public Builder addValues(com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value value) { + public Builder addValues(Value value) { if (valuesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5822,7 +5716,7 @@ public Builder addValues(com.yoti.api.client.spi.remote.proto.AttrProto.MultiVal * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ public Builder addValues( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value value) { + int index, Value value) { if (valuesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5839,7 +5733,7 @@ public Builder addValues( * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ public Builder addValues( - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder builderForValue) { + Value.Builder builderForValue) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); values_.add(builderForValue.build()); @@ -5853,7 +5747,7 @@ public Builder addValues( * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ public Builder addValues( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder builderForValue) { + int index, Value.Builder builderForValue) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); values_.add(index, builderForValue.build()); @@ -5867,7 +5761,7 @@ public Builder addValues( * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ public Builder addAllValues( - java.lang.Iterable values) { + Iterable values) { if (valuesBuilder_ == null) { ensureValuesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -5907,14 +5801,14 @@ public Builder removeValues(int index) { /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder getValuesBuilder( + public Value.Builder getValuesBuilder( int index) { return getValuesFieldBuilder().getBuilder(index); } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder getValuesOrBuilder( + public ValueOrBuilder getValuesOrBuilder( int index) { if (valuesBuilder_ == null) { return values_.get(index); } else { @@ -5924,7 +5818,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public java.util.List + public java.util.List getValuesOrBuilderList() { if (valuesBuilder_ != null) { return valuesBuilder_.getMessageOrBuilderList(); @@ -5935,31 +5829,31 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder addValuesBuilder() { + public Value.Builder addValuesBuilder() { return getValuesFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.getDefaultInstance()); + Value.getDefaultInstance()); } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder addValuesBuilder( + public Value.Builder addValuesBuilder( int index) { return getValuesFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.getDefaultInstance()); + index, Value.getDefaultInstance()); } /** * repeated .attrpubapi_v1.MultiValue.Value values = 1; */ - public java.util.List + public java.util.List getValuesBuilderList() { return getValuesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder> + Value, Value.Builder, ValueOrBuilder> getValuesFieldBuilder() { if (valuesBuilder_ == null) { valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.ValueOrBuilder>( + Value, Value.Builder, ValueOrBuilder>( values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), @@ -5968,13 +5862,13 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue.Value.Builder a } return valuesBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -5985,23 +5879,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.MultiValue) - private static final com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue DEFAULT_INSTANCE; + private static final MultiValue DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue(); + DEFAULT_INSTANCE = new MultiValue(); } - public static com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue getDefaultInstance() { + public static MultiValue getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public MultiValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MultiValue(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6009,13 +5914,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue getDefaultInstanceForType() { + @Override + public MultiValue getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -6059,7 +5964,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue getDefaultInsta private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\017Attribute.proto\022\rattrpubapi_v1\032\021Conten" + "tType.proto\"\367\001\n\tAttribute\022\014\n\004name\030\001 \001(\t\022" + "\r\n\005value\030\002 \001(\014\0220\n\014content_type\030\003 \001(\0162\032.a" + @@ -6090,45 +5995,45 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.MultiValue getDefaultInsta descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.yoti.api.client.spi.remote.proto.ContentTypeProto.getDescriptor(), + ContentTypeProto.getDescriptor(), }); internal_static_attrpubapi_v1_Attribute_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_attrpubapi_v1_Attribute_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_Attribute_descriptor, - new java.lang.String[] { "Name", "Value", "ContentType", "Anchors", "UserMetadata", "Metadata", "EphemeralId", }); + new String[] { "Name", "Value", "ContentType", "Anchors", "UserMetadata", "Metadata", "EphemeralId", }); internal_static_attrpubapi_v1_Metadata_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_attrpubapi_v1_Metadata_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_Metadata_descriptor, - new java.lang.String[] { "SupersededTimeStamp", "Deletable", "ReceiptId", "Revoked", "Locked", }); + new String[] { "SupersededTimeStamp", "Deletable", "ReceiptId", "Revoked", "Locked", }); internal_static_attrpubapi_v1_Anchor_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_attrpubapi_v1_Anchor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_Anchor_descriptor, - new java.lang.String[] { "ArtifactLink", "OriginServerCerts", "ArtifactSignature", "SubType", "Signature", "SignedTimeStamp", "AssociatedSource", }); + new String[] { "ArtifactLink", "OriginServerCerts", "ArtifactSignature", "SubType", "Signature", "SignedTimeStamp", "AssociatedSource", }); internal_static_attrpubapi_v1_UserMetadata_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_attrpubapi_v1_UserMetadata_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_UserMetadata_descriptor, - new java.lang.String[] { "Key", "Value", }); + new String[] { "Key", "Value", }); internal_static_attrpubapi_v1_MultiValue_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_attrpubapi_v1_MultiValue_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_MultiValue_descriptor, - new java.lang.String[] { "Values", }); + new String[] { "Values", }); internal_static_attrpubapi_v1_MultiValue_Value_descriptor = internal_static_attrpubapi_v1_MultiValue_descriptor.getNestedTypes().get(0); internal_static_attrpubapi_v1_MultiValue_Value_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_MultiValue_Value_descriptor, - new java.lang.String[] { "ContentType", "Data", }); - com.yoti.api.client.spi.remote.proto.ContentTypeProto.getDescriptor(); + new String[] { "ContentType", "Data", }); + ContentTypeProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttributeListProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttributeListProto.java index e124a3bb1..d3c4024f6 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttributeListProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/AttributeListProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: List.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class AttributeListProto { @@ -27,11 +28,11 @@ public interface AttributeAndIdOrBuilder extends * .attrpubapi_v1.Attribute attribute = 1; * @return The attribute. */ - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttribute(); + AttrProto.Attribute getAttribute(); /** * .attrpubapi_v1.Attribute attribute = 1; */ - com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttributeOrBuilder(); + AttrProto.AttributeOrBuilder getAttributeOrBuilder(); /** * bytes attribute_id = 2; @@ -55,125 +56,66 @@ private AttributeAndId() { attributeId_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new AttributeAndId(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AttributeAndId( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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: { - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder subBuilder = null; - if (attribute_ != null) { - subBuilder = attribute_.toBuilder(); - } - attribute_ = input.readMessage(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(attribute_); - attribute_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - - attributeId_ = input.readBytes(); - 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.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_fieldAccessorTable + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.class, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder.class); + AttributeAndId.class, Builder.class); } + private int bitField0_; public static final int ATTRIBUTE_FIELD_NUMBER = 1; - private com.yoti.api.client.spi.remote.proto.AttrProto.Attribute attribute_; + private AttrProto.Attribute attribute_; /** * .attrpubapi_v1.Attribute attribute = 1; * @return Whether the attribute field is set. */ - @java.lang.Override + @Override public boolean hasAttribute() { - return attribute_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * .attrpubapi_v1.Attribute attribute = 1; * @return The attribute. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttribute() { - return attribute_ == null ? com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance() : attribute_; + @Override + public AttrProto.Attribute getAttribute() { + return attribute_ == null ? AttrProto.Attribute.getDefaultInstance() : attribute_; } /** * .attrpubapi_v1.Attribute attribute = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttributeOrBuilder() { - return getAttribute(); + @Override + public AttrProto.AttributeOrBuilder getAttributeOrBuilder() { + return attribute_ == null ? AttrProto.Attribute.getDefaultInstance() : attribute_; } public static final int ATTRIBUTE_ID_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString attributeId_; + private com.google.protobuf.ByteString attributeId_ = com.google.protobuf.ByteString.EMPTY; /** * bytes attribute_id = 2; * @return The attributeId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getAttributeId() { return attributeId_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -183,25 +125,25 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (attribute_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(1, getAttribute()); } if (!attributeId_.isEmpty()) { output.writeBytes(2, attributeId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; size = 0; - if (attribute_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getAttribute()); } @@ -209,20 +151,20 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, attributeId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId)) { + if (!(obj instanceof AttributeAndId)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId other = (com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId) obj; + AttributeAndId other = (AttributeAndId) obj; if (hasAttribute() != other.hasAttribute()) return false; if (hasAttribute()) { @@ -231,11 +173,11 @@ public boolean equals(final java.lang.Object obj) { } if (!getAttributeId() .equals(other.getAttributeId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -248,74 +190,76 @@ public int hashCode() { } hash = (37 * hash) + ATTRIBUTE_ID_FIELD_NUMBER; hash = (53 * hash) + getAttributeId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom(byte[] data) + public static AttributeAndId parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom(java.io.InputStream input) + public static AttributeAndId parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId 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.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseDelimitedFrom(java.io.InputStream input) + + public static AttributeAndId parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseDelimitedFrom( + + public static AttributeAndId 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.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parseFrom( + public static AttributeAndId parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -323,23 +267,23 @@ public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeA .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId prototype) { + public static Builder newBuilder(AttributeAndId prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -349,18 +293,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.AttributeAndId) - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder { + AttributeAndIdOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_fieldAccessorTable + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.class, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder.class); + AttributeAndId.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.newBuilder() @@ -369,158 +313,194 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getAttributeFieldBuilder(); } } - @java.lang.Override + @Override public Builder clear() { super.clear(); - if (attributeBuilder_ == null) { - attribute_ = null; - } else { - attribute_ = null; + bitField0_ = 0; + attribute_ = null; + if (attributeBuilder_ != null) { + attributeBuilder_.dispose(); attributeBuilder_ = null; } attributeId_ = com.google.protobuf.ByteString.EMPTY; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndId_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.getDefaultInstance(); + @Override + public AttributeAndId getDefaultInstanceForType() { + return AttributeAndId.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId build() { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId result = buildPartial(); + @Override + public AttributeAndId build() { + AttributeAndId result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId buildPartial() { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId result = new com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId(this); - if (attributeBuilder_ == null) { - result.attribute_ = attribute_; - } else { - result.attribute_ = attributeBuilder_.build(); - } - result.attributeId_ = attributeId_; + @Override + public AttributeAndId buildPartial() { + AttributeAndId result = new AttributeAndId(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(AttributeAndId result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.attribute_ = attributeBuilder_ == null + ? attribute_ + : attributeBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.attributeId_ = attributeId_; + } + result.bitField0_ |= to_bitField0_; + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId)other); + if (other instanceof AttributeAndId) { + return mergeFrom((AttributeAndId)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId other) { - if (other == com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.getDefaultInstance()) return this; + public Builder mergeFrom(AttributeAndId other) { + if (other == AttributeAndId.getDefaultInstance()) return this; if (other.hasAttribute()) { mergeAttribute(other.getAttribute()); } if (other.getAttributeId() != com.google.protobuf.ByteString.EMPTY) { setAttributeId(other.getAttributeId()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getAttributeFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + attributeId_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; - private com.yoti.api.client.spi.remote.proto.AttrProto.Attribute attribute_; + private AttrProto.Attribute attribute_; private com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder> attributeBuilder_; + AttrProto.Attribute, AttrProto.Attribute.Builder, AttrProto.AttributeOrBuilder> attributeBuilder_; /** * .attrpubapi_v1.Attribute attribute = 1; * @return Whether the attribute field is set. */ public boolean hasAttribute() { - return attributeBuilder_ != null || attribute_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * .attrpubapi_v1.Attribute attribute = 1; * @return The attribute. */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttribute() { + public AttrProto.Attribute getAttribute() { if (attributeBuilder_ == null) { - return attribute_ == null ? com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance() : attribute_; + return attribute_ == null ? AttrProto.Attribute.getDefaultInstance() : attribute_; } else { return attributeBuilder_.getMessage(); } @@ -528,93 +508,95 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttribute() { /** * .attrpubapi_v1.Attribute attribute = 1; */ - public Builder setAttribute(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute value) { + public Builder setAttribute(AttrProto.Attribute value) { if (attributeBuilder_ == null) { if (value == null) { throw new NullPointerException(); } attribute_ = value; - onChanged(); } else { attributeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** * .attrpubapi_v1.Attribute attribute = 1; */ public Builder setAttribute( - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder builderForValue) { + AttrProto.Attribute.Builder builderForValue) { if (attributeBuilder_ == null) { attribute_ = builderForValue.build(); - onChanged(); } else { attributeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** * .attrpubapi_v1.Attribute attribute = 1; */ - public Builder mergeAttribute(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute value) { + public Builder mergeAttribute(AttrProto.Attribute value) { if (attributeBuilder_ == null) { - if (attribute_ != null) { - attribute_ = - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.newBuilder(attribute_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) && + attribute_ != null && + attribute_ != AttrProto.Attribute.getDefaultInstance()) { + getAttributeBuilder().mergeFrom(value); } else { attribute_ = value; } - onChanged(); } else { attributeBuilder_.mergeFrom(value); } - + if (attribute_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } return this; } /** * .attrpubapi_v1.Attribute attribute = 1; */ public Builder clearAttribute() { - if (attributeBuilder_ == null) { - attribute_ = null; - onChanged(); - } else { - attribute_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + attribute_ = null; + if (attributeBuilder_ != null) { + attributeBuilder_.dispose(); attributeBuilder_ = null; } - + onChanged(); return this; } /** * .attrpubapi_v1.Attribute attribute = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder getAttributeBuilder() { - + public AttrProto.Attribute.Builder getAttributeBuilder() { + bitField0_ |= 0x00000001; onChanged(); return getAttributeFieldBuilder().getBuilder(); } /** * .attrpubapi_v1.Attribute attribute = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttributeOrBuilder() { + public AttrProto.AttributeOrBuilder getAttributeOrBuilder() { if (attributeBuilder_ != null) { return attributeBuilder_.getMessageOrBuilder(); } else { return attribute_ == null ? - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance() : attribute_; + AttrProto.Attribute.getDefaultInstance() : attribute_; } } /** * .attrpubapi_v1.Attribute attribute = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder> + AttrProto.Attribute, AttrProto.Attribute.Builder, AttrProto.AttributeOrBuilder> getAttributeFieldBuilder() { if (attributeBuilder_ == null) { attributeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder>( + AttrProto.Attribute, AttrProto.Attribute.Builder, AttrProto.AttributeOrBuilder>( getAttribute(), getParentForChildren(), isClean()); @@ -628,7 +610,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttr * bytes attribute_id = 2; * @return The attributeId. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getAttributeId() { return attributeId_; } @@ -638,11 +620,9 @@ public com.google.protobuf.ByteString getAttributeId() { * @return This builder for chaining. */ public Builder setAttributeId(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } attributeId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -651,18 +631,18 @@ public Builder setAttributeId(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearAttributeId() { - + bitField0_ = (bitField0_ & ~0x00000002); attributeId_ = getDefaultInstance().getAttributeId(); onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -673,23 +653,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.AttributeAndId) - private static final com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId DEFAULT_INSTANCE; + private static final AttributeAndId DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId(); + DEFAULT_INSTANCE = new AttributeAndId(); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId getDefaultInstance() { + public static AttributeAndId getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public AttributeAndId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AttributeAndId(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -697,13 +688,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId getDefaultInstanceForType() { + @Override + public AttributeAndId getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -716,12 +707,12 @@ public interface AttributeAndIdListOrBuilder extends /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - java.util.List + java.util.List getAttributeAndIdListList(); /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId getAttributeAndIdList(int index); + AttributeAndId getAttributeAndIdList(int index); /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ @@ -729,12 +720,12 @@ public interface AttributeAndIdListOrBuilder extends /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - java.util.List + java.util.List getAttributeAndIdListOrBuilderList(); /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder getAttributeAndIdListOrBuilder( + AttributeAndIdOrBuilder getAttributeAndIdListOrBuilder( int index); } /** @@ -753,123 +744,69 @@ private AttributeAndIdList() { attributeAndIdList_ = java.util.Collections.emptyList(); } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new AttributeAndIdList(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AttributeAndIdList( - 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: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - attributeAndIdList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - attributeAndIdList_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.parser(), extensionRegistry)); - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - attributeAndIdList_ = java.util.Collections.unmodifiableList(attributeAndIdList_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_fieldAccessorTable + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.class, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.Builder.class); + AttributeAndIdList.class, Builder.class); } public static final int ATTRIBUTE_AND_ID_LIST_FIELD_NUMBER = 1; - private java.util.List attributeAndIdList_; + @SuppressWarnings("serial") + private java.util.List attributeAndIdList_; /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - @java.lang.Override - public java.util.List getAttributeAndIdListList() { + @Override + public java.util.List getAttributeAndIdListList() { return attributeAndIdList_; } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getAttributeAndIdListOrBuilderList() { return attributeAndIdList_; } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - @java.lang.Override + @Override public int getAttributeAndIdListCount() { return attributeAndIdList_.size(); } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId getAttributeAndIdList(int index) { + @Override + public AttributeAndId getAttributeAndIdList(int index) { return attributeAndIdList_.get(index); } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder getAttributeAndIdListOrBuilder( + @Override + public AttributeAndIdOrBuilder getAttributeAndIdListOrBuilder( int index) { return attributeAndIdList_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -879,16 +816,16 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < attributeAndIdList_.size(); i++) { output.writeMessage(1, attributeAndIdList_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -898,28 +835,28 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, attributeAndIdList_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList)) { + if (!(obj instanceof AttributeAndIdList)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList other = (com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList) obj; + AttributeAndIdList other = (AttributeAndIdList) obj; if (!getAttributeAndIdListList() .equals(other.getAttributeAndIdListList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -930,74 +867,76 @@ public int hashCode() { hash = (37 * hash) + ATTRIBUTE_AND_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getAttributeAndIdListList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom(byte[] data) + public static AttributeAndIdList parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom(java.io.InputStream input) + public static AttributeAndIdList parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList 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.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseDelimitedFrom(java.io.InputStream input) + + public static AttributeAndIdList parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseDelimitedFrom( + + public static AttributeAndIdList 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.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parseFrom( + public static AttributeAndIdList parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1005,23 +944,23 @@ public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeA .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList prototype) { + public static Builder newBuilder(AttributeAndIdList prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -1031,72 +970,74 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.AttributeAndIdList) - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdListOrBuilder { + AttributeAndIdListOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_fieldAccessorTable + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.class, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.Builder.class); + AttributeAndIdList.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getAttributeAndIdListFieldBuilder(); - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; if (attributeAndIdListBuilder_ == null) { attributeAndIdList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + attributeAndIdList_ = null; attributeAndIdListBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeAndIdList_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.getDefaultInstance(); + @Override + public AttributeAndIdList getDefaultInstanceForType() { + return AttributeAndIdList.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList build() { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList result = buildPartial(); + @Override + public AttributeAndIdList build() { + AttributeAndIdList result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList buildPartial() { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList result = new com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList(this); - int from_bitField0_ = bitField0_; + @Override + public AttributeAndIdList buildPartial() { + AttributeAndIdList result = new AttributeAndIdList(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(AttributeAndIdList result) { if (attributeAndIdListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { attributeAndIdList_ = java.util.Collections.unmodifiableList(attributeAndIdList_); @@ -1106,54 +1047,56 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdLis } else { result.attributeAndIdList_ = attributeAndIdListBuilder_.build(); } - onBuilt(); - return result; } - @java.lang.Override + private void buildPartial0(AttributeAndIdList result) { + int from_bitField0_ = bitField0_; + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList)other); + if (other instanceof AttributeAndIdList) { + return mergeFrom((AttributeAndIdList)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList other) { - if (other == com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList.getDefaultInstance()) return this; + public Builder mergeFrom(AttributeAndIdList other) { + if (other == AttributeAndIdList.getDefaultInstance()) return this; if (attributeAndIdListBuilder_ == null) { if (!other.attributeAndIdList_.isEmpty()) { if (attributeAndIdList_.isEmpty()) { @@ -1180,52 +1123,78 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttributeListProto } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + AttributeAndId m = + input.readMessage( + AttributeAndId.parser(), + extensionRegistry); + if (attributeAndIdListBuilder_ == null) { + ensureAttributeAndIdListIsMutable(); + attributeAndIdList_.add(m); + } else { + attributeAndIdListBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private java.util.List attributeAndIdList_ = + private java.util.List attributeAndIdList_ = java.util.Collections.emptyList(); private void ensureAttributeAndIdListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - attributeAndIdList_ = new java.util.ArrayList(attributeAndIdList_); + attributeAndIdList_ = new java.util.ArrayList(attributeAndIdList_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder> attributeAndIdListBuilder_; + AttributeAndId, AttributeAndId.Builder, AttributeAndIdOrBuilder> attributeAndIdListBuilder_; /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public java.util.List getAttributeAndIdListList() { + public java.util.List getAttributeAndIdListList() { if (attributeAndIdListBuilder_ == null) { return java.util.Collections.unmodifiableList(attributeAndIdList_); } else { @@ -1245,7 +1214,7 @@ public int getAttributeAndIdListCount() { /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId getAttributeAndIdList(int index) { + public AttributeAndId getAttributeAndIdList(int index) { if (attributeAndIdListBuilder_ == null) { return attributeAndIdList_.get(index); } else { @@ -1256,7 +1225,7 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId ge * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ public Builder setAttributeAndIdList( - int index, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId value) { + int index, AttributeAndId value) { if (attributeAndIdListBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1273,7 +1242,7 @@ public Builder setAttributeAndIdList( * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ public Builder setAttributeAndIdList( - int index, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder builderForValue) { + int index, AttributeAndId.Builder builderForValue) { if (attributeAndIdListBuilder_ == null) { ensureAttributeAndIdListIsMutable(); attributeAndIdList_.set(index, builderForValue.build()); @@ -1286,7 +1255,7 @@ public Builder setAttributeAndIdList( /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public Builder addAttributeAndIdList(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId value) { + public Builder addAttributeAndIdList(AttributeAndId value) { if (attributeAndIdListBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1303,7 +1272,7 @@ public Builder addAttributeAndIdList(com.yoti.api.client.spi.remote.proto.Attrib * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ public Builder addAttributeAndIdList( - int index, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId value) { + int index, AttributeAndId value) { if (attributeAndIdListBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1320,7 +1289,7 @@ public Builder addAttributeAndIdList( * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ public Builder addAttributeAndIdList( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder builderForValue) { + AttributeAndId.Builder builderForValue) { if (attributeAndIdListBuilder_ == null) { ensureAttributeAndIdListIsMutable(); attributeAndIdList_.add(builderForValue.build()); @@ -1334,7 +1303,7 @@ public Builder addAttributeAndIdList( * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ public Builder addAttributeAndIdList( - int index, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder builderForValue) { + int index, AttributeAndId.Builder builderForValue) { if (attributeAndIdListBuilder_ == null) { ensureAttributeAndIdListIsMutable(); attributeAndIdList_.add(index, builderForValue.build()); @@ -1348,7 +1317,7 @@ public Builder addAttributeAndIdList( * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ public Builder addAllAttributeAndIdList( - java.lang.Iterable values) { + Iterable values) { if (attributeAndIdListBuilder_ == null) { ensureAttributeAndIdListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1388,14 +1357,14 @@ public Builder removeAttributeAndIdList(int index) { /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder getAttributeAndIdListBuilder( + public AttributeAndId.Builder getAttributeAndIdListBuilder( int index) { return getAttributeAndIdListFieldBuilder().getBuilder(index); } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder getAttributeAndIdListOrBuilder( + public AttributeAndIdOrBuilder getAttributeAndIdListOrBuilder( int index) { if (attributeAndIdListBuilder_ == null) { return attributeAndIdList_.get(index); } else { @@ -1405,7 +1374,7 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrB /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public java.util.List + public java.util.List getAttributeAndIdListOrBuilderList() { if (attributeAndIdListBuilder_ != null) { return attributeAndIdListBuilder_.getMessageOrBuilderList(); @@ -1416,31 +1385,31 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrB /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder addAttributeAndIdListBuilder() { + public AttributeAndId.Builder addAttributeAndIdListBuilder() { return getAttributeAndIdListFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.getDefaultInstance()); + AttributeAndId.getDefaultInstance()); } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder addAttributeAndIdListBuilder( + public AttributeAndId.Builder addAttributeAndIdListBuilder( int index) { return getAttributeAndIdListFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.getDefaultInstance()); + index, AttributeAndId.getDefaultInstance()); } /** * repeated .attrpubapi_v1.AttributeAndId attribute_and_id_list = 1; */ - public java.util.List + public java.util.List getAttributeAndIdListBuilderList() { return getAttributeAndIdListFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder> + AttributeAndId, AttributeAndId.Builder, AttributeAndIdOrBuilder> getAttributeAndIdListFieldBuilder() { if (attributeAndIdListBuilder_ == null) { attributeAndIdListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Builder, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdOrBuilder>( + AttributeAndId, AttributeAndId.Builder, AttributeAndIdOrBuilder>( attributeAndIdList_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), @@ -1449,13 +1418,13 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndId.Bu } return attributeAndIdListBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1466,23 +1435,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.AttributeAndIdList) - private static final com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList DEFAULT_INSTANCE; + private static final AttributeAndIdList DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList(); + DEFAULT_INSTANCE = new AttributeAndIdList(); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList getDefaultInstance() { + public static AttributeAndIdList getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public AttributeAndIdList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AttributeAndIdList(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1490,13 +1470,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeAndIdList getDefaultInstanceForType() { + @Override + public AttributeAndIdList getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1509,12 +1489,12 @@ public interface AttributeListOrBuilder extends /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - java.util.List + java.util.List getAttributesList(); /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttributes(int index); + AttrProto.Attribute getAttributes(int index); /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ @@ -1522,12 +1502,12 @@ public interface AttributeListOrBuilder extends /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - java.util.List + java.util.List getAttributesOrBuilderList(); /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttributesOrBuilder( + AttrProto.AttributeOrBuilder getAttributesOrBuilder( int index); } /** @@ -1546,123 +1526,69 @@ private AttributeList() { attributes_ = java.util.Collections.emptyList(); } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new AttributeList(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AttributeList( - 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: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - attributes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - attributes_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.parser(), extensionRegistry)); - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - attributes_ = java.util.Collections.unmodifiableList(attributes_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeList_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeList_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeList_fieldAccessorTable + return AttributeListProto.internal_static_attrpubapi_v1_AttributeList_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.class, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.Builder.class); + AttributeList.class, Builder.class); } public static final int ATTRIBUTES_FIELD_NUMBER = 1; - private java.util.List attributes_; + @SuppressWarnings("serial") + private java.util.List attributes_; /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - @java.lang.Override - public java.util.List getAttributesList() { + @Override + public java.util.List getAttributesList() { return attributes_; } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getAttributesOrBuilderList() { return attributes_; } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - @java.lang.Override + @Override public int getAttributesCount() { return attributes_.size(); } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttributes(int index) { + @Override + public AttrProto.Attribute getAttributes(int index) { return attributes_.get(index); } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttributesOrBuilder( + @Override + public AttrProto.AttributeOrBuilder getAttributesOrBuilder( int index) { return attributes_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1672,16 +1598,16 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < attributes_.size(); i++) { output.writeMessage(1, attributes_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1691,28 +1617,28 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, attributes_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList)) { + if (!(obj instanceof AttributeList)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList other = (com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList) obj; + AttributeList other = (AttributeList) obj; if (!getAttributesList() .equals(other.getAttributesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -1723,74 +1649,76 @@ public int hashCode() { hash = (37 * hash) + ATTRIBUTES_FIELD_NUMBER; hash = (53 * hash) + getAttributesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom(byte[] data) + public static AttributeList parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom(java.io.InputStream input) + public static AttributeList parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList 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.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseDelimitedFrom(java.io.InputStream input) + + public static AttributeList parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseDelimitedFrom( + + public static AttributeList 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.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parseFrom( + public static AttributeList parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1798,23 +1726,23 @@ public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeL .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList prototype) { + public static Builder newBuilder(AttributeList prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -1824,72 +1752,74 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.AttributeList) - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeListOrBuilder { + AttributeListOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeList_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeList_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeList_fieldAccessorTable + return AttributeListProto.internal_static_attrpubapi_v1_AttributeList_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.class, com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.Builder.class); + AttributeList.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getAttributesFieldBuilder(); - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; if (attributesBuilder_ == null) { attributes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + attributes_ = null; attributesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.internal_static_attrpubapi_v1_AttributeList_descriptor; + return AttributeListProto.internal_static_attrpubapi_v1_AttributeList_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.getDefaultInstance(); + @Override + public AttributeList getDefaultInstanceForType() { + return AttributeList.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList build() { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList result = buildPartial(); + @Override + public AttributeList build() { + AttributeList result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList buildPartial() { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList result = new com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList(this); - int from_bitField0_ = bitField0_; + @Override + public AttributeList buildPartial() { + AttributeList result = new AttributeList(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(AttributeList result) { if (attributesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { attributes_ = java.util.Collections.unmodifiableList(attributes_); @@ -1899,54 +1829,56 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList bui } else { result.attributes_ = attributesBuilder_.build(); } - onBuilt(); - return result; } - @java.lang.Override + private void buildPartial0(AttributeList result) { + int from_bitField0_ = bitField0_; + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList)other); + if (other instanceof AttributeList) { + return mergeFrom((AttributeList)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList other) { - if (other == com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList.getDefaultInstance()) return this; + public Builder mergeFrom(AttributeList other) { + if (other == AttributeList.getDefaultInstance()) return this; if (attributesBuilder_ == null) { if (!other.attributes_.isEmpty()) { if (attributes_.isEmpty()) { @@ -1973,52 +1905,78 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.AttributeListProto } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + AttrProto.Attribute m = + input.readMessage( + AttrProto.Attribute.parser(), + extensionRegistry); + if (attributesBuilder_ == null) { + ensureAttributesIsMutable(); + attributes_.add(m); + } else { + attributesBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private java.util.List attributes_ = + private java.util.List attributes_ = java.util.Collections.emptyList(); private void ensureAttributesIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - attributes_ = new java.util.ArrayList(attributes_); + attributes_ = new java.util.ArrayList(attributes_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder> attributesBuilder_; + AttrProto.Attribute, AttrProto.Attribute.Builder, AttrProto.AttributeOrBuilder> attributesBuilder_; /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public java.util.List getAttributesList() { + public java.util.List getAttributesList() { if (attributesBuilder_ == null) { return java.util.Collections.unmodifiableList(attributes_); } else { @@ -2038,7 +1996,7 @@ public int getAttributesCount() { /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttributes(int index) { + public AttrProto.Attribute getAttributes(int index) { if (attributesBuilder_ == null) { return attributes_.get(index); } else { @@ -2049,7 +2007,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute getAttributes(in * repeated .attrpubapi_v1.Attribute attributes = 1; */ public Builder setAttributes( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute value) { + int index, AttrProto.Attribute value) { if (attributesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2066,7 +2024,7 @@ public Builder setAttributes( * repeated .attrpubapi_v1.Attribute attributes = 1; */ public Builder setAttributes( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder builderForValue) { + int index, AttrProto.Attribute.Builder builderForValue) { if (attributesBuilder_ == null) { ensureAttributesIsMutable(); attributes_.set(index, builderForValue.build()); @@ -2079,7 +2037,7 @@ public Builder setAttributes( /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public Builder addAttributes(com.yoti.api.client.spi.remote.proto.AttrProto.Attribute value) { + public Builder addAttributes(AttrProto.Attribute value) { if (attributesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2096,7 +2054,7 @@ public Builder addAttributes(com.yoti.api.client.spi.remote.proto.AttrProto.Attr * repeated .attrpubapi_v1.Attribute attributes = 1; */ public Builder addAttributes( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute value) { + int index, AttrProto.Attribute value) { if (attributesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2113,7 +2071,7 @@ public Builder addAttributes( * repeated .attrpubapi_v1.Attribute attributes = 1; */ public Builder addAttributes( - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder builderForValue) { + AttrProto.Attribute.Builder builderForValue) { if (attributesBuilder_ == null) { ensureAttributesIsMutable(); attributes_.add(builderForValue.build()); @@ -2127,7 +2085,7 @@ public Builder addAttributes( * repeated .attrpubapi_v1.Attribute attributes = 1; */ public Builder addAttributes( - int index, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder builderForValue) { + int index, AttrProto.Attribute.Builder builderForValue) { if (attributesBuilder_ == null) { ensureAttributesIsMutable(); attributes_.add(index, builderForValue.build()); @@ -2141,7 +2099,7 @@ public Builder addAttributes( * repeated .attrpubapi_v1.Attribute attributes = 1; */ public Builder addAllAttributes( - java.lang.Iterable values) { + Iterable values) { if (attributesBuilder_ == null) { ensureAttributesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -2181,14 +2139,14 @@ public Builder removeAttributes(int index) { /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder getAttributesBuilder( + public AttrProto.Attribute.Builder getAttributesBuilder( int index) { return getAttributesFieldBuilder().getBuilder(index); } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttributesOrBuilder( + public AttrProto.AttributeOrBuilder getAttributesOrBuilder( int index) { if (attributesBuilder_ == null) { return attributes_.get(index); } else { @@ -2198,7 +2156,7 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttr /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public java.util.List + public java.util.List getAttributesOrBuilderList() { if (attributesBuilder_ != null) { return attributesBuilder_.getMessageOrBuilderList(); @@ -2209,31 +2167,31 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder getAttr /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder addAttributesBuilder() { + public AttrProto.Attribute.Builder addAttributesBuilder() { return getAttributesFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance()); + AttrProto.Attribute.getDefaultInstance()); } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder addAttributesBuilder( + public AttrProto.Attribute.Builder addAttributesBuilder( int index) { return getAttributesFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.getDefaultInstance()); + index, AttrProto.Attribute.getDefaultInstance()); } /** * repeated .attrpubapi_v1.Attribute attributes = 1; */ - public java.util.List + public java.util.List getAttributesBuilderList() { return getAttributesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder> + AttrProto.Attribute, AttrProto.Attribute.Builder, AttrProto.AttributeOrBuilder> getAttributesFieldBuilder() { if (attributesBuilder_ == null) { attributesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.AttrProto.Attribute, com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder, com.yoti.api.client.spi.remote.proto.AttrProto.AttributeOrBuilder>( + AttrProto.Attribute, AttrProto.Attribute.Builder, AttrProto.AttributeOrBuilder>( attributes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), @@ -2242,13 +2200,13 @@ public com.yoti.api.client.spi.remote.proto.AttrProto.Attribute.Builder addAttri } return attributesBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2259,23 +2217,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.AttributeList) - private static final com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList DEFAULT_INSTANCE; + private static final AttributeList DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList(); + DEFAULT_INSTANCE = new AttributeList(); } - public static com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList getDefaultInstance() { + public static AttributeList getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public AttributeList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AttributeList(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2283,13 +2252,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList getDefaultInstanceForType() { + @Override + public AttributeList getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2318,7 +2287,7 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList get private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\nList.proto\022\rattrpubapi_v1\032\017Attribute.p" + "roto\"S\n\016AttributeAndId\022+\n\tattribute\030\001 \001(" + "\0132\030.attrpubapi_v1.Attribute\022\024\n\014attribute" + @@ -2336,27 +2305,27 @@ public com.yoti.api.client.spi.remote.proto.AttributeListProto.AttributeList get descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.yoti.api.client.spi.remote.proto.AttrProto.getDescriptor(), + AttrProto.getDescriptor(), }); internal_static_attrpubapi_v1_AttributeAndId_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_attrpubapi_v1_AttributeAndId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_AttributeAndId_descriptor, - new java.lang.String[] { "Attribute", "AttributeId", }); + new String[] { "Attribute", "AttributeId", }); internal_static_attrpubapi_v1_AttributeAndIdList_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_attrpubapi_v1_AttributeAndIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_AttributeAndIdList_descriptor, - new java.lang.String[] { "AttributeAndIdList", }); + new String[] { "AttributeAndIdList", }); internal_static_attrpubapi_v1_AttributeList_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_attrpubapi_v1_AttributeList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_AttributeList_descriptor, - new java.lang.String[] { "Attributes", }); - com.yoti.api.client.spi.remote.proto.AttrProto.getDescriptor(); + new String[] { "Attributes", }); + AttrProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ContentTypeProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ContentTypeProto.java index d83279f6a..43da302f1 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ContentTypeProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ContentTypeProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ContentType.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class ContentTypeProto { @@ -90,7 +91,7 @@ public enum ContentType public final int getNumber() { if (this == UNRECOGNIZED) { - throw new java.lang.IllegalArgumentException( + throw new IllegalArgumentException( "Can't get the number of an unknown enum value."); } return value; @@ -101,7 +102,7 @@ public final int getNumber() { * @return The enum associated with the given numeric wire value. * @deprecated Use {@link #forNumber(int)} instead. */ - @java.lang.Deprecated + @Deprecated public static ContentType valueOf(int value) { return forNumber(value); } @@ -139,7 +140,7 @@ public ContentType findValueByNumber(int number) { public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { if (this == UNRECOGNIZED) { - throw new java.lang.IllegalStateException( + throw new IllegalStateException( "Can't get the descriptor of an unrecognized enum value."); } return getDescriptor().getValues().get(ordinal()); @@ -150,7 +151,7 @@ public ContentType findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.ContentTypeProto.getDescriptor().getEnumTypes().get(0); + return ContentTypeProto.getDescriptor().getEnumTypes().get(0); } private static final ContentType[] VALUES = values(); @@ -158,7 +159,7 @@ public ContentType findValueByNumber(int number) { public static ContentType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( + throw new IllegalArgumentException( "EnumValueDescriptor is not for this type."); } if (desc.getIndex() == -1) { @@ -184,7 +185,7 @@ private ContentType(int value) { private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\021ContentType.proto\022\rattrpubapi_v1*i\n\013Co" + "ntentType\022\r\n\tUNDEFINED\020\000\022\n\n\006STRING\020\001\022\010\n\004" + "JPEG\020\002\022\010\n\004DATE\020\003\022\007\n\003PNG\020\004\022\010\n\004JSON\020\005\022\017\n\013M" + diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/DataEntryProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/DataEntryProto.java index 44bd340de..bf80aaf30 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/DataEntryProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/DataEntryProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: DataEntry.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class DataEntryProto { @@ -27,7 +28,7 @@ public interface DataEntryOrBuilder extends * .sharepubapi_v1.DataEntry.Type type = 1; * @return The type. */ - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type getType(); + DataEntry.Type getType(); /** * bytes value = 2; @@ -52,77 +53,24 @@ private DataEntry() { value_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new DataEntry(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private DataEntry( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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: { - int rawValue = input.readEnum(); - - type_ = rawValue; - break; - } - case 18: { - - value_ = input.readBytes(); - 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.yoti.api.client.spi.remote.proto.DataEntryProto.internal_static_sharepubapi_v1_DataEntry_descriptor; + return DataEntryProto.internal_static_sharepubapi_v1_DataEntry_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.DataEntryProto.internal_static_sharepubapi_v1_DataEntry_fieldAccessorTable + return DataEntryProto.internal_static_sharepubapi_v1_DataEntry_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.class, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder.class); + DataEntry.class, Builder.class); } /** @@ -193,7 +141,7 @@ public enum Type public final int getNumber() { if (this == UNRECOGNIZED) { - throw new java.lang.IllegalArgumentException( + throw new IllegalArgumentException( "Can't get the number of an unknown enum value."); } return value; @@ -204,7 +152,7 @@ public final int getNumber() { * @return The enum associated with the given numeric wire value. * @deprecated Use {@link #forNumber(int)} instead. */ - @java.lang.Deprecated + @Deprecated public static Type valueOf(int value) { return forNumber(value); } @@ -241,7 +189,7 @@ public Type findValueByNumber(int number) { public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { if (this == UNRECOGNIZED) { - throw new java.lang.IllegalStateException( + throw new IllegalStateException( "Can't get the descriptor of an unrecognized enum value."); } return getDescriptor().getValues().get(ordinal()); @@ -252,7 +200,7 @@ public Type findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.getDescriptor().getEnumTypes().get(0); + return DataEntry.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -260,7 +208,7 @@ public Type findValueByNumber(int number) { public static Type valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( + throw new IllegalArgumentException( "EnumValueDescriptor is not for this type."); } if (desc.getIndex() == -1) { @@ -279,37 +227,36 @@ private Type(int value) { } public static final int TYPE_FIELD_NUMBER = 1; - private int type_; + private int type_ = 0; /** * .sharepubapi_v1.DataEntry.Type type = 1; * @return The enum numeric value on the wire for type. */ - @java.lang.Override public int getTypeValue() { + @Override public int getTypeValue() { return type_; } /** * .sharepubapi_v1.DataEntry.Type type = 1; * @return The type. */ - @java.lang.Override public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type getType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type result = com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type.valueOf(type_); - return result == null ? com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type.UNRECOGNIZED : result; + @Override public Type getType() { + Type result = Type.forNumber(type_); + return result == null ? Type.UNRECOGNIZED : result; } public static final int VALUE_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString value_; + private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; /** * bytes value = 2; * @return The value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValue() { return value_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -319,25 +266,25 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (type_ != com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type.UNDEFINED.getNumber()) { + if (type_ != Type.UNDEFINED.getNumber()) { output.writeEnum(1, type_); } if (!value_.isEmpty()) { output.writeBytes(2, value_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; size = 0; - if (type_ != com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type.UNDEFINED.getNumber()) { + if (type_ != Type.UNDEFINED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, type_); } @@ -345,29 +292,29 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, value_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry)) { + if (!(obj instanceof DataEntry)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry other = (com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry) obj; + DataEntry other = (DataEntry) obj; if (type_ != other.type_) return false; if (!getValue() .equals(other.getValue())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -378,74 +325,76 @@ public int hashCode() { hash = (53 * hash) + type_; hash = (37 * hash) + VALUE_FIELD_NUMBER; hash = (53 * hash) + getValue().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom(byte[] data) + public static DataEntry parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom(java.io.InputStream input) + public static DataEntry parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry 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.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseDelimitedFrom(java.io.InputStream input) + + public static DataEntry parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseDelimitedFrom( + + public static DataEntry 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.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parseFrom( + public static DataEntry parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -453,23 +402,23 @@ public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry pars .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry prototype) { + public static Builder newBuilder(DataEntry prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -479,159 +428,186 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:sharepubapi_v1.DataEntry) - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder { + DataEntryOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.DataEntryProto.internal_static_sharepubapi_v1_DataEntry_descriptor; + return DataEntryProto.internal_static_sharepubapi_v1_DataEntry_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.DataEntryProto.internal_static_sharepubapi_v1_DataEntry_fieldAccessorTable + return DataEntryProto.internal_static_sharepubapi_v1_DataEntry_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.class, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder.class); + DataEntry.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; type_ = 0; - value_ = com.google.protobuf.ByteString.EMPTY; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.DataEntryProto.internal_static_sharepubapi_v1_DataEntry_descriptor; + return DataEntryProto.internal_static_sharepubapi_v1_DataEntry_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.getDefaultInstance(); + @Override + public DataEntry getDefaultInstanceForType() { + return DataEntry.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry build() { - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry result = buildPartial(); + @Override + public DataEntry build() { + DataEntry result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry buildPartial() { - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry result = new com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry(this); - result.type_ = type_; - result.value_ = value_; + @Override + public DataEntry buildPartial() { + DataEntry result = new DataEntry(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(DataEntry result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.value_ = value_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry)other); + if (other instanceof DataEntry) { + return mergeFrom((DataEntry)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry other) { - if (other == com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.getDefaultInstance()) return this; + public Builder mergeFrom(DataEntry other) { + if (other == DataEntry.getDefaultInstance()) return this; if (other.type_ != 0) { setTypeValue(other.getTypeValue()); } if (other.getValue() != com.google.protobuf.ByteString.EMPTY) { setValue(other.getValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + type_ = input.readEnum(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + value_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; private int type_ = 0; /** * .sharepubapi_v1.DataEntry.Type type = 1; * @return The enum numeric value on the wire for type. */ - @java.lang.Override public int getTypeValue() { + @Override public int getTypeValue() { return type_; } /** @@ -640,8 +616,8 @@ public Builder mergeFrom( * @return This builder for chaining. */ public Builder setTypeValue(int value) { - type_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -649,22 +625,21 @@ public Builder setTypeValue(int value) { * .sharepubapi_v1.DataEntry.Type type = 1; * @return The type. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type getType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type result = com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type.valueOf(type_); - return result == null ? com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type.UNRECOGNIZED : result; + @Override + public Type getType() { + Type result = Type.forNumber(type_); + return result == null ? Type.UNRECOGNIZED : result; } /** * .sharepubapi_v1.DataEntry.Type type = 1; * @param value The type to set. * @return This builder for chaining. */ - public Builder setType(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Type value) { + public Builder setType(Type value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; type_ = value.getNumber(); onChanged(); return this; @@ -674,7 +649,7 @@ public Builder setType(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataE * @return This builder for chaining. */ public Builder clearType() { - + bitField0_ = (bitField0_ & ~0x00000001); type_ = 0; onChanged(); return this; @@ -685,7 +660,7 @@ public Builder clearType() { * bytes value = 2; * @return The value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValue() { return value_; } @@ -695,11 +670,9 @@ public com.google.protobuf.ByteString getValue() { * @return This builder for chaining. */ public Builder setValue(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } value_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -708,18 +681,18 @@ public Builder setValue(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearValue() { - + bitField0_ = (bitField0_ & ~0x00000002); value_ = getDefaultInstance().getValue(); onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -730,23 +703,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:sharepubapi_v1.DataEntry) - private static final com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry DEFAULT_INSTANCE; + private static final DataEntry DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry(); + DEFAULT_INSTANCE = new DataEntry(); } - public static com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getDefaultInstance() { + public static DataEntry getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public DataEntry parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DataEntry(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -754,13 +738,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getDefaultInstanceForType() { + @Override + public DataEntry getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -779,7 +763,7 @@ public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getDefaultI private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\017DataEntry.proto\022\016sharepubapi_v1\"\335\001\n\tDa" + "taEntry\022,\n\004type\030\001 \001(\0162\036.sharepubapi_v1.D" + "ataEntry.Type\022\r\n\005value\030\002 \001(\014\"\222\001\n\004Type\022\r\n" + @@ -803,7 +787,7 @@ public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getDefaultI internal_static_sharepubapi_v1_DataEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_sharepubapi_v1_DataEntry_descriptor, - new java.lang.String[] { "Type", "Value", }); + new String[] { "Type", "Value", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/EncryptedDataProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/EncryptedDataProto.java index 442236ed9..a3836496a 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/EncryptedDataProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/EncryptedDataProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: EncryptedData.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class EncryptedDataProto { @@ -47,102 +48,50 @@ private EncryptedData() { cipherText_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new EncryptedData(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private EncryptedData( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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: { - - iv_ = input.readBytes(); - break; - } - case 18: { - - cipherText_ = input.readBytes(); - 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.yoti.api.client.spi.remote.proto.EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_descriptor; + return EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_fieldAccessorTable + return EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.class, com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.Builder.class); + EncryptedData.class, Builder.class); } public static final int IV_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString iv_; + private com.google.protobuf.ByteString iv_ = com.google.protobuf.ByteString.EMPTY; /** * bytes iv = 1; * @return The iv. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getIv() { return iv_; } public static final int CIPHER_TEXT_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString cipherText_; + private com.google.protobuf.ByteString cipherText_ = com.google.protobuf.ByteString.EMPTY; /** * bytes cipher_text = 2; * @return The cipherText. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getCipherText() { return cipherText_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -152,7 +101,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!iv_.isEmpty()) { @@ -161,10 +110,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!cipherText_.isEmpty()) { output.writeBytes(2, cipherText_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -178,30 +127,30 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, cipherText_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData)) { + if (!(obj instanceof EncryptedData)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData other = (com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData) obj; + EncryptedData other = (EncryptedData) obj; if (!getIv() .equals(other.getIv())) return false; if (!getCipherText() .equals(other.getCipherText())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -212,74 +161,76 @@ public int hashCode() { hash = (53 * hash) + getIv().hashCode(); hash = (37 * hash) + CIPHER_TEXT_FIELD_NUMBER; hash = (53 * hash) + getCipherText().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom(byte[] data) + public static EncryptedData parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom(java.io.InputStream input) + public static EncryptedData parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData 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.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseDelimitedFrom(java.io.InputStream input) + + public static EncryptedData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseDelimitedFrom( + + public static EncryptedData 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.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parseFrom( + public static EncryptedData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -287,23 +238,23 @@ public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedD .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData prototype) { + public static Builder newBuilder(EncryptedData prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -313,159 +264,186 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compubapi_v1.EncryptedData) - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedDataOrBuilder { + EncryptedDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_descriptor; + return EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_fieldAccessorTable + return EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.class, com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.Builder.class); + EncryptedData.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; iv_ = com.google.protobuf.ByteString.EMPTY; - cipherText_ = com.google.protobuf.ByteString.EMPTY; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_descriptor; + return EncryptedDataProto.internal_static_compubapi_v1_EncryptedData_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.getDefaultInstance(); + @Override + public EncryptedData getDefaultInstanceForType() { + return EncryptedData.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData build() { - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData result = buildPartial(); + @Override + public EncryptedData build() { + EncryptedData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData buildPartial() { - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData result = new com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData(this); - result.iv_ = iv_; - result.cipherText_ = cipherText_; + @Override + public EncryptedData buildPartial() { + EncryptedData result = new EncryptedData(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(EncryptedData result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.iv_ = iv_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.cipherText_ = cipherText_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData)other); + if (other instanceof EncryptedData) { + return mergeFrom((EncryptedData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData other) { - if (other == com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData.getDefaultInstance()) return this; + public Builder mergeFrom(EncryptedData other) { + if (other == EncryptedData.getDefaultInstance()) return this; if (other.getIv() != com.google.protobuf.ByteString.EMPTY) { setIv(other.getIv()); } if (other.getCipherText() != com.google.protobuf.ByteString.EMPTY) { setCipherText(other.getCipherText()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + iv_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + cipherText_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; private com.google.protobuf.ByteString iv_ = com.google.protobuf.ByteString.EMPTY; /** * bytes iv = 1; * @return The iv. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getIv() { return iv_; } @@ -475,11 +453,9 @@ public com.google.protobuf.ByteString getIv() { * @return This builder for chaining. */ public Builder setIv(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } iv_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -488,7 +464,7 @@ public Builder setIv(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearIv() { - + bitField0_ = (bitField0_ & ~0x00000001); iv_ = getDefaultInstance().getIv(); onChanged(); return this; @@ -499,7 +475,7 @@ public Builder clearIv() { * bytes cipher_text = 2; * @return The cipherText. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getCipherText() { return cipherText_; } @@ -509,11 +485,9 @@ public com.google.protobuf.ByteString getCipherText() { * @return This builder for chaining. */ public Builder setCipherText(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } cipherText_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -522,18 +496,18 @@ public Builder setCipherText(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearCipherText() { - + bitField0_ = (bitField0_ & ~0x00000002); cipherText_ = getDefaultInstance().getCipherText(); onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -544,23 +518,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compubapi_v1.EncryptedData) - private static final com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData DEFAULT_INSTANCE; + private static final EncryptedData DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData(); + DEFAULT_INSTANCE = new EncryptedData(); } - public static com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData getDefaultInstance() { + public static EncryptedData getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public EncryptedData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EncryptedData(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -568,13 +553,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData getDefaultInstanceForType() { + @Override + public EncryptedData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -593,7 +578,7 @@ public com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData get private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\023EncryptedData.proto\022\014compubapi_v1\"0\n\rE" + "ncryptedData\022\n\n\002iv\030\001 \001(\014\022\023\n\013cipher_text\030" + "\002 \001(\014B\342\001\n$com.yoti.api.client.spi.remote" + @@ -613,7 +598,7 @@ public com.yoti.api.client.spi.remote.proto.EncryptedDataProto.EncryptedData get internal_static_compubapi_v1_EncryptedData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compubapi_v1_EncryptedData_descriptor, - new java.lang.String[] { "Iv", "CipherText", }); + new String[] { "Iv", "CipherText", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ExtraDataProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ExtraDataProto.java index b64b25075..3cee6c071 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ExtraDataProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ExtraDataProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ExtraData.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class ExtraDataProto { @@ -21,12 +22,12 @@ public interface ExtraDataOrBuilder extends /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - java.util.List + java.util.List getListList(); /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getList(int index); + DataEntryProto.DataEntry getList(int index); /** * repeated .sharepubapi_v1.DataEntry list = 1; */ @@ -34,12 +35,12 @@ public interface ExtraDataOrBuilder extends /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - java.util.List + java.util.List getListOrBuilderList(); /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder getListOrBuilder( + DataEntryProto.DataEntryOrBuilder getListOrBuilder( int index); } /** @@ -58,123 +59,69 @@ private ExtraData() { list_ = java.util.Collections.emptyList(); } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new ExtraData(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ExtraData( - 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: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - list_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - list_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.parser(), extensionRegistry)); - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - list_ = java.util.Collections.unmodifiableList(list_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_descriptor; + return ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_fieldAccessorTable + return ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.class, com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.Builder.class); + ExtraData.class, Builder.class); } public static final int LIST_FIELD_NUMBER = 1; - private java.util.List list_; + @SuppressWarnings("serial") + private java.util.List list_; /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - @java.lang.Override - public java.util.List getListList() { + @Override + public java.util.List getListList() { return list_; } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getListOrBuilderList() { return list_; } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - @java.lang.Override + @Override public int getListCount() { return list_.size(); } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getList(int index) { + @Override + public DataEntryProto.DataEntry getList(int index) { return list_.get(index); } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder getListOrBuilder( + @Override + public DataEntryProto.DataEntryOrBuilder getListOrBuilder( int index) { return list_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -184,16 +131,16 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < list_.size(); i++) { output.writeMessage(1, list_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -203,28 +150,28 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, list_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData)) { + if (!(obj instanceof ExtraData)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData other = (com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData) obj; + ExtraData other = (ExtraData) obj; if (!getListList() .equals(other.getListList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -235,74 +182,76 @@ public int hashCode() { hash = (37 * hash) + LIST_FIELD_NUMBER; hash = (53 * hash) + getListList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom(byte[] data) + public static ExtraData parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom(java.io.InputStream input) + public static ExtraData parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData 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.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseDelimitedFrom(java.io.InputStream input) + + public static ExtraData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseDelimitedFrom( + + public static ExtraData 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.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parseFrom( + public static ExtraData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -310,23 +259,23 @@ public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData pars .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData prototype) { + public static Builder newBuilder(ExtraData prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -336,72 +285,74 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:sharepubapi_v1.ExtraData) - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraDataOrBuilder { + ExtraDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_descriptor; + return ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_fieldAccessorTable + return ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.class, com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.Builder.class); + ExtraData.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getListFieldBuilder(); - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; if (listBuilder_ == null) { list_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + list_ = null; listBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_descriptor; + return ExtraDataProto.internal_static_sharepubapi_v1_ExtraData_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.getDefaultInstance(); + @Override + public ExtraData getDefaultInstanceForType() { + return ExtraData.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData build() { - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData result = buildPartial(); + @Override + public ExtraData build() { + ExtraData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData buildPartial() { - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData result = new com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData(this); - int from_bitField0_ = bitField0_; + @Override + public ExtraData buildPartial() { + ExtraData result = new ExtraData(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(ExtraData result) { if (listBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { list_ = java.util.Collections.unmodifiableList(list_); @@ -411,54 +362,56 @@ public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData buildPartia } else { result.list_ = listBuilder_.build(); } - onBuilt(); - return result; } - @java.lang.Override + private void buildPartial0(ExtraData result) { + int from_bitField0_ = bitField0_; + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData)other); + if (other instanceof ExtraData) { + return mergeFrom((ExtraData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData other) { - if (other == com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData.getDefaultInstance()) return this; + public Builder mergeFrom(ExtraData other) { + if (other == ExtraData.getDefaultInstance()) return this; if (listBuilder_ == null) { if (!other.list_.isEmpty()) { if (list_.isEmpty()) { @@ -485,52 +438,78 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.ExtraDataProto.Ext } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + DataEntryProto.DataEntry m = + input.readMessage( + DataEntryProto.DataEntry.parser(), + extensionRegistry); + if (listBuilder_ == null) { + ensureListIsMutable(); + list_.add(m); + } else { + listBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private java.util.List list_ = + private java.util.List list_ = java.util.Collections.emptyList(); private void ensureListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - list_ = new java.util.ArrayList(list_); + list_ = new java.util.ArrayList(list_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder> listBuilder_; + DataEntryProto.DataEntry, DataEntryProto.DataEntry.Builder, DataEntryProto.DataEntryOrBuilder> listBuilder_; /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public java.util.List getListList() { + public java.util.List getListList() { if (listBuilder_ == null) { return java.util.Collections.unmodifiableList(list_); } else { @@ -550,7 +529,7 @@ public int getListCount() { /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getList(int index) { + public DataEntryProto.DataEntry getList(int index) { if (listBuilder_ == null) { return list_.get(index); } else { @@ -561,7 +540,7 @@ public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry getList(int * repeated .sharepubapi_v1.DataEntry list = 1; */ public Builder setList( - int index, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry value) { + int index, DataEntryProto.DataEntry value) { if (listBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -578,7 +557,7 @@ public Builder setList( * repeated .sharepubapi_v1.DataEntry list = 1; */ public Builder setList( - int index, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder builderForValue) { + int index, DataEntryProto.DataEntry.Builder builderForValue) { if (listBuilder_ == null) { ensureListIsMutable(); list_.set(index, builderForValue.build()); @@ -591,7 +570,7 @@ public Builder setList( /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public Builder addList(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry value) { + public Builder addList(DataEntryProto.DataEntry value) { if (listBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -608,7 +587,7 @@ public Builder addList(com.yoti.api.client.spi.remote.proto.DataEntryProto.DataE * repeated .sharepubapi_v1.DataEntry list = 1; */ public Builder addList( - int index, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry value) { + int index, DataEntryProto.DataEntry value) { if (listBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -625,7 +604,7 @@ public Builder addList( * repeated .sharepubapi_v1.DataEntry list = 1; */ public Builder addList( - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder builderForValue) { + DataEntryProto.DataEntry.Builder builderForValue) { if (listBuilder_ == null) { ensureListIsMutable(); list_.add(builderForValue.build()); @@ -639,7 +618,7 @@ public Builder addList( * repeated .sharepubapi_v1.DataEntry list = 1; */ public Builder addList( - int index, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder builderForValue) { + int index, DataEntryProto.DataEntry.Builder builderForValue) { if (listBuilder_ == null) { ensureListIsMutable(); list_.add(index, builderForValue.build()); @@ -653,7 +632,7 @@ public Builder addList( * repeated .sharepubapi_v1.DataEntry list = 1; */ public Builder addAllList( - java.lang.Iterable values) { + Iterable values) { if (listBuilder_ == null) { ensureListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -693,14 +672,14 @@ public Builder removeList(int index) { /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder getListBuilder( + public DataEntryProto.DataEntry.Builder getListBuilder( int index) { return getListFieldBuilder().getBuilder(index); } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder getListOrBuilder( + public DataEntryProto.DataEntryOrBuilder getListOrBuilder( int index) { if (listBuilder_ == null) { return list_.get(index); } else { @@ -710,7 +689,7 @@ public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder ge /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public java.util.List + public java.util.List getListOrBuilderList() { if (listBuilder_ != null) { return listBuilder_.getMessageOrBuilderList(); @@ -721,31 +700,31 @@ public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder ge /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder addListBuilder() { + public DataEntryProto.DataEntry.Builder addListBuilder() { return getListFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.getDefaultInstance()); + DataEntryProto.DataEntry.getDefaultInstance()); } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder addListBuilder( + public DataEntryProto.DataEntry.Builder addListBuilder( int index) { return getListFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.getDefaultInstance()); + index, DataEntryProto.DataEntry.getDefaultInstance()); } /** * repeated .sharepubapi_v1.DataEntry list = 1; */ - public java.util.List + public java.util.List getListBuilderList() { return getListFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder> + DataEntryProto.DataEntry, DataEntryProto.DataEntry.Builder, DataEntryProto.DataEntryOrBuilder> getListFieldBuilder() { if (listBuilder_ == null) { listBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder, com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntryOrBuilder>( + DataEntryProto.DataEntry, DataEntryProto.DataEntry.Builder, DataEntryProto.DataEntryOrBuilder>( list_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), @@ -754,13 +733,13 @@ public com.yoti.api.client.spi.remote.proto.DataEntryProto.DataEntry.Builder add } return listBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -771,23 +750,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:sharepubapi_v1.ExtraData) - private static final com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData DEFAULT_INSTANCE; + private static final ExtraData DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData(); + DEFAULT_INSTANCE = new ExtraData(); } - public static com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData getDefaultInstance() { + public static ExtraData getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public ExtraData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ExtraData(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -795,13 +785,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData getDefaultInstanceForType() { + @Override + public ExtraData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -820,7 +810,7 @@ public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData getDefaultI private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\017ExtraData.proto\022\016sharepubapi_v1\032\017DataE" + "ntry.proto\"4\n\tExtraData\022\'\n\004list\030\001 \003(\0132\031." + "sharepubapi_v1.DataEntryB\345\001\n$com.yoti.ap" + @@ -834,15 +824,15 @@ public com.yoti.api.client.spi.remote.proto.ExtraDataProto.ExtraData getDefaultI descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.yoti.api.client.spi.remote.proto.DataEntryProto.getDescriptor(), + DataEntryProto.getDescriptor(), }); internal_static_sharepubapi_v1_ExtraData_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_sharepubapi_v1_ExtraData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_sharepubapi_v1_ExtraData_descriptor, - new java.lang.String[] { "List", }); - com.yoti.api.client.spi.remote.proto.DataEntryProto.getDescriptor(); + new String[] { "List", }); + DataEntryProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/IssuingAttributesProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/IssuingAttributesProto.java index 2dfe49975..771b8ef91 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/IssuingAttributesProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/IssuingAttributesProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: IssuingAttributes.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class IssuingAttributesProto { @@ -22,7 +23,7 @@ public interface IssuingAttributesOrBuilder extends * string expiry_date = 1; * @return The expiryDate. */ - java.lang.String getExpiryDate(); + String getExpiryDate(); /** * string expiry_date = 1; * @return The bytes for expiryDate. @@ -33,12 +34,12 @@ public interface IssuingAttributesOrBuilder extends /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - java.util.List + java.util.List getDefinitionsList(); /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition getDefinitions(int index); + Definition getDefinitions(int index); /** * repeated .sharepubapi_v1.Definition definitions = 2; */ @@ -46,12 +47,12 @@ public interface IssuingAttributesOrBuilder extends /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - java.util.List + java.util.List getDefinitionsOrBuilderList(); /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder getDefinitionsOrBuilder( + DefinitionOrBuilder getDefinitionsOrBuilder( int index); } /** @@ -71,102 +72,42 @@ private IssuingAttributes() { definitions_ = java.util.Collections.emptyList(); } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new IssuingAttributes(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private IssuingAttributes( - 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(); - - expiryDate_ = s; - break; - } - case 18: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - definitions_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - definitions_.add( - input.readMessage(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.parser(), extensionRegistry)); - 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 { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - definitions_ = java.util.Collections.unmodifiableList(definitions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_descriptor; + return IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_fieldAccessorTable + return IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.class, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder.class); + IssuingAttributes.class, Builder.class); } public static final int EXPIRY_DATE_FIELD_NUMBER = 1; - private volatile java.lang.Object expiryDate_; + @SuppressWarnings("serial") + private volatile Object expiryDate_ = ""; /** * string expiry_date = 1; * @return The expiryDate. */ - @java.lang.Override - public java.lang.String getExpiryDate() { - java.lang.Object ref = expiryDate_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getExpiryDate() { + Object ref = expiryDate_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); expiryDate_ = s; return s; } @@ -175,14 +116,14 @@ public java.lang.String getExpiryDate() { * string expiry_date = 1; * @return The bytes for expiryDate. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getExpiryDateBytes() { - java.lang.Object ref = expiryDate_; - if (ref instanceof java.lang.String) { + Object ref = expiryDate_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); expiryDate_ = b; return b; } else { @@ -191,47 +132,48 @@ public java.lang.String getExpiryDate() { } public static final int DEFINITIONS_FIELD_NUMBER = 2; - private java.util.List definitions_; + @SuppressWarnings("serial") + private java.util.List definitions_; /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - @java.lang.Override - public java.util.List getDefinitionsList() { + @Override + public java.util.List getDefinitionsList() { return definitions_; } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - @java.lang.Override - public java.util.List + @Override + public java.util.List getDefinitionsOrBuilderList() { return definitions_; } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - @java.lang.Override + @Override public int getDefinitionsCount() { return definitions_.size(); } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition getDefinitions(int index) { + @Override + public Definition getDefinitions(int index) { return definitions_.get(index); } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder getDefinitionsOrBuilder( + @Override + public DefinitionOrBuilder getDefinitionsOrBuilder( int index) { return definitions_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -241,7 +183,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(expiryDate_)) { @@ -250,10 +192,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < definitions_.size(); i++) { output.writeMessage(2, definitions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -266,30 +208,30 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, definitions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes)) { + if (!(obj instanceof IssuingAttributes)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes other = (com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes) obj; + IssuingAttributes other = (IssuingAttributes) obj; if (!getExpiryDate() .equals(other.getExpiryDate())) return false; if (!getDefinitionsList() .equals(other.getDefinitionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -302,74 +244,76 @@ public int hashCode() { hash = (37 * hash) + DEFINITIONS_FIELD_NUMBER; hash = (53 * hash) + getDefinitionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom(byte[] data) + public static IssuingAttributes parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom(java.io.InputStream input) + public static IssuingAttributes parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes 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.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseDelimitedFrom(java.io.InputStream input) + + public static IssuingAttributes parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseDelimitedFrom( + + public static IssuingAttributes 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.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parseFrom( + public static IssuingAttributes parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -377,23 +321,23 @@ public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Issuin .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes prototype) { + public static Builder newBuilder(IssuingAttributes prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -403,141 +347,147 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:sharepubapi_v1.IssuingAttributes) - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder { + IssuingAttributesOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_descriptor; + return IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_fieldAccessorTable + return IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.class, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder.class); + IssuingAttributes.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getDefinitionsFieldBuilder(); - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; expiryDate_ = ""; - if (definitionsBuilder_ == null) { definitions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + definitions_ = null; definitionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_descriptor; + return IssuingAttributesProto.internal_static_sharepubapi_v1_IssuingAttributes_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.getDefaultInstance(); + @Override + public IssuingAttributes getDefaultInstanceForType() { + return IssuingAttributes.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes build() { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes result = buildPartial(); + @Override + public IssuingAttributes build() { + IssuingAttributes result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes buildPartial() { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes result = new com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes(this); - int from_bitField0_ = bitField0_; - result.expiryDate_ = expiryDate_; + @Override + public IssuingAttributes buildPartial() { + IssuingAttributes result = new IssuingAttributes(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(IssuingAttributes result) { if (definitionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { definitions_ = java.util.Collections.unmodifiableList(definitions_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.definitions_ = definitions_; } else { result.definitions_ = definitionsBuilder_.build(); } - onBuilt(); - return result; } - @java.lang.Override + private void buildPartial0(IssuingAttributes result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.expiryDate_ = expiryDate_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes)other); + if (other instanceof IssuingAttributes) { + return mergeFrom((IssuingAttributes)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes other) { - if (other == com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.getDefaultInstance()) return this; + public Builder mergeFrom(IssuingAttributes other) { + if (other == IssuingAttributes.getDefaultInstance()) return this; if (!other.getExpiryDate().isEmpty()) { expiryDate_ = other.expiryDate_; + bitField0_ |= 0x00000001; onChanged(); } if (definitionsBuilder_ == null) { if (!other.definitions_.isEmpty()) { if (definitions_.isEmpty()) { definitions_ = other.definitions_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureDefinitionsIsMutable(); definitions_.addAll(other.definitions_); @@ -550,7 +500,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.IssuingAttributesP definitionsBuilder_.dispose(); definitionsBuilder_ = null; definitions_ = other.definitions_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); definitionsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getDefinitionsFieldBuilder() : null; @@ -559,51 +509,82 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.IssuingAttributesP } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + expiryDate_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + Definition m = + input.readMessage( + Definition.parser(), + extensionRegistry); + if (definitionsBuilder_ == null) { + ensureDefinitionsIsMutable(); + definitions_.add(m); + } else { + definitionsBuilder_.addMessage(m); + } + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; - private java.lang.Object expiryDate_ = ""; + private Object expiryDate_ = ""; /** * string expiry_date = 1; * @return The expiryDate. */ - public java.lang.String getExpiryDate() { - java.lang.Object ref = expiryDate_; - if (!(ref instanceof java.lang.String)) { + public String getExpiryDate() { + Object ref = expiryDate_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); expiryDate_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -612,11 +593,11 @@ public java.lang.String getExpiryDate() { */ public com.google.protobuf.ByteString getExpiryDateBytes() { - java.lang.Object ref = expiryDate_; + Object ref = expiryDate_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); expiryDate_ = b; return b; } else { @@ -629,12 +610,10 @@ public java.lang.String getExpiryDate() { * @return This builder for chaining. */ public Builder setExpiryDate( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } expiryDate_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -643,8 +622,8 @@ public Builder setExpiryDate( * @return This builder for chaining. */ public Builder clearExpiryDate() { - expiryDate_ = getDefaultInstance().getExpiryDate(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -655,32 +634,30 @@ public Builder clearExpiryDate() { */ public Builder setExpiryDateBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); expiryDate_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } - private java.util.List definitions_ = + private java.util.List definitions_ = java.util.Collections.emptyList(); private void ensureDefinitionsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - definitions_ = new java.util.ArrayList(definitions_); - bitField0_ |= 0x00000001; + if (!((bitField0_ & 0x00000002) != 0)) { + definitions_ = new java.util.ArrayList(definitions_); + bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder> definitionsBuilder_; + Definition, Definition.Builder, DefinitionOrBuilder> definitionsBuilder_; /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public java.util.List getDefinitionsList() { + public java.util.List getDefinitionsList() { if (definitionsBuilder_ == null) { return java.util.Collections.unmodifiableList(definitions_); } else { @@ -700,7 +677,7 @@ public int getDefinitionsCount() { /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition getDefinitions(int index) { + public Definition getDefinitions(int index) { if (definitionsBuilder_ == null) { return definitions_.get(index); } else { @@ -711,7 +688,7 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition ge * repeated .sharepubapi_v1.Definition definitions = 2; */ public Builder setDefinitions( - int index, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition value) { + int index, Definition value) { if (definitionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -728,7 +705,7 @@ public Builder setDefinitions( * repeated .sharepubapi_v1.Definition definitions = 2; */ public Builder setDefinitions( - int index, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder builderForValue) { + int index, Definition.Builder builderForValue) { if (definitionsBuilder_ == null) { ensureDefinitionsIsMutable(); definitions_.set(index, builderForValue.build()); @@ -741,7 +718,7 @@ public Builder setDefinitions( /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public Builder addDefinitions(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition value) { + public Builder addDefinitions(Definition value) { if (definitionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -758,7 +735,7 @@ public Builder addDefinitions(com.yoti.api.client.spi.remote.proto.IssuingAttrib * repeated .sharepubapi_v1.Definition definitions = 2; */ public Builder addDefinitions( - int index, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition value) { + int index, Definition value) { if (definitionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -775,7 +752,7 @@ public Builder addDefinitions( * repeated .sharepubapi_v1.Definition definitions = 2; */ public Builder addDefinitions( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder builderForValue) { + Definition.Builder builderForValue) { if (definitionsBuilder_ == null) { ensureDefinitionsIsMutable(); definitions_.add(builderForValue.build()); @@ -789,7 +766,7 @@ public Builder addDefinitions( * repeated .sharepubapi_v1.Definition definitions = 2; */ public Builder addDefinitions( - int index, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder builderForValue) { + int index, Definition.Builder builderForValue) { if (definitionsBuilder_ == null) { ensureDefinitionsIsMutable(); definitions_.add(index, builderForValue.build()); @@ -803,7 +780,7 @@ public Builder addDefinitions( * repeated .sharepubapi_v1.Definition definitions = 2; */ public Builder addAllDefinitions( - java.lang.Iterable values) { + Iterable values) { if (definitionsBuilder_ == null) { ensureDefinitionsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -820,7 +797,7 @@ public Builder addAllDefinitions( public Builder clearDefinitions() { if (definitionsBuilder_ == null) { definitions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { definitionsBuilder_.clear(); @@ -843,14 +820,14 @@ public Builder removeDefinitions(int index) { /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder getDefinitionsBuilder( + public Definition.Builder getDefinitionsBuilder( int index) { return getDefinitionsFieldBuilder().getBuilder(index); } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder getDefinitionsOrBuilder( + public DefinitionOrBuilder getDefinitionsOrBuilder( int index) { if (definitionsBuilder_ == null) { return definitions_.get(index); } else { @@ -860,7 +837,7 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrB /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public java.util.List + public java.util.List getDefinitionsOrBuilderList() { if (definitionsBuilder_ != null) { return definitionsBuilder_.getMessageOrBuilderList(); @@ -871,46 +848,46 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrB /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder addDefinitionsBuilder() { + public Definition.Builder addDefinitionsBuilder() { return getDefinitionsFieldBuilder().addBuilder( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.getDefaultInstance()); + Definition.getDefaultInstance()); } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder addDefinitionsBuilder( + public Definition.Builder addDefinitionsBuilder( int index) { return getDefinitionsFieldBuilder().addBuilder( - index, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.getDefaultInstance()); + index, Definition.getDefaultInstance()); } /** * repeated .sharepubapi_v1.Definition definitions = 2; */ - public java.util.List + public java.util.List getDefinitionsBuilderList() { return getDefinitionsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder> + Definition, Definition.Builder, DefinitionOrBuilder> getDefinitionsFieldBuilder() { if (definitionsBuilder_ == null) { definitionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder>( + Definition, Definition.Builder, DefinitionOrBuilder>( definitions_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); definitions_ = null; } return definitionsBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -921,23 +898,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:sharepubapi_v1.IssuingAttributes) - private static final com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes DEFAULT_INSTANCE; + private static final IssuingAttributes DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes(); + DEFAULT_INSTANCE = new IssuingAttributes(); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes getDefaultInstance() { + public static IssuingAttributes getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public IssuingAttributes parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new IssuingAttributes(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -945,13 +933,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes getDefaultInstanceForType() { + @Override + public IssuingAttributes getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -965,7 +953,7 @@ public interface DefinitionOrBuilder extends * string name = 1; * @return The name. */ - java.lang.String getName(); + String getName(); /** * string name = 1; * @return The bytes for name. @@ -989,89 +977,42 @@ private Definition() { name_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new Definition(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Definition( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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(); - - name_ = s; - 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.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_descriptor; + return IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_fieldAccessorTable + return IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.class, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder.class); + Definition.class, Builder.class); } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile Object name_ = ""; /** * string name = 1; * @return The name. */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getName() { + Object ref = name_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); name_ = s; return s; } @@ -1080,14 +1021,14 @@ public java.lang.String getName() { * string name = 1; * @return The bytes for name. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { + Object ref = name_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); name_ = b; return b; } else { @@ -1096,7 +1037,7 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1106,16 +1047,16 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1124,28 +1065,28 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition)) { + if (!(obj instanceof Definition)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition other = (com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition) obj; + Definition other = (Definition) obj; if (!getName() .equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -1154,74 +1095,76 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom(byte[] data) + public static Definition parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom(java.io.InputStream input) + public static Definition parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition 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.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseDelimitedFrom(java.io.InputStream input) + + public static Definition parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseDelimitedFrom( + + public static Definition 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.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parseFrom( + public static Definition parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1229,23 +1172,23 @@ public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Defini .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition prototype) { + public static Builder newBuilder(Definition prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -1255,163 +1198,185 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:sharepubapi_v1.Definition) - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.DefinitionOrBuilder { + DefinitionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_descriptor; + return IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_fieldAccessorTable + return IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.class, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.Builder.class); + Definition.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_descriptor; + return IssuingAttributesProto.internal_static_sharepubapi_v1_Definition_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.getDefaultInstance(); + @Override + public Definition getDefaultInstanceForType() { + return Definition.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition build() { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition result = buildPartial(); + @Override + public Definition build() { + Definition result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition buildPartial() { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition result = new com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition(this); - result.name_ = name_; + @Override + public Definition buildPartial() { + Definition result = new Definition(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(Definition result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition)other); + if (other instanceof Definition) { + return mergeFrom((Definition)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition other) { - if (other == com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition.getDefaultInstance()) return this; + public Builder mergeFrom(Definition other) { + if (other == Definition.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; - private java.lang.Object name_ = ""; + private Object name_ = ""; /** * string name = 1; * @return The name. */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { + public String getName() { + Object ref = name_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); name_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -1420,11 +1385,11 @@ public java.lang.String getName() { */ public com.google.protobuf.ByteString getNameBytes() { - java.lang.Object ref = name_; + Object ref = name_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); name_ = b; return b; } else { @@ -1437,12 +1402,10 @@ public java.lang.String getName() { * @return This builder for chaining. */ public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1451,8 +1414,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1463,22 +1426,20 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1489,23 +1450,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:sharepubapi_v1.Definition) - private static final com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition DEFAULT_INSTANCE; + private static final Definition DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition(); + DEFAULT_INSTANCE = new Definition(); } - public static com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition getDefaultInstance() { + public static Definition getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public Definition parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Definition(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1513,13 +1485,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition getDefaultInstanceForType() { + @Override + public Definition getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1543,7 +1515,7 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition ge private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\027IssuingAttributes.proto\022\016sharepubapi_v" + "1\"Y\n\021IssuingAttributes\022\023\n\013expiry_date\030\001 " + "\001(\t\022/\n\013definitions\030\002 \003(\0132\032.sharepubapi_v" + @@ -1565,13 +1537,13 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.Definition ge internal_static_sharepubapi_v1_IssuingAttributes_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_sharepubapi_v1_IssuingAttributes_descriptor, - new java.lang.String[] { "ExpiryDate", "Definitions", }); + new String[] { "ExpiryDate", "Definitions", }); internal_static_sharepubapi_v1_Definition_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_sharepubapi_v1_Definition_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_sharepubapi_v1_Definition_descriptor, - new java.lang.String[] { "Name", }); + new String[] { "Name", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SignedTimestampProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SignedTimestampProto.java index c1c313f68..bef7cce89 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SignedTimestampProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SignedTimestampProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: SignedTimestamp.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class SignedTimestampProto { @@ -73,166 +74,94 @@ private SignedTimestamp() { chainDigestSkip2_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new SignedTimestamp(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private SignedTimestamp( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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: { - - version_ = input.readInt32(); - break; - } - case 16: { - - timestamp_ = input.readUInt64(); - break; - } - case 26: { - - messageDigest_ = input.readBytes(); - break; - } - case 34: { - - chainDigest_ = input.readBytes(); - break; - } - case 42: { - - chainDigestSkip1_ = input.readBytes(); - break; - } - case 50: { - - chainDigestSkip2_ = input.readBytes(); - 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.yoti.api.client.spi.remote.proto.SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_descriptor; + return SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_fieldAccessorTable + return SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.class, com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.Builder.class); + SignedTimestamp.class, Builder.class); } public static final int VERSION_FIELD_NUMBER = 1; - private int version_; + private int version_ = 0; /** * int32 version = 1; * @return The version. */ - @java.lang.Override + @Override public int getVersion() { return version_; } public static final int TIMESTAMP_FIELD_NUMBER = 2; - private long timestamp_; + private long timestamp_ = 0L; /** * uint64 timestamp = 2; * @return The timestamp. */ - @java.lang.Override + @Override public long getTimestamp() { return timestamp_; } public static final int MESSAGE_DIGEST_FIELD_NUMBER = 3; - private com.google.protobuf.ByteString messageDigest_; + private com.google.protobuf.ByteString messageDigest_ = com.google.protobuf.ByteString.EMPTY; /** * bytes message_digest = 3; * @return The messageDigest. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getMessageDigest() { return messageDigest_; } public static final int CHAIN_DIGEST_FIELD_NUMBER = 4; - private com.google.protobuf.ByteString chainDigest_; + private com.google.protobuf.ByteString chainDigest_ = com.google.protobuf.ByteString.EMPTY; /** * bytes chain_digest = 4; * @return The chainDigest. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChainDigest() { return chainDigest_; } public static final int CHAIN_DIGEST_SKIP1_FIELD_NUMBER = 5; - private com.google.protobuf.ByteString chainDigestSkip1_; + private com.google.protobuf.ByteString chainDigestSkip1_ = com.google.protobuf.ByteString.EMPTY; /** * bytes chain_digest_skip1 = 5; * @return The chainDigestSkip1. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChainDigestSkip1() { return chainDigestSkip1_; } public static final int CHAIN_DIGEST_SKIP2_FIELD_NUMBER = 6; - private com.google.protobuf.ByteString chainDigestSkip2_; + private com.google.protobuf.ByteString chainDigestSkip2_ = com.google.protobuf.ByteString.EMPTY; /** * bytes chain_digest_skip2 = 6; * @return The chainDigestSkip2. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChainDigestSkip2() { return chainDigestSkip2_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -242,7 +171,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (version_ != 0) { @@ -263,10 +192,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!chainDigestSkip2_.isEmpty()) { output.writeBytes(6, chainDigestSkip2_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -296,20 +225,20 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(6, chainDigestSkip2_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp)) { + if (!(obj instanceof SignedTimestamp)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp other = (com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp) obj; + SignedTimestamp other = (SignedTimestamp) obj; if (getVersion() != other.getVersion()) return false; @@ -323,11 +252,11 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getChainDigestSkip1())) return false; if (!getChainDigestSkip2() .equals(other.getChainDigestSkip2())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -347,74 +276,76 @@ public int hashCode() { hash = (53 * hash) + getChainDigestSkip1().hashCode(); hash = (37 * hash) + CHAIN_DIGEST_SKIP2_FIELD_NUMBER; hash = (53 * hash) + getChainDigestSkip2().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom(byte[] data) + public static SignedTimestamp parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom(java.io.InputStream input) + public static SignedTimestamp parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp 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.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseDelimitedFrom(java.io.InputStream input) + + public static SignedTimestamp parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseDelimitedFrom( + + public static SignedTimestamp 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.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parseFrom( + public static SignedTimestamp parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -422,23 +353,23 @@ public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTi .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp prototype) { + public static Builder newBuilder(SignedTimestamp prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -448,130 +379,137 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compubapi_v1.SignedTimestamp) - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestampOrBuilder { + SignedTimestampOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_descriptor; + return SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_fieldAccessorTable + return SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.class, com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.Builder.class); + SignedTimestamp.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; version_ = 0; - timestamp_ = 0L; - messageDigest_ = com.google.protobuf.ByteString.EMPTY; - chainDigest_ = com.google.protobuf.ByteString.EMPTY; - chainDigestSkip1_ = com.google.protobuf.ByteString.EMPTY; - chainDigestSkip2_ = com.google.protobuf.ByteString.EMPTY; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_descriptor; + return SignedTimestampProto.internal_static_compubapi_v1_SignedTimestamp_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.getDefaultInstance(); + @Override + public SignedTimestamp getDefaultInstanceForType() { + return SignedTimestamp.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp build() { - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp result = buildPartial(); + @Override + public SignedTimestamp build() { + SignedTimestamp result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp buildPartial() { - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp result = new com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp(this); - result.version_ = version_; - result.timestamp_ = timestamp_; - result.messageDigest_ = messageDigest_; - result.chainDigest_ = chainDigest_; - result.chainDigestSkip1_ = chainDigestSkip1_; - result.chainDigestSkip2_ = chainDigestSkip2_; + @Override + public SignedTimestamp buildPartial() { + SignedTimestamp result = new SignedTimestamp(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(SignedTimestamp result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.version_ = version_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.timestamp_ = timestamp_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.messageDigest_ = messageDigest_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.chainDigest_ = chainDigest_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.chainDigestSkip1_ = chainDigestSkip1_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.chainDigestSkip2_ = chainDigestSkip2_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp)other); + if (other instanceof SignedTimestamp) { + return mergeFrom((SignedTimestamp)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp other) { - if (other == com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp.getDefaultInstance()) return this; + public Builder mergeFrom(SignedTimestamp other) { + if (other == SignedTimestamp.getDefaultInstance()) return this; if (other.getVersion() != 0) { setVersion(other.getVersion()); } @@ -590,41 +528,85 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.SignedTimestampPro if (other.getChainDigestSkip2() != com.google.protobuf.ByteString.EMPTY) { setChainDigestSkip2(other.getChainDigestSkip2()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + version_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: { + timestamp_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + messageDigest_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + chainDigest_ = input.readBytes(); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + chainDigestSkip1_ = input.readBytes(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: { + chainDigestSkip2_ = input.readBytes(); + bitField0_ |= 0x00000020; + break; + } // case 50 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; private int version_ ; /** * int32 version = 1; * @return The version. */ - @java.lang.Override + @Override public int getVersion() { return version_; } @@ -634,8 +616,9 @@ public int getVersion() { * @return This builder for chaining. */ public Builder setVersion(int value) { - + version_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -644,7 +627,7 @@ public Builder setVersion(int value) { * @return This builder for chaining. */ public Builder clearVersion() { - + bitField0_ = (bitField0_ & ~0x00000001); version_ = 0; onChanged(); return this; @@ -655,7 +638,7 @@ public Builder clearVersion() { * uint64 timestamp = 2; * @return The timestamp. */ - @java.lang.Override + @Override public long getTimestamp() { return timestamp_; } @@ -665,8 +648,9 @@ public long getTimestamp() { * @return This builder for chaining. */ public Builder setTimestamp(long value) { - + timestamp_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -675,7 +659,7 @@ public Builder setTimestamp(long value) { * @return This builder for chaining. */ public Builder clearTimestamp() { - + bitField0_ = (bitField0_ & ~0x00000002); timestamp_ = 0L; onChanged(); return this; @@ -686,7 +670,7 @@ public Builder clearTimestamp() { * bytes message_digest = 3; * @return The messageDigest. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getMessageDigest() { return messageDigest_; } @@ -696,11 +680,9 @@ public com.google.protobuf.ByteString getMessageDigest() { * @return This builder for chaining. */ public Builder setMessageDigest(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } messageDigest_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -709,7 +691,7 @@ public Builder setMessageDigest(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearMessageDigest() { - + bitField0_ = (bitField0_ & ~0x00000004); messageDigest_ = getDefaultInstance().getMessageDigest(); onChanged(); return this; @@ -720,7 +702,7 @@ public Builder clearMessageDigest() { * bytes chain_digest = 4; * @return The chainDigest. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChainDigest() { return chainDigest_; } @@ -730,11 +712,9 @@ public com.google.protobuf.ByteString getChainDigest() { * @return This builder for chaining. */ public Builder setChainDigest(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } chainDigest_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -743,7 +723,7 @@ public Builder setChainDigest(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearChainDigest() { - + bitField0_ = (bitField0_ & ~0x00000008); chainDigest_ = getDefaultInstance().getChainDigest(); onChanged(); return this; @@ -754,7 +734,7 @@ public Builder clearChainDigest() { * bytes chain_digest_skip1 = 5; * @return The chainDigestSkip1. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChainDigestSkip1() { return chainDigestSkip1_; } @@ -764,11 +744,9 @@ public com.google.protobuf.ByteString getChainDigestSkip1() { * @return This builder for chaining. */ public Builder setChainDigestSkip1(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } chainDigestSkip1_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -777,7 +755,7 @@ public Builder setChainDigestSkip1(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearChainDigestSkip1() { - + bitField0_ = (bitField0_ & ~0x00000010); chainDigestSkip1_ = getDefaultInstance().getChainDigestSkip1(); onChanged(); return this; @@ -788,7 +766,7 @@ public Builder clearChainDigestSkip1() { * bytes chain_digest_skip2 = 6; * @return The chainDigestSkip2. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getChainDigestSkip2() { return chainDigestSkip2_; } @@ -798,11 +776,9 @@ public com.google.protobuf.ByteString getChainDigestSkip2() { * @return This builder for chaining. */ public Builder setChainDigestSkip2(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } chainDigestSkip2_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -811,18 +787,18 @@ public Builder setChainDigestSkip2(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearChainDigestSkip2() { - + bitField0_ = (bitField0_ & ~0x00000020); chainDigestSkip2_ = getDefaultInstance().getChainDigestSkip2(); onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -833,23 +809,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compubapi_v1.SignedTimestamp) - private static final com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp DEFAULT_INSTANCE; + private static final SignedTimestamp DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp(); + DEFAULT_INSTANCE = new SignedTimestamp(); } - public static com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp getDefaultInstance() { + public static SignedTimestamp getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public SignedTimestamp parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SignedTimestamp(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -857,13 +844,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp getDefaultInstanceForType() { + @Override + public SignedTimestamp getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -882,7 +869,7 @@ public com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\025SignedTimestamp.proto\022\014compubapi_v1\"\233\001" + "\n\017SignedTimestamp\022\017\n\007version\030\001 \001(\005\022\021\n\tti" + "mestamp\030\002 \001(\004\022\026\n\016message_digest\030\003 \001(\014\022\024\n" + @@ -904,7 +891,7 @@ public com.yoti.api.client.spi.remote.proto.SignedTimestampProto.SignedTimestamp internal_static_compubapi_v1_SignedTimestamp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compubapi_v1_SignedTimestamp_descriptor, - new java.lang.String[] { "Version", "Timestamp", "MessageDigest", "ChainDigest", "ChainDigestSkip1", "ChainDigestSkip2", }); + new String[] { "Version", "Timestamp", "MessageDigest", "ChainDigest", "ChainDigestSkip1", "ChainDigestSkip2", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SigningProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SigningProto.java index aafda98f3..ba7ea7929 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SigningProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/SigningProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Signing.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class SigningProto { @@ -22,7 +23,7 @@ public interface AttributeSigningOrBuilder extends * string name = 1; * @return The name. */ - java.lang.String getName(); + String getName(); /** * string name = 1; * @return The bytes for name. @@ -45,7 +46,7 @@ public interface AttributeSigningOrBuilder extends * .attrpubapi_v1.ContentType content_type = 3; * @return The contentType. */ - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType(); + ContentTypeProto.ContentType getContentType(); /** * bytes artifact_signature = 4; @@ -57,7 +58,7 @@ public interface AttributeSigningOrBuilder extends * string sub_type = 5; * @return The subType. */ - java.lang.String getSubType(); + String getSubType(); /** * string sub_type = 5; * @return The bytes for subType. @@ -75,7 +76,7 @@ public interface AttributeSigningOrBuilder extends * string associated_source = 7; * @return The associatedSource. */ - java.lang.String getAssociatedSource(); + String getAssociatedSource(); /** * string associated_source = 7; * @return The bytes for associatedSource. @@ -105,122 +106,42 @@ private AttributeSigning() { associatedSource_ = ""; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new AttributeSigning(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private AttributeSigning( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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(); - - name_ = s; - break; - } - case 18: { - - value_ = input.readBytes(); - break; - } - case 24: { - int rawValue = input.readEnum(); - - contentType_ = rawValue; - break; - } - case 34: { - - artifactSignature_ = input.readBytes(); - break; - } - case 42: { - java.lang.String s = input.readStringRequireUtf8(); - - subType_ = s; - break; - } - case 50: { - - signedTimeStamp_ = input.readBytes(); - break; - } - case 58: { - java.lang.String s = input.readStringRequireUtf8(); - - associatedSource_ = s; - 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.yoti.api.client.spi.remote.proto.SigningProto.internal_static_attrpubapi_v1_AttributeSigning_descriptor; + return SigningProto.internal_static_attrpubapi_v1_AttributeSigning_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.SigningProto.internal_static_attrpubapi_v1_AttributeSigning_fieldAccessorTable + return SigningProto.internal_static_attrpubapi_v1_AttributeSigning_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.class, com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.Builder.class); + AttributeSigning.class, Builder.class); } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile Object name_ = ""; /** * string name = 1; * @return The name. */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getName() { + Object ref = name_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); name_ = s; return s; } @@ -229,14 +150,14 @@ public java.lang.String getName() { * string name = 1; * @return The bytes for name. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { + Object ref = name_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); name_ = b; return b; } else { @@ -245,61 +166,61 @@ public java.lang.String getName() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString value_; + private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; /** * bytes value = 2; * @return The value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValue() { return value_; } public static final int CONTENT_TYPE_FIELD_NUMBER = 3; - private int contentType_; + private int contentType_ = 0; /** * .attrpubapi_v1.ContentType content_type = 3; * @return The enum numeric value on the wire for contentType. */ - @java.lang.Override public int getContentTypeValue() { + @Override public int getContentTypeValue() { return contentType_; } /** * .attrpubapi_v1.ContentType content_type = 3; * @return The contentType. */ - @java.lang.Override public com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType result = com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.valueOf(contentType_); - return result == null ? com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNRECOGNIZED : result; + @Override public ContentTypeProto.ContentType getContentType() { + ContentTypeProto.ContentType result = ContentTypeProto.ContentType.forNumber(contentType_); + return result == null ? ContentTypeProto.ContentType.UNRECOGNIZED : result; } public static final int ARTIFACT_SIGNATURE_FIELD_NUMBER = 4; - private com.google.protobuf.ByteString artifactSignature_; + private com.google.protobuf.ByteString artifactSignature_ = com.google.protobuf.ByteString.EMPTY; /** * bytes artifact_signature = 4; * @return The artifactSignature. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getArtifactSignature() { return artifactSignature_; } public static final int SUB_TYPE_FIELD_NUMBER = 5; - private volatile java.lang.Object subType_; + @SuppressWarnings("serial") + private volatile Object subType_ = ""; /** * string sub_type = 5; * @return The subType. */ - @java.lang.Override - public java.lang.String getSubType() { - java.lang.Object ref = subType_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getSubType() { + Object ref = subType_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); subType_ = s; return s; } @@ -308,14 +229,14 @@ public java.lang.String getSubType() { * string sub_type = 5; * @return The bytes for subType. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSubTypeBytes() { - java.lang.Object ref = subType_; - if (ref instanceof java.lang.String) { + Object ref = subType_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); subType_ = b; return b; } else { @@ -324,31 +245,32 @@ public java.lang.String getSubType() { } public static final int SIGNED_TIME_STAMP_FIELD_NUMBER = 6; - private com.google.protobuf.ByteString signedTimeStamp_; + private com.google.protobuf.ByteString signedTimeStamp_ = com.google.protobuf.ByteString.EMPTY; /** * bytes signed_time_stamp = 6; * @return The signedTimeStamp. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSignedTimeStamp() { return signedTimeStamp_; } public static final int ASSOCIATED_SOURCE_FIELD_NUMBER = 7; - private volatile java.lang.Object associatedSource_; + @SuppressWarnings("serial") + private volatile Object associatedSource_ = ""; /** * string associated_source = 7; * @return The associatedSource. */ - @java.lang.Override - public java.lang.String getAssociatedSource() { - java.lang.Object ref = associatedSource_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; + @Override + public String getAssociatedSource() { + Object ref = associatedSource_; + if (ref instanceof String) { + return (String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); associatedSource_ = s; return s; } @@ -357,14 +279,14 @@ public java.lang.String getAssociatedSource() { * string associated_source = 7; * @return The bytes for associatedSource. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getAssociatedSourceBytes() { - java.lang.Object ref = associatedSource_; - if (ref instanceof java.lang.String) { + Object ref = associatedSource_; + if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); associatedSource_ = b; return b; } else { @@ -373,7 +295,7 @@ public java.lang.String getAssociatedSource() { } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -383,7 +305,7 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { @@ -392,7 +314,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!value_.isEmpty()) { output.writeBytes(2, value_); } - if (contentType_ != com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNDEFINED.getNumber()) { + if (contentType_ != ContentTypeProto.ContentType.UNDEFINED.getNumber()) { output.writeEnum(3, contentType_); } if (!artifactSignature_.isEmpty()) { @@ -407,10 +329,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(associatedSource_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, associatedSource_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -423,7 +345,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, value_); } - if (contentType_ != com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNDEFINED.getNumber()) { + if (contentType_ != ContentTypeProto.ContentType.UNDEFINED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(3, contentType_); } @@ -441,20 +363,20 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(associatedSource_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, associatedSource_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning)) { + if (!(obj instanceof AttributeSigning)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning other = (com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning) obj; + AttributeSigning other = (AttributeSigning) obj; if (!getName() .equals(other.getName())) return false; @@ -469,11 +391,11 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getSignedTimeStamp())) return false; if (!getAssociatedSource() .equals(other.getAssociatedSource())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -494,74 +416,76 @@ public int hashCode() { hash = (53 * hash) + getSignedTimeStamp().hashCode(); hash = (37 * hash) + ASSOCIATED_SOURCE_FIELD_NUMBER; hash = (53 * hash) + getAssociatedSource().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom(byte[] data) + public static AttributeSigning parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom(java.io.InputStream input) + public static AttributeSigning parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning 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.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseDelimitedFrom(java.io.InputStream input) + + public static AttributeSigning parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseDelimitedFrom( + + public static AttributeSigning 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.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parseFrom( + public static AttributeSigning parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -569,23 +493,23 @@ public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning prototype) { + public static Builder newBuilder(AttributeSigning prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -595,135 +519,144 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:attrpubapi_v1.AttributeSigning) - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigningOrBuilder { + AttributeSigningOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.SigningProto.internal_static_attrpubapi_v1_AttributeSigning_descriptor; + return SigningProto.internal_static_attrpubapi_v1_AttributeSigning_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.SigningProto.internal_static_attrpubapi_v1_AttributeSigning_fieldAccessorTable + return SigningProto.internal_static_attrpubapi_v1_AttributeSigning_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.class, com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.Builder.class); + AttributeSigning.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - value_ = com.google.protobuf.ByteString.EMPTY; - contentType_ = 0; - artifactSignature_ = com.google.protobuf.ByteString.EMPTY; - subType_ = ""; - signedTimeStamp_ = com.google.protobuf.ByteString.EMPTY; - associatedSource_ = ""; - return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.SigningProto.internal_static_attrpubapi_v1_AttributeSigning_descriptor; + return SigningProto.internal_static_attrpubapi_v1_AttributeSigning_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.getDefaultInstance(); + @Override + public AttributeSigning getDefaultInstanceForType() { + return AttributeSigning.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning build() { - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning result = buildPartial(); + @Override + public AttributeSigning build() { + AttributeSigning result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning buildPartial() { - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning result = new com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning(this); - result.name_ = name_; - result.value_ = value_; - result.contentType_ = contentType_; - result.artifactSignature_ = artifactSignature_; - result.subType_ = subType_; - result.signedTimeStamp_ = signedTimeStamp_; - result.associatedSource_ = associatedSource_; + @Override + public AttributeSigning buildPartial() { + AttributeSigning result = new AttributeSigning(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(AttributeSigning result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.value_ = value_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.contentType_ = contentType_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.artifactSignature_ = artifactSignature_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.subType_ = subType_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.signedTimeStamp_ = signedTimeStamp_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.associatedSource_ = associatedSource_; + } + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning)other); + if (other instanceof AttributeSigning) { + return mergeFrom((AttributeSigning)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning other) { - if (other == com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning.getDefaultInstance()) return this; + public Builder mergeFrom(AttributeSigning other) { + if (other == AttributeSigning.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getValue() != com.google.protobuf.ByteString.EMPTY) { @@ -737,6 +670,7 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.SigningProto.Attri } if (!other.getSubType().isEmpty()) { subType_ = other.subType_; + bitField0_ |= 0x00000010; onChanged(); } if (other.getSignedTimeStamp() != com.google.protobuf.ByteString.EMPTY) { @@ -744,52 +678,102 @@ public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.SigningProto.Attri } if (!other.getAssociatedSource().isEmpty()) { associatedSource_ = other.associatedSource_; + bitField0_ |= 0x00000040; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + value_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + contentType_ = input.readEnum(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: { + artifactSignature_ = input.readBytes(); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + subType_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: { + signedTimeStamp_ = input.readBytes(); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + associatedSource_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000040; + break; + } // case 58 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; - private java.lang.Object name_ = ""; + private Object name_ = ""; /** * string name = 1; * @return The name. */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { + public String getName() { + Object ref = name_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); name_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -798,11 +782,11 @@ public java.lang.String getName() { */ public com.google.protobuf.ByteString getNameBytes() { - java.lang.Object ref = name_; + Object ref = name_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); name_ = b; return b; } else { @@ -815,12 +799,10 @@ public java.lang.String getName() { * @return This builder for chaining. */ public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -829,8 +811,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -841,12 +823,10 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -856,7 +836,7 @@ public Builder setNameBytes( * bytes value = 2; * @return The value. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getValue() { return value_; } @@ -866,11 +846,9 @@ public com.google.protobuf.ByteString getValue() { * @return This builder for chaining. */ public Builder setValue(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } value_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -879,7 +857,7 @@ public Builder setValue(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearValue() { - + bitField0_ = (bitField0_ & ~0x00000002); value_ = getDefaultInstance().getValue(); onChanged(); return this; @@ -890,7 +868,7 @@ public Builder clearValue() { * .attrpubapi_v1.ContentType content_type = 3; * @return The enum numeric value on the wire for contentType. */ - @java.lang.Override public int getContentTypeValue() { + @Override public int getContentTypeValue() { return contentType_; } /** @@ -899,8 +877,8 @@ public Builder clearValue() { * @return This builder for chaining. */ public Builder setContentTypeValue(int value) { - contentType_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -908,22 +886,21 @@ public Builder setContentTypeValue(int value) { * .attrpubapi_v1.ContentType content_type = 3; * @return The contentType. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType getContentType() { - @SuppressWarnings("deprecation") - com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType result = com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.valueOf(contentType_); - return result == null ? com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType.UNRECOGNIZED : result; + @Override + public ContentTypeProto.ContentType getContentType() { + ContentTypeProto.ContentType result = ContentTypeProto.ContentType.forNumber(contentType_); + return result == null ? ContentTypeProto.ContentType.UNRECOGNIZED : result; } /** * .attrpubapi_v1.ContentType content_type = 3; * @param value The contentType to set. * @return This builder for chaining. */ - public Builder setContentType(com.yoti.api.client.spi.remote.proto.ContentTypeProto.ContentType value) { + public Builder setContentType(ContentTypeProto.ContentType value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; contentType_ = value.getNumber(); onChanged(); return this; @@ -933,7 +910,7 @@ public Builder setContentType(com.yoti.api.client.spi.remote.proto.ContentTypePr * @return This builder for chaining. */ public Builder clearContentType() { - + bitField0_ = (bitField0_ & ~0x00000004); contentType_ = 0; onChanged(); return this; @@ -944,7 +921,7 @@ public Builder clearContentType() { * bytes artifact_signature = 4; * @return The artifactSignature. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getArtifactSignature() { return artifactSignature_; } @@ -954,11 +931,9 @@ public com.google.protobuf.ByteString getArtifactSignature() { * @return This builder for chaining. */ public Builder setArtifactSignature(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } artifactSignature_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -967,27 +942,27 @@ public Builder setArtifactSignature(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearArtifactSignature() { - + bitField0_ = (bitField0_ & ~0x00000008); artifactSignature_ = getDefaultInstance().getArtifactSignature(); onChanged(); return this; } - private java.lang.Object subType_ = ""; + private Object subType_ = ""; /** * string sub_type = 5; * @return The subType. */ - public java.lang.String getSubType() { - java.lang.Object ref = subType_; - if (!(ref instanceof java.lang.String)) { + public String getSubType() { + Object ref = subType_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); subType_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -996,11 +971,11 @@ public java.lang.String getSubType() { */ public com.google.protobuf.ByteString getSubTypeBytes() { - java.lang.Object ref = subType_; + Object ref = subType_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); subType_ = b; return b; } else { @@ -1013,12 +988,10 @@ public java.lang.String getSubType() { * @return This builder for chaining. */ public Builder setSubType( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } subType_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1027,8 +1000,8 @@ public Builder setSubType( * @return This builder for chaining. */ public Builder clearSubType() { - subType_ = getDefaultInstance().getSubType(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1039,12 +1012,10 @@ public Builder clearSubType() { */ public Builder setSubTypeBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); subType_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1054,7 +1025,7 @@ public Builder setSubTypeBytes( * bytes signed_time_stamp = 6; * @return The signedTimeStamp. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getSignedTimeStamp() { return signedTimeStamp_; } @@ -1064,11 +1035,9 @@ public com.google.protobuf.ByteString getSignedTimeStamp() { * @return This builder for chaining. */ public Builder setSignedTimeStamp(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } signedTimeStamp_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1077,27 +1046,27 @@ public Builder setSignedTimeStamp(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSignedTimeStamp() { - + bitField0_ = (bitField0_ & ~0x00000020); signedTimeStamp_ = getDefaultInstance().getSignedTimeStamp(); onChanged(); return this; } - private java.lang.Object associatedSource_ = ""; + private Object associatedSource_ = ""; /** * string associated_source = 7; * @return The associatedSource. */ - public java.lang.String getAssociatedSource() { - java.lang.Object ref = associatedSource_; - if (!(ref instanceof java.lang.String)) { + public String getAssociatedSource() { + Object ref = associatedSource_; + if (!(ref instanceof String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); + String s = bs.toStringUtf8(); associatedSource_ = s; return s; } else { - return (java.lang.String) ref; + return (String) ref; } } /** @@ -1106,11 +1075,11 @@ public java.lang.String getAssociatedSource() { */ public com.google.protobuf.ByteString getAssociatedSourceBytes() { - java.lang.Object ref = associatedSource_; + Object ref = associatedSource_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + (String) ref); associatedSource_ = b; return b; } else { @@ -1123,12 +1092,10 @@ public java.lang.String getAssociatedSource() { * @return This builder for chaining. */ public Builder setAssociatedSource( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + String value) { + if (value == null) { throw new NullPointerException(); } associatedSource_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -1137,8 +1104,8 @@ public Builder setAssociatedSource( * @return This builder for chaining. */ public Builder clearAssociatedSource() { - associatedSource_ = getDefaultInstance().getAssociatedSource(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } @@ -1149,22 +1116,20 @@ public Builder clearAssociatedSource() { */ public Builder setAssociatedSourceBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); associatedSource_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1175,23 +1140,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:attrpubapi_v1.AttributeSigning) - private static final com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning DEFAULT_INSTANCE; + private static final AttributeSigning DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning(); + DEFAULT_INSTANCE = new AttributeSigning(); } - public static com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning getDefaultInstance() { + public static AttributeSigning getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public AttributeSigning parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AttributeSigning(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1199,13 +1175,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning getDefaultInstanceForType() { + @Override + public AttributeSigning getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1224,7 +1200,7 @@ public com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning getDef private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\rSigning.proto\022\rattrpubapi_v1\032\021ContentT" + "ype.proto\"\305\001\n\020AttributeSigning\022\014\n\004name\030\001" + " \001(\t\022\r\n\005value\030\002 \001(\014\0220\n\014content_type\030\003 \001(" + @@ -1242,15 +1218,15 @@ public com.yoti.api.client.spi.remote.proto.SigningProto.AttributeSigning getDef descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.yoti.api.client.spi.remote.proto.ContentTypeProto.getDescriptor(), + ContentTypeProto.getDescriptor(), }); internal_static_attrpubapi_v1_AttributeSigning_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_attrpubapi_v1_AttributeSigning_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_attrpubapi_v1_AttributeSigning_descriptor, - new java.lang.String[] { "Name", "Value", "ContentType", "ArtifactSignature", "SubType", "SignedTimeStamp", "AssociatedSource", }); - com.yoti.api.client.spi.remote.proto.ContentTypeProto.getDescriptor(); + new String[] { "Name", "Value", "ContentType", "ArtifactSignature", "SubType", "SignedTimeStamp", "AssociatedSource", }); + ContentTypeProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ThirdPartyAttributeProto.java b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ThirdPartyAttributeProto.java index a3081c22c..f970c1d64 100644 --- a/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ThirdPartyAttributeProto.java +++ b/yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/proto/ThirdPartyAttributeProto.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ThirdPartyAttribute.proto +// Protobuf Java Version: 3.25.9 package com.yoti.api.client.spi.remote.proto; public final class ThirdPartyAttributeProto { @@ -33,11 +34,11 @@ public interface ThirdPartyAttributeOrBuilder extends * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; * @return The issuingAttributes. */ - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes getIssuingAttributes(); + IssuingAttributesProto.IssuingAttributes getIssuingAttributes(); /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder getIssuingAttributesOrBuilder(); + IssuingAttributesProto.IssuingAttributesOrBuilder getIssuingAttributesOrBuilder(); } /** * Protobuf type {@code sharepubapi_v1.ThirdPartyAttribute} @@ -55,125 +56,66 @@ private ThirdPartyAttribute() { issuanceToken_ = com.google.protobuf.ByteString.EMPTY; } - @java.lang.Override + @Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( + protected Object newInstance( UnusedPrivateParameter unused) { return new ThirdPartyAttribute(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ThirdPartyAttribute( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - 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: { - - issuanceToken_ = input.readBytes(); - break; - } - case 18: { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder subBuilder = null; - if (issuingAttributes_ != null) { - subBuilder = issuingAttributes_.toBuilder(); - } - issuingAttributes_ = input.readMessage(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(issuingAttributes_); - issuingAttributes_ = subBuilder.buildPartial(); - } - - 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.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor; + return ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_fieldAccessorTable + return ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.class, com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.Builder.class); + ThirdPartyAttribute.class, Builder.class); } + private int bitField0_; public static final int ISSUANCE_TOKEN_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString issuanceToken_; + private com.google.protobuf.ByteString issuanceToken_ = com.google.protobuf.ByteString.EMPTY; /** * bytes issuance_token = 1; * @return The issuanceToken. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getIssuanceToken() { return issuanceToken_; } public static final int ISSUING_ATTRIBUTES_FIELD_NUMBER = 2; - private com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes issuingAttributes_; + private IssuingAttributesProto.IssuingAttributes issuingAttributes_; /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; * @return Whether the issuingAttributes field is set. */ - @java.lang.Override + @Override public boolean hasIssuingAttributes() { - return issuingAttributes_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; * @return The issuingAttributes. */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes getIssuingAttributes() { - return issuingAttributes_ == null ? com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; + @Override + public IssuingAttributesProto.IssuingAttributes getIssuingAttributes() { + return issuingAttributes_ == null ? IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder getIssuingAttributesOrBuilder() { - return getIssuingAttributes(); + @Override + public IssuingAttributesProto.IssuingAttributesOrBuilder getIssuingAttributesOrBuilder() { + return issuingAttributes_ == null ? IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; } private byte memoizedIsInitialized = -1; - @java.lang.Override + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -183,19 +125,19 @@ public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!issuanceToken_.isEmpty()) { output.writeBytes(1, issuanceToken_); } - if (issuingAttributes_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(2, getIssuingAttributes()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } - @java.lang.Override + @Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -205,24 +147,24 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(1, issuanceToken_); } - if (issuingAttributes_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, getIssuingAttributes()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } - @java.lang.Override - public boolean equals(final java.lang.Object obj) { + @Override + public boolean equals(final Object obj) { if (obj == this) { return true; } - if (!(obj instanceof com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute)) { + if (!(obj instanceof ThirdPartyAttribute)) { return super.equals(obj); } - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute other = (com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute) obj; + ThirdPartyAttribute other = (ThirdPartyAttribute) obj; if (!getIssuanceToken() .equals(other.getIssuanceToken())) return false; @@ -231,11 +173,11 @@ public boolean equals(final java.lang.Object obj) { if (!getIssuingAttributes() .equals(other.getIssuingAttributes())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } - @java.lang.Override + @Override public int hashCode() { if (memoizedHashCode != 0) { return memoizedHashCode; @@ -248,74 +190,76 @@ public int hashCode() { hash = (37 * hash) + ISSUING_ATTRIBUTES_FIELD_NUMBER; hash = (53 * hash) + getIssuingAttributes().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom(byte[] data) + public static ThirdPartyAttribute parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom(java.io.InputStream input) + public static ThirdPartyAttribute parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute 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.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseDelimitedFrom(java.io.InputStream input) + + public static ThirdPartyAttribute parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseDelimitedFrom( + + public static ThirdPartyAttribute 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.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parseFrom( + public static ThirdPartyAttribute parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -323,23 +267,23 @@ public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.Thir .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute prototype) { + public static Builder newBuilder(ThirdPartyAttribute prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override + @Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } - @java.lang.Override + @Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -349,18 +293,18 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:sharepubapi_v1.ThirdPartyAttribute) - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttributeOrBuilder { + ThirdPartyAttributeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor; + return ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor; } - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + @Override + protected FieldAccessorTable internalGetFieldAccessorTable() { - return com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_fieldAccessorTable + return ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.class, com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.Builder.class); + ThirdPartyAttribute.class, Builder.class); } // Construct using com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.newBuilder() @@ -369,147 +313,183 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getIssuingAttributesFieldBuilder(); } } - @java.lang.Override + @Override public Builder clear() { super.clear(); + bitField0_ = 0; issuanceToken_ = com.google.protobuf.ByteString.EMPTY; - - if (issuingAttributesBuilder_ == null) { - issuingAttributes_ = null; - } else { - issuingAttributes_ = null; + issuingAttributes_ = null; + if (issuingAttributesBuilder_ != null) { + issuingAttributesBuilder_.dispose(); issuingAttributesBuilder_ = null; } return this; } - @java.lang.Override + @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor; + return ThirdPartyAttributeProto.internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute getDefaultInstanceForType() { - return com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.getDefaultInstance(); + @Override + public ThirdPartyAttribute getDefaultInstanceForType() { + return ThirdPartyAttribute.getDefaultInstance(); } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute build() { - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute result = buildPartial(); + @Override + public ThirdPartyAttribute build() { + ThirdPartyAttribute result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute buildPartial() { - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute result = new com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute(this); - result.issuanceToken_ = issuanceToken_; - if (issuingAttributesBuilder_ == null) { - result.issuingAttributes_ = issuingAttributes_; - } else { - result.issuingAttributes_ = issuingAttributesBuilder_.build(); - } + @Override + public ThirdPartyAttribute buildPartial() { + ThirdPartyAttribute result = new ThirdPartyAttribute(this); + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override + private void buildPartial0(ThirdPartyAttribute result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.issuanceToken_ = issuanceToken_; + } + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.issuingAttributes_ = issuingAttributesBuilder_ == null + ? issuingAttributes_ + : issuingAttributesBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; + } + + @Override public Builder clone() { return super.clone(); } - @java.lang.Override + @Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.setField(field, value); } - @java.lang.Override + @Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override + @Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override + @Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override + @Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override + @Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute) { - return mergeFrom((com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute)other); + if (other instanceof ThirdPartyAttribute) { + return mergeFrom((ThirdPartyAttribute)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute other) { - if (other == com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute.getDefaultInstance()) return this; + public Builder mergeFrom(ThirdPartyAttribute other) { + if (other == ThirdPartyAttribute.getDefaultInstance()) return this; if (other.getIssuanceToken() != com.google.protobuf.ByteString.EMPTY) { setIssuanceToken(other.getIssuanceToken()); } if (other.hasIssuingAttributes()) { mergeIssuingAttributes(other.getIssuingAttributes()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } - @java.lang.Override + @Override public final boolean isInitialized() { return true; } - @java.lang.Override + @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute parsedMessage = null; + if (extensionRegistry == null) { + throw new NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + issuanceToken_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getIssuingAttributesFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; private com.google.protobuf.ByteString issuanceToken_ = com.google.protobuf.ByteString.EMPTY; /** * bytes issuance_token = 1; * @return The issuanceToken. */ - @java.lang.Override + @Override public com.google.protobuf.ByteString getIssuanceToken() { return issuanceToken_; } @@ -519,11 +499,9 @@ public com.google.protobuf.ByteString getIssuanceToken() { * @return This builder for chaining. */ public Builder setIssuanceToken(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - + if (value == null) { throw new NullPointerException(); } issuanceToken_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -532,29 +510,29 @@ public Builder setIssuanceToken(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearIssuanceToken() { - + bitField0_ = (bitField0_ & ~0x00000001); issuanceToken_ = getDefaultInstance().getIssuanceToken(); onChanged(); return this; } - private com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes issuingAttributes_; + private IssuingAttributesProto.IssuingAttributes issuingAttributes_; private com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder> issuingAttributesBuilder_; + IssuingAttributesProto.IssuingAttributes, IssuingAttributesProto.IssuingAttributes.Builder, IssuingAttributesProto.IssuingAttributesOrBuilder> issuingAttributesBuilder_; /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; * @return Whether the issuingAttributes field is set. */ public boolean hasIssuingAttributes() { - return issuingAttributesBuilder_ != null || issuingAttributes_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; * @return The issuingAttributes. */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes getIssuingAttributes() { + public IssuingAttributesProto.IssuingAttributes getIssuingAttributes() { if (issuingAttributesBuilder_ == null) { - return issuingAttributes_ == null ? com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; + return issuingAttributes_ == null ? IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; } else { return issuingAttributesBuilder_.getMessage(); } @@ -562,93 +540,95 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttrib /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ - public Builder setIssuingAttributes(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes value) { + public Builder setIssuingAttributes(IssuingAttributesProto.IssuingAttributes value) { if (issuingAttributesBuilder_ == null) { if (value == null) { throw new NullPointerException(); } issuingAttributes_ = value; - onChanged(); } else { issuingAttributesBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ public Builder setIssuingAttributes( - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder builderForValue) { + IssuingAttributesProto.IssuingAttributes.Builder builderForValue) { if (issuingAttributesBuilder_ == null) { issuingAttributes_ = builderForValue.build(); - onChanged(); } else { issuingAttributesBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ - public Builder mergeIssuingAttributes(com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes value) { + public Builder mergeIssuingAttributes(IssuingAttributesProto.IssuingAttributes value) { if (issuingAttributesBuilder_ == null) { - if (issuingAttributes_ != null) { - issuingAttributes_ = - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.newBuilder(issuingAttributes_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) && + issuingAttributes_ != null && + issuingAttributes_ != IssuingAttributesProto.IssuingAttributes.getDefaultInstance()) { + getIssuingAttributesBuilder().mergeFrom(value); } else { issuingAttributes_ = value; } - onChanged(); } else { issuingAttributesBuilder_.mergeFrom(value); } - + if (issuingAttributes_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } return this; } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ public Builder clearIssuingAttributes() { - if (issuingAttributesBuilder_ == null) { - issuingAttributes_ = null; - onChanged(); - } else { - issuingAttributes_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + issuingAttributes_ = null; + if (issuingAttributesBuilder_ != null) { + issuingAttributesBuilder_.dispose(); issuingAttributesBuilder_ = null; } - + onChanged(); return this; } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder getIssuingAttributesBuilder() { - + public IssuingAttributesProto.IssuingAttributes.Builder getIssuingAttributesBuilder() { + bitField0_ |= 0x00000002; onChanged(); return getIssuingAttributesFieldBuilder().getBuilder(); } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ - public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder getIssuingAttributesOrBuilder() { + public IssuingAttributesProto.IssuingAttributesOrBuilder getIssuingAttributesOrBuilder() { if (issuingAttributesBuilder_ != null) { return issuingAttributesBuilder_.getMessageOrBuilder(); } else { return issuingAttributes_ == null ? - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; + IssuingAttributesProto.IssuingAttributes.getDefaultInstance() : issuingAttributes_; } } /** * .sharepubapi_v1.IssuingAttributes issuing_attributes = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder> + IssuingAttributesProto.IssuingAttributes, IssuingAttributesProto.IssuingAttributes.Builder, IssuingAttributesProto.IssuingAttributesOrBuilder> getIssuingAttributesFieldBuilder() { if (issuingAttributesBuilder_ == null) { issuingAttributesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributes.Builder, com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttributesOrBuilder>( + IssuingAttributesProto.IssuingAttributes, IssuingAttributesProto.IssuingAttributes.Builder, IssuingAttributesProto.IssuingAttributesOrBuilder>( getIssuingAttributes(), getParentForChildren(), isClean()); @@ -656,13 +636,13 @@ public com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.IssuingAttrib } return issuingAttributesBuilder_; } - @java.lang.Override + @Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } - @java.lang.Override + @Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -673,23 +653,34 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:sharepubapi_v1.ThirdPartyAttribute) - private static final com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute DEFAULT_INSTANCE; + private static final ThirdPartyAttribute DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute(); + DEFAULT_INSTANCE = new ThirdPartyAttribute(); } - public static com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute getDefaultInstance() { + public static ThirdPartyAttribute getDefaultInstance() { return DEFAULT_INSTANCE; } private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override + @Override public ThirdPartyAttribute parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ThirdPartyAttribute(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -697,13 +688,13 @@ public static com.google.protobuf.Parser parser() { return PARSER; } - @java.lang.Override + @Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override - public com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyAttribute getDefaultInstanceForType() { + @Override + public ThirdPartyAttribute getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -722,7 +713,7 @@ public com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyA private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { + String[] descriptorData = { "\n\031ThirdPartyAttribute.proto\022\016sharepubapi" + "_v1\032\027IssuingAttributes.proto\"l\n\023ThirdPar" + "tyAttribute\022\026\n\016issuance_token\030\001 \001(\014\022=\n\022i" + @@ -738,15 +729,15 @@ public com.yoti.api.client.spi.remote.proto.ThirdPartyAttributeProto.ThirdPartyA descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.getDescriptor(), + IssuingAttributesProto.getDescriptor(), }); internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_sharepubapi_v1_ThirdPartyAttribute_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_sharepubapi_v1_ThirdPartyAttribute_descriptor, - new java.lang.String[] { "IssuanceToken", "IssuingAttributes", }); - com.yoti.api.client.spi.remote.proto.IssuingAttributesProto.getDescriptor(); + new String[] { "IssuanceToken", "IssuingAttributes", }); + IssuingAttributesProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/yoti-sdk-auth/pom.xml b/yoti-sdk-auth/pom.xml index 7c329eac8..4ac62f832 100644 --- a/yoti-sdk-auth/pom.xml +++ b/yoti-sdk-auth/pom.xml @@ -12,7 +12,7 @@ com.yoti yoti-sdk-parent - 4.4.0 + 4.5.0-SNAPSHOT ../yoti-sdk-parent diff --git a/yoti-sdk-parent/pom.xml b/yoti-sdk-parent/pom.xml index 64e19edcb..bbea75fc0 100644 --- a/yoti-sdk-parent/pom.xml +++ b/yoti-sdk-parent/pom.xml @@ -5,7 +5,7 @@ com.yoti yoti-sdk-parent pom - 4.4.0 + 4.5.0-SNAPSHOT Yoti SDK Parent Pom Parent pom for the Java SDK projects https://github.com/getyoti/yoti-java-sdk @@ -90,8 +90,8 @@ 2.0.16 1.81 - 2.19.0 - 3.25.8 + 2.22.2 + 3.25.9 4.5.14 @@ -119,7 +119,7 @@ 10.0.4 12 - 1.24 + 1.28 java18 1.0 diff --git a/yoti-sdk-sandbox/pom.xml b/yoti-sdk-sandbox/pom.xml index aa98fa4f5..dbbae22fd 100644 --- a/yoti-sdk-sandbox/pom.xml +++ b/yoti-sdk-sandbox/pom.xml @@ -11,7 +11,7 @@ com.yoti yoti-sdk-parent - 4.4.0 + 4.5.0-SNAPSHOT ../yoti-sdk-parent diff --git a/yoti-sdk-spring-boot-auto-config/README.md b/yoti-sdk-spring-boot-auto-config/README.md index f460ac65e..e794f40d0 100644 --- a/yoti-sdk-spring-boot-auto-config/README.md +++ b/yoti-sdk-spring-boot-auto-config/README.md @@ -18,7 +18,7 @@ If you are using Maven, you need to add the following dependencies: com.yoti yoti-sdk-spring-boot-auto-config - 4.4.0 + 4.5.0-SNAPSHOT ``` @@ -26,7 +26,7 @@ If you are using Maven, you need to add the following dependencies: If you are using Gradle, here is the dependency to add: ``` -compile group: 'com.yoti', name: 'yoti-sdk-spring-boot-auto-config', version: '4.4.0' +compile group: 'com.yoti', name: 'yoti-sdk-spring-boot-auto-config', version: '4.5.0-SNAPSHOT' ``` diff --git a/yoti-sdk-spring-boot-auto-config/pom.xml b/yoti-sdk-spring-boot-auto-config/pom.xml index 54c2ae02c..b76ef2b09 100644 --- a/yoti-sdk-spring-boot-auto-config/pom.xml +++ b/yoti-sdk-spring-boot-auto-config/pom.xml @@ -12,7 +12,7 @@ com.yoti yoti-sdk-parent - 4.4.0 + 4.5.0-SNAPSHOT ../yoti-sdk-parent diff --git a/yoti-sdk-spring-boot-example/README.md b/yoti-sdk-spring-boot-example/README.md index 0f83703c1..a050baf25 100644 --- a/yoti-sdk-spring-boot-example/README.md +++ b/yoti-sdk-spring-boot-example/README.md @@ -17,7 +17,7 @@ Note that: com.yoti yoti-sdk-api - 4.4.0 + 4.5.0-SNAPSHOT ``` diff --git a/yoti-sdk-spring-boot-example/pom.xml b/yoti-sdk-spring-boot-example/pom.xml index e85665b32..4e0719c81 100644 --- a/yoti-sdk-spring-boot-example/pom.xml +++ b/yoti-sdk-spring-boot-example/pom.xml @@ -6,7 +6,7 @@ com.yoti yoti-sdk-spring-boot-example Yoti Spring Boot Example - 4.4.0 + 4.5.0-SNAPSHOT org.springframework.boot diff --git a/yoti-sdk-spring-security/README.md b/yoti-sdk-spring-security/README.md index e29d5922a..e3102700f 100644 --- a/yoti-sdk-spring-security/README.md +++ b/yoti-sdk-spring-security/README.md @@ -25,14 +25,14 @@ If you are using Maven, you need to add the following dependencies: com.yoti yoti-sdk-spring-security - 4.4.0 + 4.5.0-SNAPSHOT ``` If you are using Gradle, here is the dependency to add: ``` -compile group: 'com.yoti', name: 'yoti-sdk-spring-security', version: '4.4.0' +compile group: 'com.yoti', name: 'yoti-sdk-spring-security', version: '4.5.0-SNAPSHOT' ``` ### Provide a `YotiClient` instance diff --git a/yoti-sdk-spring-security/pom.xml b/yoti-sdk-spring-security/pom.xml index 6ae702184..220e04e82 100644 --- a/yoti-sdk-spring-security/pom.xml +++ b/yoti-sdk-spring-security/pom.xml @@ -12,7 +12,7 @@ com.yoti yoti-sdk-parent - 4.4.0 + 4.5.0-SNAPSHOT ../yoti-sdk-parent