diff --git a/functions/function/object-detection-function/pom.xml b/functions/function/object-detection-function/pom.xml index 2bcbfe1f..6170a580 100644 --- a/functions/function/object-detection-function/pom.xml +++ b/functions/function/object-detection-function/pom.xml @@ -13,7 +13,9 @@ object-detection-function object-detection-function Spring Native Function for Tensorflow Integration - + + 3.19.6 + org.springframework.cloud.fn @@ -23,7 +25,7 @@ com.google.protobuf protobuf-java - 3.19.6 + ${protobuf.version} @@ -52,6 +54,7 @@ src/main/java + com.google.protobuf:protoc:${protobuf.version} diff --git a/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/protos/StringIntLabelMapOuterClass.java b/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/protos/StringIntLabelMapOuterClass.java index 0bfd368a..ab7fe9a9 100644 --- a/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/protos/StringIntLabelMapOuterClass.java +++ b/functions/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/protos/StringIntLabelMapOuterClass.java @@ -106,7 +106,7 @@ public final class StringIntLabelMapOuterClass { /** * Protobuf type {@code org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem} */ - public static final class StringIntLabelMapItem extends + public static final class StringIntLabelMapItem extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem) StringIntLabelMapItemOrBuilder { @@ -132,61 +132,6 @@ public final class StringIntLabelMapOuterClass { getUnknownFields() { return this.unknownFields; } - private StringIntLabelMapItem( - 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: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - id_ = input.readInt32(); - break; - } - case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000004; - displayName_ = bs; - 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 org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor; @@ -213,6 +158,7 @@ public final class StringIntLabelMapOuterClass { * optional string name = 1; * @return Whether the name field is set. */ + @java.lang.Override public boolean hasName() { return ((bitField0_ & 0x00000001) != 0); } @@ -226,6 +172,7 @@ public final class StringIntLabelMapOuterClass { * optional 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) { @@ -250,6 +197,7 @@ public final class StringIntLabelMapOuterClass { * optional string name = 1; * @return The bytes for name. */ + @java.lang.Override public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; @@ -275,6 +223,7 @@ public final class StringIntLabelMapOuterClass { * optional int32 id = 2; * @return Whether the id field is set. */ + @java.lang.Override public boolean hasId() { return ((bitField0_ & 0x00000002) != 0); } @@ -287,6 +236,7 @@ public final class StringIntLabelMapOuterClass { * optional int32 id = 2; * @return The id. */ + @java.lang.Override public int getId() { return id_; } @@ -301,6 +251,7 @@ public final class StringIntLabelMapOuterClass { * optional string display_name = 3; * @return Whether the displayName field is set. */ + @java.lang.Override public boolean hasDisplayName() { return ((bitField0_ & 0x00000004) != 0); } @@ -312,6 +263,7 @@ public final class StringIntLabelMapOuterClass { * optional string display_name = 3; * @return The displayName. */ + @java.lang.Override public java.lang.String getDisplayName() { java.lang.Object ref = displayName_; if (ref instanceof java.lang.String) { @@ -334,6 +286,7 @@ public final class StringIntLabelMapOuterClass { * optional string display_name = 3; * @return The bytes for displayName. */ + @java.lang.Override public com.google.protobuf.ByteString getDisplayNameBytes() { java.lang.Object ref = displayName_; @@ -371,7 +324,7 @@ public final class StringIntLabelMapOuterClass { if (((bitField0_ & 0x00000004) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, displayName_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -390,7 +343,7 @@ public final class StringIntLabelMapOuterClass { if (((bitField0_ & 0x00000004) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, displayName_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -420,7 +373,7 @@ public final class StringIntLabelMapOuterClass { if (!getDisplayName() .equals(other.getDisplayName())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -443,7 +396,7 @@ public final class StringIntLabelMapOuterClass { hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; hash = (53 * hash) + getDisplayName().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -560,18 +513,13 @@ public final class StringIntLabelMapOuterClass { // Construct using org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -684,7 +632,7 @@ public final class StringIntLabelMapOuterClass { displayName_ = other.displayName_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -699,17 +647,45 @@ public final class StringIntLabelMapOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.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.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + id_ = input.readInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + displayName_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + 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 = (org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -844,6 +820,7 @@ public final class StringIntLabelMapOuterClass { * optional int32 id = 2; * @return Whether the id field is set. */ + @java.lang.Override public boolean hasId() { return ((bitField0_ & 0x00000002) != 0); } @@ -856,6 +833,7 @@ public final class StringIntLabelMapOuterClass { * optional int32 id = 2; * @return The id. */ + @java.lang.Override public int getId() { return id_; } @@ -1031,7 +1009,18 @@ public final class StringIntLabelMapOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StringIntLabelMapItem(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(); } }; @@ -1082,7 +1071,7 @@ public final class StringIntLabelMapOuterClass { /** * Protobuf type {@code org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap} */ - public static final class StringIntLabelMap extends + public static final class StringIntLabelMap extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap) StringIntLabelMapOrBuilder { @@ -1107,56 +1096,6 @@ public final class StringIntLabelMapOuterClass { getUnknownFields() { return this.unknownFields; } - private StringIntLabelMap( - 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)) { - item_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - item_.add( - input.readMessage(org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.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)) { - item_ = java.util.Collections.unmodifiableList(item_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor; @@ -1175,12 +1114,14 @@ public final class StringIntLabelMapOuterClass { /** * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; */ + @java.lang.Override public java.util.List getItemList() { return item_; } /** * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; */ + @java.lang.Override public java.util.List getItemOrBuilderList() { return item_; @@ -1188,18 +1129,21 @@ public final class StringIntLabelMapOuterClass { /** * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; */ + @java.lang.Override public int getItemCount() { return item_.size(); } /** * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; */ + @java.lang.Override public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getItem(int index) { return item_.get(index); } /** * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; */ + @java.lang.Override public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder getItemOrBuilder( int index) { return item_.get(index); @@ -1222,7 +1166,7 @@ public final class StringIntLabelMapOuterClass { for (int i = 0; i < item_.size(); i++) { output.writeMessage(1, item_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1235,7 +1179,7 @@ public final class StringIntLabelMapOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, item_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1252,7 +1196,7 @@ public final class StringIntLabelMapOuterClass { if (!getItemList() .equals(other.getItemList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1267,7 +1211,7 @@ public final class StringIntLabelMapOuterClass { hash = (37 * hash) + ITEM_FIELD_NUMBER; hash = (53 * hash) + getItemList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1384,29 +1328,24 @@ public final class StringIntLabelMapOuterClass { // Construct using org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getItemFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); if (itemBuilder_ == null) { item_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + item_ = null; itemBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -1517,7 +1456,7 @@ public final class StringIntLabelMapOuterClass { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1532,17 +1471,43 @@ public final class StringIntLabelMapOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.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: { + org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem m = + input.readMessage( + org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.PARSER, + extensionRegistry); + if (itemBuilder_ == null) { + ensureItemIsMutable(); + item_.add(m); + } else { + itemBuilder_.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 = (org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -1819,7 +1784,18 @@ public final class StringIntLabelMapOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StringIntLabelMap(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(); } };