From 07cedeb10a0d2cbdbc45068f29c301a397a51a41 Mon Sep 17 00:00:00 2001 From: Drew Farris Date: Tue, 23 Sep 2025 16:47:03 +0000 Subject: [PATCH] Upgrade to protobuf 3.25.5 --- .../metadata/protobuf/EdgeMetadata.java | 285 ++++++------- .../src/main/protobuf/compile_protos.sh | 17 +- .../services/query-metric/api/pom.xml | 2 +- .../services/query-metric/service/pom.xml | 2 +- pom.xml | 2 +- warehouse/annotation-core/README.md | 2 +- warehouse/annotation-core/pom.xml | 2 +- .../datawave/annotation/protobuf/v1/All.java | 8 +- .../annotation/protobuf/v1/AllOrBuilder.java | 3 +- .../annotation/protobuf/v1/Annotation.java | 210 +++++----- .../protobuf/v1/AnnotationList.java | 47 ++- .../protobuf/v1/AnnotationListOrBuilder.java | 3 +- .../protobuf/v1/AnnotationOrBuilder.java | 10 +- .../annotation/protobuf/v1/AnnotationV1.java | 115 +++--- .../protobuf/v1/CreateAnnotationRequest.java | 86 ++-- .../v1/CreateAnnotationRequestOrBuilder.java | 3 +- .../protobuf/v1/CreateSegmentRequest.java | 86 ++-- .../v1/CreateSegmentRequestOrBuilder.java | 3 +- .../protobuf/v1/DeleteAnnotationRequest.java | 60 +-- .../v1/DeleteAnnotationRequestOrBuilder.java | 3 +- .../protobuf/v1/DeleteSegmentRequest.java | 81 ++-- .../v1/DeleteSegmentRequestOrBuilder.java | 3 +- .../protobuf/v1/GetAnnotationRequest.java | 60 +-- .../v1/GetAnnotationRequestOrBuilder.java | 3 +- .../protobuf/v1/GetSegmentRequest.java | 60 +-- .../v1/GetSegmentRequestOrBuilder.java | 3 +- .../protobuf/v1/ListAnnotationsRequest.java | 72 ++-- .../v1/ListAnnotationsRequestOrBuilder.java | 3 +- .../protobuf/v1/ListSegmentsRequest.java | 72 ++-- .../v1/ListSegmentsRequestOrBuilder.java | 3 +- .../annotation/protobuf/v1/Point.java | 71 ++-- .../annotation/protobuf/v1/PointList.java | 26 +- .../protobuf/v1/PointListOrBuilder.java | 3 +- .../protobuf/v1/PointOrBuilder.java | 3 +- .../annotation/protobuf/v1/Segment.java | 372 +++++++++-------- .../annotation/protobuf/v1/SegmentList.java | 47 ++- .../protobuf/v1/SegmentListOrBuilder.java | 3 +- .../protobuf/v1/SegmentOrBuilder.java | 12 +- .../annotation/protobuf/v1/SegmentValue.java | 96 +++-- .../protobuf/v1/SegmentValueOrBuilder.java | 9 +- .../annotation/protobuf/v1/TextSpanChars.java | 42 +- .../protobuf/v1/TextSpanCharsOrBuilder.java | 3 +- .../protobuf/v1/TimeSpanSeconds.java | 50 ++- .../protobuf/v1/TimeSpanSecondsOrBuilder.java | 3 +- .../protobuf/v1/UpdateAnnotationRequest.java | 158 ++++---- .../v1/UpdateAnnotationRequestOrBuilder.java | 3 +- .../protobuf/v1/UpdateSegmentRequest.java | 158 ++++---- .../v1/UpdateSegmentRequestOrBuilder.java | 3 +- .../main/protobuf}/AnnotationV1.schema.json | 0 .../src/main/protobuf/compile_protobuf.sh | 4 - .../src/main/protobuf/compile_protos.sh | 18 + .../java/datawave/edge/protobuf/EdgeData.java | 382 ++++++++---------- .../datawave/ingest/protobuf/TermWeight.java | 229 +++++------ .../java/datawave/ingest/protobuf/Uid.java | 153 +++---- .../core/src/main/protobuf/compile_protos.sh | 17 +- web-services/pom.xml | 2 +- 56 files changed, 1672 insertions(+), 1504 deletions(-) rename warehouse/annotation-core/src/main/jsonschema/{ => warehouse/annotation-core/src/main/protobuf}/AnnotationV1.schema.json (100%) delete mode 100755 warehouse/annotation-core/src/main/protobuf/compile_protobuf.sh create mode 100755 warehouse/annotation-core/src/main/protobuf/compile_protos.sh diff --git a/core/utils/metadata-utils/src/main/java/datawave/metadata/protobuf/EdgeMetadata.java b/core/utils/metadata-utils/src/main/java/datawave/metadata/protobuf/EdgeMetadata.java index 9f404b4154e..9448be6b5ff 100644 --- a/core/utils/metadata-utils/src/main/java/datawave/metadata/protobuf/EdgeMetadata.java +++ b/core/utils/metadata-utils/src/main/java/datawave/metadata/protobuf/EdgeMetadata.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: EdgeMetadata.proto +// source: core/utils/metadata-utils/src/main/protobuf/EdgeMetadata.proto package datawave.metadata.protobuf; @@ -75,51 +75,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetadataValue(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)) { - metadata_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - metadata_.add(input.readMessage(datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata.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)) { - metadata_ = java.util.Collections.unmodifiableList(metadata_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.metadata.protobuf.EdgeMetadata.internal_static_datawave_metadata_protobuf_MetadataValue_descriptor; } @@ -295,76 +250,6 @@ 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(); - } - 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; - source_ = bs; - break; - } - case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000002; - sink_ = bs; - break; - } - case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000004; - enrichment_ = bs; - break; - } - case 34: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000008; - enrichmentIndex_ = bs; - break; - } - case 42: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000010; - date_ = bs; - break; - } - case 50: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000020; - jexlPrecondition_ = 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 datawave.metadata.protobuf.EdgeMetadata.internal_static_datawave_metadata_protobuf_MetadataValue_Metadata_descriptor; } @@ -719,7 +604,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000020) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 6, jexlPrecondition_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -747,7 +632,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000020) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, jexlPrecondition_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -798,7 +683,7 @@ public boolean equals(final java.lang.Object obj) { if (!getJexlPrecondition().equals(other.getJexlPrecondition())) return false; } - if (!unknownFields.equals(other.unknownFields)) + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -834,7 +719,7 @@ public int hashCode() { hash = (37 * hash) + JEXLPRECONDITION_FIELD_NUMBER; hash = (53 * hash) + getJexlPrecondition().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -941,16 +826,12 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF // Construct using datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata.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 @@ -1098,7 +979,7 @@ public Builder mergeFrom(datawave.metadata.protobuf.EdgeMetadata.MetadataValue.M jexlPrecondition_ = other.jexlPrecondition_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1117,17 +998,60 @@ public final boolean isInitialized() { @java.lang.Override public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata 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: { + source_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + sink_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + enrichment_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + enrichmentIndex_ = input.readBytes(); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + date_ = input.readBytes(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: { + jexlPrecondition_ = 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 = (datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1713,7 +1637,17 @@ public static datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata get @java.lang.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(); } }; @@ -1801,7 +1735,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < metadata_.size(); i++) { output.writeMessage(1, metadata_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1814,7 +1748,7 @@ public int getSerializedSize() { for (int i = 0; i < metadata_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, metadata_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1831,7 +1765,7 @@ public boolean equals(final java.lang.Object obj) { if (!getMetadataList().equals(other.getMetadataList())) return false; - if (!unknownFields.equals(other.unknownFields)) + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1847,7 +1781,7 @@ public int hashCode() { hash = (37 * hash) + METADATA_FIELD_NUMBER; hash = (53 * hash) + getMetadataList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1956,18 +1890,12 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF // Construct using datawave.metadata.protobuf.EdgeMetadata.MetadataValue.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getMetadataFieldBuilder(); - } } @java.lang.Override @@ -1975,10 +1903,11 @@ public Builder clear() { super.clear(); if (metadataBuilder_ == null) { metadata_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + metadata_ = null; metadataBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -2085,7 +2014,7 @@ public Builder mergeFrom(datawave.metadata.protobuf.EdgeMetadata.MetadataValue o } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2103,17 +2032,41 @@ public final boolean isInitialized() { @java.lang.Override public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - datawave.metadata.protobuf.EdgeMetadata.MetadataValue 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: { + datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata m = input + .readMessage(datawave.metadata.protobuf.EdgeMetadata.MetadataValue.Metadata.PARSER, extensionRegistry); + if (metadataBuilder_ == null) { + ensureMetadataIsMutable(); + metadata_.add(m); + } else { + metadataBuilder_.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 = (datawave.metadata.protobuf.EdgeMetadata.MetadataValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2385,7 +2338,17 @@ public static datawave.metadata.protobuf.EdgeMetadata.MetadataValue getDefaultIn @java.lang.Override public MetadataValue parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetadataValue(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(); } }; @@ -2416,12 +2379,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = { - "\n\022EdgeMetadata.proto\022\032datawave.metadata." + "protobuf\"\324\001\n\rMetadataValue\022D\n\010metadata\030\001" - + " \003(\01322.datawave.metadata.protobuf.Metada" + "taValue.Metadata\032}\n\010Metadata\022\016\n\006source\030\001" - + " \002(\t\022\014\n\004sink\030\002 \002(\t\022\022\n\nenrichment\030\003 \001(\t\022\027" - + "\n\017enrichmentIndex\030\004 \001(\t\022\014\n\004date\030\005 \001(\t\022\030\n" - + "\020jexlPrecondition\030\006 \001(\tB\036\n\032datawave.meta" + "data.protobufH\001"}; + java.lang.String[] descriptorData = {"\n>core/utils/metadata-utils/src/main/pro" + "tobuf/EdgeMetadata.proto\022\032datawave.metad" + + "ata.protobuf\"\324\001\n\rMetadataValue\022D\n\010metada" + "ta\030\001 \003(\01322.datawave.metadata.protobuf.Me" + + "tadataValue.Metadata\032}\n\010Metadata\022\016\n\006sour" + + "ce\030\001 \002(\t\022\014\n\004sink\030\002 \002(\t\022\022\n\nenrichment\030\003 \001" + + "(\t\022\027\n\017enrichmentIndex\030\004 \001(\t\022\014\n\004date\030\005 \001(" + + "\t\022\030\n\020jexlPrecondition\030\006 \001(\tB\036\n\032datawave." + "metadata.protobufH\001"}; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); internal_static_datawave_metadata_protobuf_MetadataValue_descriptor = getDescriptor().getMessageTypes().get(0); diff --git a/core/utils/metadata-utils/src/main/protobuf/compile_protos.sh b/core/utils/metadata-utils/src/main/protobuf/compile_protos.sh index b89842ee727..5ac528afe86 100755 --- a/core/utils/metadata-utils/src/main/protobuf/compile_protos.sh +++ b/core/utils/metadata-utils/src/main/protobuf/compile_protos.sh @@ -2,5 +2,20 @@ # Other projects use protostuff but, meh # -for PROTO in `ls -1 *proto`; do protoc --java_out ../java $PROTO; done +# override the default protof compiler and include path by setting either the PROTOC or PROTOC_INCLUDE_PATH +# environment variable. + +SCRIPT_DIR=$(dirname "$0") + +PROTOC=${PROTOC:=protoc} +PROTOC_INCLUDE_PATH=${PROTOC_INCLUDE_PATH:=/usr/local/include} +PROTOC_VERSION=$(${PROTOC} --version) +INPUT_FILES=$(ls ${SCRIPT_DIR}/*.proto) + +for PROTO in ${INPUT_FILES}; do + echo "Compiling ${PROTO} to java; SCRIPT_DIR=${SCRIPT_DIR} PROTOC=${PROTOC} PROTOC_INCLUDE_PATH=${PROTOC} PROTOC_VERSION=${PROTOC_VERSION}" 1>&2 + protoc --java_out ${SCRIPT_DIR}/../java $PROTO +done + + diff --git a/microservices/services/query-metric/api/pom.xml b/microservices/services/query-metric/api/pom.xml index 351329dc28b..b3ff1f4cad4 100644 --- a/microservices/services/query-metric/api/pom.xml +++ b/microservices/services/query-metric/api/pom.xml @@ -29,7 +29,7 @@ 31.1-jre 2.12.5 2.3.1 - 3.16.3 + 3.25.5 1.6.2 2.0.12 diff --git a/microservices/services/query-metric/service/pom.xml b/microservices/services/query-metric/service/pom.xml index 754ef2d3172..5724eeb3878 100644 --- a/microservices/services/query-metric/service/pom.xml +++ b/microservices/services/query-metric/service/pom.xml @@ -32,7 +32,7 @@ 3.0.3 2.2.3 4.0.0 - 3.16.3 + 3.25.5 2.0.12 2.0.2 4.3.1 diff --git a/pom.xml b/pom.xml index 6356ef95255..883b5e0d7fb 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 2.1 5.0.3.Final 2.0.9 - 3.16.3 + 3.25.5 1.6.2 2.0.12 3.1.5 diff --git a/warehouse/annotation-core/README.md b/warehouse/annotation-core/README.md index f55b40e8a6c..dae1c4ea352 100644 --- a/warehouse/annotation-core/README.md +++ b/warehouse/annotation-core/README.md @@ -47,7 +47,7 @@ The source code for the generated source code in `src/main/java/datawave/annotat ### Prerequisites -* **Protoc**: We used `protoc` from `libprotoc 3.16.3` from [the GitHub protobuf releases page](https://github.com/protocolbuffers/protobuf/releases/tag/v3.16.3). +* **Protoc**: We used `protoc` from `libprotoc 3.16.3` from [the GitHub protobuf releases page](s). * Follow the instructions to install this into `/usr/local/bin`. * **Google APIs**:`SegmentV1.proto` imports `field_mask` and `timestamp` from [fuchsia.googlesource.com](https://fuchsia.googlesource.com/third_party/googleapis). * These get installed into `/usr/local/include` diff --git a/warehouse/annotation-core/pom.xml b/warehouse/annotation-core/pom.xml index 260254797b4..910f1b58109 100644 --- a/warehouse/annotation-core/pom.xml +++ b/warehouse/annotation-core/pom.xml @@ -10,7 +10,7 @@ UTF-8 2.61.0 - 3.16.3 + 3.25.5 diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/All.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/All.java index b138f3a16ec..cfb5c3189e1 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/All.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/All.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -28,11 +29,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new All(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_All_descriptor; } diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AllOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AllOrBuilder.java index c05de51854a..294e74e771d 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AllOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AllOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface AllOrBuilder extends diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Annotation.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Annotation.java index 6c2fd58cf0a..f3837feac60 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Annotation.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Annotation.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -31,18 +32,13 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new Annotation(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_Annotation_descriptor; } @SuppressWarnings({"rawtypes"}) @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField(int number) { + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(int number) { switch (number) { case 7: return internalGetMetadata(); @@ -59,7 +55,8 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF } public static final int SHARD_FIELD_NUMBER = 1; - private volatile java.lang.Object shard_; + @SuppressWarnings("serial") + private volatile java.lang.Object shard_ = ""; /** * string shard = 1; @@ -97,7 +94,8 @@ public com.google.protobuf.ByteString getShardBytes() { } public static final int DATATYPE_FIELD_NUMBER = 2; - private volatile java.lang.Object dataType_; + @SuppressWarnings("serial") + private volatile java.lang.Object dataType_ = ""; /** * string dataType = 2; @@ -135,7 +133,8 @@ public com.google.protobuf.ByteString getDataTypeBytes() { } public static final int UID_FIELD_NUMBER = 3; - private volatile java.lang.Object uid_; + @SuppressWarnings("serial") + private volatile java.lang.Object uid_ = ""; /** * string uid = 3; @@ -173,7 +172,8 @@ public com.google.protobuf.ByteString getUidBytes() { } public static final int ANNOTATIONTYPE_FIELD_NUMBER = 4; - private volatile java.lang.Object annotationType_; + @SuppressWarnings("serial") + private volatile java.lang.Object annotationType_ = ""; /** * string annotationType = 4; @@ -211,7 +211,8 @@ public com.google.protobuf.ByteString getAnnotationTypeBytes() { } public static final int ANNOTATIONID_FIELD_NUMBER = 5; - private volatile java.lang.Object annotationId_; + @SuppressWarnings("serial") + private volatile java.lang.Object annotationId_ = ""; /** * string annotationId = 5; @@ -256,6 +257,7 @@ private static final class MetadataDefaultEntryHolder { com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField metadata_; private com.google.protobuf.MapField internalGetMetadata() { @@ -272,11 +274,10 @@ public int getMetadataCount() { /** * map<string, string> metadata = 7; */ - @java.lang.Override public boolean containsMetadata(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetMetadata().getMap().containsKey(key); } @@ -294,7 +295,6 @@ public java.util.Map getMetadata() { * map<string, string> metadata = 7; */ @java.lang.Override - public java.util.Map getMetadataMap() { return internalGetMetadata().getMap(); } @@ -303,10 +303,12 @@ public java.util.Map getMetadataMap() { * map<string, string> metadata = 7; */ @java.lang.Override - - public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ + java.lang.String getMetadataOrDefault(java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -316,10 +318,9 @@ public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.Str * map<string, string> metadata = 7; */ @java.lang.Override - public java.lang.String getMetadataOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); if (!map.containsKey(key)) { @@ -329,6 +330,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) { } public static final int SEGMENTS_FIELD_NUMBER = 8; + @SuppressWarnings("serial") private java.util.List segments_; /** @@ -387,19 +389,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getShardBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(shard_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, shard_); } - if (!getDataTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dataType_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, dataType_); } - if (!getUidBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uid_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, uid_); } - if (!getAnnotationTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationType_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, annotationType_); } - if (!getAnnotationIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, annotationId_); } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(output, internalGetMetadata(), MetadataDefaultEntryHolder.defaultEntry, 7); @@ -416,19 +418,19 @@ public int getSerializedSize() { return size; size = 0; - if (!getShardBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(shard_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, shard_); } - if (!getDataTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dataType_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, dataType_); } - if (!getUidBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uid_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, uid_); } - if (!getAnnotationTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationType_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, annotationType_); } - if (!getAnnotationIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, annotationId_); } for (java.util.Map.Entry entry : internalGetMetadata().getMap().entrySet()) { @@ -593,7 +595,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField(int number) { + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(int number) { switch (number) { case 7: return internalGetMetadata(); @@ -603,7 +605,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { } @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField(int number) { + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(int number) { switch (number) { case 7: return internalGetMutableMetadata(); @@ -632,16 +634,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; shard_ = ""; - dataType_ = ""; - uid_ = ""; - annotationType_ = ""; - annotationId_ = ""; - internalGetMutableMetadata().clear(); if (segmentsBuilder_ == null) { segments_ = java.util.Collections.emptyList(); @@ -649,7 +647,7 @@ public Builder clear() { segments_ = null; segmentsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -675,25 +673,47 @@ public datawave.annotation.protobuf.v1.Annotation build() { @java.lang.Override public datawave.annotation.protobuf.v1.Annotation buildPartial() { datawave.annotation.protobuf.v1.Annotation result = new datawave.annotation.protobuf.v1.Annotation(this); - int from_bitField0_ = bitField0_; - result.shard_ = shard_; - result.dataType_ = dataType_; - result.uid_ = uid_; - result.annotationType_ = annotationType_; - result.annotationId_ = annotationId_; - result.metadata_ = internalGetMetadata(); - result.metadata_.makeImmutable(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(datawave.annotation.protobuf.v1.Annotation result) { if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000040) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000040); } result.segments_ = segments_; } else { result.segments_ = segmentsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(datawave.annotation.protobuf.v1.Annotation result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.shard_ = shard_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.dataType_ = dataType_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.uid_ = uid_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.annotationType_ = annotationType_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.annotationId_ = annotationId_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.metadata_ = internalGetMetadata(); + result.metadata_.makeImmutable(); + } } @java.lang.Override @@ -741,30 +761,36 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Annotation other) { return this; if (!other.getShard().isEmpty()) { shard_ = other.shard_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDataType().isEmpty()) { dataType_ = other.dataType_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getUid().isEmpty()) { uid_ = other.uid_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getAnnotationType().isEmpty()) { annotationType_ = other.annotationType_; + bitField0_ |= 0x00000008; onChanged(); } if (!other.getAnnotationId().isEmpty()) { annotationId_ = other.annotationId_; + bitField0_ |= 0x00000010; onChanged(); } internalGetMutableMetadata().mergeFrom(other.internalGetMetadata()); + bitField0_ |= 0x00000020; if (segmentsBuilder_ == null) { if (!other.segments_.isEmpty()) { if (segments_.isEmpty()) { segments_ = other.segments_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000040); } else { ensureSegmentsIsMutable(); segments_.addAll(other.segments_); @@ -777,7 +803,7 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Annotation other) { segmentsBuilder_.dispose(); segmentsBuilder_ = null; segments_ = other.segments_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000040); segmentsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getSegmentsFieldBuilder() : null; } else { segmentsBuilder_.addAllMessages(other.segments_); @@ -810,33 +836,34 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. break; case 10: { shard_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { dataType_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { uid_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { annotationType_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { annotationId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 case 58: { com.google.protobuf.MapEntry metadata__ = input .readMessage(MetadataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); internalGetMutableMetadata().getMutableMap().put(metadata__.getKey(), metadata__.getValue()); + bitField0_ |= 0x00000020; break; } // case 58 case 66: { @@ -913,8 +940,8 @@ public Builder setShard(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - shard_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -925,8 +952,8 @@ public Builder setShard(java.lang.String value) { * @return This builder for chaining. */ public Builder clearShard() { - shard_ = getDefaultInstance().getShard(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -943,8 +970,8 @@ public Builder setShardBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - shard_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -995,8 +1022,8 @@ public Builder setDataType(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - dataType_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1007,8 +1034,8 @@ public Builder setDataType(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDataType() { - dataType_ = getDefaultInstance().getDataType(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1025,8 +1052,8 @@ public Builder setDataTypeBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - dataType_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1077,8 +1104,8 @@ public Builder setUid(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - uid_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1089,8 +1116,8 @@ public Builder setUid(java.lang.String value) { * @return This builder for chaining. */ public Builder clearUid() { - uid_ = getDefaultInstance().getUid(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1107,8 +1134,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - uid_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1159,8 +1186,8 @@ public Builder setAnnotationType(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - annotationType_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1171,8 +1198,8 @@ public Builder setAnnotationType(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAnnotationType() { - annotationType_ = getDefaultInstance().getAnnotationType(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1189,8 +1216,8 @@ public Builder setAnnotationTypeBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - annotationType_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1241,8 +1268,8 @@ public Builder setAnnotationId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - annotationId_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1253,8 +1280,8 @@ public Builder setAnnotationId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAnnotationId() { - annotationId_ = getDefaultInstance().getAnnotationId(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1271,8 +1298,8 @@ public Builder setAnnotationIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - annotationId_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1287,14 +1314,14 @@ private com.google.protobuf.MapField internal } private com.google.protobuf.MapField internalGetMutableMetadata() { - onChanged(); - ; if (metadata_ == null) { metadata_ = com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry); } if (!metadata_.isMutable()) { metadata_ = metadata_.copy(); } + bitField0_ |= 0x00000020; + onChanged(); return metadata_; } @@ -1305,11 +1332,10 @@ public int getMetadataCount() { /** * map<string, string> metadata = 7; */ - @java.lang.Override public boolean containsMetadata(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetMetadata().getMap().containsKey(key); } @@ -1327,7 +1353,6 @@ public java.util.Map getMetadata() { * map<string, string> metadata = 7; */ @java.lang.Override - public java.util.Map getMetadataMap() { return internalGetMetadata().getMap(); } @@ -1336,10 +1361,12 @@ public java.util.Map getMetadataMap() { * map<string, string> metadata = 7; */ @java.lang.Override - - public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ + java.lang.String getMetadataOrDefault(java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1349,10 +1376,9 @@ public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.Str * map<string, string> metadata = 7; */ @java.lang.Override - public java.lang.String getMetadataOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); if (!map.containsKey(key)) { @@ -1362,6 +1388,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) { } public Builder clearMetadata() { + bitField0_ = (bitField0_ & ~0x00000020); internalGetMutableMetadata().getMutableMap().clear(); return this; } @@ -1369,10 +1396,9 @@ public Builder clearMetadata() { /** * map<string, string> metadata = 7; */ - public Builder removeMetadata(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableMetadata().getMutableMap().remove(key); return this; @@ -1383,6 +1409,7 @@ public Builder removeMetadata(java.lang.String key) { */ @java.lang.Deprecated public java.util.Map getMutableMetadata() { + bitField0_ |= 0x00000020; return internalGetMutableMetadata().getMutableMap(); } @@ -1391,30 +1418,31 @@ public java.util.Map getMutableMetadata() { */ public Builder putMetadata(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } internalGetMutableMetadata().getMutableMap().put(key, value); + bitField0_ |= 0x00000020; return this; } /** * map<string, string> metadata = 7; */ - public Builder putAllMetadata(java.util.Map values) { internalGetMutableMetadata().getMutableMap().putAll(values); + bitField0_ |= 0x00000020; return this; } private java.util.List segments_ = java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000040) != 0)) { segments_ = new java.util.ArrayList(segments_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000040; } } @@ -1566,7 +1594,7 @@ public Builder addAllSegments(java.lang.Iterable getSegmen private com.google.protobuf.RepeatedFieldBuilderV3 getSegmentsFieldBuilder() { if (segmentsBuilder_ == null) { segmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3( - segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + segments_, ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationList.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationList.java index 2c1f6d60bdd..f5fcd0f3db1 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationList.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationList.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -27,11 +28,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new AnnotationList(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_AnnotationList_descriptor; } @@ -44,6 +40,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF } public static final int ANNOTATIONS_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List annotations_; /** @@ -87,7 +84,8 @@ public datawave.annotation.protobuf.v1.AnnotationOrBuilder getAnnotationsOrBuild } public static final int NEXTPAGETOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * string nextPageToken = 2; @@ -143,7 +141,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < annotations_.size(); i++) { output.writeMessage(1, annotations_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } getUnknownFields().writeTo(output); @@ -159,7 +157,7 @@ public int getSerializedSize() { for (int i = 0; i < annotations_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, annotations_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } size += getUnknownFields().getSerializedSize(); @@ -313,6 +311,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (annotationsBuilder_ == null) { annotations_ = java.util.Collections.emptyList(); } else { @@ -321,7 +320,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -347,7 +345,15 @@ public datawave.annotation.protobuf.v1.AnnotationList build() { @java.lang.Override public datawave.annotation.protobuf.v1.AnnotationList buildPartial() { datawave.annotation.protobuf.v1.AnnotationList result = new datawave.annotation.protobuf.v1.AnnotationList(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(datawave.annotation.protobuf.v1.AnnotationList result) { if (annotationsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { annotations_ = java.util.Collections.unmodifiableList(annotations_); @@ -357,9 +363,13 @@ public datawave.annotation.protobuf.v1.AnnotationList buildPartial() { } else { result.annotations_ = annotationsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(datawave.annotation.protobuf.v1.AnnotationList result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -431,6 +441,7 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.AnnotationList other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -470,7 +481,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. } // case 10 case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: { @@ -775,8 +786,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -787,8 +798,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -805,8 +816,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationListOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationListOrBuilder.java index dffe9991436..54fbb24701d 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationListOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationListOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface AnnotationListOrBuilder extends diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationOrBuilder.java index a47da9a49cb..dfcd6628b86 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface AnnotationOrBuilder extends @@ -101,13 +102,14 @@ public interface AnnotationOrBuilder extends /** * map<string, string> metadata = 7; */ - - java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue); + /* nullable */ + java.lang.String getMetadataOrDefault(java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * map<string, string> metadata = 7; */ - java.lang.String getMetadataOrThrow(java.lang.String key); /** diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationV1.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationV1.java index 5a2ce8a9831..b7bd74a88c8 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationV1.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/AnnotationV1.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public final class AnnotationV1 { @@ -63,60 +64,61 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String[] descriptorData = {"\n\022AnnotationV1.proto\022\037datawave.annotatio" + "n.protobuf.v1\032 google/protobuf/field_mas" - + "k.proto\032\037google/protobuf/timestamp.proto" + "\032\034google/api/annotations.proto\"\005\n\003All\",\n" - + "\005Point\022\t\n\001x\030\001 \001(\001\022\t\n\001y\030\002 \001(\001\022\r\n\005label\030\003 " - + "\001(\t\"B\n\tPointList\0225\n\005point\030\001 \003(\0132&.datawa" + "ve.annotation.protobuf.v1.Point\";\n\017TimeS" - + "panSeconds\022\024\n\014startSeconds\030\001 \001(\001\022\022\n\nendS" - + "econds\030\002 \001(\001\"=\n\rTextSpanChars\022\026\n\016startCh" - + "aracter\030\001 \001(\003\022\024\n\014endCharacter\030\002 \001(\003\"R\n\014S" - + "egmentValue\022\r\n\005value\030\001 \001(\t\022\r\n\005score\030\002 \001(" - + "\001\022\026\n\textension\030\003 \001(\tH\000\210\001\001B\014\n\n_extension\"" - + "\207\005\n\007Segment\022\024\n\014annotationId\030\001 \001(\t\022\021\n\tseg" - + "mentId\030\002 \001(\t\022.\n\ncreateTime\030\003 \001(\0132\032.googl" + "e.protobuf.Timestamp\022.\n\nupdateTime\030\004 \001(\013" - + "2\032.google.protobuf.Timestamp\022\014\n\004eTag\030\005 \001" + "(\t\022C\n\014segmentValue\030\006 \003(\0132-.datawave.anno" - + "tation.protobuf.v1.SegmentValue\022H\n\010metad" + "ata\030\007 \003(\01326.datawave.annotation.protobuf" - + ".v1.Segment.MetadataEntry\022\024\n\014boundaryTyp" + "e\030\n \001(\t\0223\n\003all\030\024 \001(\0132$.datawave.annotati" - + "on.protobuf.v1.AllH\000\022?\n\tpointList\030\025 \001(\0132" + "*.datawave.annotation.protobuf.v1.PointL" - + "istH\000\022@\n\004time\030\026 \001(\01320.datawave.annotatio" + "n.protobuf.v1.TimeSpanSecondsH\000\022D\n\nchara" - + "cters\030\027 \001(\0132..datawave.annotation.protob" + "uf.v1.TextSpanCharsH\000\032/\n\rMetadataEntry\022\013" - + "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\n\n\010bounda" - + "ryJ\005\010d\020\310\001\"\242\002\n\nAnnotation\022\r\n\005shard\030\001 \001(\t\022" - + "\020\n\010dataType\030\002 \001(\t\022\013\n\003uid\030\003 \001(\t\022\026\n\016annota" - + "tionType\030\004 \001(\t\022\024\n\014annotationId\030\005 \001(\t\022K\n\010" - + "metadata\030\007 \003(\01329.datawave.annotation.pro" + "tobuf.v1.Annotation.MetadataEntry\022:\n\010seg" - + "ments\030\010 \003(\0132(.datawave.annotation.protob" + "uf.v1.Segment\032/\n\rMetadataEntry\022\013\n\003key\030\001 " - + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"`\n\013SegmentList\022:\n" - + "\010segments\030\001 \003(\0132(.datawave.annotation.pr" + "otobuf.v1.Segment\022\025\n\rnextPageToken\030\002 \001(\t" - + "\"i\n\016AnnotationList\022@\n\013annotations\030\001 \003(\0132" + "+.datawave.annotation.protobuf.v1.Annota" - + "tion\022\025\n\rnextPageToken\030\002 \001(\t\"<\n\024GetAnnota" - + "tionRequest\022\016\n\006idType\030\001 \001(\t\022\024\n\014annotatio" - + "nId\030\002 \001(\t\"Z\n\027CreateAnnotationRequest\022?\n\n" + "annotation\030\002 \001(\0132+.datawave.annotation.p" - + "rotobuf.v1.Annotation\"\240\001\n\027UpdateAnnotati" + "onRequest\022?\n\nannotation\030\001 \001(\0132+.datawave" - + ".annotation.protobuf.v1.Annotation\022.\n\nup" + "dateMask\030\002 \001(\0132\032.google.protobuf.FieldMa" - + "sk\022\024\n\014allowMissing\030\003 \001(\010\"=\n\027DeleteAnnota" - + "tionRequest\022\024\n\014annotationId\030\001 \001(\t\022\014\n\004eTa" - + "g\030\003 \001(\t\"M\n\026ListAnnotationsRequest\022\020\n\010pag" - + "eSize\030\001 \001(\005\022\021\n\tpageToken\030\002 \001(\t\022\016\n\006filter" - + "\030\003 \001(\t\"<\n\021GetSegmentRequest\022\024\n\014annotatio" - + "nId\030\001 \001(\t\022\021\n\tsegmentId\030\002 \001(\t\"Q\n\024CreateSe" - + "gmentRequest\0229\n\007segment\030\002 \001(\0132(.datawave" + ".annotation.protobuf.v1.Segment\"\227\001\n\024Upda" - + "teSegmentRequest\0229\n\007segment\030\001 \001(\0132(.data" + "wave.annotation.protobuf.v1.Segment\022.\n\nu" - + "pdateMask\030\002 \001(\0132\032.google.protobuf.FieldM" + "ask\022\024\n\014allowMissing\030\003 \001(\010\"M\n\024DeleteSegme" - + "ntRequest\022\024\n\014annotationId\030\001 \001(\t\022\021\n\tsegme" - + "ntId\030\002 \001(\t\022\014\n\004eTag\030\003 \001(\t\"J\n\023ListSegments" - + "Request\022\020\n\010pageSize\030\001 \001(\005\022\021\n\tpageToken\030\002" - + " \001(\t\022\016\n\006filter\030\003 \001(\t2\342\005\n\016SegmentService\022" - + "\205\001\n\nGetSegment\0222.datawave.annotation.pro" + "tobuf.v1.GetSegmentRequest\032(.datawave.an" - + "notation.protobuf.v1.Segment\"\031\202\323\344\223\002\023\022\021/v" + "1/segments/{id}\022\210\001\n\014ListSegments\0224.dataw" - + "ave.annotation.protobuf.v1.ListSegmentsR" + "equest\032,.datawave.annotation.protobuf.v1" - + ".SegmentList\"\024\202\323\344\223\002\016\022\014/v1/segments\022\217\001\n\rC" + "reateSegment\0225.datawave.annotation.proto" - + "buf.v1.CreateSegmentRequest\032(.datawave.a" + "nnotation.protobuf.v1.Segment\"\035\202\323\344\223\002\027\"\014/" - + "v1/segments:\007segment\022\234\001\n\rUpdateSegment\0225" + ".datawave.annotation.protobuf.v1.UpdateS" - + "egmentRequest\032(.datawave.annotation.prot" + "obuf.v1.Segment\"*\202\323\344\223\002$2\031/v1/segments/{s" - + "egment.id}:\007segment\022\213\001\n\rDeleteSegment\0225." + "datawave.annotation.protobuf.v1.DeleteSe" - + "gmentRequest\032(.datawave.annotation.proto" + "buf.v1.Segment\"\031\202\323\344\223\002\023*\021/v1/segments/{id" - + "}B#\n\037datawave.annotation.protobuf.v1P\001b\006" + "proto3"}; + java.lang.String[] descriptorData = {"\n>warehouse/annotation-core/src/main/pro" + "tobuf/AnnotationV1.proto\022\037datawave.annot" + + "ation.protobuf.v1\032 google/protobuf/field" + "_mask.proto\032\037google/protobuf/timestamp.p" + + "roto\032\034google/api/annotations.proto\"\005\n\003Al" + + "l\",\n\005Point\022\t\n\001x\030\001 \001(\001\022\t\n\001y\030\002 \001(\001\022\r\n\005labe" + + "l\030\003 \001(\t\"B\n\tPointList\0225\n\005point\030\001 \003(\0132&.da" + "tawave.annotation.protobuf.v1.Point\";\n\017T" + + "imeSpanSeconds\022\024\n\014startSeconds\030\001 \001(\001\022\022\n\n" + + "endSeconds\030\002 \001(\001\"=\n\rTextSpanChars\022\026\n\016sta" + + "rtCharacter\030\001 \001(\003\022\024\n\014endCharacter\030\002 \001(\003\"" + + "R\n\014SegmentValue\022\r\n\005value\030\001 \001(\t\022\r\n\005score\030" + + "\002 \001(\001\022\026\n\textension\030\003 \001(\tH\000\210\001\001B\014\n\n_extens" + + "ion\"\207\005\n\007Segment\022\024\n\014annotationId\030\001 \001(\t\022\021\n" + + "\tsegmentId\030\002 \001(\t\022.\n\ncreateTime\030\003 \001(\0132\032.g" + "oogle.protobuf.Timestamp\022.\n\nupdateTime\030\004" + + " \001(\0132\032.google.protobuf.Timestamp\022\014\n\004eTag" + + "\030\005 \001(\t\022C\n\014segmentValue\030\006 \003(\0132-.datawave." + "annotation.protobuf.v1.SegmentValue\022H\n\010m" + + "etadata\030\007 \003(\01326.datawave.annotation.prot" + "obuf.v1.Segment.MetadataEntry\022\024\n\014boundar" + + "yType\030\n \001(\t\0223\n\003all\030\024 \001(\0132$.datawave.anno" + "tation.protobuf.v1.AllH\000\022?\n\tpointList\030\025 " + + "\001(\0132*.datawave.annotation.protobuf.v1.Po" + "intListH\000\022@\n\004time\030\026 \001(\01320.datawave.annot" + + "ation.protobuf.v1.TimeSpanSecondsH\000\022D\n\nc" + "haracters\030\027 \001(\0132..datawave.annotation.pr" + + "otobuf.v1.TextSpanCharsH\000\032/\n\rMetadataEnt" + + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\n\n\010bo" + + "undaryJ\005\010d\020\310\001\"\242\002\n\nAnnotation\022\r\n\005shard\030\001 " + + "\001(\t\022\020\n\010dataType\030\002 \001(\t\022\013\n\003uid\030\003 \001(\t\022\026\n\016an" + + "notationType\030\004 \001(\t\022\024\n\014annotationId\030\005 \001(\t" + + "\022K\n\010metadata\030\007 \003(\01329.datawave.annotation" + ".protobuf.v1.Annotation.MetadataEntry\022:\n" + + "\010segments\030\010 \003(\0132(.datawave.annotation.pr" + "otobuf.v1.Segment\032/\n\rMetadataEntry\022\013\n\003ke" + + "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"`\n\013SegmentLis" + + "t\022:\n\010segments\030\001 \003(\0132(.datawave.annotatio" + "n.protobuf.v1.Segment\022\025\n\rnextPageToken\030\002" + + " \001(\t\"i\n\016AnnotationList\022@\n\013annotations\030\001 " + "\003(\0132+.datawave.annotation.protobuf.v1.An" + + "notation\022\025\n\rnextPageToken\030\002 \001(\t\"<\n\024GetAn" + + "notationRequest\022\016\n\006idType\030\001 \001(\t\022\024\n\014annot" + "ationId\030\002 \001(\t\"Z\n\027CreateAnnotationRequest" + + "\022?\n\nannotation\030\002 \001(\0132+.datawave.annotati" + "on.protobuf.v1.Annotation\"\240\001\n\027UpdateAnno" + + "tationRequest\022?\n\nannotation\030\001 \001(\0132+.data" + "wave.annotation.protobuf.v1.Annotation\022." + + "\n\nupdateMask\030\002 \001(\0132\032.google.protobuf.Fie" + "ldMask\022\024\n\014allowMissing\030\003 \001(\010\"=\n\027DeleteAn" + + "notationRequest\022\024\n\014annotationId\030\001 \001(\t\022\014\n" + + "\004eTag\030\003 \001(\t\"M\n\026ListAnnotationsRequest\022\020\n" + + "\010pageSize\030\001 \001(\005\022\021\n\tpageToken\030\002 \001(\t\022\016\n\006fi" + + "lter\030\003 \001(\t\"<\n\021GetSegmentRequest\022\024\n\014annot" + + "ationId\030\001 \001(\t\022\021\n\tsegmentId\030\002 \001(\t\"Q\n\024Crea" + + "teSegmentRequest\0229\n\007segment\030\002 \001(\0132(.data" + "wave.annotation.protobuf.v1.Segment\"\227\001\n\024" + + "UpdateSegmentRequest\0229\n\007segment\030\001 \001(\0132(." + "datawave.annotation.protobuf.v1.Segment\022" + + ".\n\nupdateMask\030\002 \001(\0132\032.google.protobuf.Fi" + "eldMask\022\024\n\014allowMissing\030\003 \001(\010\"M\n\024DeleteS" + + "egmentRequest\022\024\n\014annotationId\030\001 \001(\t\022\021\n\ts" + + "egmentId\030\002 \001(\t\022\014\n\004eTag\030\003 \001(\t\"J\n\023ListSegm" + + "entsRequest\022\020\n\010pageSize\030\001 \001(\005\022\021\n\tpageTok" + + "en\030\002 \001(\t\022\016\n\006filter\030\003 \001(\t2\342\005\n\016SegmentServ" + + "ice\022\205\001\n\nGetSegment\0222.datawave.annotation" + ".protobuf.v1.GetSegmentRequest\032(.datawav" + + "e.annotation.protobuf.v1.Segment\"\031\202\323\344\223\002\023" + "\022\021/v1/segments/{id}\022\210\001\n\014ListSegments\0224.d" + + "atawave.annotation.protobuf.v1.ListSegme" + "ntsRequest\032,.datawave.annotation.protobu" + + "f.v1.SegmentList\"\024\202\323\344\223\002\016\022\014/v1/segments\022\217" + "\001\n\rCreateSegment\0225.datawave.annotation.p" + + "rotobuf.v1.CreateSegmentRequest\032(.datawa" + "ve.annotation.protobuf.v1.Segment\"\035\202\323\344\223\002" + + "\027\"\014/v1/segments:\007segment\022\234\001\n\rUpdateSegme" + "nt\0225.datawave.annotation.protobuf.v1.Upd" + + "ateSegmentRequest\032(.datawave.annotation." + "protobuf.v1.Segment\"*\202\323\344\223\002$2\031/v1/segment" + + "s/{segment.id}:\007segment\022\213\001\n\rDeleteSegmen" + "t\0225.datawave.annotation.protobuf.v1.Dele" + + "teSegmentRequest\032(.datawave.annotation.p" + "rotobuf.v1.Segment\"\031\202\323\344\223\002\023*\021/v1/segments" + + "/{id}B#\n\037datawave.annotation.protobuf.v1" + "P\001b\006proto3"}; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {com.google.protobuf.FieldMaskProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), com.google.api.AnnotationsProto.getDescriptor(),}); @@ -137,8 +139,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_datawave_annotation_protobuf_v1_TextSpanChars_descriptor, new java.lang.String[] {"StartCharacter", "EndCharacter",}); internal_static_datawave_annotation_protobuf_v1_SegmentValue_descriptor = getDescriptor().getMessageTypes().get(5); internal_static_datawave_annotation_protobuf_v1_SegmentValue_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_datawave_annotation_protobuf_v1_SegmentValue_descriptor, - new java.lang.String[] {"Value", "Score", "Extension", "Extension",}); + internal_static_datawave_annotation_protobuf_v1_SegmentValue_descriptor, new java.lang.String[] {"Value", "Score", "Extension",}); internal_static_datawave_annotation_protobuf_v1_Segment_descriptor = getDescriptor().getMessageTypes().get(6); internal_static_datawave_annotation_protobuf_v1_Segment_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_datawave_annotation_protobuf_v1_Segment_descriptor, new java.lang.String[] {"AnnotationId", "SegmentId", "CreateTime", diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequest.java index dac139fb3c2..685c64f305f 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequest.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequest.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -24,11 +25,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new CreateAnnotationRequest(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_CreateAnnotationRequest_descriptor; } @@ -40,6 +36,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF datawave.annotation.protobuf.v1.CreateAnnotationRequest.Builder.class); } + private int bitField0_; public static final int ANNOTATION_FIELD_NUMBER = 2; private datawave.annotation.protobuf.v1.Annotation annotation_; @@ -54,7 +51,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF */ @java.lang.Override public boolean hasAnnotation() { - return annotation_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** @@ -80,7 +77,7 @@ public datawave.annotation.protobuf.v1.Annotation getAnnotation() { */ @java.lang.Override public datawave.annotation.protobuf.v1.AnnotationOrBuilder getAnnotationOrBuilder() { - return getAnnotation(); + return annotation_ == null ? datawave.annotation.protobuf.v1.Annotation.getDefaultInstance() : annotation_; } private byte memoizedIsInitialized = -1; @@ -99,7 +96,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (annotation_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(2, getAnnotation()); } getUnknownFields().writeTo(output); @@ -112,7 +109,7 @@ public int getSerializedSize() { return size; size = 0; - if (annotation_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getAnnotation()); } size += getUnknownFields().getSerializedSize(); @@ -256,21 +253,27 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF // Construct using datawave.annotation.protobuf.v1.CreateAnnotationRequest.newBuilder() private Builder() { - + maybeForceBuilderInitialization(); } private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { + getAnnotationFieldBuilder(); + } } @java.lang.Override public Builder clear() { super.clear(); - if (annotationBuilder_ == null) { - annotation_ = null; - } else { - annotation_ = null; + bitField0_ = 0; + annotation_ = null; + if (annotationBuilder_ != null) { + annotationBuilder_.dispose(); annotationBuilder_ = null; } return this; @@ -298,15 +301,23 @@ public datawave.annotation.protobuf.v1.CreateAnnotationRequest build() { @java.lang.Override public datawave.annotation.protobuf.v1.CreateAnnotationRequest buildPartial() { datawave.annotation.protobuf.v1.CreateAnnotationRequest result = new datawave.annotation.protobuf.v1.CreateAnnotationRequest(this); - if (annotationBuilder_ == null) { - result.annotation_ = annotation_; - } else { - result.annotation_ = annotationBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(datawave.annotation.protobuf.v1.CreateAnnotationRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.annotation_ = annotationBuilder_ == null ? annotation_ : annotationBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -379,7 +390,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. break; case 18: { input.readMessage(getAnnotationFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 18 default: { @@ -398,6 +409,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. return this; } + private int bitField0_; + private datawave.annotation.protobuf.v1.Annotation annotation_; private com.google.protobuf.SingleFieldBuilderV3 annotationBuilder_; @@ -411,7 +424,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. * @return Whether the annotation field is set. */ public boolean hasAnnotation() { - return annotationBuilder_ != null || annotation_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** @@ -444,11 +457,11 @@ public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation value) { throw new NullPointerException(); } annotation_ = value; - onChanged(); } else { annotationBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } @@ -462,11 +475,11 @@ public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation value) { public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation.Builder builderForValue) { if (annotationBuilder_ == null) { annotation_ = builderForValue.build(); - onChanged(); } else { annotationBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } @@ -479,16 +492,18 @@ public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation.Builder */ public Builder mergeAnnotation(datawave.annotation.protobuf.v1.Annotation value) { if (annotationBuilder_ == null) { - if (annotation_ != null) { - annotation_ = datawave.annotation.protobuf.v1.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) && annotation_ != null && annotation_ != datawave.annotation.protobuf.v1.Annotation.getDefaultInstance()) { + getAnnotationBuilder().mergeFrom(value); } else { annotation_ = value; } - onChanged(); } else { annotationBuilder_.mergeFrom(value); } - + if (annotation_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } return this; } @@ -500,14 +515,13 @@ public Builder mergeAnnotation(datawave.annotation.protobuf.v1.Annotation value) * .datawave.annotation.protobuf.v1.Annotation annotation = 2; */ public Builder clearAnnotation() { - if (annotationBuilder_ == null) { - annotation_ = null; - onChanged(); - } else { - annotation_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + annotation_ = null; + if (annotationBuilder_ != null) { + annotationBuilder_.dispose(); annotationBuilder_ = null; } - + onChanged(); return this; } @@ -519,7 +533,7 @@ public Builder clearAnnotation() { * .datawave.annotation.protobuf.v1.Annotation annotation = 2; */ public datawave.annotation.protobuf.v1.Annotation.Builder getAnnotationBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getAnnotationFieldBuilder().getBuilder(); } diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequestOrBuilder.java index 11afab734a6..082ef2387bd 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequestOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateAnnotationRequestOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface CreateAnnotationRequestOrBuilder extends diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequest.java index 2fe7a264dc2..f2da6fc4cac 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequest.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequest.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -24,11 +25,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new CreateSegmentRequest(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_CreateSegmentRequest_descriptor; } @@ -40,6 +36,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF datawave.annotation.protobuf.v1.CreateSegmentRequest.Builder.class); } + private int bitField0_; public static final int SEGMENT_FIELD_NUMBER = 2; private datawave.annotation.protobuf.v1.Segment segment_; @@ -54,7 +51,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF */ @java.lang.Override public boolean hasSegment() { - return segment_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** @@ -80,7 +77,7 @@ public datawave.annotation.protobuf.v1.Segment getSegment() { */ @java.lang.Override public datawave.annotation.protobuf.v1.SegmentOrBuilder getSegmentOrBuilder() { - return getSegment(); + return segment_ == null ? datawave.annotation.protobuf.v1.Segment.getDefaultInstance() : segment_; } private byte memoizedIsInitialized = -1; @@ -99,7 +96,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (segment_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(2, getSegment()); } getUnknownFields().writeTo(output); @@ -112,7 +109,7 @@ public int getSerializedSize() { return size; size = 0; - if (segment_ != null) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSegment()); } size += getUnknownFields().getSerializedSize(); @@ -256,21 +253,27 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF // Construct using datawave.annotation.protobuf.v1.CreateSegmentRequest.newBuilder() private Builder() { - + maybeForceBuilderInitialization(); } private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { + getSegmentFieldBuilder(); + } } @java.lang.Override public Builder clear() { super.clear(); - if (segmentBuilder_ == null) { - segment_ = null; - } else { - segment_ = null; + bitField0_ = 0; + segment_ = null; + if (segmentBuilder_ != null) { + segmentBuilder_.dispose(); segmentBuilder_ = null; } return this; @@ -298,15 +301,23 @@ public datawave.annotation.protobuf.v1.CreateSegmentRequest build() { @java.lang.Override public datawave.annotation.protobuf.v1.CreateSegmentRequest buildPartial() { datawave.annotation.protobuf.v1.CreateSegmentRequest result = new datawave.annotation.protobuf.v1.CreateSegmentRequest(this); - if (segmentBuilder_ == null) { - result.segment_ = segment_; - } else { - result.segment_ = segmentBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(datawave.annotation.protobuf.v1.CreateSegmentRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.segment_ = segmentBuilder_ == null ? segment_ : segmentBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -379,7 +390,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. break; case 18: { input.readMessage(getSegmentFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 18 default: { @@ -398,6 +409,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. return this; } + private int bitField0_; + private datawave.annotation.protobuf.v1.Segment segment_; private com.google.protobuf.SingleFieldBuilderV3 segmentBuilder_; @@ -411,7 +424,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. * @return Whether the segment field is set. */ public boolean hasSegment() { - return segmentBuilder_ != null || segment_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** @@ -444,11 +457,11 @@ public Builder setSegment(datawave.annotation.protobuf.v1.Segment value) { throw new NullPointerException(); } segment_ = value; - onChanged(); } else { segmentBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } @@ -462,11 +475,11 @@ public Builder setSegment(datawave.annotation.protobuf.v1.Segment value) { public Builder setSegment(datawave.annotation.protobuf.v1.Segment.Builder builderForValue) { if (segmentBuilder_ == null) { segment_ = builderForValue.build(); - onChanged(); } else { segmentBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } @@ -479,16 +492,18 @@ public Builder setSegment(datawave.annotation.protobuf.v1.Segment.Builder builde */ public Builder mergeSegment(datawave.annotation.protobuf.v1.Segment value) { if (segmentBuilder_ == null) { - if (segment_ != null) { - segment_ = datawave.annotation.protobuf.v1.Segment.newBuilder(segment_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) && segment_ != null && segment_ != datawave.annotation.protobuf.v1.Segment.getDefaultInstance()) { + getSegmentBuilder().mergeFrom(value); } else { segment_ = value; } - onChanged(); } else { segmentBuilder_.mergeFrom(value); } - + if (segment_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } return this; } @@ -500,14 +515,13 @@ public Builder mergeSegment(datawave.annotation.protobuf.v1.Segment value) { * .datawave.annotation.protobuf.v1.Segment segment = 2; */ public Builder clearSegment() { - if (segmentBuilder_ == null) { - segment_ = null; - onChanged(); - } else { - segment_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + segment_ = null; + if (segmentBuilder_ != null) { + segmentBuilder_.dispose(); segmentBuilder_ = null; } - + onChanged(); return this; } @@ -519,7 +533,7 @@ public Builder clearSegment() { * .datawave.annotation.protobuf.v1.Segment segment = 2; */ public datawave.annotation.protobuf.v1.Segment.Builder getSegmentBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getSegmentFieldBuilder().getBuilder(); } diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequestOrBuilder.java index 8e6a616fb26..ae0c2983437 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequestOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/CreateSegmentRequestOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface CreateSegmentRequestOrBuilder extends diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequest.java index 8a4cf09ff52..1e743ecd0eb 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequest.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequest.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -27,11 +28,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new DeleteAnnotationRequest(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_DeleteAnnotationRequest_descriptor; } @@ -44,7 +40,8 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF } public static final int ANNOTATIONID_FIELD_NUMBER = 1; - private volatile java.lang.Object annotationId_; + @SuppressWarnings("serial") + private volatile java.lang.Object annotationId_ = ""; /** * string annotationId = 1; @@ -82,7 +79,8 @@ public com.google.protobuf.ByteString getAnnotationIdBytes() { } public static final int ETAG_FIELD_NUMBER = 3; - private volatile java.lang.Object eTag_; + @SuppressWarnings("serial") + private volatile java.lang.Object eTag_ = ""; /** * 
@@ -143,10 +141,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 1, annotationId_);
         }
-        if (!getETagBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eTag_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 3, eTag_);
         }
         getUnknownFields().writeTo(output);
@@ -159,10 +157,10 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, annotationId_);
         }
-        if (!getETagBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eTag_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, eTag_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -315,10 +313,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             annotationId_ = "";
-
             eTag_ = "";
-
             return this;
         }
 
@@ -344,12 +341,23 @@ public datawave.annotation.protobuf.v1.DeleteAnnotationRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.DeleteAnnotationRequest buildPartial() {
             datawave.annotation.protobuf.v1.DeleteAnnotationRequest result = new datawave.annotation.protobuf.v1.DeleteAnnotationRequest(this);
-            result.annotationId_ = annotationId_;
-            result.eTag_ = eTag_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.DeleteAnnotationRequest result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.annotationId_ = annotationId_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.eTag_ = eTag_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -395,10 +403,12 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.DeleteAnnotationRequest
                 return this;
             if (!other.getAnnotationId().isEmpty()) {
                 annotationId_ = other.annotationId_;
+                bitField0_ |= 0x00000001;
                 onChanged();
             }
             if (!other.getETag().isEmpty()) {
                 eTag_ = other.eTag_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -427,12 +437,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             annotationId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 26: {
                             eTag_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 26
                         default: {
@@ -451,6 +461,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object annotationId_ = "";
 
         /**
@@ -497,8 +509,8 @@ public Builder setAnnotationId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -509,8 +521,8 @@ public Builder setAnnotationId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAnnotationId() {
-
             annotationId_ = getDefaultInstance().getAnnotationId();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
         }
@@ -527,8 +539,8 @@ public Builder setAnnotationIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -591,8 +603,8 @@ public Builder setETag(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             eTag_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -607,8 +619,8 @@ public Builder setETag(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearETag() {
-
             eTag_ = getDefaultInstance().getETag();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -629,8 +641,8 @@ public Builder setETagBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             eTag_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequestOrBuilder.java
index 843fde82a6e..59d8f491188 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteAnnotationRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface DeleteAnnotationRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequest.java
index 0e515eeec58..2e70816c75a 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequest.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequest.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -28,11 +29,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new DeleteSegmentRequest();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_DeleteSegmentRequest_descriptor;
     }
@@ -45,7 +41,8 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int ANNOTATIONID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object annotationId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object annotationId_ = "";
 
     /**
      * string annotationId = 1;
@@ -83,7 +80,8 @@ public com.google.protobuf.ByteString getAnnotationIdBytes() {
     }
 
     public static final int SEGMENTID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object segmentId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object segmentId_ = "";
 
     /**
      * string segmentId = 2;
@@ -121,7 +119,8 @@ public com.google.protobuf.ByteString getSegmentIdBytes() {
     }
 
     public static final int ETAG_FIELD_NUMBER = 3;
-    private volatile java.lang.Object eTag_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object eTag_ = "";
 
     /**
      * 
@@ -182,13 +181,13 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 1, annotationId_);
         }
-        if (!getSegmentIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(segmentId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, segmentId_);
         }
-        if (!getETagBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eTag_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 3, eTag_);
         }
         getUnknownFields().writeTo(output);
@@ -201,13 +200,13 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, annotationId_);
         }
-        if (!getSegmentIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(segmentId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, segmentId_);
         }
-        if (!getETagBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eTag_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, eTag_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -364,12 +363,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             annotationId_ = "";
-
             segmentId_ = "";
-
             eTag_ = "";
-
             return this;
         }
 
@@ -395,13 +392,26 @@ public datawave.annotation.protobuf.v1.DeleteSegmentRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.DeleteSegmentRequest buildPartial() {
             datawave.annotation.protobuf.v1.DeleteSegmentRequest result = new datawave.annotation.protobuf.v1.DeleteSegmentRequest(this);
-            result.annotationId_ = annotationId_;
-            result.segmentId_ = segmentId_;
-            result.eTag_ = eTag_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.DeleteSegmentRequest result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.annotationId_ = annotationId_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.segmentId_ = segmentId_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.eTag_ = eTag_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -447,14 +457,17 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.DeleteSegmentRequest ot
                 return this;
             if (!other.getAnnotationId().isEmpty()) {
                 annotationId_ = other.annotationId_;
+                bitField0_ |= 0x00000001;
                 onChanged();
             }
             if (!other.getSegmentId().isEmpty()) {
                 segmentId_ = other.segmentId_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             if (!other.getETag().isEmpty()) {
                 eTag_ = other.eTag_;
+                bitField0_ |= 0x00000004;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -483,17 +496,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             annotationId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 18: {
                             segmentId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         case 26: {
                             eTag_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 26
                         default: {
@@ -512,6 +525,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object annotationId_ = "";
 
         /**
@@ -558,8 +573,8 @@ public Builder setAnnotationId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -570,8 +585,8 @@ public Builder setAnnotationId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAnnotationId() {
-
             annotationId_ = getDefaultInstance().getAnnotationId();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
         }
@@ -588,8 +603,8 @@ public Builder setAnnotationIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -640,8 +655,8 @@ public Builder setSegmentId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             segmentId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -652,8 +667,8 @@ public Builder setSegmentId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSegmentId() {
-
             segmentId_ = getDefaultInstance().getSegmentId();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -670,8 +685,8 @@ public Builder setSegmentIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             segmentId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -734,8 +749,8 @@ public Builder setETag(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             eTag_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -750,8 +765,8 @@ public Builder setETag(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearETag() {
-
             eTag_ = getDefaultInstance().getETag();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
         }
@@ -772,8 +787,8 @@ public Builder setETagBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             eTag_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequestOrBuilder.java
index bfc456484cc..673fbd7b03a 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/DeleteSegmentRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface DeleteSegmentRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequest.java
index 74d578e93b8..f46f7cd8a6b 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequest.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequest.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -31,11 +32,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new GetAnnotationRequest();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_GetAnnotationRequest_descriptor;
     }
@@ -48,7 +44,8 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int IDTYPE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object idType_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object idType_ = "";
 
     /**
      * string idType = 1;
@@ -86,7 +83,8 @@ public com.google.protobuf.ByteString getIdTypeBytes() {
     }
 
     public static final int ANNOTATIONID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object annotationId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object annotationId_ = "";
 
     /**
      * string annotationId = 2;
@@ -139,10 +137,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (!getIdTypeBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(idType_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 1, idType_);
         }
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, annotationId_);
         }
         getUnknownFields().writeTo(output);
@@ -155,10 +153,10 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (!getIdTypeBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(idType_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, idType_);
         }
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, annotationId_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -315,10 +313,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             idType_ = "";
-
             annotationId_ = "";
-
             return this;
         }
 
@@ -344,12 +341,23 @@ public datawave.annotation.protobuf.v1.GetAnnotationRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.GetAnnotationRequest buildPartial() {
             datawave.annotation.protobuf.v1.GetAnnotationRequest result = new datawave.annotation.protobuf.v1.GetAnnotationRequest(this);
-            result.idType_ = idType_;
-            result.annotationId_ = annotationId_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.GetAnnotationRequest result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.idType_ = idType_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.annotationId_ = annotationId_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -395,10 +403,12 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.GetAnnotationRequest ot
                 return this;
             if (!other.getIdType().isEmpty()) {
                 idType_ = other.idType_;
+                bitField0_ |= 0x00000001;
                 onChanged();
             }
             if (!other.getAnnotationId().isEmpty()) {
                 annotationId_ = other.annotationId_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -427,12 +437,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             idType_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 18: {
                             annotationId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         default: {
@@ -451,6 +461,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object idType_ = "";
 
         /**
@@ -497,8 +509,8 @@ public Builder setIdType(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             idType_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -509,8 +521,8 @@ public Builder setIdType(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearIdType() {
-
             idType_ = getDefaultInstance().getIdType();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
         }
@@ -527,8 +539,8 @@ public Builder setIdTypeBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             idType_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -579,8 +591,8 @@ public Builder setAnnotationId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             annotationId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -591,8 +603,8 @@ public Builder setAnnotationId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAnnotationId() {
-
             annotationId_ = getDefaultInstance().getAnnotationId();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -609,8 +621,8 @@ public Builder setAnnotationIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             annotationId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequestOrBuilder.java
index 40587857499..655f03b28e1 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetAnnotationRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface GetAnnotationRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequest.java
index 038bf437494..93623d1cc1f 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequest.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequest.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -31,11 +32,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new GetSegmentRequest();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_GetSegmentRequest_descriptor;
     }
@@ -48,7 +44,8 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int ANNOTATIONID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object annotationId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object annotationId_ = "";
 
     /**
      * string annotationId = 1;
@@ -86,7 +83,8 @@ public com.google.protobuf.ByteString getAnnotationIdBytes() {
     }
 
     public static final int SEGMENTID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object segmentId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object segmentId_ = "";
 
     /**
      * string segmentId = 2;
@@ -139,10 +137,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 1, annotationId_);
         }
-        if (!getSegmentIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(segmentId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, segmentId_);
         }
         getUnknownFields().writeTo(output);
@@ -155,10 +153,10 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, annotationId_);
         }
-        if (!getSegmentIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(segmentId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, segmentId_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -315,10 +313,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             annotationId_ = "";
-
             segmentId_ = "";
-
             return this;
         }
 
@@ -344,12 +341,23 @@ public datawave.annotation.protobuf.v1.GetSegmentRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.GetSegmentRequest buildPartial() {
             datawave.annotation.protobuf.v1.GetSegmentRequest result = new datawave.annotation.protobuf.v1.GetSegmentRequest(this);
-            result.annotationId_ = annotationId_;
-            result.segmentId_ = segmentId_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.GetSegmentRequest result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.annotationId_ = annotationId_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.segmentId_ = segmentId_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -395,10 +403,12 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.GetSegmentRequest other
                 return this;
             if (!other.getAnnotationId().isEmpty()) {
                 annotationId_ = other.annotationId_;
+                bitField0_ |= 0x00000001;
                 onChanged();
             }
             if (!other.getSegmentId().isEmpty()) {
                 segmentId_ = other.segmentId_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -427,12 +437,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             annotationId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 18: {
                             segmentId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         default: {
@@ -451,6 +461,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private java.lang.Object annotationId_ = "";
 
         /**
@@ -497,8 +509,8 @@ public Builder setAnnotationId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -509,8 +521,8 @@ public Builder setAnnotationId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAnnotationId() {
-
             annotationId_ = getDefaultInstance().getAnnotationId();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
         }
@@ -527,8 +539,8 @@ public Builder setAnnotationIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -579,8 +591,8 @@ public Builder setSegmentId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             segmentId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -591,8 +603,8 @@ public Builder setSegmentId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSegmentId() {
-
             segmentId_ = getDefaultInstance().getSegmentId();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -609,8 +621,8 @@ public Builder setSegmentIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             segmentId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequestOrBuilder.java
index d9f0699b8cd..8cab638a7e2 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/GetSegmentRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface GetSegmentRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequest.java
index 85259baaa01..1a38f81fd06 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequest.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequest.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -27,11 +28,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new ListAnnotationsRequest();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_ListAnnotationsRequest_descriptor;
     }
@@ -44,7 +40,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int PAGESIZE_FIELD_NUMBER = 1;
-    private int pageSize_;
+    private int pageSize_ = 0;
 
     /**
      * int32 pageSize = 1;
@@ -57,7 +53,8 @@ public int getPageSize() {
     }
 
     public static final int PAGETOKEN_FIELD_NUMBER = 2;
-    private volatile java.lang.Object pageToken_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object pageToken_ = "";
 
     /**
      * string pageToken = 2;
@@ -95,7 +92,8 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
     }
 
     public static final int FILTER_FIELD_NUMBER = 3;
-    private volatile java.lang.Object filter_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object filter_ = "";
 
     /**
      * 
@@ -159,10 +157,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         if (pageSize_ != 0) {
             output.writeInt32(1, pageSize_);
         }
-        if (!getPageTokenBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
         }
-        if (!getFilterBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 3, filter_);
         }
         getUnknownFields().writeTo(output);
@@ -178,10 +176,10 @@ public int getSerializedSize() {
         if (pageSize_ != 0) {
             size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, pageSize_);
         }
-        if (!getPageTokenBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
         }
-        if (!getFilterBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, filter_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -338,12 +336,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             pageSize_ = 0;
-
             pageToken_ = "";
-
             filter_ = "";
-
             return this;
         }
 
@@ -369,13 +365,26 @@ public datawave.annotation.protobuf.v1.ListAnnotationsRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.ListAnnotationsRequest buildPartial() {
             datawave.annotation.protobuf.v1.ListAnnotationsRequest result = new datawave.annotation.protobuf.v1.ListAnnotationsRequest(this);
-            result.pageSize_ = pageSize_;
-            result.pageToken_ = pageToken_;
-            result.filter_ = filter_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.ListAnnotationsRequest result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.pageSize_ = pageSize_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.pageToken_ = pageToken_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.filter_ = filter_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -424,10 +433,12 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.ListAnnotationsRequest
             }
             if (!other.getPageToken().isEmpty()) {
                 pageToken_ = other.pageToken_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             if (!other.getFilter().isEmpty()) {
                 filter_ = other.filter_;
+                bitField0_ |= 0x00000004;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -456,17 +467,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 8: {
                             pageSize_ = input.readInt32();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 8
                         case 18: {
                             pageToken_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         case 26: {
                             filter_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 26
                         default: {
@@ -485,6 +496,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private int pageSize_;
 
         /**
@@ -507,6 +520,7 @@ public int getPageSize() {
         public Builder setPageSize(int value) {
 
             pageSize_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -517,7 +531,7 @@ public Builder setPageSize(int value) {
          * @return This builder for chaining.
          */
         public Builder clearPageSize() {
-
+            bitField0_ = (bitField0_ & ~0x00000001);
             pageSize_ = 0;
             onChanged();
             return this;
@@ -569,8 +583,8 @@ public Builder setPageToken(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             pageToken_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -581,8 +595,8 @@ public Builder setPageToken(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearPageToken() {
-
             pageToken_ = getDefaultInstance().getPageToken();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -599,8 +613,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             pageToken_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -663,8 +677,8 @@ public Builder setFilter(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             filter_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -679,8 +693,8 @@ public Builder setFilter(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearFilter() {
-
             filter_ = getDefaultInstance().getFilter();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
         }
@@ -701,8 +715,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             filter_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequestOrBuilder.java
index eddd0d33150..98dd03521a6 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListAnnotationsRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface ListAnnotationsRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequest.java
index f9947b27901..e060222080a 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequest.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequest.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -27,11 +28,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new ListSegmentsRequest();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_ListSegmentsRequest_descriptor;
     }
@@ -44,7 +40,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int PAGESIZE_FIELD_NUMBER = 1;
-    private int pageSize_;
+    private int pageSize_ = 0;
 
     /**
      * int32 pageSize = 1;
@@ -57,7 +53,8 @@ public int getPageSize() {
     }
 
     public static final int PAGETOKEN_FIELD_NUMBER = 2;
-    private volatile java.lang.Object pageToken_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object pageToken_ = "";
 
     /**
      * string pageToken = 2;
@@ -95,7 +92,8 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
     }
 
     public static final int FILTER_FIELD_NUMBER = 3;
-    private volatile java.lang.Object filter_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object filter_ = "";
 
     /**
      * 
@@ -159,10 +157,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         if (pageSize_ != 0) {
             output.writeInt32(1, pageSize_);
         }
-        if (!getPageTokenBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
         }
-        if (!getFilterBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 3, filter_);
         }
         getUnknownFields().writeTo(output);
@@ -178,10 +176,10 @@ public int getSerializedSize() {
         if (pageSize_ != 0) {
             size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, pageSize_);
         }
-        if (!getPageTokenBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
         }
-        if (!getFilterBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, filter_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -338,12 +336,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             pageSize_ = 0;
-
             pageToken_ = "";
-
             filter_ = "";
-
             return this;
         }
 
@@ -369,13 +365,26 @@ public datawave.annotation.protobuf.v1.ListSegmentsRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.ListSegmentsRequest buildPartial() {
             datawave.annotation.protobuf.v1.ListSegmentsRequest result = new datawave.annotation.protobuf.v1.ListSegmentsRequest(this);
-            result.pageSize_ = pageSize_;
-            result.pageToken_ = pageToken_;
-            result.filter_ = filter_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.ListSegmentsRequest result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.pageSize_ = pageSize_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.pageToken_ = pageToken_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.filter_ = filter_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -424,10 +433,12 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.ListSegmentsRequest oth
             }
             if (!other.getPageToken().isEmpty()) {
                 pageToken_ = other.pageToken_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             if (!other.getFilter().isEmpty()) {
                 filter_ = other.filter_;
+                bitField0_ |= 0x00000004;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -456,17 +467,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 8: {
                             pageSize_ = input.readInt32();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 8
                         case 18: {
                             pageToken_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         case 26: {
                             filter_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 26
                         default: {
@@ -485,6 +496,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private int pageSize_;
 
         /**
@@ -507,6 +520,7 @@ public int getPageSize() {
         public Builder setPageSize(int value) {
 
             pageSize_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -517,7 +531,7 @@ public Builder setPageSize(int value) {
          * @return This builder for chaining.
          */
         public Builder clearPageSize() {
-
+            bitField0_ = (bitField0_ & ~0x00000001);
             pageSize_ = 0;
             onChanged();
             return this;
@@ -569,8 +583,8 @@ public Builder setPageToken(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             pageToken_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -581,8 +595,8 @@ public Builder setPageToken(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearPageToken() {
-
             pageToken_ = getDefaultInstance().getPageToken();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -599,8 +613,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             pageToken_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -663,8 +677,8 @@ public Builder setFilter(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             filter_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -679,8 +693,8 @@ public Builder setFilter(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearFilter() {
-
             filter_ = getDefaultInstance().getFilter();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
         }
@@ -701,8 +715,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             filter_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequestOrBuilder.java
index c48df49adfa..1ffb22880cc 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/ListSegmentsRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface ListSegmentsRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Point.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Point.java
index 5206700fe63..41ac50a35b5 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Point.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Point.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -26,11 +27,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Point();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_Point_descriptor;
     }
@@ -42,7 +38,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int X_FIELD_NUMBER = 1;
-    private double x_;
+    private double x_ = 0D;
 
     /**
      * double x = 1;
@@ -55,7 +51,7 @@ public double getX() {
     }
 
     public static final int Y_FIELD_NUMBER = 2;
-    private double y_;
+    private double y_ = 0D;
 
     /**
      * double y = 2;
@@ -68,7 +64,8 @@ public double getY() {
     }
 
     public static final int LABEL_FIELD_NUMBER = 3;
-    private volatile java.lang.Object label_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object label_ = "";
 
     /**
      * string label = 3;
@@ -121,13 +118,13 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (x_ != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(x_) != 0) {
             output.writeDouble(1, x_);
         }
-        if (y_ != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(y_) != 0) {
             output.writeDouble(2, y_);
         }
-        if (!getLabelBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 3, label_);
         }
         getUnknownFields().writeTo(output);
@@ -140,13 +137,13 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (x_ != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(x_) != 0) {
             size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, x_);
         }
-        if (y_ != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(y_) != 0) {
             size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, y_);
         }
-        if (!getLabelBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(label_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, label_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -301,12 +298,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             x_ = 0D;
-
             y_ = 0D;
-
             label_ = "";
-
             return this;
         }
 
@@ -332,13 +327,26 @@ public datawave.annotation.protobuf.v1.Point build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.Point buildPartial() {
             datawave.annotation.protobuf.v1.Point result = new datawave.annotation.protobuf.v1.Point(this);
-            result.x_ = x_;
-            result.y_ = y_;
-            result.label_ = label_;
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.Point result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.x_ = x_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.y_ = y_;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.label_ = label_;
+            }
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -390,6 +398,7 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Point other) {
             }
             if (!other.getLabel().isEmpty()) {
                 label_ = other.label_;
+                bitField0_ |= 0x00000004;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -418,17 +427,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 9: {
                             x_ = input.readDouble();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 9
                         case 17: {
                             y_ = input.readDouble();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 17
                         case 26: {
                             label_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 26
                         default: {
@@ -447,6 +456,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private double x_;
 
         /**
@@ -469,6 +480,7 @@ public double getX() {
         public Builder setX(double value) {
 
             x_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -479,7 +491,7 @@ public Builder setX(double value) {
          * @return This builder for chaining.
          */
         public Builder clearX() {
-
+            bitField0_ = (bitField0_ & ~0x00000001);
             x_ = 0D;
             onChanged();
             return this;
@@ -507,6 +519,7 @@ public double getY() {
         public Builder setY(double value) {
 
             y_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -517,7 +530,7 @@ public Builder setY(double value) {
          * @return This builder for chaining.
          */
         public Builder clearY() {
-
+            bitField0_ = (bitField0_ & ~0x00000002);
             y_ = 0D;
             onChanged();
             return this;
@@ -569,8 +582,8 @@ public Builder setLabel(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             label_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -581,8 +594,8 @@ public Builder setLabel(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearLabel() {
-
             label_ = getDefaultInstance().getLabel();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
         }
@@ -599,8 +612,8 @@ public Builder setLabelBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             label_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointList.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointList.java
index 4af2553c5c9..3e7ca431f82 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointList.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointList.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -26,11 +27,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new PointList();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_PointList_descriptor;
     }
@@ -43,6 +39,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
     }
 
     public static final int POINT_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List point_;
 
     /**
@@ -264,6 +261,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             if (pointBuilder_ == null) {
                 point_ = java.util.Collections.emptyList();
             } else {
@@ -296,7 +294,15 @@ public datawave.annotation.protobuf.v1.PointList build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.PointList buildPartial() {
             datawave.annotation.protobuf.v1.PointList result = new datawave.annotation.protobuf.v1.PointList(this);
-            int from_bitField0_ = bitField0_;
+            buildPartialRepeatedFields(result);
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
+            onBuilt();
+            return result;
+        }
+
+        private void buildPartialRepeatedFields(datawave.annotation.protobuf.v1.PointList result) {
             if (pointBuilder_ == null) {
                 if (((bitField0_ & 0x00000001) != 0)) {
                     point_ = java.util.Collections.unmodifiableList(point_);
@@ -306,8 +312,10 @@ public datawave.annotation.protobuf.v1.PointList buildPartial() {
             } else {
                 result.point_ = pointBuilder_.build();
             }
-            onBuilt();
-            return result;
+        }
+
+        private void buildPartial0(datawave.annotation.protobuf.v1.PointList result) {
+            int from_bitField0_ = bitField0_;
         }
 
         @java.lang.Override
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointListOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointListOrBuilder.java
index d760af07a64..9ff8602543b 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointListOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointListOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface PointListOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointOrBuilder.java
index 01341d151dc..af6ae37e5f3 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/PointOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface PointOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Segment.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Segment.java
index 95214749f53..384a5c77104 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Segment.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/Segment.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -34,18 +35,13 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new Segment();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_Segment_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
     @java.lang.Override
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(int number) {
         switch (number) {
             case 7:
                 return internalGetMetadata();
@@ -60,7 +56,9 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
                         .ensureFieldAccessorsInitialized(datawave.annotation.protobuf.v1.Segment.class, datawave.annotation.protobuf.v1.Segment.Builder.class);
     }
 
+    private int bitField0_;
     private int boundaryCase_ = 0;
+    @SuppressWarnings("serial")
     private java.lang.Object boundary_;
 
     public enum BoundaryCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum {
@@ -110,7 +108,8 @@ public BoundaryCase getBoundaryCase() {
     }
 
     public static final int ANNOTATIONID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object annotationId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object annotationId_ = "";
 
     /**
      * 
@@ -156,7 +155,8 @@ public com.google.protobuf.ByteString getAnnotationIdBytes() {
     }
 
     public static final int SEGMENTID_FIELD_NUMBER = 2;
-    private volatile java.lang.Object segmentId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object segmentId_ = "";
 
     /**
      * 
@@ -215,7 +215,7 @@ public com.google.protobuf.ByteString getSegmentIdBytes() {
      */
     @java.lang.Override
     public boolean hasCreateTime() {
-        return createTime_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -241,7 +241,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-        return getCreateTime();
+        return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
     }
 
     public static final int UPDATETIME_FIELD_NUMBER = 4;
@@ -258,7 +258,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
      */
     @java.lang.Override
     public boolean hasUpdateTime() {
-        return updateTime_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -284,11 +284,12 @@ public com.google.protobuf.Timestamp getUpdateTime() {
      */
     @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
-        return getUpdateTime();
+        return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
     }
 
     public static final int ETAG_FIELD_NUMBER = 5;
-    private volatile java.lang.Object eTag_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object eTag_ = "";
 
     /**
      * 
@@ -334,6 +335,7 @@ public com.google.protobuf.ByteString getETagBytes() {
     }
 
     public static final int SEGMENTVALUE_FIELD_NUMBER = 6;
+    @SuppressWarnings("serial")
     private java.util.List segmentValue_;
 
     /**
@@ -404,6 +406,7 @@ private static final class MetadataDefaultEntryHolder {
                         com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, "");
     }
 
+    @SuppressWarnings("serial")
     private com.google.protobuf.MapField metadata_;
 
     private com.google.protobuf.MapField internalGetMetadata() {
@@ -424,11 +427,10 @@ public int getMetadataCount() {
      *
      * map<string, string> metadata = 7;
      */
-
     @java.lang.Override
     public boolean containsMetadata(java.lang.String key) {
         if (key == null) {
-            throw new java.lang.NullPointerException();
+            throw new NullPointerException("map key");
         }
         return internalGetMetadata().getMap().containsKey(key);
     }
@@ -450,7 +452,6 @@ public java.util.Map getMetadata() {
      * map<string, string> metadata = 7;
      */
     @java.lang.Override
-
     public java.util.Map getMetadataMap() {
         return internalGetMetadata().getMap();
     }
@@ -463,10 +464,12 @@ public java.util.Map getMetadataMap() {
      * map<string, string> metadata = 7;
      */
     @java.lang.Override
-
-    public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue) {
+    public /* nullable */
+    java.lang.String getMetadataOrDefault(java.lang.String key,
+                    /* nullable */
+                    java.lang.String defaultValue) {
         if (key == null) {
-            throw new java.lang.NullPointerException();
+            throw new NullPointerException("map key");
         }
         java.util.Map map = internalGetMetadata().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -480,10 +483,9 @@ public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.Str
      * map<string, string> metadata = 7;
      */
     @java.lang.Override
-
     public java.lang.String getMetadataOrThrow(java.lang.String key) {
         if (key == null) {
-            throw new java.lang.NullPointerException();
+            throw new NullPointerException("map key");
         }
         java.util.Map map = internalGetMetadata().getMap();
         if (!map.containsKey(key)) {
@@ -493,7 +495,8 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
     }
 
     public static final int BOUNDARYTYPE_FIELD_NUMBER = 10;
-    private volatile java.lang.Object boundaryType_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object boundaryType_ = "";
 
     /**
      * 
@@ -710,26 +713,26 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 1, annotationId_);
         }
-        if (!getSegmentIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(segmentId_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, segmentId_);
         }
-        if (createTime_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
             output.writeMessage(3, getCreateTime());
         }
-        if (updateTime_ != null) {
+        if (((bitField0_ & 0x00000002) != 0)) {
             output.writeMessage(4, getUpdateTime());
         }
-        if (!getETagBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eTag_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 5, eTag_);
         }
         for (int i = 0; i < segmentValue_.size(); i++) {
             output.writeMessage(6, segmentValue_.get(i));
         }
         com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(output, internalGetMetadata(), MetadataDefaultEntryHolder.defaultEntry, 7);
-        if (!getBoundaryTypeBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(boundaryType_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 10, boundaryType_);
         }
         if (boundaryCase_ == 20) {
@@ -754,19 +757,19 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (!getAnnotationIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(annotationId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, annotationId_);
         }
-        if (!getSegmentIdBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(segmentId_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, segmentId_);
         }
-        if (createTime_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCreateTime());
         }
-        if (updateTime_ != null) {
+        if (((bitField0_ & 0x00000002) != 0)) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getUpdateTime());
         }
-        if (!getETagBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eTag_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, eTag_);
         }
         for (int i = 0; i < segmentValue_.size(); i++) {
@@ -777,7 +780,7 @@ public int getSerializedSize() {
                             .setKey(entry.getKey()).setValue(entry.getValue()).build();
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, metadata__);
         }
-        if (!getBoundaryTypeBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(boundaryType_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, boundaryType_);
         }
         if (boundaryCase_ == 20) {
@@ -1008,7 +1011,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         }
 
         @SuppressWarnings({"rawtypes"})
-        protected com.google.protobuf.MapField internalGetMapField(int number) {
+        protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(int number) {
             switch (number) {
                 case 7:
                     return internalGetMetadata();
@@ -1018,7 +1021,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
         }
 
         @SuppressWarnings({"rawtypes"})
-        protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+        protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(int number) {
             switch (number) {
                 case 7:
                     return internalGetMutableMetadata();
@@ -1036,45 +1039,48 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
         // Construct using datawave.annotation.protobuf.v1.Segment.newBuilder()
         private Builder() {
-
+            maybeForceBuilderInitialization();
         }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             super(parent);
+            maybeForceBuilderInitialization();
+        }
 
+        private void maybeForceBuilderInitialization() {
+            if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+                getCreateTimeFieldBuilder();
+                getUpdateTimeFieldBuilder();
+                getSegmentValueFieldBuilder();
+            }
         }
 
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             annotationId_ = "";
-
             segmentId_ = "";
-
-            if (createTimeBuilder_ == null) {
-                createTime_ = null;
-            } else {
-                createTime_ = null;
+            createTime_ = null;
+            if (createTimeBuilder_ != null) {
+                createTimeBuilder_.dispose();
                 createTimeBuilder_ = null;
             }
-            if (updateTimeBuilder_ == null) {
-                updateTime_ = null;
-            } else {
-                updateTime_ = null;
+            updateTime_ = null;
+            if (updateTimeBuilder_ != null) {
+                updateTimeBuilder_.dispose();
                 updateTimeBuilder_ = null;
             }
             eTag_ = "";
-
             if (segmentValueBuilder_ == null) {
                 segmentValue_ = java.util.Collections.emptyList();
             } else {
                 segmentValue_ = null;
                 segmentValueBuilder_.clear();
             }
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000020);
             internalGetMutableMetadata().clear();
             boundaryType_ = "";
-
             if (allBuilder_ != null) {
                 allBuilder_.clear();
             }
@@ -1114,63 +1120,72 @@ public datawave.annotation.protobuf.v1.Segment build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.Segment buildPartial() {
             datawave.annotation.protobuf.v1.Segment result = new datawave.annotation.protobuf.v1.Segment(this);
-            int from_bitField0_ = bitField0_;
-            result.annotationId_ = annotationId_;
-            result.segmentId_ = segmentId_;
-            if (createTimeBuilder_ == null) {
-                result.createTime_ = createTime_;
-            } else {
-                result.createTime_ = createTimeBuilder_.build();
-            }
-            if (updateTimeBuilder_ == null) {
-                result.updateTime_ = updateTime_;
-            } else {
-                result.updateTime_ = updateTimeBuilder_.build();
+            buildPartialRepeatedFields(result);
+            if (bitField0_ != 0) {
+                buildPartial0(result);
             }
-            result.eTag_ = eTag_;
+            buildPartialOneofs(result);
+            onBuilt();
+            return result;
+        }
+
+        private void buildPartialRepeatedFields(datawave.annotation.protobuf.v1.Segment result) {
             if (segmentValueBuilder_ == null) {
-                if (((bitField0_ & 0x00000001) != 0)) {
+                if (((bitField0_ & 0x00000020) != 0)) {
                     segmentValue_ = java.util.Collections.unmodifiableList(segmentValue_);
-                    bitField0_ = (bitField0_ & ~0x00000001);
+                    bitField0_ = (bitField0_ & ~0x00000020);
                 }
                 result.segmentValue_ = segmentValue_;
             } else {
                 result.segmentValue_ = segmentValueBuilder_.build();
             }
-            result.metadata_ = internalGetMetadata();
-            result.metadata_.makeImmutable();
-            result.boundaryType_ = boundaryType_;
-            if (boundaryCase_ == 20) {
-                if (allBuilder_ == null) {
-                    result.boundary_ = boundary_;
-                } else {
-                    result.boundary_ = allBuilder_.build();
-                }
+        }
+
+        private void buildPartial0(datawave.annotation.protobuf.v1.Segment result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.annotationId_ = annotationId_;
             }
-            if (boundaryCase_ == 21) {
-                if (pointListBuilder_ == null) {
-                    result.boundary_ = boundary_;
-                } else {
-                    result.boundary_ = pointListBuilder_.build();
-                }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.segmentId_ = segmentId_;
             }
-            if (boundaryCase_ == 22) {
-                if (timeBuilder_ == null) {
-                    result.boundary_ = boundary_;
-                } else {
-                    result.boundary_ = timeBuilder_.build();
-                }
+            int to_bitField0_ = 0;
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build();
+                to_bitField0_ |= 0x00000001;
             }
-            if (boundaryCase_ == 23) {
-                if (charactersBuilder_ == null) {
-                    result.boundary_ = boundary_;
-                } else {
-                    result.boundary_ = charactersBuilder_.build();
-                }
+            if (((from_bitField0_ & 0x00000008) != 0)) {
+                result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
+                to_bitField0_ |= 0x00000002;
+            }
+            if (((from_bitField0_ & 0x00000010) != 0)) {
+                result.eTag_ = eTag_;
             }
+            if (((from_bitField0_ & 0x00000040) != 0)) {
+                result.metadata_ = internalGetMetadata();
+                result.metadata_.makeImmutable();
+            }
+            if (((from_bitField0_ & 0x00000080) != 0)) {
+                result.boundaryType_ = boundaryType_;
+            }
+            result.bitField0_ |= to_bitField0_;
+        }
+
+        private void buildPartialOneofs(datawave.annotation.protobuf.v1.Segment result) {
             result.boundaryCase_ = boundaryCase_;
-            onBuilt();
-            return result;
+            result.boundary_ = this.boundary_;
+            if (boundaryCase_ == 20 && allBuilder_ != null) {
+                result.boundary_ = allBuilder_.build();
+            }
+            if (boundaryCase_ == 21 && pointListBuilder_ != null) {
+                result.boundary_ = pointListBuilder_.build();
+            }
+            if (boundaryCase_ == 22 && timeBuilder_ != null) {
+                result.boundary_ = timeBuilder_.build();
+            }
+            if (boundaryCase_ == 23 && charactersBuilder_ != null) {
+                result.boundary_ = charactersBuilder_.build();
+            }
         }
 
         @java.lang.Override
@@ -1218,10 +1233,12 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Segment other) {
                 return this;
             if (!other.getAnnotationId().isEmpty()) {
                 annotationId_ = other.annotationId_;
+                bitField0_ |= 0x00000001;
                 onChanged();
             }
             if (!other.getSegmentId().isEmpty()) {
                 segmentId_ = other.segmentId_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             if (other.hasCreateTime()) {
@@ -1232,13 +1249,14 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Segment other) {
             }
             if (!other.getETag().isEmpty()) {
                 eTag_ = other.eTag_;
+                bitField0_ |= 0x00000010;
                 onChanged();
             }
             if (segmentValueBuilder_ == null) {
                 if (!other.segmentValue_.isEmpty()) {
                     if (segmentValue_.isEmpty()) {
                         segmentValue_ = other.segmentValue_;
-                        bitField0_ = (bitField0_ & ~0x00000001);
+                        bitField0_ = (bitField0_ & ~0x00000020);
                     } else {
                         ensureSegmentValueIsMutable();
                         segmentValue_.addAll(other.segmentValue_);
@@ -1251,7 +1269,7 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Segment other) {
                         segmentValueBuilder_.dispose();
                         segmentValueBuilder_ = null;
                         segmentValue_ = other.segmentValue_;
-                        bitField0_ = (bitField0_ & ~0x00000001);
+                        bitField0_ = (bitField0_ & ~0x00000020);
                         segmentValueBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getSegmentValueFieldBuilder() : null;
                     } else {
                         segmentValueBuilder_.addAllMessages(other.segmentValue_);
@@ -1259,8 +1277,10 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.Segment other) {
                 }
             }
             internalGetMutableMetadata().mergeFrom(other.internalGetMetadata());
+            bitField0_ |= 0x00000040;
             if (!other.getBoundaryType().isEmpty()) {
                 boundaryType_ = other.boundaryType_;
+                bitField0_ |= 0x00000080;
                 onChanged();
             }
             switch (other.getBoundaryCase()) {
@@ -1310,27 +1330,27 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             annotationId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 18: {
                             segmentId_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         case 26: {
                             input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 26
                         case 34: {
                             input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
-
+                            bitField0_ |= 0x00000008;
                             break;
                         } // case 34
                         case 42: {
                             eTag_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000010;
                             break;
                         } // case 42
                         case 50: {
@@ -1348,11 +1368,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             com.google.protobuf.MapEntry metadata__ = input
                                             .readMessage(MetadataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
                             internalGetMutableMetadata().getMutableMap().put(metadata__.getKey(), metadata__.getValue());
+                            bitField0_ |= 0x00000040;
                             break;
                         } // case 58
                         case 82: {
                             boundaryType_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000080;
                             break;
                         } // case 82
                         case 162: {
@@ -1465,8 +1486,8 @@ public Builder setAnnotationId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -1481,8 +1502,8 @@ public Builder setAnnotationId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearAnnotationId() {
-
             annotationId_ = getDefaultInstance().getAnnotationId();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
         }
@@ -1503,8 +1524,8 @@ public Builder setAnnotationIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             annotationId_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -1567,8 +1588,8 @@ public Builder setSegmentId(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             segmentId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -1583,8 +1604,8 @@ public Builder setSegmentId(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearSegmentId() {
-
             segmentId_ = getDefaultInstance().getSegmentId();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -1605,8 +1626,8 @@ public Builder setSegmentIdBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             segmentId_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -1624,7 +1645,7 @@ public Builder setSegmentIdBytes(com.google.protobuf.ByteString value) {
          * @return Whether the createTime field is set.
          */
         public boolean hasCreateTime() {
-            return createTimeBuilder_ != null || createTime_ != null;
+            return ((bitField0_ & 0x00000004) != 0);
         }
 
         /**
@@ -1657,11 +1678,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
                     throw new NullPointerException();
                 }
                 createTime_ = value;
-                onChanged();
             } else {
                 createTimeBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000004;
+            onChanged();
             return this;
         }
 
@@ -1675,11 +1696,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) {
         public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) {
             if (createTimeBuilder_ == null) {
                 createTime_ = builderForValue.build();
-                onChanged();
             } else {
                 createTimeBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000004;
+            onChanged();
             return this;
         }
 
@@ -1692,16 +1713,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal
          */
         public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
             if (createTimeBuilder_ == null) {
-                if (createTime_ != null) {
-                    createTime_ = com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+                if (((bitField0_ & 0x00000004) != 0) && createTime_ != null && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+                    getCreateTimeBuilder().mergeFrom(value);
                 } else {
                     createTime_ = value;
                 }
-                onChanged();
             } else {
                 createTimeBuilder_.mergeFrom(value);
             }
-
+            if (createTime_ != null) {
+                bitField0_ |= 0x00000004;
+                onChanged();
+            }
             return this;
         }
 
@@ -1713,14 +1736,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
          * .google.protobuf.Timestamp createTime = 3;
          */
         public Builder clearCreateTime() {
-            if (createTimeBuilder_ == null) {
-                createTime_ = null;
-                onChanged();
-            } else {
-                createTime_ = null;
+            bitField0_ = (bitField0_ & ~0x00000004);
+            createTime_ = null;
+            if (createTimeBuilder_ != null) {
+                createTimeBuilder_.dispose();
                 createTimeBuilder_ = null;
             }
-
+            onChanged();
             return this;
         }
 
@@ -1732,7 +1754,7 @@ public Builder clearCreateTime() {
          * .google.protobuf.Timestamp createTime = 3;
          */
         public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-
+            bitField0_ |= 0x00000004;
             onChanged();
             return getCreateTimeFieldBuilder().getBuilder();
         }
@@ -1781,7 +1803,7 @@ private com.google.protobuf.SingleFieldBuilderV3.google.protobuf.Timestamp updateTime = 4;
          */
         public Builder clearUpdateTime() {
-            if (updateTimeBuilder_ == null) {
-                updateTime_ = null;
-                onChanged();
-            } else {
-                updateTime_ = null;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            updateTime_ = null;
+            if (updateTimeBuilder_ != null) {
+                updateTimeBuilder_.dispose();
                 updateTimeBuilder_ = null;
             }
-
+            onChanged();
             return this;
         }
 
@@ -1889,7 +1912,7 @@ public Builder clearUpdateTime() {
          * .google.protobuf.Timestamp updateTime = 4;
          */
         public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
-
+            bitField0_ |= 0x00000008;
             onChanged();
             return getUpdateTimeFieldBuilder().getBuilder();
         }
@@ -1983,8 +2006,8 @@ public Builder setETag(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             eTag_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
         }
@@ -1999,8 +2022,8 @@ public Builder setETag(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearETag() {
-
             eTag_ = getDefaultInstance().getETag();
+            bitField0_ = (bitField0_ & ~0x00000010);
             onChanged();
             return this;
         }
@@ -2021,8 +2044,8 @@ public Builder setETagBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             eTag_ = value;
+            bitField0_ |= 0x00000010;
             onChanged();
             return this;
         }
@@ -2030,9 +2053,9 @@ public Builder setETagBytes(com.google.protobuf.ByteString value) {
         private java.util.List segmentValue_ = java.util.Collections.emptyList();
 
         private void ensureSegmentValueIsMutable() {
-            if (!((bitField0_ & 0x00000001) != 0)) {
+            if (!((bitField0_ & 0x00000020) != 0)) {
                 segmentValue_ = new java.util.ArrayList(segmentValue_);
-                bitField0_ |= 0x00000001;
+                bitField0_ |= 0x00000020;
             }
         }
 
@@ -2228,7 +2251,7 @@ public Builder addAllSegmentValue(java.lang.Iterable getS
         private com.google.protobuf.RepeatedFieldBuilderV3 getSegmentValueFieldBuilder() {
             if (segmentValueBuilder_ == null) {
                 segmentValueBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3(
-                                segmentValue_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+                                segmentValue_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean());
                 segmentValue_ = null;
             }
             return segmentValueBuilder_;
@@ -2347,14 +2370,14 @@ private com.google.protobuf.MapField internal
         }
 
         private com.google.protobuf.MapField internalGetMutableMetadata() {
-            onChanged();
-            ;
             if (metadata_ == null) {
                 metadata_ = com.google.protobuf.MapField.newMapField(MetadataDefaultEntryHolder.defaultEntry);
             }
             if (!metadata_.isMutable()) {
                 metadata_ = metadata_.copy();
             }
+            bitField0_ |= 0x00000040;
+            onChanged();
             return metadata_;
         }
 
@@ -2369,11 +2392,10 @@ public int getMetadataCount() {
          *
          * map<string, string> metadata = 7;
          */
-
         @java.lang.Override
         public boolean containsMetadata(java.lang.String key) {
             if (key == null) {
-                throw new java.lang.NullPointerException();
+                throw new NullPointerException("map key");
             }
             return internalGetMetadata().getMap().containsKey(key);
         }
@@ -2395,7 +2417,6 @@ public java.util.Map getMetadata() {
          * map<string, string> metadata = 7;
          */
         @java.lang.Override
-
         public java.util.Map getMetadataMap() {
             return internalGetMetadata().getMap();
         }
@@ -2408,10 +2429,12 @@ public java.util.Map getMetadataMap() {
          * map<string, string> metadata = 7;
          */
         @java.lang.Override
-
-        public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue) {
+        public /* nullable */
+        java.lang.String getMetadataOrDefault(java.lang.String key,
+                        /* nullable */
+                        java.lang.String defaultValue) {
             if (key == null) {
-                throw new java.lang.NullPointerException();
+                throw new NullPointerException("map key");
             }
             java.util.Map map = internalGetMetadata().getMap();
             return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -2425,10 +2448,9 @@ public java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.Str
          * map<string, string> metadata = 7;
          */
         @java.lang.Override
-
         public java.lang.String getMetadataOrThrow(java.lang.String key) {
             if (key == null) {
-                throw new java.lang.NullPointerException();
+                throw new NullPointerException("map key");
             }
             java.util.Map map = internalGetMetadata().getMap();
             if (!map.containsKey(key)) {
@@ -2438,6 +2460,7 @@ public java.lang.String getMetadataOrThrow(java.lang.String key) {
         }
 
         public Builder clearMetadata() {
+            bitField0_ = (bitField0_ & ~0x00000040);
             internalGetMutableMetadata().getMutableMap().clear();
             return this;
         }
@@ -2449,10 +2472,9 @@ public Builder clearMetadata() {
          *
          * map<string, string> metadata = 7;
          */
-
         public Builder removeMetadata(java.lang.String key) {
             if (key == null) {
-                throw new java.lang.NullPointerException();
+                throw new NullPointerException("map key");
             }
             internalGetMutableMetadata().getMutableMap().remove(key);
             return this;
@@ -2463,6 +2485,7 @@ public Builder removeMetadata(java.lang.String key) {
          */
         @java.lang.Deprecated
         public java.util.Map getMutableMetadata() {
+            bitField0_ |= 0x00000040;
             return internalGetMutableMetadata().getMutableMap();
         }
 
@@ -2475,12 +2498,13 @@ public java.util.Map getMutableMetadata() {
          */
         public Builder putMetadata(java.lang.String key, java.lang.String value) {
             if (key == null) {
-                throw new java.lang.NullPointerException();
+                throw new NullPointerException("map key");
             }
             if (value == null) {
-                throw new java.lang.NullPointerException();
+                throw new NullPointerException("map value");
             }
             internalGetMutableMetadata().getMutableMap().put(key, value);
+            bitField0_ |= 0x00000040;
             return this;
         }
 
@@ -2491,9 +2515,9 @@ public Builder putMetadata(java.lang.String key, java.lang.String value) {
          *
          * map<string, string> metadata = 7;
          */
-
         public Builder putAllMetadata(java.util.Map values) {
             internalGetMutableMetadata().getMutableMap().putAll(values);
+            bitField0_ |= 0x00000040;
             return this;
         }
 
@@ -2555,8 +2579,8 @@ public Builder setBoundaryType(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             boundaryType_ = value;
+            bitField0_ |= 0x00000080;
             onChanged();
             return this;
         }
@@ -2571,8 +2595,8 @@ public Builder setBoundaryType(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearBoundaryType() {
-
             boundaryType_ = getDefaultInstance().getBoundaryType();
+            bitField0_ = (bitField0_ & ~0x00000080);
             onChanged();
             return this;
         }
@@ -2593,8 +2617,8 @@ public Builder setBoundaryTypeBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             boundaryType_ = value;
+            bitField0_ |= 0x00000080;
             onChanged();
             return this;
         }
@@ -2676,8 +2700,9 @@ public Builder mergeAll(datawave.annotation.protobuf.v1.All value) {
             } else {
                 if (boundaryCase_ == 20) {
                     allBuilder_.mergeFrom(value);
+                } else {
+                    allBuilder_.setMessage(value);
                 }
-                allBuilder_.setMessage(value);
             }
             boundaryCase_ = 20;
             return this;
@@ -2739,7 +2764,6 @@ private com.google.protobuf.SingleFieldBuilderV3 segments_;
 
     /**
@@ -91,7 +88,8 @@ public datawave.annotation.protobuf.v1.SegmentOrBuilder getSegmentsOrBuilder(int
     }
 
     public static final int NEXTPAGETOKEN_FIELD_NUMBER = 2;
-    private volatile java.lang.Object nextPageToken_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object nextPageToken_ = "";
 
     /**
      * string nextPageToken = 2;
@@ -147,7 +145,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
         for (int i = 0; i < segments_.size(); i++) {
             output.writeMessage(1, segments_.get(i));
         }
-        if (!getNextPageTokenBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
         }
         getUnknownFields().writeTo(output);
@@ -163,7 +161,7 @@ public int getSerializedSize() {
         for (int i = 0; i < segments_.size(); i++) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, segments_.get(i));
         }
-        if (!getNextPageTokenBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
         }
         size += getUnknownFields().getSerializedSize();
@@ -321,6 +319,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             if (segmentsBuilder_ == null) {
                 segments_ = java.util.Collections.emptyList();
             } else {
@@ -329,7 +328,6 @@ public Builder clear() {
             }
             bitField0_ = (bitField0_ & ~0x00000001);
             nextPageToken_ = "";
-
             return this;
         }
 
@@ -355,7 +353,15 @@ public datawave.annotation.protobuf.v1.SegmentList build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.SegmentList buildPartial() {
             datawave.annotation.protobuf.v1.SegmentList result = new datawave.annotation.protobuf.v1.SegmentList(this);
-            int from_bitField0_ = bitField0_;
+            buildPartialRepeatedFields(result);
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
+            onBuilt();
+            return result;
+        }
+
+        private void buildPartialRepeatedFields(datawave.annotation.protobuf.v1.SegmentList result) {
             if (segmentsBuilder_ == null) {
                 if (((bitField0_ & 0x00000001) != 0)) {
                     segments_ = java.util.Collections.unmodifiableList(segments_);
@@ -365,9 +371,13 @@ public datawave.annotation.protobuf.v1.SegmentList buildPartial() {
             } else {
                 result.segments_ = segmentsBuilder_.build();
             }
-            result.nextPageToken_ = nextPageToken_;
-            onBuilt();
-            return result;
+        }
+
+        private void buildPartial0(datawave.annotation.protobuf.v1.SegmentList result) {
+            int from_bitField0_ = bitField0_;
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.nextPageToken_ = nextPageToken_;
+            }
         }
 
         @java.lang.Override
@@ -439,6 +449,7 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.SegmentList other) {
             }
             if (!other.getNextPageToken().isEmpty()) {
                 nextPageToken_ = other.nextPageToken_;
+                bitField0_ |= 0x00000002;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -477,7 +488,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                         } // case 10
                         case 18: {
                             nextPageToken_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         default: {
@@ -782,8 +793,8 @@ public Builder setNextPageToken(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             nextPageToken_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -794,8 +805,8 @@ public Builder setNextPageToken(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearNextPageToken() {
-
             nextPageToken_ = getDefaultInstance().getNextPageToken();
+            bitField0_ = (bitField0_ & ~0x00000002);
             onChanged();
             return this;
         }
@@ -812,8 +823,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             nextPageToken_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentListOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentListOrBuilder.java
index 05a4dbba184..d5085370d6b 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentListOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentListOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface SegmentListOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentOrBuilder.java
index 2c8c5df884c..fe33e5bf3ed 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface SegmentOrBuilder extends
@@ -220,8 +221,10 @@ public interface SegmentOrBuilder extends
      *
      * map<string, string> metadata = 7;
      */
-
-    java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue);
+    /* nullable */
+    java.lang.String getMetadataOrDefault(java.lang.String key,
+                    /* nullable */
+                    java.lang.String defaultValue);
 
     /**
      * 
@@ -230,7 +233,6 @@ public interface SegmentOrBuilder extends
      *
      * map<string, string> metadata = 7;
      */
-
     java.lang.String getMetadataOrThrow(java.lang.String key);
 
     /**
@@ -343,5 +345,5 @@ public interface SegmentOrBuilder extends
      */
     datawave.annotation.protobuf.v1.TextSpanCharsOrBuilder getCharactersOrBuilder();
 
-    public datawave.annotation.protobuf.v1.Segment.BoundaryCase getBoundaryCase();
+    datawave.annotation.protobuf.v1.Segment.BoundaryCase getBoundaryCase();
 }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValue.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValue.java
index 7945cd4d428..40b1e3e5230 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValue.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValue.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -31,11 +32,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new SegmentValue();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_SegmentValue_descriptor;
     }
@@ -49,7 +45,8 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
     private int bitField0_;
     public static final int VALUE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object value_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object value_ = "";
 
     /**
      * 
@@ -95,7 +92,7 @@ public com.google.protobuf.ByteString getValueBytes() {
     }
 
     public static final int SCORE_FIELD_NUMBER = 2;
-    private double score_;
+    private double score_ = 0D;
 
     /**
      * 
@@ -112,14 +109,15 @@ public double getScore() {
     }
 
     public static final int EXTENSION_FIELD_NUMBER = 3;
-    private volatile java.lang.Object extension_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object extension_ = "";
 
     /**
      * 
      * type-specific data
      * 

      *
-     * string extension = 3;
+     * optional string extension = 3;
      *
      * @return Whether the extension field is set.
      */
@@ -133,7 +131,7 @@ public boolean hasExtension() {
      * type-specific data
      * 

      *
-     * string extension = 3;
+     * optional string extension = 3;
      *
      * @return The extension.
      */
@@ -155,7 +153,7 @@ public java.lang.String getExtension() {
      * type-specific data
      * 

      *
-     * string extension = 3;
+     * optional string extension = 3;
      *
      * @return The bytes for extension.
      */
@@ -187,10 +185,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (!getValueBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
             com.google.protobuf.GeneratedMessageV3.writeString(output, 1, value_);
         }
-        if (score_ != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(score_) != 0) {
             output.writeDouble(2, score_);
         }
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -206,10 +204,10 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (!getValueBytes().isEmpty()) {
+        if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) {
             size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, value_);
         }
-        if (score_ != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(score_) != 0) {
             size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, score_);
         }
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -378,12 +376,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         @java.lang.Override
         public Builder clear() {
             super.clear();
+            bitField0_ = 0;
             value_ = "";
-
             score_ = 0D;
-
             extension_ = "";
-            bitField0_ = (bitField0_ & ~0x00000001);
             return this;
         }
 
@@ -409,17 +405,27 @@ public datawave.annotation.protobuf.v1.SegmentValue build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.SegmentValue buildPartial() {
             datawave.annotation.protobuf.v1.SegmentValue result = new datawave.annotation.protobuf.v1.SegmentValue(this);
+            if (bitField0_ != 0) {
+                buildPartial0(result);
+            }
+            onBuilt();
+            return result;
+        }
+
+        private void buildPartial0(datawave.annotation.protobuf.v1.SegmentValue result) {
             int from_bitField0_ = bitField0_;
-            int to_bitField0_ = 0;
-            result.value_ = value_;
-            result.score_ = score_;
             if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.value_ = value_;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.score_ = score_;
+            }
+            int to_bitField0_ = 0;
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.extension_ = extension_;
                 to_bitField0_ |= 0x00000001;
             }
-            result.extension_ = extension_;
-            result.bitField0_ = to_bitField0_;
-            onBuilt();
-            return result;
+            result.bitField0_ |= to_bitField0_;
         }
 
         @java.lang.Override
@@ -467,14 +473,15 @@ public Builder mergeFrom(datawave.annotation.protobuf.v1.SegmentValue other) {
                 return this;
             if (!other.getValue().isEmpty()) {
                 value_ = other.value_;
+                bitField0_ |= 0x00000001;
                 onChanged();
             }
             if (other.getScore() != 0D) {
                 setScore(other.getScore());
             }
             if (other.hasExtension()) {
-                bitField0_ |= 0x00000001;
                 extension_ = other.extension_;
+                bitField0_ |= 0x00000004;
                 onChanged();
             }
             this.mergeUnknownFields(other.getUnknownFields());
@@ -503,17 +510,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             value_ = input.readStringRequireUtf8();
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 17: {
                             score_ = input.readDouble();
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 17
                         case 26: {
                             extension_ = input.readStringRequireUtf8();
-                            bitField0_ |= 0x00000001;
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 26
                         default: {
@@ -592,8 +599,8 @@ public Builder setValue(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-
             value_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -608,8 +615,8 @@ public Builder setValue(java.lang.String value) {
          * @return This builder for chaining.
          */
         public Builder clearValue() {
-
             value_ = getDefaultInstance().getValue();
+            bitField0_ = (bitField0_ & ~0x00000001);
             onChanged();
             return this;
         }
@@ -630,8 +637,8 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-
             value_ = value;
+            bitField0_ |= 0x00000001;
             onChanged();
             return this;
         }
@@ -666,6 +673,7 @@ public double getScore() {
         public Builder setScore(double value) {
 
             score_ = value;
+            bitField0_ |= 0x00000002;
             onChanged();
             return this;
         }
@@ -680,7 +688,7 @@ public Builder setScore(double value) {
          * @return This builder for chaining.
          */
         public Builder clearScore() {
-
+            bitField0_ = (bitField0_ & ~0x00000002);
             score_ = 0D;
             onChanged();
             return this;
@@ -693,12 +701,12 @@ public Builder clearScore() {
          * type-specific data
          * 

          *
-         * string extension = 3;
+         * optional string extension = 3;
          *
          * @return Whether the extension field is set.
          */
         public boolean hasExtension() {
-            return ((bitField0_ & 0x00000001) != 0);
+            return ((bitField0_ & 0x00000004) != 0);
         }
 
         /**
@@ -706,7 +714,7 @@ public boolean hasExtension() {
          * type-specific data
          * 

          *
-         * string extension = 3;
+         * optional string extension = 3;
          *
          * @return The extension.
          */
@@ -727,7 +735,7 @@ public java.lang.String getExtension() {
          * type-specific data
          * 

          *
-         * string extension = 3;
+         * optional string extension = 3;
          *
          * @return The bytes for extension.
          */
@@ -747,7 +755,7 @@ public com.google.protobuf.ByteString getExtensionBytes() {
          * type-specific data
          * 

          *
-         * string extension = 3;
+         * optional string extension = 3;
          *
          * @param value
          *            The extension to set.
@@ -757,8 +765,8 @@ public Builder setExtension(java.lang.String value) {
             if (value == null) {
                 throw new NullPointerException();
             }
-            bitField0_ |= 0x00000001;
             extension_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -768,13 +776,13 @@ public Builder setExtension(java.lang.String value) {
          * type-specific data
          * 

          *
-         * string extension = 3;
+         * optional string extension = 3;
          *
          * @return This builder for chaining.
          */
         public Builder clearExtension() {
-            bitField0_ = (bitField0_ & ~0x00000001);
             extension_ = getDefaultInstance().getExtension();
+            bitField0_ = (bitField0_ & ~0x00000004);
             onChanged();
             return this;
         }
@@ -784,7 +792,7 @@ public Builder clearExtension() {
          * type-specific data
          * 

          *
-         * string extension = 3;
+         * optional string extension = 3;
          *
          * @param value
          *            The bytes for extension to set.
@@ -795,8 +803,8 @@ public Builder setExtensionBytes(com.google.protobuf.ByteString value) {
                 throw new NullPointerException();
             }
             checkByteStringIsUtf8(value);
-            bitField0_ |= 0x00000001;
             extension_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValueOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValueOrBuilder.java
index 143d38ca898..3bee222b945 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValueOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/SegmentValueOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface SegmentValueOrBuilder extends
@@ -45,7 +46,7 @@ public interface SegmentValueOrBuilder extends
      * type-specific data
      * 

      *
-     * string extension = 3;
+     * optional string extension = 3;
      *
      * @return Whether the extension field is set.
      */
@@ -56,7 +57,7 @@ public interface SegmentValueOrBuilder extends
      * type-specific data
      * 

      *
-     * string extension = 3;
+     * optional string extension = 3;
      *
      * @return The extension.
      */
@@ -67,7 +68,7 @@ public interface SegmentValueOrBuilder extends
      * type-specific data
      *
* - * string extension = 3; + * optional string extension = 3; * * @return The bytes for extension. */ diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanChars.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanChars.java index b23b5b72bd9..f9e31a45ad4 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanChars.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanChars.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -24,11 +25,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new TextSpanChars(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_TextSpanChars_descriptor; } @@ -41,7 +37,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF } public static final int STARTCHARACTER_FIELD_NUMBER = 1; - private long startCharacter_; + private long startCharacter_ = 0L; /** * int64 startCharacter = 1; @@ -54,7 +50,7 @@ public long getStartCharacter() { } public static final int ENDCHARACTER_FIELD_NUMBER = 2; - private long endCharacter_; + private long endCharacter_ = 0L; /** * int64 endCharacter = 2; @@ -253,10 +249,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; startCharacter_ = 0L; - endCharacter_ = 0L; - return this; } @@ -282,12 +277,23 @@ public datawave.annotation.protobuf.v1.TextSpanChars build() { @java.lang.Override public datawave.annotation.protobuf.v1.TextSpanChars buildPartial() { datawave.annotation.protobuf.v1.TextSpanChars result = new datawave.annotation.protobuf.v1.TextSpanChars(this); - result.startCharacter_ = startCharacter_; - result.endCharacter_ = endCharacter_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(datawave.annotation.protobuf.v1.TextSpanChars result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.startCharacter_ = startCharacter_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.endCharacter_ = endCharacter_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -363,12 +369,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. break; case 8: { startCharacter_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 16: { endCharacter_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: { @@ -387,6 +393,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. return this; } + private int bitField0_; + private long startCharacter_; /** @@ -409,6 +417,7 @@ public long getStartCharacter() { public Builder setStartCharacter(long value) { startCharacter_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -419,7 +428,7 @@ public Builder setStartCharacter(long value) { * @return This builder for chaining. */ public Builder clearStartCharacter() { - + bitField0_ = (bitField0_ & ~0x00000001); startCharacter_ = 0L; onChanged(); return this; @@ -447,6 +456,7 @@ public long getEndCharacter() { public Builder setEndCharacter(long value) { endCharacter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -457,7 +467,7 @@ public Builder setEndCharacter(long value) { * @return This builder for chaining. */ public Builder clearEndCharacter() { - + bitField0_ = (bitField0_ & ~0x00000002); endCharacter_ = 0L; onChanged(); return this; diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanCharsOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanCharsOrBuilder.java index 0988ba8ffe5..1d391641369 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanCharsOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TextSpanCharsOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface TextSpanCharsOrBuilder extends diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSeconds.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSeconds.java index a4b77482923..9cd25de8394 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSeconds.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSeconds.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -24,11 +25,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new TimeSpanSeconds(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_TimeSpanSeconds_descriptor; } @@ -41,7 +37,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF } public static final int STARTSECONDS_FIELD_NUMBER = 1; - private double startSeconds_; + private double startSeconds_ = 0D; /** * double startSeconds = 1; @@ -54,7 +50,7 @@ public double getStartSeconds() { } public static final int ENDSECONDS_FIELD_NUMBER = 2; - private double endSeconds_; + private double endSeconds_ = 0D; /** * double endSeconds = 2; @@ -82,10 +78,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (startSeconds_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(startSeconds_) != 0) { output.writeDouble(1, startSeconds_); } - if (endSeconds_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(endSeconds_) != 0) { output.writeDouble(2, endSeconds_); } getUnknownFields().writeTo(output); @@ -98,10 +94,10 @@ public int getSerializedSize() { return size; size = 0; - if (startSeconds_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(startSeconds_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, startSeconds_); } - if (endSeconds_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(endSeconds_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, endSeconds_); } size += getUnknownFields().getSerializedSize(); @@ -254,10 +250,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; startSeconds_ = 0D; - endSeconds_ = 0D; - return this; } @@ -283,12 +278,23 @@ public datawave.annotation.protobuf.v1.TimeSpanSeconds build() { @java.lang.Override public datawave.annotation.protobuf.v1.TimeSpanSeconds buildPartial() { datawave.annotation.protobuf.v1.TimeSpanSeconds result = new datawave.annotation.protobuf.v1.TimeSpanSeconds(this); - result.startSeconds_ = startSeconds_; - result.endSeconds_ = endSeconds_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(datawave.annotation.protobuf.v1.TimeSpanSeconds result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.startSeconds_ = startSeconds_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.endSeconds_ = endSeconds_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -364,12 +370,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. break; case 9: { startSeconds_ = input.readDouble(); - + bitField0_ |= 0x00000001; break; } // case 9 case 17: { endSeconds_ = input.readDouble(); - + bitField0_ |= 0x00000002; break; } // case 17 default: { @@ -388,6 +394,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google. return this; } + private int bitField0_; + private double startSeconds_; /** @@ -410,6 +418,7 @@ public double getStartSeconds() { public Builder setStartSeconds(double value) { startSeconds_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -420,7 +429,7 @@ public Builder setStartSeconds(double value) { * @return This builder for chaining. */ public Builder clearStartSeconds() { - + bitField0_ = (bitField0_ & ~0x00000001); startSeconds_ = 0D; onChanged(); return this; @@ -448,6 +457,7 @@ public double getEndSeconds() { public Builder setEndSeconds(double value) { endSeconds_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -458,7 +468,7 @@ public Builder setEndSeconds(double value) { * @return This builder for chaining. */ public Builder clearEndSeconds() { - + bitField0_ = (bitField0_ & ~0x00000002); endSeconds_ = 0D; onChanged(); return this; diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSecondsOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSecondsOrBuilder.java index 65cd50df7a1..ae82aa8d6e7 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSecondsOrBuilder.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/TimeSpanSecondsOrBuilder.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; public interface TimeSpanSecondsOrBuilder extends diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequest.java index 282985d9413..2579b9ad25c 100644 --- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequest.java +++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequest.java @@ -1,6 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: AnnotationV1.proto +// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto +// Protobuf Java Version: 3.25.3 package datawave.annotation.protobuf.v1; /** @@ -24,11 +25,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new UpdateAnnotationRequest(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_UpdateAnnotationRequest_descriptor; } @@ -40,6 +36,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF datawave.annotation.protobuf.v1.UpdateAnnotationRequest.Builder.class); } + private int bitField0_; public static final int ANNOTATION_FIELD_NUMBER = 1; private datawave.annotation.protobuf.v1.Annotation annotation_; @@ -54,7 +51,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF */ @java.lang.Override public boolean hasAnnotation() { - return annotation_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** @@ -80,7 +77,7 @@ public datawave.annotation.protobuf.v1.Annotation getAnnotation() { */ @java.lang.Override public datawave.annotation.protobuf.v1.AnnotationOrBuilder getAnnotationOrBuilder() { - return getAnnotation(); + return annotation_ == null ? datawave.annotation.protobuf.v1.Annotation.getDefaultInstance() : annotation_; } public static final int UPDATEMASK_FIELD_NUMBER = 2; @@ -97,7 +94,7 @@ public datawave.annotation.protobuf.v1.AnnotationOrBuilder getAnnotationOrBuilde */ @java.lang.Override public boolean hasUpdateMask() { - return updateMask_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** @@ -123,11 +120,11 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } public static final int ALLOWMISSING_FIELD_NUMBER = 3; - private boolean allowMissing_; + private boolean allowMissing_ = false; /** * 
@@ -159,10 +156,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (annotation_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
             output.writeMessage(1, getAnnotation());
         }
-        if (updateMask_ != null) {
+        if (((bitField0_ & 0x00000002) != 0)) {
             output.writeMessage(2, getUpdateMask());
         }
         if (allowMissing_ != false) {
@@ -178,10 +175,10 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (annotation_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getAnnotation());
         }
-        if (updateMask_ != null) {
+        if (((bitField0_ & 0x00000002) != 0)) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
         }
         if (allowMissing_ != false) {
@@ -342,31 +339,36 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
         // Construct using datawave.annotation.protobuf.v1.UpdateAnnotationRequest.newBuilder()
         private Builder() {
-
+            maybeForceBuilderInitialization();
         }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             super(parent);
+            maybeForceBuilderInitialization();
+        }
 
+        private void maybeForceBuilderInitialization() {
+            if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+                getAnnotationFieldBuilder();
+                getUpdateMaskFieldBuilder();
+            }
         }
 
         @java.lang.Override
         public Builder clear() {
             super.clear();
-            if (annotationBuilder_ == null) {
-                annotation_ = null;
-            } else {
-                annotation_ = null;
+            bitField0_ = 0;
+            annotation_ = null;
+            if (annotationBuilder_ != null) {
+                annotationBuilder_.dispose();
                 annotationBuilder_ = null;
             }
-            if (updateMaskBuilder_ == null) {
-                updateMask_ = null;
-            } else {
-                updateMask_ = null;
+            updateMask_ = null;
+            if (updateMaskBuilder_ != null) {
+                updateMaskBuilder_.dispose();
                 updateMaskBuilder_ = null;
             }
             allowMissing_ = false;
-
             return this;
         }
 
@@ -392,21 +394,30 @@ public datawave.annotation.protobuf.v1.UpdateAnnotationRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.UpdateAnnotationRequest buildPartial() {
             datawave.annotation.protobuf.v1.UpdateAnnotationRequest result = new datawave.annotation.protobuf.v1.UpdateAnnotationRequest(this);
-            if (annotationBuilder_ == null) {
-                result.annotation_ = annotation_;
-            } else {
-                result.annotation_ = annotationBuilder_.build();
+            if (bitField0_ != 0) {
+                buildPartial0(result);
             }
-            if (updateMaskBuilder_ == null) {
-                result.updateMask_ = updateMask_;
-            } else {
-                result.updateMask_ = updateMaskBuilder_.build();
-            }
-            result.allowMissing_ = allowMissing_;
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.UpdateAnnotationRequest result) {
+            int from_bitField0_ = bitField0_;
+            int to_bitField0_ = 0;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.annotation_ = annotationBuilder_ == null ? annotation_ : annotationBuilder_.build();
+                to_bitField0_ |= 0x00000001;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+                to_bitField0_ |= 0x00000002;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.allowMissing_ = allowMissing_;
+            }
+            result.bitField0_ |= to_bitField0_;
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -485,17 +496,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             input.readMessage(getAnnotationFieldBuilder().getBuilder(), extensionRegistry);
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 18: {
                             input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         case 24: {
                             allowMissing_ = input.readBool();
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 24
                         default: {
@@ -514,6 +525,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private datawave.annotation.protobuf.v1.Annotation annotation_;
         private com.google.protobuf.SingleFieldBuilderV3 annotationBuilder_;
 
@@ -527,7 +540,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
          * @return Whether the annotation field is set.
          */
         public boolean hasAnnotation() {
-            return annotationBuilder_ != null || annotation_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
         }
 
         /**
@@ -560,11 +573,11 @@ public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation value) {
                     throw new NullPointerException();
                 }
                 annotation_ = value;
-                onChanged();
             } else {
                 annotationBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
         }
 
@@ -578,11 +591,11 @@ public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation value) {
         public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation.Builder builderForValue) {
             if (annotationBuilder_ == null) {
                 annotation_ = builderForValue.build();
-                onChanged();
             } else {
                 annotationBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
         }
 
@@ -595,16 +608,18 @@ public Builder setAnnotation(datawave.annotation.protobuf.v1.Annotation.Builder
          */
         public Builder mergeAnnotation(datawave.annotation.protobuf.v1.Annotation value) {
             if (annotationBuilder_ == null) {
-                if (annotation_ != null) {
-                    annotation_ = datawave.annotation.protobuf.v1.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
+                if (((bitField0_ & 0x00000001) != 0) && annotation_ != null && annotation_ != datawave.annotation.protobuf.v1.Annotation.getDefaultInstance()) {
+                    getAnnotationBuilder().mergeFrom(value);
                 } else {
                     annotation_ = value;
                 }
-                onChanged();
             } else {
                 annotationBuilder_.mergeFrom(value);
             }
-
+            if (annotation_ != null) {
+                bitField0_ |= 0x00000001;
+                onChanged();
+            }
             return this;
         }
 
@@ -616,14 +631,13 @@ public Builder mergeAnnotation(datawave.annotation.protobuf.v1.Annotation value)
          * .datawave.annotation.protobuf.v1.Annotation annotation = 1;
          */
         public Builder clearAnnotation() {
-            if (annotationBuilder_ == null) {
-                annotation_ = null;
-                onChanged();
-            } else {
-                annotation_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            annotation_ = null;
+            if (annotationBuilder_ != null) {
+                annotationBuilder_.dispose();
                 annotationBuilder_ = null;
             }
-
+            onChanged();
             return this;
         }
 
@@ -635,7 +649,7 @@ public Builder clearAnnotation() {
          * .datawave.annotation.protobuf.v1.Annotation annotation = 1;
          */
         public datawave.annotation.protobuf.v1.Annotation.Builder getAnnotationBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getAnnotationFieldBuilder().getBuilder();
         }
@@ -684,7 +698,7 @@ private com.google.protobuf.SingleFieldBuilderV3.google.protobuf.FieldMask updateMask = 2;
          */
         public Builder clearUpdateMask() {
-            if (updateMaskBuilder_ == null) {
-                updateMask_ = null;
-                onChanged();
-            } else {
-                updateMask_ = null;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            updateMask_ = null;
+            if (updateMaskBuilder_ != null) {
+                updateMaskBuilder_.dispose();
                 updateMaskBuilder_ = null;
             }
-
+            onChanged();
             return this;
         }
 
@@ -792,7 +807,7 @@ public Builder clearUpdateMask() {
          * .google.protobuf.FieldMask updateMask = 2;
          */
         public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+            bitField0_ |= 0x00000002;
             onChanged();
             return getUpdateMaskFieldBuilder().getBuilder();
         }
@@ -858,6 +873,7 @@ public boolean getAllowMissing() {
         public Builder setAllowMissing(boolean value) {
 
             allowMissing_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -872,7 +888,7 @@ public Builder setAllowMissing(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearAllowMissing() {
-
+            bitField0_ = (bitField0_ & ~0x00000004);
             allowMissing_ = false;
             onChanged();
             return this;
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequestOrBuilder.java
index 469136a6f39..f4f24074bee 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateAnnotationRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface UpdateAnnotationRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequest.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequest.java
index cba92961f96..912dd0fa569 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequest.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequest.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 /**
@@ -24,11 +25,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
         return new UpdateSegmentRequest();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-        return this.unknownFields;
-    }
-
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return datawave.annotation.protobuf.v1.AnnotationV1.internal_static_datawave_annotation_protobuf_v1_UpdateSegmentRequest_descriptor;
     }
@@ -40,6 +36,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
                                         datawave.annotation.protobuf.v1.UpdateSegmentRequest.Builder.class);
     }
 
+    private int bitField0_;
     public static final int SEGMENT_FIELD_NUMBER = 1;
     private datawave.annotation.protobuf.v1.Segment segment_;
 
@@ -54,7 +51,7 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
      */
     @java.lang.Override
     public boolean hasSegment() {
-        return segment_ != null;
+        return ((bitField0_ & 0x00000001) != 0);
     }
 
     /**
@@ -80,7 +77,7 @@ public datawave.annotation.protobuf.v1.Segment getSegment() {
      */
     @java.lang.Override
     public datawave.annotation.protobuf.v1.SegmentOrBuilder getSegmentOrBuilder() {
-        return getSegment();
+        return segment_ == null ? datawave.annotation.protobuf.v1.Segment.getDefaultInstance() : segment_;
     }
 
     public static final int UPDATEMASK_FIELD_NUMBER = 2;
@@ -97,7 +94,7 @@ public datawave.annotation.protobuf.v1.SegmentOrBuilder getSegmentOrBuilder() {
      */
     @java.lang.Override
     public boolean hasUpdateMask() {
-        return updateMask_ != null;
+        return ((bitField0_ & 0x00000002) != 0);
     }
 
     /**
@@ -123,11 +120,11 @@ public com.google.protobuf.FieldMask getUpdateMask() {
      */
     @java.lang.Override
     public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
-        return getUpdateMask();
+        return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
     }
 
     public static final int ALLOWMISSING_FIELD_NUMBER = 3;
-    private boolean allowMissing_;
+    private boolean allowMissing_ = false;
 
     /**
      * 
@@ -159,10 +156,10 @@ public final boolean isInitialized() {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-        if (segment_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
             output.writeMessage(1, getSegment());
         }
-        if (updateMask_ != null) {
+        if (((bitField0_ & 0x00000002) != 0)) {
             output.writeMessage(2, getUpdateMask());
         }
         if (allowMissing_ != false) {
@@ -178,10 +175,10 @@ public int getSerializedSize() {
             return size;
 
         size = 0;
-        if (segment_ != null) {
+        if (((bitField0_ & 0x00000001) != 0)) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getSegment());
         }
-        if (updateMask_ != null) {
+        if (((bitField0_ & 0x00000002) != 0)) {
             size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask());
         }
         if (allowMissing_ != false) {
@@ -342,31 +339,36 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
         // Construct using datawave.annotation.protobuf.v1.UpdateSegmentRequest.newBuilder()
         private Builder() {
-
+            maybeForceBuilderInitialization();
         }
 
         private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
             super(parent);
+            maybeForceBuilderInitialization();
+        }
 
+        private void maybeForceBuilderInitialization() {
+            if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+                getSegmentFieldBuilder();
+                getUpdateMaskFieldBuilder();
+            }
         }
 
         @java.lang.Override
         public Builder clear() {
             super.clear();
-            if (segmentBuilder_ == null) {
-                segment_ = null;
-            } else {
-                segment_ = null;
+            bitField0_ = 0;
+            segment_ = null;
+            if (segmentBuilder_ != null) {
+                segmentBuilder_.dispose();
                 segmentBuilder_ = null;
             }
-            if (updateMaskBuilder_ == null) {
-                updateMask_ = null;
-            } else {
-                updateMask_ = null;
+            updateMask_ = null;
+            if (updateMaskBuilder_ != null) {
+                updateMaskBuilder_.dispose();
                 updateMaskBuilder_ = null;
             }
             allowMissing_ = false;
-
             return this;
         }
 
@@ -392,21 +394,30 @@ public datawave.annotation.protobuf.v1.UpdateSegmentRequest build() {
         @java.lang.Override
         public datawave.annotation.protobuf.v1.UpdateSegmentRequest buildPartial() {
             datawave.annotation.protobuf.v1.UpdateSegmentRequest result = new datawave.annotation.protobuf.v1.UpdateSegmentRequest(this);
-            if (segmentBuilder_ == null) {
-                result.segment_ = segment_;
-            } else {
-                result.segment_ = segmentBuilder_.build();
+            if (bitField0_ != 0) {
+                buildPartial0(result);
             }
-            if (updateMaskBuilder_ == null) {
-                result.updateMask_ = updateMask_;
-            } else {
-                result.updateMask_ = updateMaskBuilder_.build();
-            }
-            result.allowMissing_ = allowMissing_;
             onBuilt();
             return result;
         }
 
+        private void buildPartial0(datawave.annotation.protobuf.v1.UpdateSegmentRequest result) {
+            int from_bitField0_ = bitField0_;
+            int to_bitField0_ = 0;
+            if (((from_bitField0_ & 0x00000001) != 0)) {
+                result.segment_ = segmentBuilder_ == null ? segment_ : segmentBuilder_.build();
+                to_bitField0_ |= 0x00000001;
+            }
+            if (((from_bitField0_ & 0x00000002) != 0)) {
+                result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build();
+                to_bitField0_ |= 0x00000002;
+            }
+            if (((from_bitField0_ & 0x00000004) != 0)) {
+                result.allowMissing_ = allowMissing_;
+            }
+            result.bitField0_ |= to_bitField0_;
+        }
+
         @java.lang.Override
         public Builder clone() {
             return super.clone();
@@ -485,17 +496,17 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
                             break;
                         case 10: {
                             input.readMessage(getSegmentFieldBuilder().getBuilder(), extensionRegistry);
-
+                            bitField0_ |= 0x00000001;
                             break;
                         } // case 10
                         case 18: {
                             input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry);
-
+                            bitField0_ |= 0x00000002;
                             break;
                         } // case 18
                         case 24: {
                             allowMissing_ = input.readBool();
-
+                            bitField0_ |= 0x00000004;
                             break;
                         } // case 24
                         default: {
@@ -514,6 +525,8 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
             return this;
         }
 
+        private int bitField0_;
+
         private datawave.annotation.protobuf.v1.Segment segment_;
         private com.google.protobuf.SingleFieldBuilderV3 segmentBuilder_;
 
@@ -527,7 +540,7 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.
          * @return Whether the segment field is set.
          */
         public boolean hasSegment() {
-            return segmentBuilder_ != null || segment_ != null;
+            return ((bitField0_ & 0x00000001) != 0);
         }
 
         /**
@@ -560,11 +573,11 @@ public Builder setSegment(datawave.annotation.protobuf.v1.Segment value) {
                     throw new NullPointerException();
                 }
                 segment_ = value;
-                onChanged();
             } else {
                 segmentBuilder_.setMessage(value);
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
         }
 
@@ -578,11 +591,11 @@ public Builder setSegment(datawave.annotation.protobuf.v1.Segment value) {
         public Builder setSegment(datawave.annotation.protobuf.v1.Segment.Builder builderForValue) {
             if (segmentBuilder_ == null) {
                 segment_ = builderForValue.build();
-                onChanged();
             } else {
                 segmentBuilder_.setMessage(builderForValue.build());
             }
-
+            bitField0_ |= 0x00000001;
+            onChanged();
             return this;
         }
 
@@ -595,16 +608,18 @@ public Builder setSegment(datawave.annotation.protobuf.v1.Segment.Builder builde
          */
         public Builder mergeSegment(datawave.annotation.protobuf.v1.Segment value) {
             if (segmentBuilder_ == null) {
-                if (segment_ != null) {
-                    segment_ = datawave.annotation.protobuf.v1.Segment.newBuilder(segment_).mergeFrom(value).buildPartial();
+                if (((bitField0_ & 0x00000001) != 0) && segment_ != null && segment_ != datawave.annotation.protobuf.v1.Segment.getDefaultInstance()) {
+                    getSegmentBuilder().mergeFrom(value);
                 } else {
                     segment_ = value;
                 }
-                onChanged();
             } else {
                 segmentBuilder_.mergeFrom(value);
             }
-
+            if (segment_ != null) {
+                bitField0_ |= 0x00000001;
+                onChanged();
+            }
             return this;
         }
 
@@ -616,14 +631,13 @@ public Builder mergeSegment(datawave.annotation.protobuf.v1.Segment value) {
          * .datawave.annotation.protobuf.v1.Segment segment = 1;
          */
         public Builder clearSegment() {
-            if (segmentBuilder_ == null) {
-                segment_ = null;
-                onChanged();
-            } else {
-                segment_ = null;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            segment_ = null;
+            if (segmentBuilder_ != null) {
+                segmentBuilder_.dispose();
                 segmentBuilder_ = null;
             }
-
+            onChanged();
             return this;
         }
 
@@ -635,7 +649,7 @@ public Builder clearSegment() {
          * .datawave.annotation.protobuf.v1.Segment segment = 1;
          */
         public datawave.annotation.protobuf.v1.Segment.Builder getSegmentBuilder() {
-
+            bitField0_ |= 0x00000001;
             onChanged();
             return getSegmentFieldBuilder().getBuilder();
         }
@@ -684,7 +698,7 @@ private com.google.protobuf.SingleFieldBuilderV3.google.protobuf.FieldMask updateMask = 2;
          */
         public Builder clearUpdateMask() {
-            if (updateMaskBuilder_ == null) {
-                updateMask_ = null;
-                onChanged();
-            } else {
-                updateMask_ = null;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            updateMask_ = null;
+            if (updateMaskBuilder_ != null) {
+                updateMaskBuilder_.dispose();
                 updateMaskBuilder_ = null;
             }
-
+            onChanged();
             return this;
         }
 
@@ -792,7 +807,7 @@ public Builder clearUpdateMask() {
          * .google.protobuf.FieldMask updateMask = 2;
          */
         public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
-
+            bitField0_ |= 0x00000002;
             onChanged();
             return getUpdateMaskFieldBuilder().getBuilder();
         }
@@ -858,6 +873,7 @@ public boolean getAllowMissing() {
         public Builder setAllowMissing(boolean value) {
 
             allowMissing_ = value;
+            bitField0_ |= 0x00000004;
             onChanged();
             return this;
         }
@@ -872,7 +888,7 @@ public Builder setAllowMissing(boolean value) {
          * @return This builder for chaining.
          */
         public Builder clearAllowMissing() {
-
+            bitField0_ = (bitField0_ & ~0x00000004);
             allowMissing_ = false;
             onChanged();
             return this;
diff --git a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequestOrBuilder.java b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequestOrBuilder.java
index 80cceedbd2c..da7875121a9 100644
--- a/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequestOrBuilder.java
+++ b/warehouse/annotation-core/src/main/java/datawave/annotation/protobuf/v1/UpdateSegmentRequestOrBuilder.java
@@ -1,6 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: AnnotationV1.proto
+// source: warehouse/annotation-core/src/main/protobuf/AnnotationV1.proto
 
+// Protobuf Java Version: 3.25.3
 package datawave.annotation.protobuf.v1;
 
 public interface UpdateSegmentRequestOrBuilder extends
diff --git a/warehouse/annotation-core/src/main/jsonschema/AnnotationV1.schema.json b/warehouse/annotation-core/src/main/jsonschema/warehouse/annotation-core/src/main/protobuf/AnnotationV1.schema.json
similarity index 100%
rename from warehouse/annotation-core/src/main/jsonschema/AnnotationV1.schema.json
rename to warehouse/annotation-core/src/main/jsonschema/warehouse/annotation-core/src/main/protobuf/AnnotationV1.schema.json
diff --git a/warehouse/annotation-core/src/main/protobuf/compile_protobuf.sh b/warehouse/annotation-core/src/main/protobuf/compile_protobuf.sh
deleted file mode 100755
index 811792f3eb7..00000000000
--- a/warehouse/annotation-core/src/main/protobuf/compile_protobuf.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-protoc --java_out ../java AnnotationV1.proto
-protoc --jsonschema_out=../jsonschema --jsonschema_opt=entrypoint_message=Annotation AnnotationV1.proto
diff --git a/warehouse/annotation-core/src/main/protobuf/compile_protos.sh b/warehouse/annotation-core/src/main/protobuf/compile_protos.sh
new file mode 100755
index 00000000000..26ec3562887
--- /dev/null
+++ b/warehouse/annotation-core/src/main/protobuf/compile_protos.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# override the default protof compiler and include path by setting either the PROTOC or PROTOC_INCLUDE_PATH
+# environment variable.
+
+SCRIPT_DIR=$(dirname "$0")
+
+PROTOC=${PROTOC:=protoc}
+PROTOC_INCLUDE_PATH=${PROTOC_INCLUDE_PATH:=/usr/local/include}
+PROTOC_VERSION=$(${PROTOC} --version)
+PROTO=AnnotationV1.proto
+
+
+echo "Compiling ${PROTO} to java;  SCRIPT_DIR=${SCRIPT_DIR} PROTOC=${PROTOC} PROTOC_INCLUDE_PATH=${PROTOC} PROTOC_VERSION=${PROTOC_VERSION}" 1>&2
+${PROTOC} --java_out ${SCRIPT_DIR}/../java ${SCRIPT_DIR}/${PROTO}
+
+echo "Compiling ${PROTO} to json schema;  SCRIPT_DIR=${SCRIPT_DIR} PROTOC=${PROTOC} PROTOC_INCLUDE_PATH=${PROTOC} PROTOC_VERSION=${PROTOC_VERSION}" 1>&2
+${PROTOC} --jsonschema_out=${SCRIPT_DIR}/../jsonschema --jsonschema_opt=entrypoint_message=Annotation ${SCRIPT_DIR}/${PROTO}
diff --git a/warehouse/core/src/main/java/datawave/edge/protobuf/EdgeData.java b/warehouse/core/src/main/java/datawave/edge/protobuf/EdgeData.java
index 1d3a2d4c53d..b3dafda1ed7 100644
--- a/warehouse/core/src/main/java/datawave/edge/protobuf/EdgeData.java
+++ b/warehouse/core/src/main/java/datawave/edge/protobuf/EdgeData.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: EdgeData.proto
+// source: warehouse/core/src/main/protobuf/EdgeData.proto
 
 package datawave.edge.protobuf;
 
@@ -315,140 +315,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
             return this.unknownFields;
         }
 
-        private EdgeValue(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                        throws com.google.protobuf.InvalidProtocolBufferException {
-            this();
-            if (extensionRegistry == null) {
-                throw new java.lang.NullPointerException();
-            }
-            int mutable_bitField0_ = 0;
-            com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder();
-            try {
-                boolean done = false;
-                while (!done) {
-                    int tag = input.readTag();
-                    switch (tag) {
-                        case 0:
-                            done = true;
-                            break;
-                        case 8: {
-                            bitField0_ |= 0x00000001;
-                            count_ = input.readInt64();
-                            break;
-                        }
-                        case 16: {
-                            if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                                hours_ = newLongList();
-                                mutable_bitField0_ |= 0x00000002;
-                            }
-                            hours_.addLong(input.readInt64());
-                            break;
-                        }
-                        case 18: {
-                            int length = input.readRawVarint32();
-                            int limit = input.pushLimit(length);
-                            if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                                hours_ = newLongList();
-                                mutable_bitField0_ |= 0x00000002;
-                            }
-                            while (input.getBytesUntilLimit() > 0) {
-                                hours_.addLong(input.readInt64());
-                            }
-                            input.popLimit(limit);
-                            break;
-                        }
-                        case 24: {
-                            if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                                duration_ = newLongList();
-                                mutable_bitField0_ |= 0x00000004;
-                            }
-                            duration_.addLong(input.readInt64());
-                            break;
-                        }
-                        case 26: {
-                            int length = input.readRawVarint32();
-                            int limit = input.pushLimit(length);
-                            if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                                duration_ = newLongList();
-                                mutable_bitField0_ |= 0x00000004;
-                            }
-                            while (input.getBytesUntilLimit() > 0) {
-                                duration_.addLong(input.readInt64());
-                            }
-                            input.popLimit(limit);
-                            break;
-                        }
-                        case 32: {
-                            bitField0_ |= 0x00000002;
-                            hourBitmask_ = input.readInt32();
-                            break;
-                        }
-                        case 42: {
-                            com.google.protobuf.ByteString bs = input.readBytes();
-                            bitField0_ |= 0x00000004;
-                            sourceValue_ = bs;
-                            break;
-                        }
-                        case 50: {
-                            com.google.protobuf.ByteString bs = input.readBytes();
-                            bitField0_ |= 0x00000008;
-                            sinkValue_ = bs;
-                            break;
-                        }
-                        case 58: {
-                            com.google.protobuf.ByteString bs = input.readBytes();
-                            bitField0_ |= 0x00000010;
-                            loadDate_ = bs;
-                            break;
-                        }
-                        case 64: {
-                            bitField0_ |= 0x00000020;
-                            badActivity_ = input.readBool();
-                            break;
-                        }
-                        case 74: {
-                            datawave.edge.protobuf.EdgeData.EdgeValue.UUID.Builder subBuilder = null;
-                            if (((bitField0_ & 0x00000040) != 0)) {
-                                subBuilder = uuid_.toBuilder();
-                            }
-                            uuid_ = input.readMessage(datawave.edge.protobuf.EdgeData.EdgeValue.UUID.PARSER, extensionRegistry);
-                            if (subBuilder != null) {
-                                subBuilder.mergeFrom(uuid_);
-                                uuid_ = subBuilder.buildPartial();
-                            }
-                            bitField0_ |= 0x00000040;
-                            break;
-                        }
-                        case 82: {
-                            com.google.protobuf.ByteString bs = input.readBytes();
-                            bitField0_ |= 0x00000080;
-                            uuidString_ = 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 {
-                if (((mutable_bitField0_ & 0x00000002) != 0)) {
-                    hours_.makeImmutable(); // C
-                }
-                if (((mutable_bitField0_ & 0x00000004) != 0)) {
-                    duration_.makeImmutable(); // C
-                }
-                this.unknownFields = unknownFields.build();
-                makeExtensionsImmutable();
-            }
-        }
-
         public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             return datawave.edge.protobuf.EdgeData.internal_static_datawave_edge_protobuf_EdgeValue_descriptor;
         }
@@ -518,50 +384,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
                 return this.unknownFields;
             }
 
-            private UUID(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                            throws com.google.protobuf.InvalidProtocolBufferException {
-                this();
-                if (extensionRegistry == null) {
-                    throw new java.lang.NullPointerException();
-                }
-                int mutable_bitField0_ = 0;
-                com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder();
-                try {
-                    boolean done = false;
-                    while (!done) {
-                        int tag = input.readTag();
-                        switch (tag) {
-                            case 0:
-                                done = true;
-                                break;
-                            case 8: {
-                                bitField0_ |= 0x00000001;
-                                leastSignificantBits_ = input.readSInt64();
-                                break;
-                            }
-                            case 16: {
-                                bitField0_ |= 0x00000002;
-                                mostSignificantBits_ = input.readSInt64();
-                                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 datawave.edge.protobuf.EdgeData.internal_static_datawave_edge_protobuf_EdgeValue_UUID_descriptor;
             }
@@ -649,7 +471,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
                 if (((bitField0_ & 0x00000002) != 0)) {
                     output.writeSInt64(2, mostSignificantBits_);
                 }
-                unknownFields.writeTo(output);
+                getUnknownFields().writeTo(output);
             }
 
             @java.lang.Override
@@ -665,7 +487,7 @@ public int getSerializedSize() {
                 if (((bitField0_ & 0x00000002) != 0)) {
                     size += com.google.protobuf.CodedOutputStream.computeSInt64Size(2, mostSignificantBits_);
                 }
-                size += unknownFields.getSerializedSize();
+                size += getUnknownFields().getSerializedSize();
                 memoizedSize = size;
                 return size;
             }
@@ -692,7 +514,7 @@ public boolean equals(final java.lang.Object obj) {
                     if (getMostSignificantBits() != other.getMostSignificantBits())
                         return false;
                 }
-                if (!unknownFields.equals(other.unknownFields))
+                if (!getUnknownFields().equals(other.getUnknownFields()))
                     return false;
                 return true;
             }
@@ -712,7 +534,7 @@ public int hashCode() {
                     hash = (37 * hash) + MOST_SIGNIFICANT_BITS_FIELD_NUMBER;
                     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getMostSignificantBits());
                 }
-                hash = (29 * hash) + unknownFields.hashCode();
+                hash = (29 * hash) + getUnknownFields().hashCode();
                 memoizedHashCode = hash;
                 return hash;
             }
@@ -816,16 +638,12 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
                 // Construct using datawave.edge.protobuf.EdgeData.EdgeValue.UUID.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
@@ -924,7 +742,7 @@ public Builder mergeFrom(datawave.edge.protobuf.EdgeData.EdgeValue.UUID other) {
                     if (other.hasMostSignificantBits()) {
                         setMostSignificantBits(other.getMostSignificantBits());
                     }
-                    this.mergeUnknownFields(other.unknownFields);
+                    this.mergeUnknownFields(other.getUnknownFields());
                     onChanged();
                     return this;
                 }
@@ -943,17 +761,40 @@ public final boolean isInitialized() {
                 @java.lang.Override
                 public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                                 throws java.io.IOException {
-                    datawave.edge.protobuf.EdgeData.EdgeValue.UUID 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 8: {
+                                    leastSignificantBits_ = input.readSInt64();
+                                    bitField0_ |= 0x00000001;
+                                    break;
+                                } // case 8
+                                case 16: {
+                                    mostSignificantBits_ = input.readSInt64();
+                                    bitField0_ |= 0x00000002;
+                                    break;
+                                } // case 16
+                                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 = (datawave.edge.protobuf.EdgeData.EdgeValue.UUID) e.getUnfinishedMessage();
                         throw e.unwrapIOException();
                     } finally {
-                        if (parsedMessage != null) {
-                            mergeFrom(parsedMessage);
-                        }
-                    }
+                        onChanged();
+                    } // finally
                     return this;
                 }
 
@@ -1083,7 +924,17 @@ public static datawave.edge.protobuf.EdgeData.EdgeValue.UUID getDefaultInstance(
                 @java.lang.Override
                 public UUID parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                                 throws com.google.protobuf.InvalidProtocolBufferException {
-                    return new UUID(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();
                 }
             };
 
@@ -1605,7 +1456,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             if (((bitField0_ & 0x00000080) != 0)) {
                 com.google.protobuf.GeneratedMessageV3.writeString(output, 10, uuidString_);
             }
-            unknownFields.writeTo(output);
+            getUnknownFields().writeTo(output);
         }
 
         @java.lang.Override
@@ -1663,7 +1514,7 @@ public int getSerializedSize() {
             if (((bitField0_ & 0x00000080) != 0)) {
                 size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, uuidString_);
             }
-            size += unknownFields.getSerializedSize();
+            size += getUnknownFields().getSerializedSize();
             memoizedSize = size;
             return size;
         }
@@ -1730,7 +1581,7 @@ public boolean equals(final java.lang.Object obj) {
                 if (!getUuidString().equals(other.getUuidString()))
                     return false;
             }
-            if (!unknownFields.equals(other.unknownFields))
+            if (!getUnknownFields().equals(other.getUnknownFields()))
                 return false;
             return true;
         }
@@ -1782,7 +1633,7 @@ public int hashCode() {
                 hash = (37 * hash) + UUID_STRING_FIELD_NUMBER;
                 hash = (53 * hash) + getUuidString().hashCode();
             }
-            hash = (29 * hash) + unknownFields.hashCode();
+            hash = (29 * hash) + getUnknownFields().hashCode();
             memoizedHashCode = hash;
             return hash;
         }
@@ -2102,7 +1953,7 @@ public Builder mergeFrom(datawave.edge.protobuf.EdgeData.EdgeValue other) {
                     uuidString_ = other.uuidString_;
                     onChanged();
                 }
-                this.mergeUnknownFields(other.unknownFields);
+                this.mergeUnknownFields(other.getUnknownFields());
                 onChanged();
                 return this;
             }
@@ -2120,17 +1971,102 @@ public final boolean isInitialized() {
             @java.lang.Override
             public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                             throws java.io.IOException {
-                datawave.edge.protobuf.EdgeData.EdgeValue 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 8: {
+                                count_ = input.readInt64();
+                                bitField0_ |= 0x00000001;
+                                break;
+                            } // case 8
+                            case 16: {
+                                long v = input.readInt64();
+                                ensureHoursIsMutable();
+                                hours_.addLong(v);
+                                break;
+                            } // case 16
+                            case 18: {
+                                int length = input.readRawVarint32();
+                                int limit = input.pushLimit(length);
+                                ensureHoursIsMutable();
+                                while (input.getBytesUntilLimit() > 0) {
+                                    hours_.addLong(input.readInt64());
+                                }
+                                input.popLimit(limit);
+                                break;
+                            } // case 18
+                            case 24: {
+                                long v = input.readInt64();
+                                ensureDurationIsMutable();
+                                duration_.addLong(v);
+                                break;
+                            } // case 24
+                            case 26: {
+                                int length = input.readRawVarint32();
+                                int limit = input.pushLimit(length);
+                                ensureDurationIsMutable();
+                                while (input.getBytesUntilLimit() > 0) {
+                                    duration_.addLong(input.readInt64());
+                                }
+                                input.popLimit(limit);
+                                break;
+                            } // case 26
+                            case 32: {
+                                hourBitmask_ = input.readInt32();
+                                bitField0_ |= 0x00000008;
+                                break;
+                            } // case 32
+                            case 42: {
+                                sourceValue_ = input.readBytes();
+                                bitField0_ |= 0x00000010;
+                                break;
+                            } // case 42
+                            case 50: {
+                                sinkValue_ = input.readBytes();
+                                bitField0_ |= 0x00000020;
+                                break;
+                            } // case 50
+                            case 58: {
+                                loadDate_ = input.readBytes();
+                                bitField0_ |= 0x00000040;
+                                break;
+                            } // case 58
+                            case 64: {
+                                badActivity_ = input.readBool();
+                                bitField0_ |= 0x00000080;
+                                break;
+                            } // case 64
+                            case 74: {
+                                input.readMessage(getUuidFieldBuilder().getBuilder(), extensionRegistry);
+                                bitField0_ |= 0x00000100;
+                                break;
+                            } // case 74
+                            case 82: {
+                                uuidString_ = input.readBytes();
+                                bitField0_ |= 0x00000200;
+                                break;
+                            } // case 82
+                            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 = (datawave.edge.protobuf.EdgeData.EdgeValue) e.getUnfinishedMessage();
                     throw e.unwrapIOException();
                 } finally {
-                    if (parsedMessage != null) {
-                        mergeFrom(parsedMessage);
-                    }
-                }
+                    onChanged();
+                } // finally
                 return this;
             }
 
@@ -3146,7 +3082,17 @@ public static datawave.edge.protobuf.EdgeData.EdgeValue getDefaultInstance() {
             @java.lang.Override
             public EdgeValue parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                             throws com.google.protobuf.InvalidProtocolBufferException {
-                return new EdgeValue(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();
             }
         };
 
@@ -3177,14 +3123,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
     private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
     static {
-        java.lang.String[] descriptorData = {
-                "\n\016EdgeData.proto\022\026datawave.edge.protobuf" + "\"\271\002\n\tEdgeValue\022\r\n\005count\030\001 \001(\003\022\021\n\005hours\030\002"
-                                + " \003(\003B\002\020\001\022\024\n\010duration\030\003 \003(\003B\002\020\001\022\023\n\013hourBi"
-                                + "tmask\030\004 \001(\005\022\023\n\013sourceValue\030\005 \001(\t\022\021\n\tsink"
-                                + "Value\030\006 \001(\t\022\020\n\010loadDate\030\007 \001(\t\022\023\n\013badActi"
-                                + "vity\030\010 \001(\010\0224\n\004uuid\030\t \001(\0132&.datawave.edge"
-                                + ".protobuf.EdgeValue.UUID\022\023\n\013uuid_string\030" + "\n \001(\t\032E\n\004UUID\022\036\n\026least_significant_bits\030"
-                                + "\001 \002(\022\022\035\n\025most_significant_bits\030\002 \002(\022B\032\n\026" + "datawave.edge.protobufH\001"};
+        java.lang.String[] descriptorData = {"\n/warehouse/core/src/main/protobuf/EdgeD" + "ata.proto\022\026datawave.edge.protobuf\"\271\002\n\tEd"
+                        + "geValue\022\r\n\005count\030\001 \001(\003\022\021\n\005hours\030\002 \003(\003B\002\020"
+                        + "\001\022\024\n\010duration\030\003 \003(\003B\002\020\001\022\023\n\013hourBitmask\030\004"
+                        + " \001(\005\022\023\n\013sourceValue\030\005 \001(\t\022\021\n\tsinkValue\030\006"
+                        + " \001(\t\022\020\n\010loadDate\030\007 \001(\t\022\023\n\013badActivity\030\010 "
+                        + "\001(\010\0224\n\004uuid\030\t \001(\0132&.datawave.edge.protob" + "uf.EdgeValue.UUID\022\023\n\013uuid_string\030\n \001(\t\032E"
+                        + "\n\004UUID\022\036\n\026least_significant_bits\030\001 \002(\022\022\035"
+                        + "\n\025most_significant_bits\030\002 \002(\022B\032\n\026datawav" + "e.edge.protobufH\001"};
         descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
                         new com.google.protobuf.Descriptors.FileDescriptor[] {});
         internal_static_datawave_edge_protobuf_EdgeValue_descriptor = getDescriptor().getMessageTypes().get(0);
diff --git a/warehouse/core/src/main/java/datawave/ingest/protobuf/TermWeight.java b/warehouse/core/src/main/java/datawave/ingest/protobuf/TermWeight.java
index d10cc80fdf2..308679226e1 100644
--- a/warehouse/core/src/main/java/datawave/ingest/protobuf/TermWeight.java
+++ b/warehouse/core/src/main/java/datawave/ingest/protobuf/TermWeight.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: TermWeight.proto
+// source: warehouse/core/src/main/protobuf/TermWeight.proto
 
 package datawave.ingest.protobuf;
 
@@ -131,117 +131,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
             return this.unknownFields;
         }
 
-        private Info(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 24: {
-                            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                                termOffset_ = newIntList();
-                                mutable_bitField0_ |= 0x00000001;
-                            }
-                            termOffset_.addInt(input.readUInt32());
-                            break;
-                        }
-                        case 26: {
-                            int length = input.readRawVarint32();
-                            int limit = input.pushLimit(length);
-                            if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                                termOffset_ = newIntList();
-                                mutable_bitField0_ |= 0x00000001;
-                            }
-                            while (input.getBytesUntilLimit() > 0) {
-                                termOffset_.addInt(input.readUInt32());
-                            }
-                            input.popLimit(limit);
-                            break;
-                        }
-                        case 32: {
-                            if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                                prevSkips_ = newIntList();
-                                mutable_bitField0_ |= 0x00000002;
-                            }
-                            prevSkips_.addInt(input.readUInt32());
-                            break;
-                        }
-                        case 34: {
-                            int length = input.readRawVarint32();
-                            int limit = input.pushLimit(length);
-                            if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                                prevSkips_ = newIntList();
-                                mutable_bitField0_ |= 0x00000002;
-                            }
-                            while (input.getBytesUntilLimit() > 0) {
-                                prevSkips_.addInt(input.readUInt32());
-                            }
-                            input.popLimit(limit);
-                            break;
-                        }
-                        case 40: {
-                            if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                                score_ = newIntList();
-                                mutable_bitField0_ |= 0x00000004;
-                            }
-                            score_.addInt(input.readUInt32());
-                            break;
-                        }
-                        case 42: {
-                            int length = input.readRawVarint32();
-                            int limit = input.pushLimit(length);
-                            if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                                score_ = newIntList();
-                                mutable_bitField0_ |= 0x00000004;
-                            }
-                            while (input.getBytesUntilLimit() > 0) {
-                                score_.addInt(input.readUInt32());
-                            }
-                            input.popLimit(limit);
-                            break;
-                        }
-                        case 48: {
-                            bitField0_ |= 0x00000001;
-                            zeroOffsetMatch_ = 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 {
-                if (((mutable_bitField0_ & 0x00000001) != 0)) {
-                    termOffset_.makeImmutable(); // C
-                }
-                if (((mutable_bitField0_ & 0x00000002) != 0)) {
-                    prevSkips_.makeImmutable(); // C
-                }
-                if (((mutable_bitField0_ & 0x00000004) != 0)) {
-                    score_.makeImmutable(); // C
-                }
-                this.unknownFields = unknownFields.build();
-                makeExtensionsImmutable();
-            }
-        }
-
         public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             return datawave.ingest.protobuf.TermWeight.internal_static_datawave_ingest_protobuf_Info_descriptor;
         }
@@ -403,7 +292,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             if (((bitField0_ & 0x00000001) != 0)) {
                 output.writeBool(6, zeroOffsetMatch_);
             }
-            unknownFields.writeTo(output);
+            getUnknownFields().writeTo(output);
         }
 
         @java.lang.Override
@@ -440,7 +329,7 @@ public int getSerializedSize() {
             if (((bitField0_ & 0x00000001) != 0)) {
                 size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, zeroOffsetMatch_);
             }
-            size += unknownFields.getSerializedSize();
+            size += getUnknownFields().getSerializedSize();
             memoizedSize = size;
             return size;
         }
@@ -467,7 +356,7 @@ public boolean equals(final java.lang.Object obj) {
                 if (getZeroOffsetMatch() != other.getZeroOffsetMatch())
                     return false;
             }
-            if (!unknownFields.equals(other.unknownFields))
+            if (!getUnknownFields().equals(other.getUnknownFields()))
                 return false;
             return true;
         }
@@ -495,7 +384,7 @@ public int hashCode() {
                 hash = (37 * hash) + ZEROOFFSETMATCH_FIELD_NUMBER;
                 hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getZeroOffsetMatch());
             }
-            hash = (29 * hash) + unknownFields.hashCode();
+            hash = (29 * hash) + getUnknownFields().hashCode();
             memoizedHashCode = hash;
             return hash;
         }
@@ -597,16 +486,12 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
             // Construct using datawave.ingest.protobuf.TermWeight.Info.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
@@ -747,7 +632,7 @@ public Builder mergeFrom(datawave.ingest.protobuf.TermWeight.Info other) {
                 if (other.hasZeroOffsetMatch()) {
                     setZeroOffsetMatch(other.getZeroOffsetMatch());
                 }
-                this.mergeUnknownFields(other.unknownFields);
+                this.mergeUnknownFields(other.getUnknownFields());
                 onChanged();
                 return this;
             }
@@ -760,17 +645,83 @@ public final boolean isInitialized() {
             @java.lang.Override
             public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                             throws java.io.IOException {
-                datawave.ingest.protobuf.TermWeight.Info 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 24: {
+                                int v = input.readUInt32();
+                                ensureTermOffsetIsMutable();
+                                termOffset_.addInt(v);
+                                break;
+                            } // case 24
+                            case 26: {
+                                int length = input.readRawVarint32();
+                                int limit = input.pushLimit(length);
+                                ensureTermOffsetIsMutable();
+                                while (input.getBytesUntilLimit() > 0) {
+                                    termOffset_.addInt(input.readUInt32());
+                                }
+                                input.popLimit(limit);
+                                break;
+                            } // case 26
+                            case 32: {
+                                int v = input.readUInt32();
+                                ensurePrevSkipsIsMutable();
+                                prevSkips_.addInt(v);
+                                break;
+                            } // case 32
+                            case 34: {
+                                int length = input.readRawVarint32();
+                                int limit = input.pushLimit(length);
+                                ensurePrevSkipsIsMutable();
+                                while (input.getBytesUntilLimit() > 0) {
+                                    prevSkips_.addInt(input.readUInt32());
+                                }
+                                input.popLimit(limit);
+                                break;
+                            } // case 34
+                            case 40: {
+                                int v = input.readUInt32();
+                                ensureScoreIsMutable();
+                                score_.addInt(v);
+                                break;
+                            } // case 40
+                            case 42: {
+                                int length = input.readRawVarint32();
+                                int limit = input.pushLimit(length);
+                                ensureScoreIsMutable();
+                                while (input.getBytesUntilLimit() > 0) {
+                                    score_.addInt(input.readUInt32());
+                                }
+                                input.popLimit(limit);
+                                break;
+                            } // case 42
+                            case 48: {
+                                zeroOffsetMatch_ = input.readBool();
+                                bitField0_ |= 0x00000008;
+                                break;
+                            } // case 48
+                            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 = (datawave.ingest.protobuf.TermWeight.Info) e.getUnfinishedMessage();
                     throw e.unwrapIOException();
                 } finally {
-                    if (parsedMessage != null) {
-                        mergeFrom(parsedMessage);
-                    }
-                }
+                    onChanged();
+                } // finally
                 return this;
             }
 
@@ -1134,7 +1085,17 @@ public static datawave.ingest.protobuf.TermWeight.Info getDefaultInstance() {
             @java.lang.Override
             public Info parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                             throws com.google.protobuf.InvalidProtocolBufferException {
-                return new Info(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();
             }
         };
 
@@ -1163,10 +1124,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
     private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
     static {
-        java.lang.String[] descriptorData = {
-                "\n\020TermWeight.proto\022\030datawave.ingest.prot" + "obuf\"[\n\004Info\022\022\n\ntermOffset\030\003 \003(\r\022\021\n\tprev"
-                                + "Skips\030\004 \003(\r\022\r\n\005score\030\005 \003(\r\022\035\n\017zeroOffset"
-                                + "Match\030\006 \001(\010:\004trueB\034\n\030datawave.ingest.pro" + "tobufH\001"};
+        java.lang.String[] descriptorData = {"\n1warehouse/core/src/main/protobuf/TermW" + "eight.proto\022\030datawave.ingest.protobuf\"[\n"
+                        + "\004Info\022\022\n\ntermOffset\030\003 \003(\r\022\021\n\tprevSkips\030\004"
+                        + " \003(\r\022\r\n\005score\030\005 \003(\r\022\035\n\017zeroOffsetMatch\030\006"
+                        + " \001(\010:\004trueB\034\n\030datawave.ingest.protobufH\001"};
         descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
                         new com.google.protobuf.Descriptors.FileDescriptor[] {});
         internal_static_datawave_ingest_protobuf_Info_descriptor = getDescriptor().getMessageTypes().get(0);
diff --git a/warehouse/core/src/main/java/datawave/ingest/protobuf/Uid.java b/warehouse/core/src/main/java/datawave/ingest/protobuf/Uid.java
index 02bf9c1fbf7..309abddf7e7 100644
--- a/warehouse/core/src/main/java/datawave/ingest/protobuf/Uid.java
+++ b/warehouse/core/src/main/java/datawave/ingest/protobuf/Uid.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: Uid.proto
+// source: warehouse/core/src/main/protobuf/Uid.proto
 
 package datawave.ingest.protobuf;
 
@@ -138,74 +138,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
             return this.unknownFields;
         }
 
-        private List(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                        throws com.google.protobuf.InvalidProtocolBufferException {
-            this();
-            if (extensionRegistry == null) {
-                throw new java.lang.NullPointerException();
-            }
-            int mutable_bitField0_ = 0;
-            com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder();
-            try {
-                boolean done = false;
-                while (!done) {
-                    int tag = input.readTag();
-                    switch (tag) {
-                        case 0:
-                            done = true;
-                            break;
-                        case 8: {
-                            bitField0_ |= 0x00000001;
-                            iGNORE_ = input.readBool();
-                            break;
-                        }
-                        case 16: {
-                            bitField0_ |= 0x00000002;
-                            cOUNT_ = input.readUInt64();
-                            break;
-                        }
-                        case 26: {
-                            com.google.protobuf.ByteString bs = input.readBytes();
-                            if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                                uID_ = new com.google.protobuf.LazyStringArrayList();
-                                mutable_bitField0_ |= 0x00000004;
-                            }
-                            uID_.add(bs);
-                            break;
-                        }
-                        case 34: {
-                            com.google.protobuf.ByteString bs = input.readBytes();
-                            if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                                rEMOVEDUID_ = new com.google.protobuf.LazyStringArrayList();
-                                mutable_bitField0_ |= 0x00000008;
-                            }
-                            rEMOVEDUID_.add(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 {
-                if (((mutable_bitField0_ & 0x00000004) != 0)) {
-                    uID_ = uID_.getUnmodifiableView();
-                }
-                if (((mutable_bitField0_ & 0x00000008) != 0)) {
-                    rEMOVEDUID_ = rEMOVEDUID_.getUnmodifiableView();
-                }
-                this.unknownFields = unknownFields.build();
-                makeExtensionsImmutable();
-            }
-        }
-
         public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
             return datawave.ingest.protobuf.Uid.internal_static_datawave_ingest_protobuf_List_descriptor;
         }
@@ -385,7 +317,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
             for (int i = 0; i < rEMOVEDUID_.size(); i++) {
                 com.google.protobuf.GeneratedMessageV3.writeString(output, 4, rEMOVEDUID_.getRaw(i));
             }
-            unknownFields.writeTo(output);
+            getUnknownFields().writeTo(output);
         }
 
         @java.lang.Override
@@ -417,7 +349,7 @@ public int getSerializedSize() {
                 size += dataSize;
                 size += 1 * getREMOVEDUIDList().size();
             }
-            size += unknownFields.getSerializedSize();
+            size += getUnknownFields().getSerializedSize();
             memoizedSize = size;
             return size;
         }
@@ -448,7 +380,7 @@ public boolean equals(final java.lang.Object obj) {
                 return false;
             if (!getREMOVEDUIDList().equals(other.getREMOVEDUIDList()))
                 return false;
-            if (!unknownFields.equals(other.unknownFields))
+            if (!getUnknownFields().equals(other.getUnknownFields()))
                 return false;
             return true;
         }
@@ -476,7 +408,7 @@ public int hashCode() {
                 hash = (37 * hash) + REMOVEDUID_FIELD_NUMBER;
                 hash = (53 * hash) + getREMOVEDUIDList().hashCode();
             }
-            hash = (29 * hash) + unknownFields.hashCode();
+            hash = (29 * hash) + getUnknownFields().hashCode();
             memoizedHashCode = hash;
             return hash;
         }
@@ -578,16 +510,12 @@ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetF
 
             // Construct using datawave.ingest.protobuf.Uid.List.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
@@ -720,7 +648,7 @@ public Builder mergeFrom(datawave.ingest.protobuf.Uid.List other) {
                     }
                     onChanged();
                 }
-                this.mergeUnknownFields(other.unknownFields);
+                this.mergeUnknownFields(other.getUnknownFields());
                 onChanged();
                 return this;
             }
@@ -739,17 +667,52 @@ public final boolean isInitialized() {
             @java.lang.Override
             public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                             throws java.io.IOException {
-                datawave.ingest.protobuf.Uid.List 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 8: {
+                                iGNORE_ = input.readBool();
+                                bitField0_ |= 0x00000001;
+                                break;
+                            } // case 8
+                            case 16: {
+                                cOUNT_ = input.readUInt64();
+                                bitField0_ |= 0x00000002;
+                                break;
+                            } // case 16
+                            case 26: {
+                                com.google.protobuf.ByteString bs = input.readBytes();
+                                ensureUIDIsMutable();
+                                uID_.add(bs);
+                                break;
+                            } // case 26
+                            case 34: {
+                                com.google.protobuf.ByteString bs = input.readBytes();
+                                ensureREMOVEDUIDIsMutable();
+                                rEMOVEDUID_.add(bs);
+                                break;
+                            } // case 34
+                            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 = (datawave.ingest.protobuf.Uid.List) e.getUnfinishedMessage();
                     throw e.unwrapIOException();
                 } finally {
-                    if (parsedMessage != null) {
-                        mergeFrom(parsedMessage);
-                    }
-                }
+                    onChanged();
+                } // finally
                 return this;
             }
 
@@ -1135,7 +1098,17 @@ public static datawave.ingest.protobuf.Uid.List getDefaultInstance() {
             @java.lang.Override
             public List parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                             throws com.google.protobuf.InvalidProtocolBufferException {
-                return new List(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();
             }
         };
 
@@ -1164,9 +1137,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
     private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
     static {
-        java.lang.String[] descriptorData = {"\n\tUid.proto\022\030datawave.ingest.protobuf\"F\n"
-                        + "\004List\022\016\n\006IGNORE\030\001 \002(\010\022\r\n\005COUNT\030\002 \002(\004\022\013\n\003"
-                        + "UID\030\003 \003(\t\022\022\n\nREMOVEDUID\030\004 \003(\tB\034\n\030datawav" + "e.ingest.protobufH\001"};
+        java.lang.String[] descriptorData = {"\n*warehouse/core/src/main/protobuf/Uid.p" + "roto\022\030datawave.ingest.protobuf\"F\n\004List\022\016"
+                        + "\n\006IGNORE\030\001 \002(\010\022\r\n\005COUNT\030\002 \002(\004\022\013\n\003UID\030\003 \003"
+                        + "(\t\022\022\n\nREMOVEDUID\030\004 \003(\tB\034\n\030datawave.inges" + "t.protobufH\001"};
         descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
                         new com.google.protobuf.Descriptors.FileDescriptor[] {});
         internal_static_datawave_ingest_protobuf_List_descriptor = getDescriptor().getMessageTypes().get(0);
diff --git a/warehouse/core/src/main/protobuf/compile_protos.sh b/warehouse/core/src/main/protobuf/compile_protos.sh
index b89842ee727..5ac528afe86 100755
--- a/warehouse/core/src/main/protobuf/compile_protos.sh
+++ b/warehouse/core/src/main/protobuf/compile_protos.sh
@@ -2,5 +2,20 @@
 
 # Other projects use protostuff but, meh
 #
-for PROTO in `ls -1 *proto`; do protoc --java_out ../java $PROTO; done
+# override the default protof compiler and include path by setting either the PROTOC or PROTOC_INCLUDE_PATH
+# environment variable.
+
+SCRIPT_DIR=$(dirname "$0")
+
+PROTOC=${PROTOC:=protoc}
+PROTOC_INCLUDE_PATH=${PROTOC_INCLUDE_PATH:=/usr/local/include}
+PROTOC_VERSION=$(${PROTOC} --version)
+INPUT_FILES=$(ls ${SCRIPT_DIR}/*.proto)
+
+for PROTO in ${INPUT_FILES}; do
+    echo "Compiling ${PROTO} to java; SCRIPT_DIR=${SCRIPT_DIR} PROTOC=${PROTOC} PROTOC_INCLUDE_PATH=${PROTOC} PROTOC_VERSION=${PROTOC_VERSION}" 1>&2
+    protoc --java_out ${SCRIPT_DIR}/../java $PROTO
+done
+
+
 
diff --git a/web-services/pom.xml b/web-services/pom.xml
index 1a9dd4709aa..da68a7c774f 100644
--- a/web-services/pom.xml
+++ b/web-services/pom.xml
@@ -51,7 +51,7 @@
         1.0.1
         1.1
         1.0.0
-        3.16.3
+        3.25.5