diff --git a/container/features/pom.xml b/container/features/pom.xml index a5f1010766a9..7a11074b22bb 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -217,6 +217,8 @@ netty org.json pax-jetty + protobuf + protobuf-util scv-api scv-jceks-impl scv-shell diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml index e56909d69c6f..c23cf7540773 100644 --- a/container/features/src/main/resources/features-core.xml +++ b/container/features/src/main/resources/features-core.xml @@ -168,6 +168,12 @@ mvn:com.google.guava/guava/31.1-jre + + + guava-dependencies + mvn:com.google.guava/guava/32.1.3-jre + + mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion} mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion} @@ -291,6 +297,17 @@ wrap:mvn:org.json/json/${jsonVersion}$Export-Package=org.json&Bundle-Version=${jsonVersion} + + mvn:com.google.protobuf/protobuf-java/${protobufVersion} + + + guava32 + protobuf + mvn:com.google.code.gson/gson/${gsonVersion} + mvn:com.google.protobuf/protobuf-java-util/${protobufVersion} + wrap:mvn:com.google.code.findbugs/jsr305/3.0.2 + + mvn:org.yaml/snakeyaml/${snakeyamlVersion} diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml index 97abcb53bad9..e73e05f25b89 100644 --- a/container/features/src/main/resources/features-minion.xml +++ b/container/features/src/main/resources/features-minion.xml @@ -135,9 +135,9 @@ commons-csv dropwizard-metrics netty + protobuf opennms-dnsresolver-api opennms-util - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:com.google.code.gson/gson/${gsonVersion} wrap:mvn:io.pkts/pkts-core/${pktsVersion}$Bundle-SymbolicName=io.pkts.core&Bundle-Version=${pktsVersion} wrap:mvn:io.pkts/pkts-buffers/${pktsVersion}$Bundle-SymbolicName=io.pkts.buffers&Bundle-Version=${pktsVersion} diff --git a/container/features/src/main/resources/features-sentinel.xml b/container/features/src/main/resources/features-sentinel.xml index 0fd9cc97a8b4..054660f1985a 100644 --- a/container/features/src/main/resources/features-sentinel.xml +++ b/container/features/src/main/resources/features-sentinel.xml @@ -104,6 +104,7 @@ sentinel-timeseries-api netty + protobuf dropwizard-metrics camel-spring @@ -116,8 +117,6 @@ sentinel-thresholding-service opennms-util - mvn:com.google.protobuf/protobuf-java/${protobufVersion} - mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version} mvn:org.opennms.features.telemetry.config/org.opennms.features.telemetry.config.api/${project.version} @@ -135,6 +134,8 @@ commons-csv dropwizard-metrics guava + protobuf + protobuf-util rate-limited-logger sentinel-telemetry opennms-jest @@ -143,7 +144,6 @@ opennms-dnsresolver-netty sentinel-kvstore-api opennms-kafka - mvn:com.google.protobuf/protobuf-java-util/${protobufVersion} mvn:org.opennms.features.flows/org.opennms.features.flows.kafka-persistence/${project.version} mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version} mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version} diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml index 73ac7b8cf2f7..1b5583970163 100644 --- a/container/features/src/main/resources/features.xml +++ b/container/features/src/main/resources/features.xml @@ -428,12 +428,12 @@ guava javax.mail org.json + protobuf rate-limited-logger opennms-core opennms-distributed-core-api opennms-integration-api opennms-core-tracing - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.api/${project.version} mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.common/${project.version} mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.xml/${project.version} @@ -948,18 +948,18 @@ guava kafka-streams + protobuf rate-limited-logger opennms-collection-api opennms-situation-feedback-api - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version} mvn:org.opennms.features.kafka/org.opennms.features.kafka.producer/${project.version} + protobuf opennms-kafka opennms-events-api opennms-model - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version} mvn:org.opennms.features.kafka/org.opennms.features.kafka.consumer/${project.version} @@ -967,11 +967,10 @@ guava netty dropwizard-metrics + protobuf opennms-collection-api opennms-thresholding-api opennms-osgi-jsr223 - mvn:com.google.protobuf/protobuf-java/${protobufVersion} - mvn:com.google.code.gson/gson/${gsonVersion} wrap:mvn:io.pkts/pkts-core/${pktsVersion} wrap:mvn:io.pkts/pkts-buffers/${pktsVersion} mvn:org.opennms.core/org.opennms.core.lib/${project.version} @@ -987,13 +986,13 @@ netty camel-spring dropwizard-metrics + protobuf opennms-core-daemon opennms-core-ipc-sink-api opennms-dao-api opennms-dao opennms-telemetry-collection opennms-util - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.common/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.registry/${project.version} @@ -1024,13 +1023,13 @@ commons-net + protobuf opennms-telemetry-collection - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.features.telemetry.protocols.jti/org.opennms.features.telemetry.protocols.jti.adapter/${project.version} + protobuf opennms-telemetry-collection - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.features.telemetry.protocols.nxos/org.opennms.features.telemetry.protocols.nxos.adapter/${project.version} @@ -1038,10 +1037,10 @@ mvn:org.opennms.features.telemetry.protocols.graphite/org.opennms.features.telemetry.protocols.graphite.adapter/${project.version} + protobuf opennms-telemetry-collection opennms-telemetry-openconfig-client opennms-rpc-utils - mvn:com.google.protobuf/protobuf-java/${protobufVersion} mvn:org.opennms.core.grpc/org.opennms.core.grpc.osgi/${project.version} mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.api/${project.version} mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.common/${project.version} @@ -1097,18 +1096,20 @@ bson commons-csv dropwizard-metrics - opennms-health - opennms-jest guava netty + protobuf + protobuf-util quartz + rate-limited-logger opennms-core-tracing opennms-distributed-core-api - opennms-integration-api - opennms-telemetry-collection opennms-dnsresolver-api + opennms-health + opennms-integration-api + opennms-jest opennms-kafka - rate-limited-logger + opennms-telemetry-collection mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version} mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version} mvn:org.opennms.features.flows.rest/org.opennms.features.flows.rest.api/${project.version} @@ -1123,8 +1124,6 @@ mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.common/${project.version} mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.listeners/${project.version} - mvn:com.google.protobuf/protobuf-java/${protobufVersion} - mvn:com.google.protobuf/protobuf-java-util/${protobufVersion} mvn:org.opennms.features.telemetry.protocols/org.opennms.features.telemetry.protocols.common/${project.version} mvn:org.opennms.features.telemetry.protocols/org.opennms.features.telemetry.protocols.flows/${project.version} mvn:org.opennms.features.telemetry.protocols.netflow/org.opennms.features.telemetry.protocols.netflow.parser/${project.version} @@ -1786,7 +1785,7 @@ guava json-patch - mvn:com.google.protobuf/protobuf-java/${protobufVersion} + protobuf mvn:org.opennms.core.ipc.twin/org.opennms.core.ipc.twin.api/${project.version} mvn:org.opennms.core.ipc.twin/org.opennms.core.ipc.twin.common/${project.version} @@ -1812,12 +1811,12 @@ + protobuf opennms-kafka opennms-core-ipc-twin-common mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version} mvn:org.opennms.core.ipc.twin.kafka/org.opennms.core.ipc.twin.kafka.common/${project.version} mvn:org.opennms.core/org.opennms.core.sysprops/${project.version} - mvn:com.google.protobuf/protobuf-java/${protobufVersion} opennms-core-ipc-twin-kafka-common diff --git a/core/ipc/rpc/kafka/pom.xml b/core/ipc/rpc/kafka/pom.xml index 9472545d0e49..6b52150cbbcd 100644 --- a/core/ipc/rpc/kafka/pom.xml +++ b/core/ipc/rpc/kafka/pom.xml @@ -12,12 +12,11 @@ bundle - - @@ -33,14 +32,13 @@ - - - - - + ${maven.os.plugin.version} + + --> org.apache.felix @@ -35,14 +34,13 @@ - - + @@ -84,11 +84,10 @@ - @@ -35,14 +35,13 @@ - - - - - - + - + ${maven.os.plugin.version} + + --> org.apache.felix @@ -35,14 +34,13 @@ - org.apache.felix @@ -41,15 +41,14 @@ - - + - + org.apache.felix @@ -36,14 +36,13 @@ - org.apache.felix @@ -31,25 +31,24 @@ - - + + diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/CpuMemoryUtilizationOuterClass.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/CpuMemoryUtilizationOuterClass.java index 283c4972b74c..de71c54efdcd 100644 --- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/CpuMemoryUtilizationOuterClass.java +++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/CpuMemoryUtilizationOuterClass.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2017-2022 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc. + * Copyright (C) 2017-2023 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -73,6 +73,7 @@ org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOut } /** *
+   *
    * The top level message is CpuMemoryUtilization
    * 
* @@ -98,61 +99,6 @@ protected java.lang.Object newInstance( return new CpuMemoryUtilization(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CpuMemoryUtilization( - 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)) { - utilization_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - utilization_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary.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)) { - utilization_ = java.util.Collections.unmodifiableList(utilization_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.internal_static_CpuMemoryUtilization_descriptor; @@ -167,6 +113,7 @@ private CpuMemoryUtilization( } public static final int UTILIZATION_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List utilization_; /** * repeated .CpuMemoryUtilizationSummary utilization = 1; @@ -223,7 +170,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < utilization_.size(); i++) { output.writeMessage(1, utilization_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -236,7 +183,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, utilization_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -253,7 +200,7 @@ public boolean equals(final java.lang.Object obj) { if (!getUtilizationList() .equals(other.getUtilizationList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -268,7 +215,7 @@ public int hashCode() { hash = (37 * hash) + UTILIZATION_FIELD_NUMBER; hash = (53 * hash) + getUtilizationList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -317,11 +264,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemory return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -365,6 +314,7 @@ protected Builder newBuilderForType( } /** *
+     *
      * The top level message is CpuMemoryUtilization
      * 
* @@ -389,29 +339,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getUtilizationFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (utilizationBuilder_ == null) { utilization_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + utilization_ = null; utilizationBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -438,7 +384,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtiliza @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization result) { if (utilizationBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { utilization_ = java.util.Collections.unmodifiableList(utilization_); @@ -448,8 +400,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtiliza } else { result.utilization_ = utilizationBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -522,7 +476,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -537,17 +491,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary.PARSER, + extensionRegistry); + if (utilizationBuilder_ == null) { + ensureUtilizationIsMutable(); + utilization_.add(m); + } else { + utilizationBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilization) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -824,7 +804,18 @@ public CpuMemoryUtilization parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CpuMemoryUtilization(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(); } }; @@ -1009,82 +1000,6 @@ protected java.lang.Object newInstance( return new CpuMemoryUtilizationSummary(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CpuMemoryUtilizationSummary( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - size_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - bytesAllocated_ = input.readUInt64(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - utilization_ = input.readInt32(); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - applicationUtilization_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - applicationUtilization_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication.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_ & 0x00000010) != 0)) { - applicationUtilization_ = java.util.Collections.unmodifiableList(applicationUtilization_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.internal_static_CpuMemoryUtilizationSummary_descriptor; @@ -1100,7 +1015,8 @@ private CpuMemoryUtilizationSummary( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** *
      * Name of the partition.
@@ -1160,7 +1076,7 @@ public java.lang.String getName() {
     }
 
     public static final int SIZE_FIELD_NUMBER = 2;
-    private long size_;
+    private long size_ = 0L;
     /**
      * 
      * The total size of the partition in bytes
@@ -1187,7 +1103,7 @@ public long getSize() {
     }
 
     public static final int BYTES_ALLOCATED_FIELD_NUMBER = 3;
-    private long bytesAllocated_;
+    private long bytesAllocated_ = 0L;
     /**
      * 
      * The amount of memory currently allocated from the partition in bytes
@@ -1214,7 +1130,7 @@ public long getBytesAllocated() {
     }
 
     public static final int UTILIZATION_FIELD_NUMBER = 4;
-    private int utilization_;
+    private int utilization_ = 0;
     /**
      * 
      * The amount of memory that is currently allocated, expressed
@@ -1243,6 +1159,7 @@ public int getUtilization() {
     }
 
     public static final int APPLICATION_UTILIZATION_FIELD_NUMBER = 5;
+    @SuppressWarnings("serial")
     private java.util.List applicationUtilization_;
     /**
      * 
@@ -1331,7 +1248,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < applicationUtilization_.size(); i++) {
         output.writeMessage(5, applicationUtilization_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1359,7 +1276,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(5, applicationUtilization_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1396,7 +1313,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getApplicationUtilizationList()
           .equals(other.getApplicationUtilizationList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1429,7 +1346,7 @@ public int hashCode() {
         hash = (37 * hash) + APPLICATION_UTILIZATION_FIELD_NUMBER;
         hash = (53 * hash) + getApplicationUtilizationList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1478,11 +1395,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemory
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1551,37 +1470,29 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getApplicationUtilizationFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         size_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         bytesAllocated_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         utilization_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
         if (applicationUtilizationBuilder_ == null) {
           applicationUtilization_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
+          applicationUtilization_ = null;
           applicationUtilizationBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -1608,12 +1519,31 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtiliza
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary(this);
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary result) {
+        if (applicationUtilizationBuilder_ == null) {
+          if (((bitField0_ & 0x00000010) != 0)) {
+            applicationUtilization_ = java.util.Collections.unmodifiableList(applicationUtilization_);
+            bitField0_ = (bitField0_ & ~0x00000010);
+          }
+          result.applicationUtilization_ = applicationUtilization_;
+        } else {
+          result.applicationUtilization_ = applicationUtilizationBuilder_.build();
+        }
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000001;
         }
-        result.name_ = name_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.size_ = size_;
           to_bitField0_ |= 0x00000002;
@@ -1626,18 +1556,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtiliza
           result.utilization_ = utilization_;
           to_bitField0_ |= 0x00000008;
         }
-        if (applicationUtilizationBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)) {
-            applicationUtilization_ = java.util.Collections.unmodifiableList(applicationUtilization_);
-            bitField0_ = (bitField0_ & ~0x00000010);
-          }
-          result.applicationUtilization_ = applicationUtilization_;
-        } else {
-          result.applicationUtilization_ = applicationUtilizationBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -1685,8 +1604,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary.getDefaultInstance()) return this;
         if (other.hasName()) {
-          bitField0_ |= 0x00000001;
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasSize()) {
@@ -1724,7 +1643,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -1739,17 +1658,63 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                size_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                bytesAllocated_ = input.readUInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                utilization_ = input.readInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 42: {
+                org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication m =
+                    input.readMessage(
+                        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication.PARSER,
+                        extensionRegistry);
+                if (applicationUtilizationBuilder_ == null) {
+                  ensureApplicationUtilizationIsMutable();
+                  applicationUtilization_.add(m);
+                } else {
+                  applicationUtilizationBuilder_.addMessage(m);
+                }
+                break;
+              } // case 42
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationSummary) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -1820,11 +1785,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1837,8 +1800,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1853,11 +1816,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -1897,8 +1858,9 @@ public long getSize() {
        * @return This builder for chaining.
        */
       public Builder setSize(long value) {
-        bitField0_ |= 0x00000002;
+
         size_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -1952,8 +1914,9 @@ public long getBytesAllocated() {
        * @return This builder for chaining.
        */
       public Builder setBytesAllocated(long value) {
-        bitField0_ |= 0x00000004;
+
         bytesAllocated_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2010,8 +1973,9 @@ public int getUtilization() {
        * @return This builder for chaining.
        */
       public Builder setUtilization(int value) {
-        bitField0_ |= 0x00000008;
+
         utilization_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2375,7 +2339,18 @@ public CpuMemoryUtilizationSummary parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CpuMemoryUtilizationSummary(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();
       }
     };
 
@@ -2531,75 +2506,6 @@ protected java.lang.Object newInstance(
       return new CpuMemoryUtilizationPerApplication();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CpuMemoryUtilizationPerApplication(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              name_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              bytesAllocated_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              allocations_ = input.readUInt64();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              frees_ = input.readUInt64();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              allocationsFailed_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.internal_static_CpuMemoryUtilizationPerApplication_descriptor;
@@ -2615,7 +2521,8 @@ private CpuMemoryUtilizationPerApplication(
 
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object name_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object name_ = "";
     /**
      * 
      * Application name
@@ -2675,7 +2582,7 @@ public java.lang.String getName() {
     }
 
     public static final int BYTES_ALLOCATED_FIELD_NUMBER = 2;
-    private long bytesAllocated_;
+    private long bytesAllocated_ = 0L;
     /**
      * 
      * Number of bytes allocated
@@ -2702,7 +2609,7 @@ public long getBytesAllocated() {
     }
 
     public static final int ALLOCATIONS_FIELD_NUMBER = 3;
-    private long allocations_;
+    private long allocations_ = 0L;
     /**
      * 
      *  Number of allocations
@@ -2729,7 +2636,7 @@ public long getAllocations() {
     }
 
     public static final int FREES_FIELD_NUMBER = 4;
-    private long frees_;
+    private long frees_ = 0L;
     /**
      * 
      *  Number of frees
@@ -2756,7 +2663,7 @@ public long getFrees() {
     }
 
     public static final int ALLOCATIONS_FAILED_FIELD_NUMBER = 5;
-    private long allocationsFailed_;
+    private long allocationsFailed_ = 0L;
     /**
      * 
      * Number of allocations failed
@@ -2811,7 +2718,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeUInt64(5, allocationsFailed_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -2839,7 +2746,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(5, allocationsFailed_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -2879,7 +2786,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAllocationsFailed()
             != other.getAllocationsFailed()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -2914,7 +2821,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getAllocationsFailed());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -2963,11 +2870,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemory
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3035,32 +2944,23 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         name_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         bytesAllocated_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         allocations_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         frees_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         allocationsFailed_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -3087,12 +2987,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtiliza
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.name_ = name_;
           to_bitField0_ |= 0x00000001;
         }
-        result.name_ = name_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.bytesAllocated_ = bytesAllocated_;
           to_bitField0_ |= 0x00000002;
@@ -3109,9 +3015,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtiliza
           result.allocationsFailed_ = allocationsFailed_;
           to_bitField0_ |= 0x00000010;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -3159,8 +3063,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication.getDefaultInstance()) return this;
         if (other.hasName()) {
-          bitField0_ |= 0x00000001;
           name_ = other.name_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasBytesAllocated()) {
@@ -3175,7 +3079,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasAllocationsFailed()) {
           setAllocationsFailed(other.getAllocationsFailed());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3190,17 +3094,55 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                name_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                bytesAllocated_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                allocations_ = input.readUInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                frees_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                allocationsFailed_ = input.readUInt64();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.CpuMemoryUtilizationOuterClass.CpuMemoryUtilizationPerApplication) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -3271,11 +3213,9 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3288,8 +3228,8 @@ public Builder setName(
        * @return This builder for chaining.
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = getDefaultInstance().getName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -3304,11 +3244,9 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         name_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -3348,8 +3286,9 @@ public long getBytesAllocated() {
        * @return This builder for chaining.
        */
       public Builder setBytesAllocated(long value) {
-        bitField0_ |= 0x00000002;
+
         bytesAllocated_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -3403,8 +3342,9 @@ public long getAllocations() {
        * @return This builder for chaining.
        */
       public Builder setAllocations(long value) {
-        bitField0_ |= 0x00000004;
+
         allocations_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -3458,8 +3398,9 @@ public long getFrees() {
        * @return This builder for chaining.
        */
       public Builder setFrees(long value) {
-        bitField0_ |= 0x00000008;
+
         frees_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3513,8 +3454,9 @@ public long getAllocationsFailed() {
        * @return This builder for chaining.
        */
       public Builder setAllocationsFailed(long value) {
-        bitField0_ |= 0x00000010;
+
         allocationsFailed_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -3565,7 +3507,18 @@ public CpuMemoryUtilizationPerApplication parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CpuMemoryUtilizationPerApplication(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();
       }
     };
 
diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/FirewallOuterClass.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/FirewallOuterClass.java
index d732d3925716..7435556a6fc4 100644
--- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/FirewallOuterClass.java
+++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/FirewallOuterClass.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2017-2022 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc.
+ * Copyright (C) 2017-2023 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -73,6 +73,7 @@ org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Fire
   }
   /**
    * 
+   *
    * Top-level message
    * 
* @@ -98,61 +99,6 @@ protected java.lang.Object newInstance( return new Firewall(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Firewall( - 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)) { - firewallStats_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - firewallStats_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats.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)) { - firewallStats_ = java.util.Collections.unmodifiableList(firewallStats_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_Firewall_descriptor; @@ -167,6 +113,7 @@ private Firewall( } public static final int FIREWALL_STATS_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List firewallStats_; /** * repeated .FirewallStats firewall_stats = 1; @@ -229,7 +176,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < firewallStats_.size(); i++) { output.writeMessage(1, firewallStats_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -242,7 +189,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, firewallStats_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -259,7 +206,7 @@ public boolean equals(final java.lang.Object obj) { if (!getFirewallStatsList() .equals(other.getFirewallStatsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -274,7 +221,7 @@ public int hashCode() { hash = (37 * hash) + FIREWALL_STATS_FIELD_NUMBER; hash = (53 * hash) + getFirewallStatsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -323,11 +270,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -371,6 +320,7 @@ protected Builder newBuilderForType( } /** *
+     *
      * Top-level message
      * 
* @@ -395,29 +345,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getFirewallStatsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (firewallStatsBuilder_ == null) { firewallStats_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + firewallStats_ = null; firewallStatsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -444,7 +390,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall result) { if (firewallStatsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { firewallStats_ = java.util.Collections.unmodifiableList(firewallStats_); @@ -454,8 +406,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla } else { result.firewallStats_ = firewallStatsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -528,7 +482,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -548,17 +502,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats.PARSER, + extensionRegistry); + if (firewallStatsBuilder_ == null) { + ensureFirewallStatsIsMutable(); + firewallStats_.add(m); + } else { + firewallStatsBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Firewall) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -835,7 +815,18 @@ public Firewall parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Firewall(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(); } }; @@ -997,6 +988,7 @@ org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.Hier } /** *
+   *
    * Firewall filter statistics
    * 
* @@ -1026,108 +1018,6 @@ protected java.lang.Object newInstance( return new FirewallStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private FirewallStats( - 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; - filterName_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - timestamp_ = input.readUInt64(); - break; - } - case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - memoryUsage_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - memoryUsage_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage.PARSER, extensionRegistry)); - break; - } - case 34: { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - counterStats_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - counterStats_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats.PARSER, extensionRegistry)); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - policerStats_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - policerStats_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats.PARSER, extensionRegistry)); - break; - } - case 50: { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - hierarchicalPolicerStats_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; - } - hierarchicalPolicerStats_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats.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_ & 0x00000004) != 0)) { - memoryUsage_ = java.util.Collections.unmodifiableList(memoryUsage_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - counterStats_ = java.util.Collections.unmodifiableList(counterStats_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - policerStats_ = java.util.Collections.unmodifiableList(policerStats_); - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - hierarchicalPolicerStats_ = java.util.Collections.unmodifiableList(hierarchicalPolicerStats_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_FirewallStats_descriptor; @@ -1143,7 +1033,8 @@ private FirewallStats( private int bitField0_; public static final int FILTER_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object filterName_; + @SuppressWarnings("serial") + private volatile java.lang.Object filterName_ = ""; /** * required string filter_name = 1 [(.telemetry_options) = { ... } * @return Whether the filterName field is set. @@ -1191,7 +1082,7 @@ public java.lang.String getFilterName() { } public static final int TIMESTAMP_FIELD_NUMBER = 2; - private long timestamp_; + private long timestamp_ = 0L; /** *
      * The Unix timestamp (seconds since 00:00:00 UTC 1970-01-01) of
@@ -1222,6 +1113,7 @@ public long getTimestamp() {
     }
 
     public static final int MEMORY_USAGE_FIELD_NUMBER = 3;
+    @SuppressWarnings("serial")
     private java.util.List memoryUsage_;
     /**
      * repeated .MemoryUsage memory_usage = 3;
@@ -1262,6 +1154,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla
     }
 
     public static final int COUNTER_STATS_FIELD_NUMBER = 4;
+    @SuppressWarnings("serial")
     private java.util.List counterStats_;
     /**
      * repeated .CounterStats counter_stats = 4;
@@ -1302,6 +1195,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla
     }
 
     public static final int POLICER_STATS_FIELD_NUMBER = 5;
+    @SuppressWarnings("serial")
     private java.util.List policerStats_;
     /**
      * repeated .PolicerStats policer_stats = 5;
@@ -1342,6 +1236,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla
     }
 
     public static final int HIERARCHICAL_POLICER_STATS_FIELD_NUMBER = 6;
+    @SuppressWarnings("serial")
     private java.util.List hierarchicalPolicerStats_;
     /**
      * repeated .HierarchicalPolicerStats hierarchical_policer_stats = 6;
@@ -1441,7 +1336,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < hierarchicalPolicerStats_.size(); i++) {
         output.writeMessage(6, hierarchicalPolicerStats_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1473,7 +1368,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, hierarchicalPolicerStats_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1506,7 +1401,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getPolicerStatsList())) return false;
       if (!getHierarchicalPolicerStatsList()
           .equals(other.getHierarchicalPolicerStatsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1542,7 +1437,7 @@ public int hashCode() {
         hash = (37 * hash) + HIERARCHICAL_POLICER_STATS_FIELD_NUMBER;
         hash = (53 * hash) + getHierarchicalPolicerStatsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1591,11 +1486,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1639,6 +1536,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Firewall filter statistics
      * 
* @@ -1663,54 +1561,48 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getMemoryUsageFieldBuilder(); - getCounterStatsFieldBuilder(); - getPolicerStatsFieldBuilder(); - getHierarchicalPolicerStatsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; filterName_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); if (memoryUsageBuilder_ == null) { memoryUsage_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + memoryUsage_ = null; memoryUsageBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (counterStatsBuilder_ == null) { counterStats_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + counterStats_ = null; counterStatsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); if (policerStatsBuilder_ == null) { policerStats_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + policerStats_ = null; policerStatsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); if (hierarchicalPolicerStatsBuilder_ == null) { hierarchicalPolicerStats_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); } else { + hierarchicalPolicerStats_ = null; hierarchicalPolicerStatsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -1737,16 +1629,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) != 0)) { - to_bitField0_ |= 0x00000001; - } - result.filterName_ = filterName_; - if (((from_bitField0_ & 0x00000002) != 0)) { - result.timestamp_ = timestamp_; - to_bitField0_ |= 0x00000002; - } + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats result) { if (memoryUsageBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { memoryUsage_ = java.util.Collections.unmodifiableList(memoryUsage_); @@ -1783,9 +1672,20 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla } else { result.hierarchicalPolicerStats_ = hierarchicalPolicerStatsBuilder_.build(); } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.filterName_ = filterName_; + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.timestamp_ = timestamp_; + to_bitField0_ |= 0x00000002; + } + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -1833,8 +1733,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats.getDefaultInstance()) return this; if (other.hasFilterName()) { - bitField0_ |= 0x00000001; filterName_ = other.filterName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasTimestamp()) { @@ -1944,7 +1844,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1982,17 +1882,92 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats 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: { + filterName_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + timestamp_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage.PARSER, + extensionRegistry); + if (memoryUsageBuilder_ == null) { + ensureMemoryUsageIsMutable(); + memoryUsage_.add(m); + } else { + memoryUsageBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats.PARSER, + extensionRegistry); + if (counterStatsBuilder_ == null) { + ensureCounterStatsIsMutable(); + counterStats_.add(m); + } else { + counterStatsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats.PARSER, + extensionRegistry); + if (policerStatsBuilder_ == null) { + ensurePolicerStatsIsMutable(); + policerStats_.add(m); + } else { + policerStatsBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats.PARSER, + extensionRegistry); + if (hierarchicalPolicerStatsBuilder_ == null) { + ensureHierarchicalPolicerStatsIsMutable(); + hierarchicalPolicerStats_.add(m); + } else { + hierarchicalPolicerStatsBuilder_.addMessage(m); + } + 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 = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.FirewallStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -2047,11 +2022,9 @@ public java.lang.String getFilterName() { */ public Builder setFilterName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } filterName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2060,8 +2033,8 @@ public Builder setFilterName( * @return This builder for chaining. */ public Builder clearFilterName() { - bitField0_ = (bitField0_ & ~0x00000001); filterName_ = getDefaultInstance().getFilterName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2072,11 +2045,9 @@ public Builder clearFilterName() { */ public Builder setFilterNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } filterName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2122,8 +2093,9 @@ public long getTimestamp() { * @return This builder for chaining. */ public Builder setTimestamp(long value) { - bitField0_ |= 0x00000002; + timestamp_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3136,7 +3108,18 @@ public FirewallStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FirewallStats(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(); } }; @@ -3219,6 +3202,7 @@ public interface MemoryUsageOrBuilder extends } /** *
+   *
    * Memory usage
    * 
* @@ -3244,60 +3228,6 @@ protected java.lang.Object newInstance( return new MemoryUsage(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private MemoryUsage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - allocated_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_MemoryUsage_descriptor; @@ -3313,7 +3243,8 @@ private MemoryUsage( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** *
      * The router has typically several types of memories (e.g. CPU's memory,
@@ -3382,7 +3313,7 @@ public java.lang.String getName() {
     }
 
     public static final int ALLOCATED_FIELD_NUMBER = 2;
-    private long allocated_;
+    private long allocated_ = 0L;
     /**
      * 
      * The amount of the memory allocated in bytes to the filter
@@ -3432,7 +3363,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt64(2, allocated_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3448,7 +3379,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(2, allocated_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3473,7 +3404,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAllocated()
             != other.getAllocated()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3493,7 +3424,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getAllocated());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3542,11 +3473,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3590,6 +3523,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Memory usage
      * 
* @@ -3614,26 +3548,20 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); allocated_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -3660,19 +3588,23 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; to_bitField0_ |= 0x00000001; } - result.name_ = name_; if (((from_bitField0_ & 0x00000002) != 0)) { result.allocated_ = allocated_; to_bitField0_ |= 0x00000002; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -3720,14 +3652,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasAllocated()) { setAllocated(other.getAllocated()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3745,17 +3677,40 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + allocated_ = input.readUInt64(); + 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 = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.MemoryUsage) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -3838,11 +3793,9 @@ public java.lang.String getName() { */ public Builder setName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3858,8 +3811,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -3877,11 +3830,9 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3921,8 +3872,9 @@ public long getAllocated() { * @return This builder for chaining. */ public Builder setAllocated(long value) { - bitField0_ |= 0x00000002; + allocated_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3973,7 +3925,18 @@ public MemoryUsage parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MemoryUsage(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(); } }; @@ -4066,6 +4029,7 @@ public interface CounterStatsOrBuilder extends } /** *
+   *
    * Counter statistics
    * 
* @@ -4091,65 +4055,6 @@ protected java.lang.Object newInstance( return new CounterStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private CounterStats( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - packets_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - bytes_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_CounterStats_descriptor; @@ -4165,7 +4070,8 @@ private CounterStats( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** *
      * Counter name
@@ -4225,7 +4131,7 @@ public java.lang.String getName() {
     }
 
     public static final int PACKETS_FIELD_NUMBER = 2;
-    private long packets_;
+    private long packets_ = 0L;
     /**
      * 
      * The total number of packets seen by the counter
@@ -4252,7 +4158,7 @@ public long getPackets() {
     }
 
     public static final int BYTES_FIELD_NUMBER = 3;
-    private long bytes_;
+    private long bytes_ = 0L;
     /**
      * 
      * The total number of bytes seen by the counter
@@ -4305,7 +4211,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeUInt64(3, bytes_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4325,7 +4231,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(3, bytes_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4355,7 +4261,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getBytes()
             != other.getBytes()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4380,7 +4286,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getBytes());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4429,11 +4335,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4477,6 +4385,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Counter statistics
      * 
* @@ -4501,28 +4410,21 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); packets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); bytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -4549,12 +4451,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; to_bitField0_ |= 0x00000001; } - result.name_ = name_; if (((from_bitField0_ & 0x00000002) != 0)) { result.packets_ = packets_; to_bitField0_ |= 0x00000002; @@ -4563,9 +4471,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla result.bytes_ = bytes_; to_bitField0_ |= 0x00000004; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -4613,8 +4519,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasPackets()) { @@ -4623,7 +4529,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasBytes()) { setBytes(other.getBytes()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4641,17 +4547,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + packets_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + bytes_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.CounterStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -4722,11 +4656,9 @@ public java.lang.String getName() { */ public Builder setName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4739,8 +4671,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -4755,11 +4687,9 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4799,8 +4729,9 @@ public long getPackets() { * @return This builder for chaining. */ public Builder setPackets(long value) { - bitField0_ |= 0x00000002; + packets_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -4854,8 +4785,9 @@ public long getBytes() { * @return This builder for chaining. */ public Builder setBytes(long value) { - bitField0_ |= 0x00000004; + bytes_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -4906,7 +4838,18 @@ public CounterStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CounterStats(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(); } }; @@ -5026,6 +4969,7 @@ public interface PolicerStatsOrBuilder extends } /** *
+   *
    * Policer statistics
    * 
* @@ -5051,78 +4995,6 @@ protected java.lang.Object newInstance( return new PolicerStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private PolicerStats( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - outOfSpecPackets_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - outOfSpecBytes_ = input.readUInt64(); - break; - } - case 34: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) != 0)) { - subBuilder = extendedPolicerStats_.toBuilder(); - } - extendedPolicerStats_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(extendedPolicerStats_); - extendedPolicerStats_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_PolicerStats_descriptor; @@ -5138,7 +5010,8 @@ private PolicerStats( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** *
      * Policer instance name
@@ -5198,7 +5071,7 @@ public java.lang.String getName() {
     }
 
     public static final int OUT_OF_SPEC_PACKETS_FIELD_NUMBER = 2;
-    private long outOfSpecPackets_;
+    private long outOfSpecPackets_ = 0L;
     /**
      * 
      * The total number of packets marked out-of-specification by the policer
@@ -5225,7 +5098,7 @@ public long getOutOfSpecPackets() {
     }
 
     public static final int OUT_OF_SPEC_BYTES_FIELD_NUMBER = 3;
-    private long outOfSpecBytes_;
+    private long outOfSpecBytes_ = 0L;
     /**
      * 
      * The total number of bytes marked out-of-specification by the policer
@@ -5319,7 +5192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeMessage(4, getExtendedPolicerStats());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5343,7 +5216,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getExtendedPolicerStats());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5378,7 +5251,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getExtendedPolicerStats()
             .equals(other.getExtendedPolicerStats())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5407,7 +5280,7 @@ public int hashCode() {
         hash = (37 * hash) + EXTENDED_POLICER_STATS_FIELD_NUMBER;
         hash = (53 * hash) + getExtendedPolicerStats().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5456,11 +5329,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5504,6 +5379,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Policer statistics
      * 
* @@ -5545,18 +5421,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); outOfSpecPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); outOfSpecBytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); - if (extendedPolicerStatsBuilder_ == null) { - extendedPolicerStats_ = null; - } else { - extendedPolicerStatsBuilder_.clear(); + extendedPolicerStats_ = null; + if (extendedPolicerStatsBuilder_ != null) { + extendedPolicerStatsBuilder_.dispose(); + extendedPolicerStatsBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -5583,12 +5456,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; to_bitField0_ |= 0x00000001; } - result.name_ = name_; if (((from_bitField0_ & 0x00000002) != 0)) { result.outOfSpecPackets_ = outOfSpecPackets_; to_bitField0_ |= 0x00000002; @@ -5598,16 +5477,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla to_bitField0_ |= 0x00000004; } if (((from_bitField0_ & 0x00000008) != 0)) { - if (extendedPolicerStatsBuilder_ == null) { - result.extendedPolicerStats_ = extendedPolicerStats_; - } else { - result.extendedPolicerStats_ = extendedPolicerStatsBuilder_.build(); - } + result.extendedPolicerStats_ = extendedPolicerStatsBuilder_ == null + ? extendedPolicerStats_ + : extendedPolicerStatsBuilder_.build(); to_bitField0_ |= 0x00000008; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -5655,8 +5530,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasOutOfSpecPackets()) { @@ -5668,7 +5543,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasExtendedPolicerStats()) { mergeExtendedPolicerStats(other.getExtendedPolicerStats()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5686,17 +5561,52 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + outOfSpecPackets_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + outOfSpecBytes_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: { + input.readMessage( + getExtendedPolicerStatsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000008; + 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 = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.PolicerStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -5767,11 +5677,9 @@ public java.lang.String getName() { */ public Builder setName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -5784,8 +5692,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -5800,11 +5708,9 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -5844,8 +5750,9 @@ public long getOutOfSpecPackets() { * @return This builder for chaining. */ public Builder setOutOfSpecPackets(long value) { - bitField0_ |= 0x00000002; + outOfSpecPackets_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -5899,8 +5806,9 @@ public long getOutOfSpecBytes() { * @return This builder for chaining. */ public Builder setOutOfSpecBytes(long value) { - bitField0_ |= 0x00000004; + outOfSpecBytes_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -5961,11 +5869,11 @@ public Builder setExtendedPolicerStats(org.opennms.netmgt.telemetry.protocols.jt throw new NullPointerException(); } extendedPolicerStats_ = value; - onChanged(); } else { extendedPolicerStatsBuilder_.setMessage(value); } bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -5979,11 +5887,11 @@ public Builder setExtendedPolicerStats( org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.Builder builderForValue) { if (extendedPolicerStatsBuilder_ == null) { extendedPolicerStats_ = builderForValue.build(); - onChanged(); } else { extendedPolicerStatsBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -5996,18 +5904,19 @@ public Builder setExtendedPolicerStats( public Builder mergeExtendedPolicerStats(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats value) { if (extendedPolicerStatsBuilder_ == null) { if (((bitField0_ & 0x00000008) != 0) && - extendedPolicerStats_ != null && - extendedPolicerStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.getDefaultInstance()) { - extendedPolicerStats_ = - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.newBuilder(extendedPolicerStats_).mergeFrom(value).buildPartial(); + extendedPolicerStats_ != null && + extendedPolicerStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.getDefaultInstance()) { + getExtendedPolicerStatsBuilder().mergeFrom(value); } else { extendedPolicerStats_ = value; } - onChanged(); } else { extendedPolicerStatsBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000008; + if (extendedPolicerStats_ != null) { + bitField0_ |= 0x00000008; + onChanged(); + } return this; } /** @@ -6018,13 +5927,13 @@ public Builder mergeExtendedPolicerStats(org.opennms.netmgt.telemetry.protocols. * optional .ExtendedPolicerStats extended_policer_stats = 4; */ public Builder clearExtendedPolicerStats() { - if (extendedPolicerStatsBuilder_ == null) { - extendedPolicerStats_ = null; - onChanged(); - } else { - extendedPolicerStatsBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000008); + extendedPolicerStats_ = null; + if (extendedPolicerStatsBuilder_ != null) { + extendedPolicerStatsBuilder_.dispose(); + extendedPolicerStatsBuilder_ = null; + } + onChanged(); return this; } /** @@ -6107,7 +6016,18 @@ public PolicerStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PolicerStats(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(); } }; @@ -6209,6 +6129,7 @@ public interface ExtendedPolicerStatsOrBuilder extends } /** *
+   *
    * Extended policer statistics when enhanced policer statistics are available
    * 
* @@ -6233,69 +6154,6 @@ protected java.lang.Object newInstance( return new ExtendedPolicerStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ExtendedPolicerStats( - 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; - offeredPackets_ = input.readUInt64(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - offeredBytes_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - transmittedPackets_ = input.readUInt64(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - transmittedBytes_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_ExtendedPolicerStats_descriptor; @@ -6311,7 +6169,7 @@ private ExtendedPolicerStats( private int bitField0_; public static final int OFFERED_PACKETS_FIELD_NUMBER = 1; - private long offeredPackets_; + private long offeredPackets_ = 0L; /** *
      * The total number of packets subjected to policing
@@ -6338,7 +6196,7 @@ public long getOfferedPackets() {
     }
 
     public static final int OFFERED_BYTES_FIELD_NUMBER = 2;
-    private long offeredBytes_;
+    private long offeredBytes_ = 0L;
     /**
      * 
      * The total number of bytes subjected to policing
@@ -6365,7 +6223,7 @@ public long getOfferedBytes() {
     }
 
     public static final int TRANSMITTED_PACKETS_FIELD_NUMBER = 3;
-    private long transmittedPackets_;
+    private long transmittedPackets_ = 0L;
     /**
      * 
      * The total number of packets not discarded by the policer
@@ -6392,7 +6250,7 @@ public long getTransmittedPackets() {
     }
 
     public static final int TRANSMITTED_BYTES_FIELD_NUMBER = 4;
-    private long transmittedBytes_;
+    private long transmittedBytes_ = 0L;
     /**
      * 
      * The total number of bytes not discarded by the policer
@@ -6444,7 +6302,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt64(4, transmittedBytes_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6469,7 +6327,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(4, transmittedBytes_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6504,7 +6362,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getTransmittedBytes()
             != other.getTransmittedBytes()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6535,7 +6393,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getTransmittedBytes());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6584,11 +6442,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6632,6 +6492,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Extended policer statistics when enhanced policer statistics are available
      * 
* @@ -6656,30 +6517,22 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; offeredPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000001); offeredBytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); transmittedPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); transmittedBytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -6706,6 +6559,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -6724,9 +6583,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla result.transmittedBytes_ = transmittedBytes_; to_bitField0_ |= 0x00000008; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -6785,7 +6642,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasTransmittedBytes()) { setTransmittedBytes(other.getTransmittedBytes()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -6800,17 +6657,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats 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: { + offeredPackets_ = input.readUInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: { + offeredBytes_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + transmittedPackets_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + transmittedBytes_ = input.readUInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.ExtendedPolicerStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -6850,8 +6740,9 @@ public long getOfferedPackets() { * @return This builder for chaining. */ public Builder setOfferedPackets(long value) { - bitField0_ |= 0x00000001; + offeredPackets_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -6905,8 +6796,9 @@ public long getOfferedBytes() { * @return This builder for chaining. */ public Builder setOfferedBytes(long value) { - bitField0_ |= 0x00000002; + offeredBytes_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -6960,8 +6852,9 @@ public long getTransmittedPackets() { * @return This builder for chaining. */ public Builder setTransmittedPackets(long value) { - bitField0_ |= 0x00000004; + transmittedPackets_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -7015,8 +6908,9 @@ public long getTransmittedBytes() { * @return This builder for chaining. */ public Builder setTransmittedBytes(long value) { - bitField0_ |= 0x00000008; + transmittedBytes_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -7067,7 +6961,18 @@ public ExtendedPolicerStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ExtendedPolicerStats(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(); } }; @@ -7206,6 +7111,7 @@ public interface HierarchicalPolicerStatsOrBuilder extends } /** *
+   *
    * Hierarchical policer statistics
    * 
* @@ -7231,75 +7137,6 @@ protected java.lang.Object newInstance( return new HierarchicalPolicerStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private HierarchicalPolicerStats( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - premiumPackets_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - premiumBytes_ = input.readUInt64(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - aggregatePackets_ = input.readUInt64(); - break; - } - case 40: { - bitField0_ |= 0x00000010; - aggregateBytes_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.internal_static_HierarchicalPolicerStats_descriptor; @@ -7315,7 +7152,8 @@ private HierarchicalPolicerStats( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** *
      * Hierarchical policer instance name
@@ -7375,7 +7213,7 @@ public java.lang.String getName() {
     }
 
     public static final int PREMIUM_PACKETS_FIELD_NUMBER = 2;
-    private long premiumPackets_;
+    private long premiumPackets_ = 0L;
     /**
      * 
      * The total number of packets marked out-of-specification by
@@ -7404,7 +7242,7 @@ public long getPremiumPackets() {
     }
 
     public static final int PREMIUM_BYTES_FIELD_NUMBER = 3;
-    private long premiumBytes_;
+    private long premiumBytes_ = 0L;
     /**
      * 
      * The total number of bytes marked out-of-specification by
@@ -7433,7 +7271,7 @@ public long getPremiumBytes() {
     }
 
     public static final int AGGREGATE_PACKETS_FIELD_NUMBER = 4;
-    private long aggregatePackets_;
+    private long aggregatePackets_ = 0L;
     /**
      * 
      * The total number of packets marked out-of-specification by
@@ -7462,7 +7300,7 @@ public long getAggregatePackets() {
     }
 
     public static final int AGGREGATE_BYTES_FIELD_NUMBER = 5;
-    private long aggregateBytes_;
+    private long aggregateBytes_ = 0L;
     /**
      * 
      * The total number of bytes marked out-of-specification by
@@ -7523,7 +7361,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000010) != 0)) {
         output.writeUInt64(5, aggregateBytes_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7551,7 +7389,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(5, aggregateBytes_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7591,7 +7429,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAggregateBytes()
             != other.getAggregateBytes()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7626,7 +7464,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getAggregateBytes());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7675,11 +7513,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7723,6 +7563,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Hierarchical policer statistics
      * 
* @@ -7747,32 +7588,23 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); premiumPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); premiumBytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); aggregatePackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000008); aggregateBytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -7799,12 +7631,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; to_bitField0_ |= 0x00000001; } - result.name_ = name_; if (((from_bitField0_ & 0x00000002) != 0)) { result.premiumPackets_ = premiumPackets_; to_bitField0_ |= 0x00000002; @@ -7821,9 +7659,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterCla result.aggregateBytes_ = aggregateBytes_; to_bitField0_ |= 0x00000010; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -7871,8 +7707,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasPremiumPackets()) { @@ -7887,7 +7723,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasAggregateBytes()) { setAggregateBytes(other.getAggregateBytes()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -7905,17 +7741,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + premiumPackets_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + premiumBytes_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + aggregatePackets_ = input.readUInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 40: { + aggregateBytes_ = input.readUInt64(); + bitField0_ |= 0x00000010; + break; + } // case 40 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.FirewallOuterClass.HierarchicalPolicerStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -7986,11 +7860,9 @@ public java.lang.String getName() { */ public Builder setName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -8003,8 +7875,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -8019,11 +7891,9 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -8066,8 +7936,9 @@ public long getPremiumPackets() { * @return This builder for chaining. */ public Builder setPremiumPackets(long value) { - bitField0_ |= 0x00000002; + premiumPackets_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -8125,8 +7996,9 @@ public long getPremiumBytes() { * @return This builder for chaining. */ public Builder setPremiumBytes(long value) { - bitField0_ |= 0x00000004; + premiumBytes_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -8184,8 +8056,9 @@ public long getAggregatePackets() { * @return This builder for chaining. */ public Builder setAggregatePackets(long value) { - bitField0_ |= 0x00000008; + aggregatePackets_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -8243,8 +8116,9 @@ public long getAggregateBytes() { * @return This builder for chaining. */ public Builder setAggregateBytes(long value) { - bitField0_ |= 0x00000010; + aggregateBytes_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -8296,7 +8170,18 @@ public HierarchicalPolicerStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new HierarchicalPolicerStats(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(); } }; diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LogicalPortOuterClass.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LogicalPortOuterClass.java index e3368dd8c351..26c04d9cdb9b 100644 --- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LogicalPortOuterClass.java +++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LogicalPortOuterClass.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2017-2022 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc. + * Copyright (C) 2017-2023 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -73,6 +73,7 @@ org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.L } /** *
+   *
    * Top-level message
    * 
* @@ -98,61 +99,6 @@ protected java.lang.Object newInstance( return new LogicalPort(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private LogicalPort( - 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)) { - interfaceInfo_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - interfaceInfo_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo.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)) { - interfaceInfo_ = java.util.Collections.unmodifiableList(interfaceInfo_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.internal_static_LogicalPort_descriptor; @@ -167,6 +113,7 @@ private LogicalPort( } public static final int INTERFACE_INFO_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List interfaceInfo_; /** * repeated .LogicalInterfaceInfo interface_info = 1; @@ -229,7 +176,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < interfaceInfo_.size(); i++) { output.writeMessage(1, interfaceInfo_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -242,7 +189,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, interfaceInfo_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -259,7 +206,7 @@ public boolean equals(final java.lang.Object obj) { if (!getInterfaceInfoList() .equals(other.getInterfaceInfoList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -274,7 +221,7 @@ public int hashCode() { hash = (37 * hash) + INTERFACE_INFO_FIELD_NUMBER; hash = (53 * hash) + getInterfaceInfoList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -323,11 +270,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPo return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -371,6 +320,7 @@ protected Builder newBuilderForType( } /** *
+     *
      * Top-level message
      * 
* @@ -395,29 +345,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getInterfaceInfoFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (interfaceInfoBuilder_ == null) { interfaceInfo_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + interfaceInfo_ = null; interfaceInfoBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -444,7 +390,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort result) { if (interfaceInfoBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { interfaceInfo_ = java.util.Collections.unmodifiableList(interfaceInfo_); @@ -454,8 +406,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter } else { result.interfaceInfo_ = interfaceInfoBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -528,7 +482,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -548,17 +502,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo.PARSER, + extensionRegistry); + if (interfaceInfoBuilder_ == null) { + ensureInterfaceInfoIsMutable(); + interfaceInfo_.add(m); + } else { + interfaceInfoBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalPort) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -835,7 +815,18 @@ public LogicalPort parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LogicalPort(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(); } }; @@ -1038,6 +1029,7 @@ public interface LogicalInterfaceInfoOrBuilder extends } /** *
+   *
    * Logical Interaface information
    * 
* @@ -1064,110 +1056,6 @@ protected java.lang.Object newInstance( return new LogicalInterfaceInfo(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private LogicalInterfaceInfo( - 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; - ifName_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - initTime_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - snmpIfIndex_ = input.readUInt32(); - break; - } - case 34: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000008; - parentAeName_ = bs; - break; - } - case 42: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) != 0)) { - subBuilder = ingressStats_.toBuilder(); - } - ingressStats_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(ingressStats_); - ingressStats_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - case 50: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) != 0)) { - subBuilder = egressStats_.toBuilder(); - } - egressStats_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(egressStats_); - egressStats_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000020; - break; - } - case 58: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) != 0)) { - subBuilder = opState_.toBuilder(); - } - opState_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(opState_); - opState_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000040; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.internal_static_LogicalInterfaceInfo_descriptor; @@ -1183,7 +1071,8 @@ private LogicalInterfaceInfo( private int bitField0_; public static final int IF_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object ifName_; + @SuppressWarnings("serial") + private volatile java.lang.Object ifName_ = ""; /** *
      * Logical interface name (e.g. xe-0/0/0.0)
@@ -1243,7 +1132,7 @@ public java.lang.String getIfName() {
     }
 
     public static final int INIT_TIME_FIELD_NUMBER = 2;
-    private long initTime_;
+    private long initTime_ = 0L;
     /**
      * 
      * Time reset
@@ -1270,7 +1159,7 @@ public long getInitTime() {
     }
 
     public static final int SNMP_IF_INDEX_FIELD_NUMBER = 3;
-    private int snmpIfIndex_;
+    private int snmpIfIndex_ = 0;
     /**
      * 
      * Global Index
@@ -1297,7 +1186,8 @@ public int getSnmpIfIndex() {
     }
 
     public static final int PARENT_AE_NAME_FIELD_NUMBER = 4;
-    private volatile java.lang.Object parentAeName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object parentAeName_ = "";
     /**
      * 
      * Name of the aggregate bundle
@@ -1525,7 +1415,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000040) != 0)) {
         output.writeMessage(7, getOpState());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1560,7 +1450,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, getOpState());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1610,7 +1500,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getOpState()
             .equals(other.getOpState())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1650,7 +1540,7 @@ public int hashCode() {
         hash = (37 * hash) + OP_STATE_FIELD_NUMBER;
         hash = (53 * hash) + getOpState().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1699,11 +1589,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPo
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1747,6 +1639,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Logical Interaface information
      * 
* @@ -1790,32 +1683,26 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; ifName_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); initTime_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); snmpIfIndex_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); parentAeName_ = ""; - bitField0_ = (bitField0_ & ~0x00000008); - if (ingressStatsBuilder_ == null) { - ingressStats_ = null; - } else { - ingressStatsBuilder_.clear(); + ingressStats_ = null; + if (ingressStatsBuilder_ != null) { + ingressStatsBuilder_.dispose(); + ingressStatsBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000010); - if (egressStatsBuilder_ == null) { - egressStats_ = null; - } else { - egressStatsBuilder_.clear(); + egressStats_ = null; + if (egressStatsBuilder_ != null) { + egressStatsBuilder_.dispose(); + egressStatsBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000020); - if (opStateBuilder_ == null) { - opState_ = null; - } else { - opStateBuilder_.clear(); + opState_ = null; + if (opStateBuilder_ != null) { + opStateBuilder_.dispose(); + opStateBuilder_ = null; } - bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -1842,12 +1729,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.ifName_ = ifName_; to_bitField0_ |= 0x00000001; } - result.ifName_ = ifName_; if (((from_bitField0_ & 0x00000002) != 0)) { result.initTime_ = initTime_; to_bitField0_ |= 0x00000002; @@ -1857,36 +1750,28 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter to_bitField0_ |= 0x00000004; } if (((from_bitField0_ & 0x00000008) != 0)) { + result.parentAeName_ = parentAeName_; to_bitField0_ |= 0x00000008; } - result.parentAeName_ = parentAeName_; if (((from_bitField0_ & 0x00000010) != 0)) { - if (ingressStatsBuilder_ == null) { - result.ingressStats_ = ingressStats_; - } else { - result.ingressStats_ = ingressStatsBuilder_.build(); - } + result.ingressStats_ = ingressStatsBuilder_ == null + ? ingressStats_ + : ingressStatsBuilder_.build(); to_bitField0_ |= 0x00000010; } if (((from_bitField0_ & 0x00000020) != 0)) { - if (egressStatsBuilder_ == null) { - result.egressStats_ = egressStats_; - } else { - result.egressStats_ = egressStatsBuilder_.build(); - } + result.egressStats_ = egressStatsBuilder_ == null + ? egressStats_ + : egressStatsBuilder_.build(); to_bitField0_ |= 0x00000020; } if (((from_bitField0_ & 0x00000040) != 0)) { - if (opStateBuilder_ == null) { - result.opState_ = opState_; - } else { - result.opState_ = opStateBuilder_.build(); - } + result.opState_ = opStateBuilder_ == null + ? opState_ + : opStateBuilder_.build(); to_bitField0_ |= 0x00000040; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -1934,8 +1819,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo.getDefaultInstance()) return this; if (other.hasIfName()) { - bitField0_ |= 0x00000001; ifName_ = other.ifName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasInitTime()) { @@ -1945,8 +1830,8 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot setSnmpIfIndex(other.getSnmpIfIndex()); } if (other.hasParentAeName()) { - bitField0_ |= 0x00000008; parentAeName_ = other.parentAeName_; + bitField0_ |= 0x00000008; onChanged(); } if (other.hasIngressStats()) { @@ -1958,7 +1843,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasOpState()) { mergeOpState(other.getOpState()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1989,17 +1874,71 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo 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: { + ifName_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + initTime_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + snmpIfIndex_ = input.readUInt32(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 34: { + parentAeName_ = input.readBytes(); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + input.readMessage( + getIngressStatsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: { + input.readMessage( + getEgressStatsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + input.readMessage( + getOpStateFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000040; + break; + } // case 58 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.LogicalInterfaceInfo) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -2070,11 +2009,9 @@ public java.lang.String getIfName() { */ public Builder setIfName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } ifName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2087,8 +2024,8 @@ public Builder setIfName( * @return This builder for chaining. */ public Builder clearIfName() { - bitField0_ = (bitField0_ & ~0x00000001); ifName_ = getDefaultInstance().getIfName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2103,11 +2040,9 @@ public Builder clearIfName() { */ public Builder setIfNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } ifName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2147,8 +2082,9 @@ public long getInitTime() { * @return This builder for chaining. */ public Builder setInitTime(long value) { - bitField0_ |= 0x00000002; + initTime_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2202,8 +2138,9 @@ public int getSnmpIfIndex() { * @return This builder for chaining. */ public Builder setSnmpIfIndex(int value) { - bitField0_ |= 0x00000004; + snmpIfIndex_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2288,11 +2225,9 @@ public java.lang.String getParentAeName() { */ public Builder setParentAeName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + if (value == null) { throw new NullPointerException(); } parentAeName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2305,8 +2240,8 @@ public Builder setParentAeName( * @return This builder for chaining. */ public Builder clearParentAeName() { - bitField0_ = (bitField0_ & ~0x00000008); parentAeName_ = getDefaultInstance().getParentAeName(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -2321,11 +2256,9 @@ public Builder clearParentAeName() { */ public Builder setParentAeNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; + if (value == null) { throw new NullPointerException(); } parentAeName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2372,11 +2305,11 @@ public Builder setIngressStats(org.opennms.netmgt.telemetry.protocols.jti.adapte throw new NullPointerException(); } ingressStats_ = value; - onChanged(); } else { ingressStatsBuilder_.setMessage(value); } bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2390,11 +2323,11 @@ public Builder setIngressStats( org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.Builder builderForValue) { if (ingressStatsBuilder_ == null) { ingressStats_ = builderForValue.build(); - onChanged(); } else { ingressStatsBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2407,18 +2340,19 @@ public Builder setIngressStats( public Builder mergeIngressStats(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats value) { if (ingressStatsBuilder_ == null) { if (((bitField0_ & 0x00000010) != 0) && - ingressStats_ != null && - ingressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.getDefaultInstance()) { - ingressStats_ = - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.newBuilder(ingressStats_).mergeFrom(value).buildPartial(); + ingressStats_ != null && + ingressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.getDefaultInstance()) { + getIngressStatsBuilder().mergeFrom(value); } else { ingressStats_ = value; } - onChanged(); } else { ingressStatsBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000010; + if (ingressStats_ != null) { + bitField0_ |= 0x00000010; + onChanged(); + } return this; } /** @@ -2429,13 +2363,13 @@ public Builder mergeIngressStats(org.opennms.netmgt.telemetry.protocols.jti.adap * optional .IngressInterfaceStats ingress_stats = 5; */ public Builder clearIngressStats() { - if (ingressStatsBuilder_ == null) { - ingressStats_ = null; - onChanged(); - } else { - ingressStatsBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000010); + ingressStats_ = null; + if (ingressStatsBuilder_ != null) { + ingressStatsBuilder_.dispose(); + ingressStatsBuilder_ = null; + } + onChanged(); return this; } /** @@ -2528,11 +2462,11 @@ public Builder setEgressStats(org.opennms.netmgt.telemetry.protocols.jti.adapter throw new NullPointerException(); } egressStats_ = value; - onChanged(); } else { egressStatsBuilder_.setMessage(value); } bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -2546,11 +2480,11 @@ public Builder setEgressStats( org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.Builder builderForValue) { if (egressStatsBuilder_ == null) { egressStats_ = builderForValue.build(); - onChanged(); } else { egressStatsBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -2563,18 +2497,19 @@ public Builder setEgressStats( public Builder mergeEgressStats(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats value) { if (egressStatsBuilder_ == null) { if (((bitField0_ & 0x00000020) != 0) && - egressStats_ != null && - egressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.getDefaultInstance()) { - egressStats_ = - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.newBuilder(egressStats_).mergeFrom(value).buildPartial(); + egressStats_ != null && + egressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.getDefaultInstance()) { + getEgressStatsBuilder().mergeFrom(value); } else { egressStats_ = value; } - onChanged(); } else { egressStatsBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000020; + if (egressStats_ != null) { + bitField0_ |= 0x00000020; + onChanged(); + } return this; } /** @@ -2585,13 +2520,13 @@ public Builder mergeEgressStats(org.opennms.netmgt.telemetry.protocols.jti.adapt * optional .EgressInterfaceStats egress_stats = 6; */ public Builder clearEgressStats() { - if (egressStatsBuilder_ == null) { - egressStats_ = null; - onChanged(); - } else { - egressStatsBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000020); + egressStats_ = null; + if (egressStatsBuilder_ != null) { + egressStatsBuilder_.dispose(); + egressStatsBuilder_ = null; + } + onChanged(); return this; } /** @@ -2684,11 +2619,11 @@ public Builder setOpState(org.opennms.netmgt.telemetry.protocols.jti.adapter.pro throw new NullPointerException(); } opState_ = value; - onChanged(); } else { opStateBuilder_.setMessage(value); } bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2702,11 +2637,11 @@ public Builder setOpState( org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.Builder builderForValue) { if (opStateBuilder_ == null) { opState_ = builderForValue.build(); - onChanged(); } else { opStateBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -2719,18 +2654,19 @@ public Builder setOpState( public Builder mergeOpState(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState value) { if (opStateBuilder_ == null) { if (((bitField0_ & 0x00000040) != 0) && - opState_ != null && - opState_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.getDefaultInstance()) { - opState_ = - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.newBuilder(opState_).mergeFrom(value).buildPartial(); + opState_ != null && + opState_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.getDefaultInstance()) { + getOpStateBuilder().mergeFrom(value); } else { opState_ = value; } - onChanged(); } else { opStateBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000040; + if (opState_ != null) { + bitField0_ |= 0x00000040; + onChanged(); + } return this; } /** @@ -2741,13 +2677,13 @@ public Builder mergeOpState(org.opennms.netmgt.telemetry.protocols.jti.adapter.p * optional .OperationalState op_state = 7; */ public Builder clearOpState() { - if (opStateBuilder_ == null) { - opState_ = null; - onChanged(); - } else { - opStateBuilder_.clear(); - } bitField0_ = (bitField0_ & ~0x00000040); + opState_ = null; + if (opStateBuilder_ != null) { + opStateBuilder_.dispose(); + opStateBuilder_ = null; + } + onChanged(); return this; } /** @@ -2830,7 +2766,18 @@ public LogicalInterfaceInfo parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LogicalInterfaceInfo(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(); } }; @@ -2956,6 +2903,7 @@ org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.F } /** *
+   *
    *  Interface inbound/Ingress traffic statistics
    * 
* @@ -2981,81 +2929,6 @@ protected java.lang.Object newInstance( return new IngressInterfaceStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private IngressInterfaceStats( - 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; - ifPackets_ = input.readUInt64(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - ifOctets_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - ifUcastPackets_ = input.readUInt64(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - ifMcastPackets_ = input.readUInt64(); - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - ifFcStats_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - ifFcStats_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting.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_ & 0x00000010) != 0)) { - ifFcStats_ = java.util.Collections.unmodifiableList(ifFcStats_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.internal_static_IngressInterfaceStats_descriptor; @@ -3071,7 +2944,7 @@ private IngressInterfaceStats( private int bitField0_; public static final int IF_PACKETS_FIELD_NUMBER = 1; - private long ifPackets_; + private long ifPackets_ = 0L; /** *
      * Count of packets
@@ -3098,7 +2971,7 @@ public long getIfPackets() {
     }
 
     public static final int IF_OCTETS_FIELD_NUMBER = 2;
-    private long ifOctets_;
+    private long ifOctets_ = 0L;
     /**
      * 
      * Count of bytes
@@ -3125,7 +2998,7 @@ public long getIfOctets() {
     }
 
     public static final int IF_UCAST_PACKETS_FIELD_NUMBER = 3;
-    private long ifUcastPackets_;
+    private long ifUcastPackets_ = 0L;
     /**
      * 
      * Count of unicast packets
@@ -3152,7 +3025,7 @@ public long getIfUcastPackets() {
     }
 
     public static final int IF_MCAST_PACKETS_FIELD_NUMBER = 4;
-    private long ifMcastPackets_;
+    private long ifMcastPackets_ = 0L;
     /**
      * 
      * Count of multicast packets
@@ -3179,6 +3052,7 @@ public long getIfMcastPackets() {
     }
 
     public static final int IF_FC_STATS_FIELD_NUMBER = 5;
+    @SuppressWarnings("serial")
     private java.util.List ifFcStats_;
     /**
      * repeated .ForwardingClassAccounting if_fc_stats = 5;
@@ -3259,7 +3133,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < ifFcStats_.size(); i++) {
         output.writeMessage(5, ifFcStats_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3288,7 +3162,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(5, ifFcStats_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3325,7 +3199,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getIfFcStatsList()
           .equals(other.getIfFcStatsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3360,7 +3234,7 @@ public int hashCode() {
         hash = (37 * hash) + IF_FC_STATS_FIELD_NUMBER;
         hash = (53 * hash) + getIfFcStatsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3409,11 +3283,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPo
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3457,6 +3333,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      *  Interface inbound/Ingress traffic statistics
      * 
* @@ -3481,37 +3358,29 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getIfFcStatsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; ifPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000001); ifOctets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); ifUcastPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); ifMcastPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000008); if (ifFcStatsBuilder_ == null) { ifFcStats_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + ifFcStats_ = null; ifFcStatsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -3538,6 +3407,25 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats result) { + if (ifFcStatsBuilder_ == null) { + if (((bitField0_ & 0x00000010) != 0)) { + ifFcStats_ = java.util.Collections.unmodifiableList(ifFcStats_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.ifFcStats_ = ifFcStats_; + } else { + result.ifFcStats_ = ifFcStatsBuilder_.build(); + } + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -3556,18 +3444,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter result.ifMcastPackets_ = ifMcastPackets_; to_bitField0_ |= 0x00000008; } - if (ifFcStatsBuilder_ == null) { - if (((bitField0_ & 0x00000010) != 0)) { - ifFcStats_ = java.util.Collections.unmodifiableList(ifFcStats_); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.ifFcStats_ = ifFcStats_; - } else { - result.ifFcStats_ = ifFcStatsBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -3652,7 +3529,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3676,17 +3553,63 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats 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: { + ifPackets_ = input.readUInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: { + ifOctets_ = input.readUInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + ifUcastPackets_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + ifMcastPackets_ = input.readUInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 42: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting.PARSER, + extensionRegistry); + if (ifFcStatsBuilder_ == null) { + ensureIfFcStatsIsMutable(); + ifFcStats_.add(m); + } else { + ifFcStatsBuilder_.addMessage(m); + } + break; + } // case 42 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.IngressInterfaceStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -3726,8 +3649,9 @@ public long getIfPackets() { * @return This builder for chaining. */ public Builder setIfPackets(long value) { - bitField0_ |= 0x00000001; + ifPackets_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3781,8 +3705,9 @@ public long getIfOctets() { * @return This builder for chaining. */ public Builder setIfOctets(long value) { - bitField0_ |= 0x00000002; + ifOctets_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3836,8 +3761,9 @@ public long getIfUcastPackets() { * @return This builder for chaining. */ public Builder setIfUcastPackets(long value) { - bitField0_ |= 0x00000004; + ifUcastPackets_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -3891,8 +3817,9 @@ public long getIfMcastPackets() { * @return This builder for chaining. */ public Builder setIfMcastPackets(long value) { - bitField0_ |= 0x00000008; + ifMcastPackets_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -4183,7 +4110,18 @@ public IngressInterfaceStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new IngressInterfaceStats(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(); } }; @@ -4247,6 +4185,7 @@ public interface EgressInterfaceStatsOrBuilder extends } /** *
+   *
    *  Interface outbound/Egress traffic statistics
    * 
* @@ -4271,59 +4210,6 @@ protected java.lang.Object newInstance( return new EgressInterfaceStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private EgressInterfaceStats( - 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; - ifPackets_ = input.readUInt64(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - ifOctets_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.internal_static_EgressInterfaceStats_descriptor; @@ -4339,7 +4225,7 @@ private EgressInterfaceStats( private int bitField0_; public static final int IF_PACKETS_FIELD_NUMBER = 1; - private long ifPackets_; + private long ifPackets_ = 0L; /** *
      * Count of packets
@@ -4366,7 +4252,7 @@ public long getIfPackets() {
     }
 
     public static final int IF_OCTETS_FIELD_NUMBER = 2;
-    private long ifOctets_;
+    private long ifOctets_ = 0L;
     /**
      * 
      * Count of bytes
@@ -4420,7 +4306,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000002) != 0)) {
         output.writeUInt64(2, ifOctets_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4437,7 +4323,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(2, ifOctets_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4462,7 +4348,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getIfOctets()
             != other.getIfOctets()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4483,7 +4369,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getIfOctets());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4532,11 +4418,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPo
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4580,6 +4468,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      *  Interface outbound/Egress traffic statistics
      * 
* @@ -4604,26 +4493,20 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; ifPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000001); ifOctets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -4650,6 +4533,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -4660,9 +4549,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter result.ifOctets_ = ifOctets_; to_bitField0_ |= 0x00000002; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -4715,7 +4602,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasIfOctets()) { setIfOctets(other.getIfOctets()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4736,17 +4623,40 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats 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: { + ifPackets_ = input.readUInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: { + ifOctets_ = input.readUInt64(); + 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 = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.EgressInterfaceStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -4786,8 +4696,9 @@ public long getIfPackets() { * @return This builder for chaining. */ public Builder setIfPackets(long value) { - bitField0_ |= 0x00000001; + ifPackets_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4841,8 +4752,9 @@ public long getIfOctets() { * @return This builder for chaining. */ public Builder setIfOctets(long value) { - bitField0_ |= 0x00000002; + ifOctets_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -4893,7 +4805,18 @@ public EgressInterfaceStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EgressInterfaceStats(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(); } }; @@ -4948,6 +4871,7 @@ public interface OperationalStateOrBuilder extends } /** *
+   *
    *  Interface operational State details
    * 
* @@ -4973,55 +4897,6 @@ protected java.lang.Object newInstance( return new OperationalState(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private OperationalState( - 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; - operationalStatus_ = bs; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.internal_static_OperationalState_descriptor; @@ -5037,7 +4912,8 @@ private OperationalState( private int bitField0_; public static final int OPERATIONAL_STATUS_FIELD_NUMBER = 1; - private volatile java.lang.Object operationalStatus_; + @SuppressWarnings("serial") + private volatile java.lang.Object operationalStatus_ = ""; /** *
      * If the link is up/down
@@ -5113,7 +4989,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000001) != 0)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, operationalStatus_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5125,7 +5001,7 @@ public int getSerializedSize() {
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, operationalStatus_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5145,7 +5021,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getOperationalStatus()
             .equals(other.getOperationalStatus())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5160,7 +5036,7 @@ public int hashCode() {
         hash = (37 * hash) + OPERATIONAL_STATUS_FIELD_NUMBER;
         hash = (53 * hash) + getOperationalStatus().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5209,11 +5085,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPo
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5257,6 +5135,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      *  Interface operational State details
      * 
* @@ -5281,24 +5160,19 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; operationalStatus_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -5325,15 +5199,19 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.operationalStatus_ = operationalStatus_; to_bitField0_ |= 0x00000001; } - result.operationalStatus_ = operationalStatus_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -5381,11 +5259,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState.getDefaultInstance()) return this; if (other.hasOperationalStatus()) { - bitField0_ |= 0x00000001; operationalStatus_ = other.operationalStatus_; + bitField0_ |= 0x00000001; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5400,17 +5278,35 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState 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: { + operationalStatus_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.OperationalState) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -5481,11 +5377,9 @@ public java.lang.String getOperationalStatus() { */ public Builder setOperationalStatus( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } operationalStatus_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -5498,8 +5392,8 @@ public Builder setOperationalStatus( * @return This builder for chaining. */ public Builder clearOperationalStatus() { - bitField0_ = (bitField0_ & ~0x00000001); operationalStatus_ = getDefaultInstance().getOperationalStatus(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -5514,11 +5408,9 @@ public Builder clearOperationalStatus() { */ public Builder setOperationalStatusBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } operationalStatus_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -5555,7 +5447,18 @@ public OperationalState parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new OperationalState(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(); } }; @@ -5667,6 +5570,7 @@ public interface ForwardingClassAccountingOrBuilder extends } /** *
+   *
    *  Interface forwarding class accounting
    * 
* @@ -5692,70 +5596,6 @@ protected java.lang.Object newInstance( return new ForwardingClassAccounting(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ForwardingClassAccounting( - 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; - ifFamily_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - fcNumber_ = input.readUInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - ifPackets_ = input.readUInt64(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - ifOctets_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.internal_static_ForwardingClassAccounting_descriptor; @@ -5771,7 +5611,8 @@ private ForwardingClassAccounting( private int bitField0_; public static final int IF_FAMILY_FIELD_NUMBER = 1; - private volatile java.lang.Object ifFamily_; + @SuppressWarnings("serial") + private volatile java.lang.Object ifFamily_ = ""; /** *
      * Interface protocol
@@ -5831,7 +5672,7 @@ public java.lang.String getIfFamily() {
     }
 
     public static final int FC_NUMBER_FIELD_NUMBER = 2;
-    private int fcNumber_;
+    private int fcNumber_ = 0;
     /**
      * 
      * Forwarding class number
@@ -5858,7 +5699,7 @@ public int getFcNumber() {
     }
 
     public static final int IF_PACKETS_FIELD_NUMBER = 3;
-    private long ifPackets_;
+    private long ifPackets_ = 0L;
     /**
      * 
      * Count of packets
@@ -5885,7 +5726,7 @@ public long getIfPackets() {
     }
 
     public static final int IF_OCTETS_FIELD_NUMBER = 4;
-    private long ifOctets_;
+    private long ifOctets_ = 0L;
     /**
      * 
      * Count of bytes
@@ -5937,7 +5778,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt64(4, ifOctets_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5961,7 +5802,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(4, ifOctets_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5996,7 +5837,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getIfOctets()
             != other.getIfOctets()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6025,7 +5866,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getIfOctets());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6074,11 +5915,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPo
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6122,6 +5965,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      *  Interface forwarding class accounting
      * 
* @@ -6146,30 +5990,22 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; ifFamily_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); fcNumber_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); ifPackets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); ifOctets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -6196,12 +6032,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.ifFamily_ = ifFamily_; to_bitField0_ |= 0x00000001; } - result.ifFamily_ = ifFamily_; if (((from_bitField0_ & 0x00000002) != 0)) { result.fcNumber_ = fcNumber_; to_bitField0_ |= 0x00000002; @@ -6214,9 +6056,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuter result.ifOctets_ = ifOctets_; to_bitField0_ |= 0x00000008; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -6264,8 +6104,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting.getDefaultInstance()) return this; if (other.hasIfFamily()) { - bitField0_ |= 0x00000001; ifFamily_ = other.ifFamily_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasFcNumber()) { @@ -6277,7 +6117,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasIfOctets()) { setIfOctets(other.getIfOctets()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -6292,17 +6132,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting 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: { + ifFamily_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + fcNumber_ = input.readUInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + ifPackets_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + ifOctets_ = input.readUInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LogicalPortOuterClass.ForwardingClassAccounting) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -6373,11 +6246,9 @@ public java.lang.String getIfFamily() { */ public Builder setIfFamily( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } ifFamily_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -6390,8 +6261,8 @@ public Builder setIfFamily( * @return This builder for chaining. */ public Builder clearIfFamily() { - bitField0_ = (bitField0_ & ~0x00000001); ifFamily_ = getDefaultInstance().getIfFamily(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -6406,11 +6277,9 @@ public Builder clearIfFamily() { */ public Builder setIfFamilyBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } ifFamily_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -6450,8 +6319,9 @@ public int getFcNumber() { * @return This builder for chaining. */ public Builder setFcNumber(int value) { - bitField0_ |= 0x00000002; + fcNumber_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -6505,8 +6375,9 @@ public long getIfPackets() { * @return This builder for chaining. */ public Builder setIfPackets(long value) { - bitField0_ |= 0x00000004; + ifPackets_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -6560,8 +6431,9 @@ public long getIfOctets() { * @return This builder for chaining. */ public Builder setIfOctets(long value) { - bitField0_ |= 0x00000008; + ifOctets_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -6612,7 +6484,18 @@ public ForwardingClassAccounting parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ForwardingClassAccounting(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(); } }; diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspMon.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspMon.java index f7bc43fff4de..b684fd0e1b93 100644 --- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspMon.java +++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspMon.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2017-2022 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc. + * Copyright (C) 2017-2023 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -534,65 +534,6 @@ protected java.lang.Object newInstance( return new key(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private key( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - instanceIdentifier_ = input.readInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - timeStampg_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_key_descriptor; @@ -608,7 +549,8 @@ private key( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * required string name = 1; * @return Whether the name field is set. @@ -656,7 +598,7 @@ public java.lang.String getName() { } public static final int INSTANCE_IDENTIFIER_FIELD_NUMBER = 2; - private int instanceIdentifier_; + private int instanceIdentifier_ = 0; /** * required int32 instance_identifier = 2; * @return Whether the instanceIdentifier field is set. @@ -675,7 +617,7 @@ public int getInstanceIdentifier() { } public static final int TIME_STAMPG_FIELD_NUMBER = 3; - private long timeStampg_; + private long timeStampg_ = 0L; /** * required uint64 time_stampg = 3; * @return Whether the timeStampg field is set. @@ -728,7 +670,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (((bitField0_ & 0x00000004) != 0)) { output.writeUInt64(3, timeStampg_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -748,7 +690,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(3, timeStampg_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -778,7 +720,7 @@ public boolean equals(final java.lang.Object obj) { if (getTimeStampg() != other.getTimeStampg()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -802,7 +744,7 @@ public int hashCode() { hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getTimeStampg()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -851,11 +793,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ke return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -923,28 +867,21 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); instanceIdentifier_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); timeStampg_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -971,12 +908,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key build @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; to_bitField0_ |= 0x00000001; } - result.name_ = name_; if (((from_bitField0_ & 0x00000002) != 0)) { result.instanceIdentifier_ = instanceIdentifier_; to_bitField0_ |= 0x00000002; @@ -985,9 +928,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key build result.timeStampg_ = timeStampg_; to_bitField0_ |= 0x00000004; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -1035,8 +976,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasInstanceIdentifier()) { @@ -1045,7 +986,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasTimeStampg()) { setTimeStampg(other.getTimeStampg()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1069,17 +1010,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + instanceIdentifier_ = input.readInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + timeStampg_ = input.readUInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -1134,11 +1103,9 @@ public java.lang.String getName() { */ public Builder setName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1147,8 +1114,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1159,11 +1126,9 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1191,8 +1156,9 @@ public int getInstanceIdentifier() { * @return This builder for chaining. */ public Builder setInstanceIdentifier(int value) { - bitField0_ |= 0x00000002; + instanceIdentifier_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1230,8 +1196,9 @@ public long getTimeStampg() { * @return This builder for chaining. */ public Builder setTimeStampg(long value) { - bitField0_ |= 0x00000004; + timeStampg_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1278,7 +1245,18 @@ public key parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new key(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(); } }; @@ -1352,73 +1330,6 @@ protected java.lang.Object newInstance( return new lsp_monitor_data_event(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private lsp_monitor_data_event( - 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: { - int rawValue = input.readEnum(); - @SuppressWarnings("deprecation") - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event value = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - eventIdentifier_ = rawValue; - } - break; - } - case 16: { - int rawValue = input.readEnum(); - @SuppressWarnings("deprecation") - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode value = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(2, rawValue); - } else { - bitField0_ |= 0x00000002; - subcode_ = rawValue; - } - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_lsp_monitor_data_event_descriptor; @@ -1434,7 +1345,7 @@ private lsp_monitor_data_event( private int bitField0_; public static final int EVENT_IDENTIFIER_FIELD_NUMBER = 1; - private int eventIdentifier_; + private int eventIdentifier_ = 0; /** * required .lsp_event event_identifier = 1; * @return Whether the eventIdentifier field is set. @@ -1447,13 +1358,12 @@ private lsp_monitor_data_event( * @return The eventIdentifier. */ @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event getEventIdentifier() { - @SuppressWarnings("deprecation") - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.valueOf(eventIdentifier_); + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.forNumber(eventIdentifier_); return result == null ? org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.INITIATED : result; } public static final int SUBCODE_FIELD_NUMBER = 2; - private int subcode_; + private int subcode_ = 1; /** * optional .event_subcode subcode = 2; * @return Whether the subcode field is set. @@ -1466,8 +1376,7 @@ private lsp_monitor_data_event( * @return The subcode. */ @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode getSubcode() { - @SuppressWarnings("deprecation") - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.valueOf(subcode_); + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.forNumber(subcode_); return result == null ? org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.ADMISSION_CONTROL_FAILURE : result; } @@ -1495,7 +1404,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (((bitField0_ & 0x00000002) != 0)) { output.writeEnum(2, subcode_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1512,7 +1421,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeEnumSize(2, subcode_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1535,7 +1444,7 @@ public boolean equals(final java.lang.Object obj) { if (hasSubcode()) { if (subcode_ != other.subcode_) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1554,7 +1463,7 @@ public int hashCode() { hash = (37 * hash) + SUBCODE_FIELD_NUMBER; hash = (53 * hash) + subcode_; } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1603,11 +1512,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ls return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1675,26 +1586,20 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; eventIdentifier_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); subcode_ = 1; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -1721,19 +1626,23 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monit @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.eventIdentifier_ = eventIdentifier_; to_bitField0_ |= 0x00000001; } - result.eventIdentifier_ = eventIdentifier_; if (((from_bitField0_ & 0x00000002) != 0)) { + result.subcode_ = subcode_; to_bitField0_ |= 0x00000002; } - result.subcode_ = subcode_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -1786,7 +1695,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasSubcode()) { setSubcode(other.getSubcode()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1804,17 +1713,54 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event 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: { + int tmpRaw = input.readEnum(); + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event tmpValue = + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.forNumber(tmpRaw); + if (tmpValue == null) { + mergeUnknownVarintField(1, tmpRaw); + } else { + eventIdentifier_ = tmpRaw; + bitField0_ |= 0x00000001; + } + break; + } // case 8 + case 16: { + int tmpRaw = input.readEnum(); + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode tmpValue = + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.forNumber(tmpRaw); + if (tmpValue == null) { + mergeUnknownVarintField(2, tmpRaw); + } else { + subcode_ = tmpRaw; + 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 = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -1833,8 +1779,7 @@ public Builder mergeFrom( */ @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event getEventIdentifier() { - @SuppressWarnings("deprecation") - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.valueOf(eventIdentifier_); + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.forNumber(eventIdentifier_); return result == null ? org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_event.INITIATED : result; } /** @@ -1876,8 +1821,7 @@ public Builder clearEventIdentifier() { */ @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode getSubcode() { - @SuppressWarnings("deprecation") - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.valueOf(subcode_); + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode result = org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.forNumber(subcode_); return result == null ? org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.event_subcode.ADMISSION_CONTROL_FAILURE : result; } /** @@ -1937,7 +1881,18 @@ public lsp_monitor_data_event parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new lsp_monitor_data_event(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(); } }; @@ -2012,60 +1967,6 @@ protected java.lang.Object newInstance( return new ero_type_entry(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ero_type_entry( - 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; - ip_ = input.readUInt32(); - break; - } - case 18: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000002; - flags_ = bs; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_ero_type_entry_descriptor; @@ -2081,7 +1982,7 @@ private ero_type_entry( private int bitField0_; public static final int IP_FIELD_NUMBER = 1; - private int ip_; + private int ip_ = 0; /** * required uint32 ip = 1; * @return Whether the ip field is set. @@ -2100,7 +2001,8 @@ public int getIp() { } public static final int FLAGS_FIELD_NUMBER = 2; - private volatile java.lang.Object flags_; + @SuppressWarnings("serial") + private volatile java.lang.Object flags_ = ""; /** * optional string flags = 2; * @return Whether the flags field is set. @@ -2171,7 +2073,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (((bitField0_ & 0x00000002) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, flags_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2187,7 +2089,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, flags_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2212,7 +2114,7 @@ public boolean equals(final java.lang.Object obj) { if (!getFlags() .equals(other.getFlags())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2231,7 +2133,7 @@ public int hashCode() { hash = (37 * hash) + FLAGS_FIELD_NUMBER; hash = (53 * hash) + getFlags().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2280,11 +2182,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.er return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2348,26 +2252,20 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; ip_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); flags_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -2394,6 +2292,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_ @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -2401,12 +2305,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_ to_bitField0_ |= 0x00000001; } if (((from_bitField0_ & 0x00000002) != 0)) { + result.flags_ = flags_; to_bitField0_ |= 0x00000002; } - result.flags_ = flags_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -2457,11 +2359,11 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot setIp(other.getIp()); } if (other.hasFlags()) { - bitField0_ |= 0x00000002; flags_ = other.flags_; + bitField0_ |= 0x00000002; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2479,17 +2381,40 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry 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: { + ip_ = input.readUInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + flags_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -2517,8 +2442,9 @@ public int getIp() { * @return This builder for chaining. */ public Builder setIp(int value) { - bitField0_ |= 0x00000001; + ip_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2583,11 +2509,9 @@ public java.lang.String getFlags() { */ public Builder setFlags( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + if (value == null) { throw new NullPointerException(); } flags_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2596,8 +2520,8 @@ public Builder setFlags( * @return This builder for chaining. */ public Builder clearFlags() { - bitField0_ = (bitField0_ & ~0x00000002); flags_ = getDefaultInstance().getFlags(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -2608,11 +2532,9 @@ public Builder clearFlags() { */ public Builder setFlagsBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + if (value == null) { throw new NullPointerException(); } flags_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2649,7 +2571,18 @@ public ero_type_entry parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ero_type_entry(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(); } }; @@ -2720,61 +2653,6 @@ protected java.lang.Object newInstance( return new ero_ipv4_type(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ero_ipv4_type( - 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)) { - entry_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - entry_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry.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)) { - entry_ = java.util.Collections.unmodifiableList(entry_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_ero_ipv4_type_descriptor; @@ -2789,6 +2667,7 @@ private ero_ipv4_type( } public static final int ENTRY_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List entry_; /** * repeated .ero_type_entry entry = 1; @@ -2851,7 +2730,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < entry_.size(); i++) { output.writeMessage(1, entry_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2864,7 +2743,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, entry_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2881,7 +2760,7 @@ public boolean equals(final java.lang.Object obj) { if (!getEntryList() .equals(other.getEntryList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2896,7 +2775,7 @@ public int hashCode() { hash = (37 * hash) + ENTRY_FIELD_NUMBER; hash = (53 * hash) + getEntryList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2945,11 +2824,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.er return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3013,29 +2894,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getEntryFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (entryBuilder_ == null) { entry_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + entry_ = null; entryBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -3062,7 +2939,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_ @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type result) { if (entryBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { entry_ = java.util.Collections.unmodifiableList(entry_); @@ -3072,8 +2955,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_ } else { result.entry_ = entryBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -3146,7 +3031,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3166,17 +3051,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_type_entry.PARSER, + extensionRegistry); + if (entryBuilder_ == null) { + ensureEntryIsMutable(); + entry_.add(m); + } else { + entryBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -3453,7 +3364,18 @@ public ero_ipv4_type parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ero_ipv4_type(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(); } }; @@ -3575,69 +3497,6 @@ protected java.lang.Object newInstance( return new rro_type_entry(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private rro_type_entry( - 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; - nodeid_ = input.readUInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - flags_ = input.readUInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - intfAddr_ = input.readUInt32(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - label_ = input.readUInt32(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_rro_type_entry_descriptor; @@ -3653,7 +3512,7 @@ private rro_type_entry( private int bitField0_; public static final int NODEID_FIELD_NUMBER = 1; - private int nodeid_; + private int nodeid_ = 0; /** *
      * node-id or loopback
@@ -3680,7 +3539,7 @@ public int getNodeid() {
     }
 
     public static final int FLAGS_FIELD_NUMBER = 2;
-    private int flags_;
+    private int flags_ = 0;
     /**
      * 
      * contains flags
@@ -3707,7 +3566,7 @@ public int getFlags() {
     }
 
     public static final int INTF_ADDR_FIELD_NUMBER = 3;
-    private int intfAddr_;
+    private int intfAddr_ = 0;
     /**
      * 
      * interface-ip
@@ -3734,7 +3593,7 @@ public int getIntfAddr() {
     }
 
     public static final int LABEL_FIELD_NUMBER = 4;
-    private int label_;
+    private int label_ = 0;
     /**
      * 
      * may be using PHP
@@ -3786,7 +3645,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeUInt32(4, label_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3811,7 +3670,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, label_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3846,7 +3705,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getLabel()
             != other.getLabel()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -3873,7 +3732,7 @@ public int hashCode() {
         hash = (37 * hash) + LABEL_FIELD_NUMBER;
         hash = (53 * hash) + getLabel();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3922,11 +3781,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rr
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3990,30 +3851,22 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         nodeid_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         flags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         intfAddr_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         label_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -4040,6 +3893,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4058,9 +3917,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_
           result.label_ = label_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4119,7 +3976,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasLabel()) {
           setLabel(other.getLabel());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4134,17 +3991,50 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry 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: {
+                nodeid_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                flags_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                intfAddr_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                label_ = input.readUInt32();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4184,8 +4074,9 @@ public int getNodeid() {
        * @return This builder for chaining.
        */
       public Builder setNodeid(int value) {
-        bitField0_ |= 0x00000001;
+
         nodeid_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4239,8 +4130,9 @@ public int getFlags() {
        * @return This builder for chaining.
        */
       public Builder setFlags(int value) {
-        bitField0_ |= 0x00000002;
+
         flags_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4294,8 +4186,9 @@ public int getIntfAddr() {
        * @return This builder for chaining.
        */
       public Builder setIntfAddr(int value) {
-        bitField0_ |= 0x00000004;
+
         intfAddr_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4349,8 +4242,9 @@ public int getLabel() {
        * @return This builder for chaining.
        */
       public Builder setLabel(int value) {
-        bitField0_ |= 0x00000008;
+
         label_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -4401,7 +4295,18 @@ public rro_type_entry parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new rro_type_entry(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();
       }
     };
 
@@ -4472,61 +4377,6 @@ protected java.lang.Object newInstance(
       return new rro_ipv4_type();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private rro_ipv4_type(
-        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)) {
-                rroEntry_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              rroEntry_.add(
-                  input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry.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)) {
-          rroEntry_ = java.util.Collections.unmodifiableList(rroEntry_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_rro_ipv4_type_descriptor;
@@ -4541,6 +4391,7 @@ private rro_ipv4_type(
     }
 
     public static final int RRO_ENTRY_FIELD_NUMBER = 1;
+    @SuppressWarnings("serial")
     private java.util.List rroEntry_;
     /**
      * repeated .rro_type_entry rro_entry = 1;
@@ -4597,7 +4448,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < rroEntry_.size(); i++) {
         output.writeMessage(1, rroEntry_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4610,7 +4461,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, rroEntry_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4627,7 +4478,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getRroEntryList()
           .equals(other.getRroEntryList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4642,7 +4493,7 @@ public int hashCode() {
         hash = (37 * hash) + RRO_ENTRY_FIELD_NUMBER;
         hash = (53 * hash) + getRroEntryList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4691,11 +4542,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rr
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4759,29 +4612,25 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getRroEntryFieldBuilder();
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         if (rroEntryBuilder_ == null) {
           rroEntry_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
+          rroEntry_ = null;
           rroEntryBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -4808,7 +4657,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type(this);
-        int from_bitField0_ = bitField0_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type result) {
         if (rroEntryBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             rroEntry_ = java.util.Collections.unmodifiableList(rroEntry_);
@@ -4818,8 +4673,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_
         } else {
           result.rroEntry_ = rroEntryBuilder_.build();
         }
-        onBuilt();
-        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type result) {
+        int from_bitField0_ = bitField0_;
       }
 
       @java.lang.Override
@@ -4892,7 +4749,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
             }
           }
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4907,17 +4764,43 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type parsedMessage = null;
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              case 10: {
+                org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry m =
+                    input.readMessage(
+                        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_type_entry.PARSER,
+                        extensionRegistry);
+                if (rroEntryBuilder_ == null) {
+                  ensureRroEntryIsMutable();
+                  rroEntry_.add(m);
+                } else {
+                  rroEntryBuilder_.addMessage(m);
+                }
+                break;
+              } // case 10
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -5194,7 +5077,18 @@ public rro_ipv4_type parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new rro_ipv4_type(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();
       }
     };
 
@@ -5325,96 +5219,6 @@ protected java.lang.Object newInstance(
       return new lsp_monitor_data_property();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private lsp_monitor_data_property(
-        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;
-              bandwidth_ = input.readUInt64();
-              break;
-            }
-            case 18: {
-              com.google.protobuf.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000002;
-              pathName_ = bs;
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              metric_ = input.readInt32();
-              break;
-            }
-            case 37: {
-              bitField0_ |= 0x00000008;
-              maxAvgBw_ = input.readFloat();
-              break;
-            }
-            case 42: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000010) != 0)) {
-                subBuilder = ero_.toBuilder();
-              }
-              ero_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(ero_);
-                ero_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000010;
-              break;
-            }
-            case 50: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) != 0)) {
-                subBuilder = rro_.toBuilder();
-              }
-              rro_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(rro_);
-                rro_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000020;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_lsp_monitor_data_property_descriptor;
@@ -5430,7 +5234,7 @@ private lsp_monitor_data_property(
 
     private int bitField0_;
     public static final int BANDWIDTH_FIELD_NUMBER = 1;
-    private long bandwidth_;
+    private long bandwidth_ = 0L;
     /**
      * optional uint64 bandwidth = 1;
      * @return Whether the bandwidth field is set.
@@ -5449,7 +5253,8 @@ public long getBandwidth() {
     }
 
     public static final int PATH_NAME_FIELD_NUMBER = 2;
-    private volatile java.lang.Object pathName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object pathName_ = "";
     /**
      * optional string path_name = 2;
      * @return Whether the pathName field is set.
@@ -5497,7 +5302,7 @@ public java.lang.String getPathName() {
     }
 
     public static final int METRIC_FIELD_NUMBER = 3;
-    private int metric_;
+    private int metric_ = 0;
     /**
      * optional int32 metric = 3;
      * @return Whether the metric field is set.
@@ -5516,7 +5321,7 @@ public int getMetric() {
     }
 
     public static final int MAX_AVG_BW_FIELD_NUMBER = 4;
-    private float maxAvgBw_;
+    private float maxAvgBw_ = 0F;
     /**
      * optional float max_avg_bw = 4;
      * @return Whether the maxAvgBw field is set.
@@ -5624,7 +5429,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000020) != 0)) {
         output.writeMessage(6, getRro());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5656,7 +5461,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, getRro());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5702,7 +5507,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getRro()
             .equals(other.getRro())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -5739,7 +5544,7 @@ public int hashCode() {
         hash = (37 * hash) + RRO_FIELD_NUMBER;
         hash = (53 * hash) + getRro().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -5788,11 +5593,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ls
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5878,26 +5685,21 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         bandwidth_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         pathName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
         metric_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         maxAvgBw_ = 0F;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (eroBuilder_ == null) {
-          ero_ = null;
-        } else {
-          eroBuilder_.clear();
+        ero_ = null;
+        if (eroBuilder_ != null) {
+          eroBuilder_.dispose();
+          eroBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        if (rroBuilder_ == null) {
-          rro_ = null;
-        } else {
-          rroBuilder_.clear();
+        rro_ = null;
+        if (rroBuilder_ != null) {
+          rroBuilder_.dispose();
+          rroBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -5924,6 +5726,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monit
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -5931,9 +5739,9 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monit
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.pathName_ = pathName_;
           to_bitField0_ |= 0x00000002;
         }
-        result.pathName_ = pathName_;
         if (((from_bitField0_ & 0x00000004) != 0)) {
           result.metric_ = metric_;
           to_bitField0_ |= 0x00000004;
@@ -5943,24 +5751,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monit
           to_bitField0_ |= 0x00000008;
         }
         if (((from_bitField0_ & 0x00000010) != 0)) {
-          if (eroBuilder_ == null) {
-            result.ero_ = ero_;
-          } else {
-            result.ero_ = eroBuilder_.build();
-          }
+          result.ero_ = eroBuilder_ == null
+              ? ero_
+              : eroBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
         if (((from_bitField0_ & 0x00000020) != 0)) {
-          if (rroBuilder_ == null) {
-            result.rro_ = rro_;
-          } else {
-            result.rro_ = rroBuilder_.build();
-          }
+          result.rro_ = rroBuilder_ == null
+              ? rro_
+              : rroBuilder_.build();
           to_bitField0_ |= 0x00000020;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6011,8 +5813,8 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
           setBandwidth(other.getBandwidth());
         }
         if (other.hasPathName()) {
-          bitField0_ |= 0x00000002;
           pathName_ = other.pathName_;
+          bitField0_ |= 0x00000002;
           onChanged();
         }
         if (other.hasMetric()) {
@@ -6027,7 +5829,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasRro()) {
           mergeRro(other.getRro());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6047,17 +5849,64 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property 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: {
+                bandwidth_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 18: {
+                pathName_ = input.readBytes();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 24: {
+                metric_ = input.readInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 37: {
+                maxAvgBw_ = input.readFloat();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 37
+              case 42: {
+                input.readMessage(
+                    getEroFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 42
+              case 50: {
+                input.readMessage(
+                    getRroFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                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 = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6085,8 +5934,9 @@ public long getBandwidth() {
        * @return This builder for chaining.
        */
       public Builder setBandwidth(long value) {
-        bitField0_ |= 0x00000001;
+
         bandwidth_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6151,11 +6001,9 @@ public java.lang.String getPathName() {
        */
       public Builder setPathName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         pathName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6164,8 +6012,8 @@ public Builder setPathName(
        * @return This builder for chaining.
        */
       public Builder clearPathName() {
-        bitField0_ = (bitField0_ & ~0x00000002);
         pathName_ = getDefaultInstance().getPathName();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -6176,11 +6024,9 @@ public Builder clearPathName() {
        */
       public Builder setPathNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
+        if (value == null) { throw new NullPointerException(); }
         pathName_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6208,8 +6054,9 @@ public int getMetric() {
        * @return This builder for chaining.
        */
       public Builder setMetric(int value) {
-        bitField0_ |= 0x00000004;
+
         metric_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -6247,8 +6094,9 @@ public float getMaxAvgBw() {
        * @return This builder for chaining.
        */
       public Builder setMaxAvgBw(float value) {
-        bitField0_ |= 0x00000008;
+
         maxAvgBw_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -6293,11 +6141,11 @@ public Builder setEro(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.L
             throw new NullPointerException();
           }
           ero_ = value;
-          onChanged();
         } else {
           eroBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -6307,11 +6155,11 @@ public Builder setEro(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.Builder builderForValue) {
         if (eroBuilder_ == null) {
           ero_ = builderForValue.build();
-          onChanged();
         } else {
           eroBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000010;
+        onChanged();
         return this;
       }
       /**
@@ -6320,31 +6168,32 @@ public Builder setEro(
       public Builder mergeEro(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type value) {
         if (eroBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
-              ero_ != null &&
-              ero_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.getDefaultInstance()) {
-            ero_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.newBuilder(ero_).mergeFrom(value).buildPartial();
+            ero_ != null &&
+            ero_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ero_ipv4_type.getDefaultInstance()) {
+            getEroBuilder().mergeFrom(value);
           } else {
             ero_ = value;
           }
-          onChanged();
         } else {
           eroBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000010;
+        if (ero_ != null) {
+          bitField0_ |= 0x00000010;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .ero_ipv4_type ero = 5;
        */
       public Builder clearEro() {
-        if (eroBuilder_ == null) {
-          ero_ = null;
-          onChanged();
-        } else {
-          eroBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000010);
+        ero_ = null;
+        if (eroBuilder_ != null) {
+          eroBuilder_.dispose();
+          eroBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6413,11 +6262,11 @@ public Builder setRro(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.L
             throw new NullPointerException();
           }
           rro_ = value;
-          onChanged();
         } else {
           rroBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -6427,11 +6276,11 @@ public Builder setRro(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.Builder builderForValue) {
         if (rroBuilder_ == null) {
           rro_ = builderForValue.build();
-          onChanged();
         } else {
           rroBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000020;
+        onChanged();
         return this;
       }
       /**
@@ -6440,31 +6289,32 @@ public Builder setRro(
       public Builder mergeRro(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type value) {
         if (rroBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
-              rro_ != null &&
-              rro_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.getDefaultInstance()) {
-            rro_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.newBuilder(rro_).mergeFrom(value).buildPartial();
+            rro_ != null &&
+            rro_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.rro_ipv4_type.getDefaultInstance()) {
+            getRroBuilder().mergeFrom(value);
           } else {
             rro_ = value;
           }
-          onChanged();
         } else {
           rroBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000020;
+        if (rro_ != null) {
+          bitField0_ |= 0x00000020;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .rro_ipv4_type rro = 6;
        */
       public Builder clearRro() {
-        if (rroBuilder_ == null) {
-          rro_ = null;
-          onChanged();
-        } else {
-          rroBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000020);
+        rro_ = null;
+        if (rroBuilder_ != null) {
+          rroBuilder_.dispose();
+          rroBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -6535,7 +6385,18 @@ public lsp_monitor_data_property parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new lsp_monitor_data_property(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();
       }
     };
 
@@ -6626,88 +6487,6 @@ protected java.lang.Object newInstance(
       return new lsp_mon();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private lsp_mon(
-        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: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = keyField_.toBuilder();
-              }
-              keyField_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(keyField_);
-                keyField_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 18: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) != 0)) {
-                subBuilder = eventField_.toBuilder();
-              }
-              eventField_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(eventField_);
-                eventField_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
-            case 26: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) != 0)) {
-                subBuilder = propertyField_.toBuilder();
-              }
-              propertyField_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(propertyField_);
-                propertyField_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000004;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.internal_static_lsp_mon_descriptor;
@@ -6843,7 +6622,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000004) != 0)) {
         output.writeMessage(3, getPropertyField());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -6864,7 +6643,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getPropertyField());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -6894,7 +6673,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getPropertyField()
             .equals(other.getPropertyField())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6917,7 +6696,7 @@ public int hashCode() {
         hash = (37 * hash) + PROPERTY_FIELD_FIELD_NUMBER;
         hash = (53 * hash) + getPropertyField().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6966,11 +6745,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.ls
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7053,24 +6834,22 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (keyFieldBuilder_ == null) {
-          keyField_ = null;
-        } else {
-          keyFieldBuilder_.clear();
+        bitField0_ = 0;
+        keyField_ = null;
+        if (keyFieldBuilder_ != null) {
+          keyFieldBuilder_.dispose();
+          keyFieldBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (eventFieldBuilder_ == null) {
-          eventField_ = null;
-        } else {
-          eventFieldBuilder_.clear();
+        eventField_ = null;
+        if (eventFieldBuilder_ != null) {
+          eventFieldBuilder_.dispose();
+          eventFieldBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (propertyFieldBuilder_ == null) {
-          propertyField_ = null;
-        } else {
-          propertyFieldBuilder_.clear();
+        propertyField_ = null;
+        if (propertyFieldBuilder_ != null) {
+          propertyFieldBuilder_.dispose();
+          propertyFieldBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -7097,35 +6876,33 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon b
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (keyFieldBuilder_ == null) {
-            result.keyField_ = keyField_;
-          } else {
-            result.keyField_ = keyFieldBuilder_.build();
-          }
+          result.keyField_ = keyFieldBuilder_ == null
+              ? keyField_
+              : keyFieldBuilder_.build();
           to_bitField0_ |= 0x00000001;
         }
         if (((from_bitField0_ & 0x00000002) != 0)) {
-          if (eventFieldBuilder_ == null) {
-            result.eventField_ = eventField_;
-          } else {
-            result.eventField_ = eventFieldBuilder_.build();
-          }
+          result.eventField_ = eventFieldBuilder_ == null
+              ? eventField_
+              : eventFieldBuilder_.build();
           to_bitField0_ |= 0x00000002;
         }
         if (((from_bitField0_ & 0x00000004) != 0)) {
-          if (propertyFieldBuilder_ == null) {
-            result.propertyField_ = propertyField_;
-          } else {
-            result.propertyField_ = propertyFieldBuilder_.build();
-          }
+          result.propertyField_ = propertyFieldBuilder_ == null
+              ? propertyField_
+              : propertyFieldBuilder_.build();
           to_bitField0_ |= 0x00000004;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -7181,7 +6958,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasPropertyField()) {
           mergePropertyField(other.getPropertyField());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -7212,17 +6989,51 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon 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: {
+                input.readMessage(
+                    getKeyFieldFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 18: {
+                input.readMessage(
+                    getEventFieldFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 18
+              case 26: {
+                input.readMessage(
+                    getPropertyFieldFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 26
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_mon) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -7257,11 +7068,11 @@ public Builder setKeyField(org.opennms.netmgt.telemetry.protocols.jti.adapter.pr
             throw new NullPointerException();
           }
           keyField_ = value;
-          onChanged();
         } else {
           keyFieldBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -7271,11 +7082,11 @@ public Builder setKeyField(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.Builder builderForValue) {
         if (keyFieldBuilder_ == null) {
           keyField_ = builderForValue.build();
-          onChanged();
         } else {
           keyFieldBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000001;
+        onChanged();
         return this;
       }
       /**
@@ -7284,31 +7095,32 @@ public Builder setKeyField(
       public Builder mergeKeyField(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key value) {
         if (keyFieldBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0) &&
-              keyField_ != null &&
-              keyField_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.getDefaultInstance()) {
-            keyField_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.newBuilder(keyField_).mergeFrom(value).buildPartial();
+            keyField_ != null &&
+            keyField_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.key.getDefaultInstance()) {
+            getKeyFieldBuilder().mergeFrom(value);
           } else {
             keyField_ = value;
           }
-          onChanged();
         } else {
           keyFieldBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000001;
+        if (keyField_ != null) {
+          bitField0_ |= 0x00000001;
+          onChanged();
+        }
         return this;
       }
       /**
        * required .key key_field = 1;
        */
       public Builder clearKeyField() {
-        if (keyFieldBuilder_ == null) {
-          keyField_ = null;
-          onChanged();
-        } else {
-          keyFieldBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000001);
+        keyField_ = null;
+        if (keyFieldBuilder_ != null) {
+          keyFieldBuilder_.dispose();
+          keyFieldBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7377,11 +7189,11 @@ public Builder setEventField(org.opennms.netmgt.telemetry.protocols.jti.adapter.
             throw new NullPointerException();
           }
           eventField_ = value;
-          onChanged();
         } else {
           eventFieldBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7391,11 +7203,11 @@ public Builder setEventField(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.Builder builderForValue) {
         if (eventFieldBuilder_ == null) {
           eventField_ = builderForValue.build();
-          onChanged();
         } else {
           eventFieldBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
+        onChanged();
         return this;
       }
       /**
@@ -7404,31 +7216,32 @@ public Builder setEventField(
       public Builder mergeEventField(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event value) {
         if (eventFieldBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
-              eventField_ != null &&
-              eventField_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.getDefaultInstance()) {
-            eventField_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.newBuilder(eventField_).mergeFrom(value).buildPartial();
+            eventField_ != null &&
+            eventField_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_event.getDefaultInstance()) {
+            getEventFieldBuilder().mergeFrom(value);
           } else {
             eventField_ = value;
           }
-          onChanged();
         } else {
           eventFieldBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000002;
+        if (eventField_ != null) {
+          bitField0_ |= 0x00000002;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .lsp_monitor_data_event event_field = 2;
        */
       public Builder clearEventField() {
-        if (eventFieldBuilder_ == null) {
-          eventField_ = null;
-          onChanged();
-        } else {
-          eventFieldBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000002);
+        eventField_ = null;
+        if (eventFieldBuilder_ != null) {
+          eventFieldBuilder_.dispose();
+          eventFieldBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7497,11 +7310,11 @@ public Builder setPropertyField(org.opennms.netmgt.telemetry.protocols.jti.adapt
             throw new NullPointerException();
           }
           propertyField_ = value;
-          onChanged();
         } else {
           propertyFieldBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7511,11 +7324,11 @@ public Builder setPropertyField(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property.Builder builderForValue) {
         if (propertyFieldBuilder_ == null) {
           propertyField_ = builderForValue.build();
-          onChanged();
         } else {
           propertyFieldBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
+        onChanged();
         return this;
       }
       /**
@@ -7524,31 +7337,32 @@ public Builder setPropertyField(
       public Builder mergePropertyField(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property value) {
         if (propertyFieldBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
-              propertyField_ != null &&
-              propertyField_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property.getDefaultInstance()) {
-            propertyField_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property.newBuilder(propertyField_).mergeFrom(value).buildPartial();
+            propertyField_ != null &&
+            propertyField_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspMon.lsp_monitor_data_property.getDefaultInstance()) {
+            getPropertyFieldBuilder().mergeFrom(value);
           } else {
             propertyField_ = value;
           }
-          onChanged();
         } else {
           propertyFieldBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000004;
+        if (propertyField_ != null) {
+          bitField0_ |= 0x00000004;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .lsp_monitor_data_property property_field = 3;
        */
       public Builder clearPropertyField() {
-        if (propertyFieldBuilder_ == null) {
-          propertyField_ = null;
-          onChanged();
-        } else {
-          propertyFieldBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000004);
+        propertyField_ = null;
+        if (propertyFieldBuilder_ != null) {
+          propertyFieldBuilder_.dispose();
+          propertyFieldBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -7619,7 +7433,18 @@ public lsp_mon parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new lsp_mon(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();
       }
     };
 
diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspStatsOuterClass.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspStatsOuterClass.java
index b773c812bbc3..1ff53b23418d 100644
--- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspStatsOuterClass.java
+++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/LspStatsOuterClass.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2017-2022 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc.
+ * Copyright (C) 2017-2023 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -93,6 +93,7 @@ org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspS
   }
   /**
    * 
+   *
    * Top-level message
    * 
* @@ -118,61 +119,6 @@ protected java.lang.Object newInstance( return new LspStats(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private LspStats( - 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)) { - lspStatsRecords_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - lspStatsRecords_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord.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)) { - lspStatsRecords_ = java.util.Collections.unmodifiableList(lspStatsRecords_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.internal_static_LspStats_descriptor; @@ -187,6 +133,7 @@ private LspStats( } public static final int LSP_STATS_RECORDS_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List lspStatsRecords_; /** *
@@ -269,7 +216,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < lspStatsRecords_.size(); i++) {
         output.writeMessage(1, lspStatsRecords_.get(i));
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -282,7 +229,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, lspStatsRecords_.get(i));
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -299,7 +246,7 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getLspStatsRecordsList()
           .equals(other.getLspStatsRecordsList())) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -314,7 +261,7 @@ public int hashCode() {
         hash = (37 * hash) + LSP_STATS_RECORDS_FIELD_NUMBER;
         hash = (53 * hash) + getLspStatsRecordsList().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -363,11 +310,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -411,6 +360,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * Top-level message
      * 
* @@ -435,29 +385,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getLspStatsRecordsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (lspStatsRecordsBuilder_ == null) { lspStatsRecords_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + lspStatsRecords_ = null; lspStatsRecordsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -484,7 +430,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats result) { if (lspStatsRecordsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { lspStatsRecords_ = java.util.Collections.unmodifiableList(lspStatsRecords_); @@ -494,8 +446,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterCla } else { result.lspStatsRecords_ = lspStatsRecordsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -568,7 +522,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -588,17 +542,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord.PARSER, + extensionRegistry); + if (lspStatsRecordsBuilder_ == null) { + ensureLspStatsRecordsIsMutable(); + lspStatsRecords_.add(m); + } else { + lspStatsRecordsBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStats) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -947,7 +927,18 @@ public LspStats parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LspStats(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(); } }; @@ -1132,6 +1123,7 @@ public interface LspStatsRecordOrBuilder extends } /** *
+   *
    * LSP statistics record
    * 
* @@ -1158,86 +1150,6 @@ protected java.lang.Object newInstance( return new LspStatsRecord(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private LspStatsRecord( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - name_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - instanceIdentifier_ = input.readUInt32(); - break; - } - case 26: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000004; - counterName_ = bs; - break; - } - case 32: { - bitField0_ |= 0x00000008; - packets_ = input.readUInt64(); - break; - } - case 40: { - bitField0_ |= 0x00000010; - bytes_ = input.readUInt64(); - break; - } - case 48: { - bitField0_ |= 0x00000020; - packetRate_ = input.readUInt64(); - break; - } - case 56: { - bitField0_ |= 0x00000040; - byteRate_ = input.readUInt64(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.internal_static_LspStatsRecord_descriptor; @@ -1253,7 +1165,8 @@ private LspStatsRecord( private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** *
      * Name of the LSP
@@ -1313,7 +1226,7 @@ public java.lang.String getName() {
     }
 
     public static final int INSTANCE_IDENTIFIER_FIELD_NUMBER = 2;
-    private int instanceIdentifier_;
+    private int instanceIdentifier_ = 0;
     /**
      * 
      * Instance Identifier for cases when RPD creates multiple instances
@@ -1340,7 +1253,8 @@ public int getInstanceIdentifier() {
     }
 
     public static final int COUNTER_NAME_FIELD_NUMBER = 3;
-    private volatile java.lang.Object counterName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object counterName_ = "";
     /**
      * 
      * Name of the counter. This is useful when an LSP has multiple counters.
@@ -1406,7 +1320,7 @@ public java.lang.String getCounterName() {
     }
 
     public static final int PACKETS_FIELD_NUMBER = 4;
-    private long packets_;
+    private long packets_ = 0L;
     /**
      * 
      * The total number of packets
@@ -1433,7 +1347,7 @@ public long getPackets() {
     }
 
     public static final int BYTES_FIELD_NUMBER = 5;
-    private long bytes_;
+    private long bytes_ = 0L;
     /**
      * 
      * The total number of bytes
@@ -1460,7 +1374,7 @@ public long getBytes() {
     }
 
     public static final int PACKET_RATE_FIELD_NUMBER = 6;
-    private long packetRate_;
+    private long packetRate_ = 0L;
     /**
      * 
      * Packet rate computed over the most recent 3 second interval
@@ -1487,7 +1401,7 @@ public long getPacketRate() {
     }
 
     public static final int BYTE_RATE_FIELD_NUMBER = 7;
-    private long byteRate_;
+    private long byteRate_ = 0L;
     /**
      * 
      * Byte rate computed over the most recent 3 second interval
@@ -1560,7 +1474,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000040) != 0)) {
         output.writeUInt64(7, byteRate_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1595,7 +1509,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(7, byteRate_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1645,7 +1559,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getByteRate()
             != other.getByteRate()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1688,7 +1602,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getByteRate());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1737,11 +1651,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsO
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1785,6 +1701,7 @@ protected Builder newBuilderForType(
     }
     /**
      * 
+     *
      * LSP statistics record
      * 
* @@ -1809,36 +1726,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); instanceIdentifier_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); counterName_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); packets_ = 0L; - bitField0_ = (bitField0_ & ~0x00000008); bytes_ = 0L; - bitField0_ = (bitField0_ & ~0x00000010); packetRate_ = 0L; - bitField0_ = (bitField0_ & ~0x00000020); byteRate_ = 0L; - bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -1865,20 +1771,26 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterCla @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; to_bitField0_ |= 0x00000001; } - result.name_ = name_; if (((from_bitField0_ & 0x00000002) != 0)) { result.instanceIdentifier_ = instanceIdentifier_; to_bitField0_ |= 0x00000002; } if (((from_bitField0_ & 0x00000004) != 0)) { + result.counterName_ = counterName_; to_bitField0_ |= 0x00000004; } - result.counterName_ = counterName_; if (((from_bitField0_ & 0x00000008) != 0)) { result.packets_ = packets_; to_bitField0_ |= 0x00000008; @@ -1895,9 +1807,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterCla result.byteRate_ = byteRate_; to_bitField0_ |= 0x00000040; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -1945,16 +1855,16 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord other) { if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord.getDefaultInstance()) return this; if (other.hasName()) { - bitField0_ |= 0x00000001; name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasInstanceIdentifier()) { setInstanceIdentifier(other.getInstanceIdentifier()); } if (other.hasCounterName()) { - bitField0_ |= 0x00000004; counterName_ = other.counterName_; + bitField0_ |= 0x00000004; onChanged(); } if (other.hasPackets()) { @@ -1969,7 +1879,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot if (other.hasByteRate()) { setByteRate(other.getByteRate()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1993,17 +1903,65 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + instanceIdentifier_ = input.readUInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + counterName_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 32: { + packets_ = input.readUInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 40: { + bytes_ = input.readUInt64(); + bitField0_ |= 0x00000010; + break; + } // case 40 + case 48: { + packetRate_ = input.readUInt64(); + bitField0_ |= 0x00000020; + break; + } // case 48 + case 56: { + byteRate_ = input.readUInt64(); + bitField0_ |= 0x00000040; + break; + } // case 56 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.LspStatsOuterClass.LspStatsRecord) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -2074,11 +2032,9 @@ public java.lang.String getName() { */ public Builder setName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2091,8 +2047,8 @@ public Builder setName( * @return This builder for chaining. */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2107,11 +2063,9 @@ public Builder clearName() { */ public Builder setNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2151,8 +2105,9 @@ public int getInstanceIdentifier() { * @return This builder for chaining. */ public Builder setInstanceIdentifier(int value) { - bitField0_ |= 0x00000002; + instanceIdentifier_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2245,11 +2200,9 @@ public java.lang.String getCounterName() { */ public Builder setCounterName( java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; + if (value == null) { throw new NullPointerException(); } counterName_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2264,8 +2217,8 @@ public Builder setCounterName( * @return This builder for chaining. */ public Builder clearCounterName() { - bitField0_ = (bitField0_ & ~0x00000004); counterName_ = getDefaultInstance().getCounterName(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -2282,11 +2235,9 @@ public Builder clearCounterName() { */ public Builder setCounterNameBytes( com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; + if (value == null) { throw new NullPointerException(); } counterName_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2326,8 +2277,9 @@ public long getPackets() { * @return This builder for chaining. */ public Builder setPackets(long value) { - bitField0_ |= 0x00000008; + packets_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2381,8 +2333,9 @@ public long getBytes() { * @return This builder for chaining. */ public Builder setBytes(long value) { - bitField0_ |= 0x00000010; + bytes_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2436,8 +2389,9 @@ public long getPacketRate() { * @return This builder for chaining. */ public Builder setPacketRate(long value) { - bitField0_ |= 0x00000020; + packetRate_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2491,8 +2445,9 @@ public long getByteRate() { * @return This builder for chaining. */ public Builder setByteRate(long value) { - bitField0_ |= 0x00000040; + byteRate_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2543,7 +2498,18 @@ public LspStatsRecord parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LspStatsRecord(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(); } }; diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/Port.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/Port.java index 948ae0c71ce4..3a364d182e39 100644 --- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/Port.java +++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/Port.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2017-2022 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc. + * Copyright (C) 2017-2023 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -94,61 +94,6 @@ protected java.lang.Object newInstance( return new GPort(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private GPort( - 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)) { - interfaceStats_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - interfaceStats_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos.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)) { - interfaceStats_ = java.util.Collections.unmodifiableList(interfaceStats_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.internal_static_GPort_descriptor; @@ -163,6 +108,7 @@ private GPort( } public static final int INTERFACE_STATS_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private java.util.List interfaceStats_; /** * repeated .InterfaceInfos interface_stats = 1; @@ -225,7 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < interfaceStats_.size(); i++) { output.writeMessage(1, interfaceStats_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -238,7 +184,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, interfaceStats_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -255,7 +201,7 @@ public boolean equals(final java.lang.Object obj) { if (!getInterfaceStatsList() .equals(other.getInterfaceStatsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -270,7 +216,7 @@ public int hashCode() { hash = (37 * hash) + INTERFACE_STATS_FIELD_NUMBER; hash = (53 * hash) + getInterfaceStatsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -319,11 +265,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPor return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } + public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -387,29 +335,25 @@ public static final class Builder extends // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getInterfaceStatsFieldBuilder(); - } + } @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (interfaceStatsBuilder_ == null) { interfaceStats_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + interfaceStats_ = null; interfaceStatsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -436,7 +380,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort build @java.lang.Override public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort buildPartial() { org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort result) { if (interfaceStatsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { interfaceStats_ = java.util.Collections.unmodifiableList(interfaceStats_); @@ -446,8 +396,10 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort build } else { result.interfaceStats_ = interfaceStatsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -520,7 +472,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -540,17 +492,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos m = + input.readMessage( + org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos.PARSER, + extensionRegistry); + if (interfaceStatsBuilder_ == null) { + ensureInterfaceStatsIsMutable(); + interfaceStats_.add(m); + } else { + interfaceStatsBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.GPort) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int bitField0_; @@ -827,7 +805,18 @@ public GPort parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GPort(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(); } }; @@ -1142,134 +1131,6 @@ protected java.lang.Object newInstance( return new InterfaceInfos(); } - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private InterfaceInfos( - 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; - ifName_ = bs; - break; - } - case 16: { - bitField0_ |= 0x00000002; - initTime_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - snmpIfIndex_ = input.readUInt32(); - break; - } - case 34: { - com.google.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000008; - parentAeName_ = bs; - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - egressQueueInfo_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - egressQueueInfo_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats.PARSER, extensionRegistry)); - break; - } - case 50: { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - ingressQueueInfo_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; - } - ingressQueueInfo_.add( - input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats.PARSER, extensionRegistry)); - break; - } - case 58: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) != 0)) { - subBuilder = ingressStats_.toBuilder(); - } - ingressStats_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(ingressStats_); - ingressStats_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - case 66: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) != 0)) { - subBuilder = egressStats_.toBuilder(); - } - egressStats_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(egressStats_); - egressStats_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000020; - break; - } - case 74: { - org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) != 0)) { - subBuilder = ingressErrors_.toBuilder(); - } - ingressErrors_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(ingressErrors_); - ingressErrors_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000040; - 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_ & 0x00000010) != 0)) { - egressQueueInfo_ = java.util.Collections.unmodifiableList(egressQueueInfo_); - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - ingressQueueInfo_ = java.util.Collections.unmodifiableList(ingressQueueInfo_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.internal_static_InterfaceInfos_descriptor; @@ -1285,7 +1146,8 @@ private InterfaceInfos( private int bitField0_; public static final int IF_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object ifName_; + @SuppressWarnings("serial") + private volatile java.lang.Object ifName_ = ""; /** *
      * e.g., xe-0/0/0
@@ -1345,7 +1207,7 @@ public java.lang.String getIfName() {
     }
 
     public static final int INIT_TIME_FIELD_NUMBER = 2;
-    private long initTime_;
+    private long initTime_ = 0L;
     /**
      * 
      * time when if/stats last reset
@@ -1372,7 +1234,7 @@ public long getInitTime() {
     }
 
     public static final int SNMP_IF_INDEX_FIELD_NUMBER = 3;
-    private int snmpIfIndex_;
+    private int snmpIfIndex_ = 0;
     /**
      * 
      * Global Index
@@ -1399,7 +1261,8 @@ public int getSnmpIfIndex() {
     }
 
     public static final int PARENT_AE_NAME_FIELD_NUMBER = 4;
-    private volatile java.lang.Object parentAeName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object parentAeName_ = "";
     /**
      * 
      * name of parent for ae interface, if applicable
@@ -1459,6 +1322,7 @@ public java.lang.String getParentAeName() {
     }
 
     public static final int EGRESS_QUEUE_INFO_FIELD_NUMBER = 5;
+    @SuppressWarnings("serial")
     private java.util.List egressQueueInfo_;
     /**
      * 
@@ -1519,6 +1383,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStatsO
     }
 
     public static final int INGRESS_QUEUE_INFO_FIELD_NUMBER = 6;
+    @SuppressWarnings("serial")
     private java.util.List ingressQueueInfo_;
     /**
      * 
@@ -1753,7 +1618,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000040) != 0)) {
         output.writeMessage(9, getIngressErrors());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1796,7 +1661,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(9, getIngressErrors());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1850,7 +1715,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getIngressErrors()
             .equals(other.getIngressErrors())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1898,7 +1763,7 @@ public int hashCode() {
         hash = (37 * hash) + INGRESS_ERRORS_FIELD_NUMBER;
         hash = (53 * hash) + getIngressErrors().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1947,11 +1812,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.Inte
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2036,44 +1903,40 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         ifName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         initTime_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         snmpIfIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         parentAeName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
         if (egressQueueInfoBuilder_ == null) {
           egressQueueInfo_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
+          egressQueueInfo_ = null;
           egressQueueInfoBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000010);
         if (ingressQueueInfoBuilder_ == null) {
           ingressQueueInfo_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
+          ingressQueueInfo_ = null;
           ingressQueueInfoBuilder_.clear();
         }
-        if (ingressStatsBuilder_ == null) {
-          ingressStats_ = null;
-        } else {
-          ingressStatsBuilder_.clear();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        ingressStats_ = null;
+        if (ingressStatsBuilder_ != null) {
+          ingressStatsBuilder_.dispose();
+          ingressStatsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000040);
-        if (egressStatsBuilder_ == null) {
-          egressStats_ = null;
-        } else {
-          egressStatsBuilder_.clear();
+        egressStats_ = null;
+        if (egressStatsBuilder_ != null) {
+          egressStatsBuilder_.dispose();
+          egressStatsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000080);
-        if (ingressErrorsBuilder_ == null) {
-          ingressErrors_ = null;
-        } else {
-          ingressErrorsBuilder_.clear();
+        ingressErrors_ = null;
+        if (ingressErrorsBuilder_ != null) {
+          ingressErrorsBuilder_.dispose();
+          ingressErrorsBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
 
@@ -2100,24 +1963,13 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceIn
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.ifName_ = ifName_;
-        if (((from_bitField0_ & 0x00000002) != 0)) {
-          result.initTime_ = initTime_;
-          to_bitField0_ |= 0x00000002;
-        }
-        if (((from_bitField0_ & 0x00000004) != 0)) {
-          result.snmpIfIndex_ = snmpIfIndex_;
-          to_bitField0_ |= 0x00000004;
-        }
-        if (((from_bitField0_ & 0x00000008) != 0)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.parentAeName_ = parentAeName_;
+        buildPartialRepeatedFields(result);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartialRepeatedFields(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos result) {
         if (egressQueueInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0)) {
             egressQueueInfo_ = java.util.Collections.unmodifiableList(egressQueueInfo_);
@@ -2136,33 +1988,46 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceIn
         } else {
           result.ingressQueueInfo_ = ingressQueueInfoBuilder_.build();
         }
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos result) {
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.ifName_ = ifName_;
+          to_bitField0_ |= 0x00000001;
+        }
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.initTime_ = initTime_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.snmpIfIndex_ = snmpIfIndex_;
+          to_bitField0_ |= 0x00000004;
+        }
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.parentAeName_ = parentAeName_;
+          to_bitField0_ |= 0x00000008;
+        }
         if (((from_bitField0_ & 0x00000040) != 0)) {
-          if (ingressStatsBuilder_ == null) {
-            result.ingressStats_ = ingressStats_;
-          } else {
-            result.ingressStats_ = ingressStatsBuilder_.build();
-          }
+          result.ingressStats_ = ingressStatsBuilder_ == null
+              ? ingressStats_
+              : ingressStatsBuilder_.build();
           to_bitField0_ |= 0x00000010;
         }
         if (((from_bitField0_ & 0x00000080) != 0)) {
-          if (egressStatsBuilder_ == null) {
-            result.egressStats_ = egressStats_;
-          } else {
-            result.egressStats_ = egressStatsBuilder_.build();
-          }
+          result.egressStats_ = egressStatsBuilder_ == null
+              ? egressStats_
+              : egressStatsBuilder_.build();
           to_bitField0_ |= 0x00000020;
         }
         if (((from_bitField0_ & 0x00000100) != 0)) {
-          if (ingressErrorsBuilder_ == null) {
-            result.ingressErrors_ = ingressErrors_;
-          } else {
-            result.ingressErrors_ = ingressErrorsBuilder_.build();
-          }
+          result.ingressErrors_ = ingressErrorsBuilder_ == null
+              ? ingressErrors_
+              : ingressErrorsBuilder_.build();
           to_bitField0_ |= 0x00000040;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2210,8 +2075,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos.getDefaultInstance()) return this;
         if (other.hasIfName()) {
-          bitField0_ |= 0x00000001;
           ifName_ = other.ifName_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasInitTime()) {
@@ -2221,8 +2086,8 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
           setSnmpIfIndex(other.getSnmpIfIndex());
         }
         if (other.hasParentAeName()) {
-          bitField0_ |= 0x00000008;
           parentAeName_ = other.parentAeName_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (egressQueueInfoBuilder_ == null) {
@@ -2286,7 +2151,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasIngressErrors()) {
           mergeIngressErrors(other.getIngressErrors());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2317,17 +2182,97 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos 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: {
+                ifName_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                initTime_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                snmpIfIndex_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                parentAeName_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 42: {
+                org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats m =
+                    input.readMessage(
+                        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats.PARSER,
+                        extensionRegistry);
+                if (egressQueueInfoBuilder_ == null) {
+                  ensureEgressQueueInfoIsMutable();
+                  egressQueueInfo_.add(m);
+                } else {
+                  egressQueueInfoBuilder_.addMessage(m);
+                }
+                break;
+              } // case 42
+              case 50: {
+                org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats m =
+                    input.readMessage(
+                        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats.PARSER,
+                        extensionRegistry);
+                if (ingressQueueInfoBuilder_ == null) {
+                  ensureIngressQueueInfoIsMutable();
+                  ingressQueueInfo_.add(m);
+                } else {
+                  ingressQueueInfoBuilder_.addMessage(m);
+                }
+                break;
+              } // case 50
+              case 58: {
+                input.readMessage(
+                    getIngressStatsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 58
+              case 66: {
+                input.readMessage(
+                    getEgressStatsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 66
+              case 74: {
+                input.readMessage(
+                    getIngressErrorsFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 74
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceInfos) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2398,11 +2343,9 @@ public java.lang.String getIfName() {
        */
       public Builder setIfName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         ifName_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2415,8 +2358,8 @@ public Builder setIfName(
        * @return This builder for chaining.
        */
       public Builder clearIfName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         ifName_ = getDefaultInstance().getIfName();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2431,11 +2374,9 @@ public Builder clearIfName() {
        */
       public Builder setIfNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         ifName_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2475,8 +2416,9 @@ public long getInitTime() {
        * @return This builder for chaining.
        */
       public Builder setInitTime(long value) {
-        bitField0_ |= 0x00000002;
+
         initTime_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2530,8 +2472,9 @@ public int getSnmpIfIndex() {
        * @return This builder for chaining.
        */
       public Builder setSnmpIfIndex(int value) {
-        bitField0_ |= 0x00000004;
+
         snmpIfIndex_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2616,11 +2559,9 @@ public java.lang.String getParentAeName() {
        */
       public Builder setParentAeName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         parentAeName_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2633,8 +2574,8 @@ public Builder setParentAeName(
        * @return This builder for chaining.
        */
       public Builder clearParentAeName() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         parentAeName_ = getDefaultInstance().getParentAeName();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -2649,11 +2590,9 @@ public Builder clearParentAeName() {
        */
       public Builder setParentAeNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         parentAeName_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -3324,11 +3263,11 @@ public Builder setIngressStats(org.opennms.netmgt.telemetry.protocols.jti.adapte
             throw new NullPointerException();
           }
           ingressStats_ = value;
-          onChanged();
         } else {
           ingressStatsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000040;
+        onChanged();
         return this;
       }
       /**
@@ -3342,11 +3281,11 @@ public Builder setIngressStats(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.Builder builderForValue) {
         if (ingressStatsBuilder_ == null) {
           ingressStats_ = builderForValue.build();
-          onChanged();
         } else {
           ingressStatsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000040;
+        onChanged();
         return this;
       }
       /**
@@ -3359,18 +3298,19 @@ public Builder setIngressStats(
       public Builder mergeIngressStats(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats value) {
         if (ingressStatsBuilder_ == null) {
           if (((bitField0_ & 0x00000040) != 0) &&
-              ingressStats_ != null &&
-              ingressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.getDefaultInstance()) {
-            ingressStats_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.newBuilder(ingressStats_).mergeFrom(value).buildPartial();
+            ingressStats_ != null &&
+            ingressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.getDefaultInstance()) {
+            getIngressStatsBuilder().mergeFrom(value);
           } else {
             ingressStats_ = value;
           }
-          onChanged();
         } else {
           ingressStatsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000040;
+        if (ingressStats_ != null) {
+          bitField0_ |= 0x00000040;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -3381,13 +3321,13 @@ public Builder mergeIngressStats(org.opennms.netmgt.telemetry.protocols.jti.adap
        * optional .InterfaceStats ingress_stats = 7;
        */
       public Builder clearIngressStats() {
-        if (ingressStatsBuilder_ == null) {
-          ingressStats_ = null;
-          onChanged();
-        } else {
-          ingressStatsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000040);
+        ingressStats_ = null;
+        if (ingressStatsBuilder_ != null) {
+          ingressStatsBuilder_.dispose();
+          ingressStatsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3480,11 +3420,11 @@ public Builder setEgressStats(org.opennms.netmgt.telemetry.protocols.jti.adapter
             throw new NullPointerException();
           }
           egressStats_ = value;
-          onChanged();
         } else {
           egressStatsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /**
@@ -3498,11 +3438,11 @@ public Builder setEgressStats(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.Builder builderForValue) {
         if (egressStatsBuilder_ == null) {
           egressStats_ = builderForValue.build();
-          onChanged();
         } else {
           egressStatsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000080;
+        onChanged();
         return this;
       }
       /**
@@ -3515,18 +3455,19 @@ public Builder setEgressStats(
       public Builder mergeEgressStats(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats value) {
         if (egressStatsBuilder_ == null) {
           if (((bitField0_ & 0x00000080) != 0) &&
-              egressStats_ != null &&
-              egressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.getDefaultInstance()) {
-            egressStats_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.newBuilder(egressStats_).mergeFrom(value).buildPartial();
+            egressStats_ != null &&
+            egressStats_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.getDefaultInstance()) {
+            getEgressStatsBuilder().mergeFrom(value);
           } else {
             egressStats_ = value;
           }
-          onChanged();
         } else {
           egressStatsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000080;
+        if (egressStats_ != null) {
+          bitField0_ |= 0x00000080;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -3537,13 +3478,13 @@ public Builder mergeEgressStats(org.opennms.netmgt.telemetry.protocols.jti.adapt
        * optional .InterfaceStats egress_stats = 8;
        */
       public Builder clearEgressStats() {
-        if (egressStatsBuilder_ == null) {
-          egressStats_ = null;
-          onChanged();
-        } else {
-          egressStatsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000080);
+        egressStats_ = null;
+        if (egressStatsBuilder_ != null) {
+          egressStatsBuilder_.dispose();
+          egressStatsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3636,11 +3577,11 @@ public Builder setIngressErrors(org.opennms.netmgt.telemetry.protocols.jti.adapt
             throw new NullPointerException();
           }
           ingressErrors_ = value;
-          onChanged();
         } else {
           ingressErrorsBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -3654,11 +3595,11 @@ public Builder setIngressErrors(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.Builder builderForValue) {
         if (ingressErrorsBuilder_ == null) {
           ingressErrors_ = builderForValue.build();
-          onChanged();
         } else {
           ingressErrorsBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -3671,18 +3612,19 @@ public Builder setIngressErrors(
       public Builder mergeIngressErrors(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors value) {
         if (ingressErrorsBuilder_ == null) {
           if (((bitField0_ & 0x00000100) != 0) &&
-              ingressErrors_ != null &&
-              ingressErrors_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.getDefaultInstance()) {
-            ingressErrors_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.newBuilder(ingressErrors_).mergeFrom(value).buildPartial();
+            ingressErrors_ != null &&
+            ingressErrors_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.getDefaultInstance()) {
+            getIngressErrorsBuilder().mergeFrom(value);
           } else {
             ingressErrors_ = value;
           }
-          onChanged();
         } else {
           ingressErrorsBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000100;
+        if (ingressErrors_ != null) {
+          bitField0_ |= 0x00000100;
+          onChanged();
+        }
         return this;
       }
       /**
@@ -3693,13 +3635,13 @@ public Builder mergeIngressErrors(org.opennms.netmgt.telemetry.protocols.jti.ada
        * optional .IngressInterfaceErrors ingress_errors = 9;
        */
       public Builder clearIngressErrors() {
-        if (ingressErrorsBuilder_ == null) {
-          ingressErrors_ = null;
-          onChanged();
-        } else {
-          ingressErrorsBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000100);
+        ingressErrors_ = null;
+        if (ingressErrorsBuilder_ != null) {
+          ingressErrorsBuilder_.dispose();
+          ingressErrorsBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -3782,7 +3724,18 @@ public InterfaceInfos parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new InterfaceInfos(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();
       }
     };
 
@@ -3961,84 +3914,6 @@ protected java.lang.Object newInstance(
       return new InterfaceStats();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private InterfaceStats(
-        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;
-              ifPkts_ = input.readUInt64();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              ifOctets_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              if1SecPkts_ = input.readUInt64();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              if1SecOctets_ = input.readUInt64();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              ifUcPkts_ = input.readUInt64();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              ifMcPkts_ = input.readUInt64();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              ifBcPkts_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.internal_static_InterfaceStats_descriptor;
@@ -4054,7 +3929,7 @@ private InterfaceStats(
 
     private int bitField0_;
     public static final int IF_PKTS_FIELD_NUMBER = 1;
-    private long ifPkts_;
+    private long ifPkts_ = 0L;
     /**
      * 
      * Counter: the total number of packets sent/rcvd by this interface
@@ -4081,7 +3956,7 @@ public long getIfPkts() {
     }
 
     public static final int IF_OCTETS_FIELD_NUMBER = 2;
-    private long ifOctets_;
+    private long ifOctets_ = 0L;
     /**
      * 
      * Counter: the total number of bytes sent/rcvd by this interface
@@ -4108,7 +3983,7 @@ public long getIfOctets() {
     }
 
     public static final int IF_1SEC_PKTS_FIELD_NUMBER = 3;
-    private long if1SecPkts_;
+    private long if1SecPkts_ = 0L;
     /**
      * 
      * Rate: the rate at which packets are sent/rcvd by this interface (in packets/sec)
@@ -4135,7 +4010,7 @@ public long getIf1SecPkts() {
     }
 
     public static final int IF_1SEC_OCTETS_FIELD_NUMBER = 4;
-    private long if1SecOctets_;
+    private long if1SecOctets_ = 0L;
     /**
      * 
      * Rate: the rate at which bytes are sent/rcvd by this interface
@@ -4162,7 +4037,7 @@ public long getIf1SecOctets() {
     }
 
     public static final int IF_UC_PKTS_FIELD_NUMBER = 5;
-    private long ifUcPkts_;
+    private long ifUcPkts_ = 0L;
     /**
      * 
      * Counter: total no of unicast packets sent/rcvd by this interface
@@ -4189,7 +4064,7 @@ public long getIfUcPkts() {
     }
 
     public static final int IF_MC_PKTS_FIELD_NUMBER = 6;
-    private long ifMcPkts_;
+    private long ifMcPkts_ = 0L;
     /**
      * 
      * Counter: total no of multicast packets sent/rcvd by this interface
@@ -4216,7 +4091,7 @@ public long getIfMcPkts() {
     }
 
     public static final int IF_BC_PKTS_FIELD_NUMBER = 7;
-    private long ifBcPkts_;
+    private long ifBcPkts_ = 0L;
     /**
      * 
      * Counter: total no of broadcast packets sent/rcvd by this interface
@@ -4305,7 +4180,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000040) != 0)) {
         output.writeUInt64(7, ifBcPkts_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4342,7 +4217,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(7, ifBcPkts_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4392,7 +4267,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getIfBcPkts()
             != other.getIfBcPkts()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -4438,7 +4313,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getIfBcPkts());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4487,11 +4362,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.Inte
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4555,36 +4432,25 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         ifPkts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         ifOctets_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         if1SecPkts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         if1SecOctets_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         ifUcPkts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         ifMcPkts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000020);
         ifBcPkts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
@@ -4611,6 +4477,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceSt
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4641,9 +4513,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceSt
           result.ifBcPkts_ = ifBcPkts_;
           to_bitField0_ |= 0x00000040;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -4711,7 +4581,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasIfBcPkts()) {
           setIfBcPkts(other.getIfBcPkts());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4747,17 +4617,65 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats 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: {
+                ifPkts_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                ifOctets_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                if1SecPkts_ = input.readUInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                if1SecOctets_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                ifUcPkts_ = input.readUInt64();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                ifMcPkts_ = input.readUInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 56: {
+                ifBcPkts_ = input.readUInt64();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.InterfaceStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -4797,8 +4715,9 @@ public long getIfPkts() {
        * @return This builder for chaining.
        */
       public Builder setIfPkts(long value) {
-        bitField0_ |= 0x00000001;
+
         ifPkts_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -4852,8 +4771,9 @@ public long getIfOctets() {
        * @return This builder for chaining.
        */
       public Builder setIfOctets(long value) {
-        bitField0_ |= 0x00000002;
+
         ifOctets_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -4907,8 +4827,9 @@ public long getIf1SecPkts() {
        * @return This builder for chaining.
        */
       public Builder setIf1SecPkts(long value) {
-        bitField0_ |= 0x00000004;
+
         if1SecPkts_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -4962,8 +4883,9 @@ public long getIf1SecOctets() {
        * @return This builder for chaining.
        */
       public Builder setIf1SecOctets(long value) {
-        bitField0_ |= 0x00000008;
+
         if1SecOctets_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -5017,8 +4939,9 @@ public long getIfUcPkts() {
        * @return This builder for chaining.
        */
       public Builder setIfUcPkts(long value) {
-        bitField0_ |= 0x00000010;
+
         ifUcPkts_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -5072,8 +4995,9 @@ public long getIfMcPkts() {
        * @return This builder for chaining.
        */
       public Builder setIfMcPkts(long value) {
-        bitField0_ |= 0x00000020;
+
         ifMcPkts_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -5127,8 +5051,9 @@ public long getIfBcPkts() {
        * @return This builder for chaining.
        */
       public Builder setIfBcPkts(long value) {
-        bitField0_ |= 0x00000040;
+
         ifBcPkts_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -5179,7 +5104,18 @@ public InterfaceStats parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new InterfaceStats(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();
       }
     };
 
@@ -5415,99 +5351,6 @@ protected java.lang.Object newInstance(
       return new IngressInterfaceErrors();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private IngressInterfaceErrors(
-        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;
-              ifInErrors_ = input.readUInt64();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              ifInQdrops_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              ifInFrameErrors_ = input.readUInt64();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              ifInDiscards_ = input.readUInt64();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              ifInRunts_ = input.readUInt64();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              ifInL3Incompletes_ = input.readUInt64();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              ifInL2ChanErrors_ = input.readUInt64();
-              break;
-            }
-            case 64: {
-              bitField0_ |= 0x00000080;
-              ifInL2MismatchTimeouts_ = input.readUInt64();
-              break;
-            }
-            case 72: {
-              bitField0_ |= 0x00000100;
-              ifInFifoErrors_ = input.readUInt64();
-              break;
-            }
-            case 80: {
-              bitField0_ |= 0x00000200;
-              ifInResourceErrors_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.internal_static_IngressInterfaceErrors_descriptor;
@@ -5523,7 +5366,7 @@ private IngressInterfaceErrors(
 
     private int bitField0_;
     public static final int IF_IN_ERRORS_FIELD_NUMBER = 1;
-    private long ifInErrors_;
+    private long ifInErrors_ = 0L;
     /**
      * 
      * Counter: the number of packets that contained errors
@@ -5550,7 +5393,7 @@ public long getIfInErrors() {
     }
 
     public static final int IF_IN_QDROPS_FIELD_NUMBER = 2;
-    private long ifInQdrops_;
+    private long ifInQdrops_ = 0L;
     /**
      * 
      * Counter: the number of packets dropped by the input queue of the I/O Manager ASIC
@@ -5577,7 +5420,7 @@ public long getIfInQdrops() {
     }
 
     public static final int IF_IN_FRAME_ERRORS_FIELD_NUMBER = 3;
-    private long ifInFrameErrors_;
+    private long ifInFrameErrors_ = 0L;
     /**
      * 
      * Counter: the number of packets which were misaligned
@@ -5604,7 +5447,7 @@ public long getIfInFrameErrors() {
     }
 
     public static final int IF_IN_DISCARDS_FIELD_NUMBER = 4;
-    private long ifInDiscards_;
+    private long ifInDiscards_ = 0L;
     /**
      * 
      * Counter: the number of non-errorpackets which were chosen to be discarded
@@ -5631,7 +5474,7 @@ public long getIfInDiscards() {
     }
 
     public static final int IF_IN_RUNTS_FIELD_NUMBER = 5;
-    private long ifInRunts_;
+    private long ifInRunts_ = 0L;
     /**
      * 
      * Counter: the number of runt packets
@@ -5658,7 +5501,7 @@ public long getIfInRunts() {
     }
 
     public static final int IF_IN_L3_INCOMPLETES_FIELD_NUMBER = 6;
-    private long ifInL3Incompletes_;
+    private long ifInL3Incompletes_ = 0L;
     /**
      * 
      * Counter: the number of packets that fail Layer 3 sanity checks of the header
@@ -5685,7 +5528,7 @@ public long getIfInL3Incompletes() {
     }
 
     public static final int IF_IN_L2CHAN_ERRORS_FIELD_NUMBER = 7;
-    private long ifInL2ChanErrors_;
+    private long ifInL2ChanErrors_ = 0L;
     /**
      * 
      * Counter: the number of packets for which the software could not find a valid logical interface
@@ -5712,7 +5555,7 @@ public long getIfInL2ChanErrors() {
     }
 
     public static final int IF_IN_L2_MISMATCH_TIMEOUTS_FIELD_NUMBER = 8;
-    private long ifInL2MismatchTimeouts_;
+    private long ifInL2MismatchTimeouts_ = 0L;
     /**
      * 
      * Counter: the number of malform or short packets
@@ -5739,7 +5582,7 @@ public long getIfInL2MismatchTimeouts() {
     }
 
     public static final int IF_IN_FIFO_ERRORS_FIELD_NUMBER = 9;
-    private long ifInFifoErrors_;
+    private long ifInFifoErrors_ = 0L;
     /**
      * 
      * Counter: the number of FIFO errors
@@ -5766,7 +5609,7 @@ public long getIfInFifoErrors() {
     }
 
     public static final int IF_IN_RESOURCE_ERRORS_FIELD_NUMBER = 10;
-    private long ifInResourceErrors_;
+    private long ifInResourceErrors_ = 0L;
     /**
      * 
      * Counter: the number of resourceerrors
@@ -5836,7 +5679,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000200) != 0)) {
         output.writeUInt64(10, ifInResourceErrors_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -5885,7 +5728,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(10, ifInResourceErrors_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -5950,7 +5793,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getIfInResourceErrors()
             != other.getIfInResourceErrors()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -6011,7 +5854,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getIfInResourceErrors());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -6060,11 +5903,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.Ingr
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6128,42 +5973,28 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         ifInErrors_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
         ifInQdrops_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         ifInFrameErrors_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         ifInDiscards_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         ifInRunts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         ifInL3Incompletes_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000020);
         ifInL2ChanErrors_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000040);
         ifInL2MismatchTimeouts_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000080);
         ifInFifoErrors_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000100);
         ifInResourceErrors_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
 
@@ -6190,6 +6021,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInte
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6232,9 +6069,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInte
           result.ifInResourceErrors_ = ifInResourceErrors_;
           to_bitField0_ |= 0x00000200;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -6311,7 +6146,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasIfInResourceErrors()) {
           setIfInResourceErrors(other.getIfInResourceErrors());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -6326,17 +6161,80 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors 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: {
+                ifInErrors_ = input.readUInt64();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                ifInQdrops_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                ifInFrameErrors_ = input.readUInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                ifInDiscards_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                ifInRunts_ = input.readUInt64();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                ifInL3Incompletes_ = input.readUInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 56: {
+                ifInL2ChanErrors_ = input.readUInt64();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              case 64: {
+                ifInL2MismatchTimeouts_ = input.readUInt64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 64
+              case 72: {
+                ifInFifoErrors_ = input.readUInt64();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 72
+              case 80: {
+                ifInResourceErrors_ = input.readUInt64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 80
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.IngressInterfaceErrors) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -6376,8 +6274,9 @@ public long getIfInErrors() {
        * @return This builder for chaining.
        */
       public Builder setIfInErrors(long value) {
-        bitField0_ |= 0x00000001;
+
         ifInErrors_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -6431,8 +6330,9 @@ public long getIfInQdrops() {
        * @return This builder for chaining.
        */
       public Builder setIfInQdrops(long value) {
-        bitField0_ |= 0x00000002;
+
         ifInQdrops_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -6486,8 +6386,9 @@ public long getIfInFrameErrors() {
        * @return This builder for chaining.
        */
       public Builder setIfInFrameErrors(long value) {
-        bitField0_ |= 0x00000004;
+
         ifInFrameErrors_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -6541,8 +6442,9 @@ public long getIfInDiscards() {
        * @return This builder for chaining.
        */
       public Builder setIfInDiscards(long value) {
-        bitField0_ |= 0x00000008;
+
         ifInDiscards_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -6596,8 +6498,9 @@ public long getIfInRunts() {
        * @return This builder for chaining.
        */
       public Builder setIfInRunts(long value) {
-        bitField0_ |= 0x00000010;
+
         ifInRunts_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -6651,8 +6554,9 @@ public long getIfInL3Incompletes() {
        * @return This builder for chaining.
        */
       public Builder setIfInL3Incompletes(long value) {
-        bitField0_ |= 0x00000020;
+
         ifInL3Incompletes_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -6706,8 +6610,9 @@ public long getIfInL2ChanErrors() {
        * @return This builder for chaining.
        */
       public Builder setIfInL2ChanErrors(long value) {
-        bitField0_ |= 0x00000040;
+
         ifInL2ChanErrors_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -6761,8 +6666,9 @@ public long getIfInL2MismatchTimeouts() {
        * @return This builder for chaining.
        */
       public Builder setIfInL2MismatchTimeouts(long value) {
-        bitField0_ |= 0x00000080;
+
         ifInL2MismatchTimeouts_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -6816,8 +6722,9 @@ public long getIfInFifoErrors() {
        * @return This builder for chaining.
        */
       public Builder setIfInFifoErrors(long value) {
-        bitField0_ |= 0x00000100;
+
         ifInFifoErrors_ = value;
+        bitField0_ |= 0x00000100;
         onChanged();
         return this;
       }
@@ -6871,8 +6778,9 @@ public long getIfInResourceErrors() {
        * @return This builder for chaining.
        */
       public Builder setIfInResourceErrors(long value) {
-        bitField0_ |= 0x00000200;
+
         ifInResourceErrors_ = value;
+        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -6923,7 +6831,18 @@ public IngressInterfaceErrors parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new IngressInterfaceErrors(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();
       }
     };
 
@@ -7189,109 +7108,6 @@ protected java.lang.Object newInstance(
       return new QueueStats();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private QueueStats(
-        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;
-              queueNumber_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              packets_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              bytes_ = input.readUInt64();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              tailDropPackets_ = input.readUInt64();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              rlDropPackets_ = input.readUInt64();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              rlDropBytes_ = input.readUInt64();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              redDropPackets_ = input.readUInt64();
-              break;
-            }
-            case 64: {
-              bitField0_ |= 0x00000080;
-              redDropBytes_ = input.readUInt64();
-              break;
-            }
-            case 72: {
-              bitField0_ |= 0x00000100;
-              avgBufferOccupancy_ = input.readUInt64();
-              break;
-            }
-            case 80: {
-              bitField0_ |= 0x00000200;
-              curBufferOccupancy_ = input.readUInt64();
-              break;
-            }
-            case 88: {
-              bitField0_ |= 0x00000400;
-              peakBufferOccupancy_ = input.readUInt64();
-              break;
-            }
-            case 96: {
-              bitField0_ |= 0x00000800;
-              allocatedBufferSize_ = input.readUInt64();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.internal_static_QueueStats_descriptor;
@@ -7307,7 +7123,7 @@ private QueueStats(
 
     private int bitField0_;
     public static final int QUEUE_NUMBER_FIELD_NUMBER = 1;
-    private int queueNumber_;
+    private int queueNumber_ = 0;
     /**
      * optional uint32 queue_number = 1 [(.telemetry_options) = { ... }
      * @return Whether the queueNumber field is set.
@@ -7326,7 +7142,7 @@ public int getQueueNumber() {
     }
 
     public static final int PACKETS_FIELD_NUMBER = 2;
-    private long packets_;
+    private long packets_ = 0L;
     /**
      * 
      * Counter: the total number of packets that have been added to this queue
@@ -7353,7 +7169,7 @@ public long getPackets() {
     }
 
     public static final int BYTES_FIELD_NUMBER = 3;
-    private long bytes_;
+    private long bytes_ = 0L;
     /**
      * 
      * Counter: the total number of bytes that have been added to this queue
@@ -7380,7 +7196,7 @@ public long getBytes() {
     }
 
     public static final int TAIL_DROP_PACKETS_FIELD_NUMBER = 4;
-    private long tailDropPackets_;
+    private long tailDropPackets_ = 0L;
     /**
      * 
      * Counter: the total number of tail dropped packets
@@ -7407,7 +7223,7 @@ public long getTailDropPackets() {
     }
 
     public static final int RL_DROP_PACKETS_FIELD_NUMBER = 5;
-    private long rlDropPackets_;
+    private long rlDropPackets_ = 0L;
     /**
      * 
      * Counter: the total number of rate-limitd packets
@@ -7434,7 +7250,7 @@ public long getRlDropPackets() {
     }
 
     public static final int RL_DROP_BYTES_FIELD_NUMBER = 6;
-    private long rlDropBytes_;
+    private long rlDropBytes_ = 0L;
     /**
      * 
      * Counter: the total number of rate-limited bytes
@@ -7461,7 +7277,7 @@ public long getRlDropBytes() {
     }
 
     public static final int RED_DROP_PACKETS_FIELD_NUMBER = 7;
-    private long redDropPackets_;
+    private long redDropPackets_ = 0L;
     /**
      * 
      * Counter: the total number of red-dropped packets
@@ -7488,7 +7304,7 @@ public long getRedDropPackets() {
     }
 
     public static final int RED_DROP_BYTES_FIELD_NUMBER = 8;
-    private long redDropBytes_;
+    private long redDropBytes_ = 0L;
     /**
      * 
      * Counter: the total number of red-dropped bytes
@@ -7515,7 +7331,7 @@ public long getRedDropBytes() {
     }
 
     public static final int AVG_BUFFER_OCCUPANCY_FIELD_NUMBER = 9;
-    private long avgBufferOccupancy_;
+    private long avgBufferOccupancy_ = 0L;
     /**
      * 
      * Average: avg queue depth,TAQL:time-average-queue-len, in packets, details TBD
@@ -7542,7 +7358,7 @@ public long getAvgBufferOccupancy() {
     }
 
     public static final int CUR_BUFFER_OCCUPANCY_FIELD_NUMBER = 10;
-    private long curBufferOccupancy_;
+    private long curBufferOccupancy_ = 0L;
     /**
      * 
      * Gauge: current queue depth, in packets
@@ -7569,7 +7385,7 @@ public long getCurBufferOccupancy() {
     }
 
     public static final int PEAK_BUFFER_OCCUPANCY_FIELD_NUMBER = 11;
-    private long peakBufferOccupancy_;
+    private long peakBufferOccupancy_ = 0L;
     /**
      * 
      * Peak: the max measured queue depth, in packets, across all measurements since bo ot.
@@ -7596,7 +7412,7 @@ public long getPeakBufferOccupancy() {
     }
 
     public static final int ALLOCATED_BUFFER_SIZE_FIELD_NUMBER = 12;
-    private long allocatedBufferSize_;
+    private long allocatedBufferSize_ = 0L;
     /**
      * 
      * allocated buffer size
@@ -7672,7 +7488,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000800) != 0)) {
         output.writeUInt64(12, allocatedBufferSize_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -7729,7 +7545,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(12, allocatedBufferSize_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -7804,7 +7620,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getAllocatedBufferSize()
             != other.getAllocatedBufferSize()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -7874,7 +7690,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
             getAllocatedBufferSize());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -7923,11 +7739,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.Queu
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7991,46 +7809,30 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         queueNumber_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
         packets_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
         bytes_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000004);
         tailDropPackets_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
         rlDropPackets_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         rlDropBytes_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000020);
         redDropPackets_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000040);
         redDropBytes_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000080);
         avgBufferOccupancy_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000100);
         curBufferOccupancy_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000200);
         peakBufferOccupancy_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000400);
         allocatedBufferSize_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000800);
         return this;
       }
 
@@ -8057,6 +7859,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -8107,9 +7915,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats
           result.allocatedBufferSize_ = allocatedBufferSize_;
           to_bitField0_ |= 0x00000800;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -8192,7 +7998,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasAllocatedBufferSize()) {
           setAllocatedBufferSize(other.getAllocatedBufferSize());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -8207,17 +8013,90 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats 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: {
+                queueNumber_ = input.readUInt32();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                packets_ = input.readUInt64();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                bytes_ = input.readUInt64();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                tailDropPackets_ = input.readUInt64();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              case 40: {
+                rlDropPackets_ = input.readUInt64();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                rlDropBytes_ = input.readUInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 56: {
+                redDropPackets_ = input.readUInt64();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              case 64: {
+                redDropBytes_ = input.readUInt64();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 64
+              case 72: {
+                avgBufferOccupancy_ = input.readUInt64();
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 72
+              case 80: {
+                curBufferOccupancy_ = input.readUInt64();
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 80
+              case 88: {
+                peakBufferOccupancy_ = input.readUInt64();
+                bitField0_ |= 0x00000400;
+                break;
+              } // case 88
+              case 96: {
+                allocatedBufferSize_ = input.readUInt64();
+                bitField0_ |= 0x00000800;
+                break;
+              } // case 96
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Port.QueueStats) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -8245,8 +8124,9 @@ public int getQueueNumber() {
        * @return This builder for chaining.
        */
       public Builder setQueueNumber(int value) {
-        bitField0_ |= 0x00000001;
+
         queueNumber_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -8296,8 +8176,9 @@ public long getPackets() {
        * @return This builder for chaining.
        */
       public Builder setPackets(long value) {
-        bitField0_ |= 0x00000002;
+
         packets_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -8351,8 +8232,9 @@ public long getBytes() {
        * @return This builder for chaining.
        */
       public Builder setBytes(long value) {
-        bitField0_ |= 0x00000004;
+
         bytes_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -8406,8 +8288,9 @@ public long getTailDropPackets() {
        * @return This builder for chaining.
        */
       public Builder setTailDropPackets(long value) {
-        bitField0_ |= 0x00000008;
+
         tailDropPackets_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -8461,8 +8344,9 @@ public long getRlDropPackets() {
        * @return This builder for chaining.
        */
       public Builder setRlDropPackets(long value) {
-        bitField0_ |= 0x00000010;
+
         rlDropPackets_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -8516,8 +8400,9 @@ public long getRlDropBytes() {
        * @return This builder for chaining.
        */
       public Builder setRlDropBytes(long value) {
-        bitField0_ |= 0x00000020;
+
         rlDropBytes_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -8571,8 +8456,9 @@ public long getRedDropPackets() {
        * @return This builder for chaining.
        */
       public Builder setRedDropPackets(long value) {
-        bitField0_ |= 0x00000040;
+
         redDropPackets_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -8626,8 +8512,9 @@ public long getRedDropBytes() {
        * @return This builder for chaining.
        */
       public Builder setRedDropBytes(long value) {
-        bitField0_ |= 0x00000080;
+
         redDropBytes_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -8681,8 +8568,9 @@ public long getAvgBufferOccupancy() {
        * @return This builder for chaining.
        */
       public Builder setAvgBufferOccupancy(long value) {
-        bitField0_ |= 0x00000100;
+
         avgBufferOccupancy_ = value;
+        bitField0_ |= 0x00000100;
         onChanged();
         return this;
       }
@@ -8736,8 +8624,9 @@ public long getCurBufferOccupancy() {
        * @return This builder for chaining.
        */
       public Builder setCurBufferOccupancy(long value) {
-        bitField0_ |= 0x00000200;
+
         curBufferOccupancy_ = value;
+        bitField0_ |= 0x00000200;
         onChanged();
         return this;
       }
@@ -8791,8 +8680,9 @@ public long getPeakBufferOccupancy() {
        * @return This builder for chaining.
        */
       public Builder setPeakBufferOccupancy(long value) {
-        bitField0_ |= 0x00000400;
+
         peakBufferOccupancy_ = value;
+        bitField0_ |= 0x00000400;
         onChanged();
         return this;
       }
@@ -8846,8 +8736,9 @@ public long getAllocatedBufferSize() {
        * @return This builder for chaining.
        */
       public Builder setAllocatedBufferSize(long value) {
-        bitField0_ |= 0x00000800;
+
         allocatedBufferSize_ = value;
+        bitField0_ |= 0x00000800;
         onChanged();
         return this;
       }
@@ -8898,7 +8789,18 @@ public QueueStats parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new QueueStats(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();
       }
     };
 
diff --git a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/TelemetryTop.java b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/TelemetryTop.java
index 6757693bd77e..05eb64a9031f 100644
--- a/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/TelemetryTop.java
+++ b/features/telemetry/protocols/jti/adapter/src/main/java/org/opennms/netmgt/telemetry/protocols/jti/adapter/proto/TelemetryTop.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2017-2022 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2022 The OpenNMS Group, Inc.
+ * Copyright (C) 2017-2023 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -114,69 +114,6 @@ protected java.lang.Object newInstance(
       return new TelemetryFieldOptions();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TelemetryFieldOptions(
-        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;
-              isKey_ = input.readBool();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              isTimestamp_ = input.readBool();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              isCounter_ = input.readBool();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              isGauge_ = input.readBool();
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.internal_static_TelemetryFieldOptions_descriptor;
@@ -192,7 +129,7 @@ private TelemetryFieldOptions(
 
     private int bitField0_;
     public static final int IS_KEY_FIELD_NUMBER = 1;
-    private boolean isKey_;
+    private boolean isKey_ = false;
     /**
      * optional bool is_key = 1;
      * @return Whether the isKey field is set.
@@ -211,7 +148,7 @@ public boolean getIsKey() {
     }
 
     public static final int IS_TIMESTAMP_FIELD_NUMBER = 2;
-    private boolean isTimestamp_;
+    private boolean isTimestamp_ = false;
     /**
      * optional bool is_timestamp = 2;
      * @return Whether the isTimestamp field is set.
@@ -230,7 +167,7 @@ public boolean getIsTimestamp() {
     }
 
     public static final int IS_COUNTER_FIELD_NUMBER = 3;
-    private boolean isCounter_;
+    private boolean isCounter_ = false;
     /**
      * optional bool is_counter = 3;
      * @return Whether the isCounter field is set.
@@ -249,7 +186,7 @@ public boolean getIsCounter() {
     }
 
     public static final int IS_GAUGE_FIELD_NUMBER = 4;
-    private boolean isGauge_;
+    private boolean isGauge_ = false;
     /**
      * optional bool is_gauge = 4;
      * @return Whether the isGauge field is set.
@@ -293,7 +230,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBool(4, isGauge_);
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -318,7 +255,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(4, isGauge_);
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -353,7 +290,7 @@ public boolean equals(final java.lang.Object obj) {
         if (getIsGauge()
             != other.getIsGauge()) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -384,7 +321,7 @@ public int hashCode() {
         hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
             getIsGauge());
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -433,11 +370,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Telemetry
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -501,30 +440,22 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         isKey_ = false;
-        bitField0_ = (bitField0_ & ~0x00000001);
         isTimestamp_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
         isCounter_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
         isGauge_ = false;
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -551,6 +482,12 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.Tel
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -569,9 +506,7 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.Tel
           result.isGauge_ = isGauge_;
           to_bitField0_ |= 0x00000008;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -630,7 +565,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasIsGauge()) {
           setIsGauge(other.getIsGauge());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -645,17 +580,50 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions 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: {
+                isKey_ = input.readBool();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 8
+              case 16: {
+                isTimestamp_ = input.readBool();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                isCounter_ = input.readBool();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 32: {
+                isGauge_ = input.readBool();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 32
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryFieldOptions) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -683,8 +651,9 @@ public boolean getIsKey() {
        * @return This builder for chaining.
        */
       public Builder setIsKey(boolean value) {
-        bitField0_ |= 0x00000001;
+
         isKey_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -722,8 +691,9 @@ public boolean getIsTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setIsTimestamp(boolean value) {
-        bitField0_ |= 0x00000002;
+
         isTimestamp_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -761,8 +731,9 @@ public boolean getIsCounter() {
        * @return This builder for chaining.
        */
       public Builder setIsCounter(boolean value) {
-        bitField0_ |= 0x00000004;
+
         isCounter_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -800,8 +771,9 @@ public boolean getIsGauge() {
        * @return This builder for chaining.
        */
       public Builder setIsGauge(boolean value) {
-        bitField0_ |= 0x00000008;
+
         isGauge_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -848,7 +820,18 @@ public TelemetryFieldOptions parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TelemetryFieldOptions(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();
       }
     };
 
@@ -1100,117 +1083,6 @@ protected java.lang.Object newInstance(
       return new TelemetryStream();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private TelemetryStream(
-        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;
-              systemId_ = bs;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              componentId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              subComponentId_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              com.google.protobuf.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000008;
-              sensorName_ = bs;
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              sequenceNumber_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              timestamp_ = input.readUInt64();
-              break;
-            }
-            case 56: {
-              bitField0_ |= 0x00000040;
-              versionMajor_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-              bitField0_ |= 0x00000080;
-              versionMinor_ = input.readUInt32();
-              break;
-            }
-            case 802: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000100) != 0)) {
-                subBuilder = ietf_.toBuilder();
-              }
-              ietf_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(ietf_);
-                ietf_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000100;
-              break;
-            }
-            case 810: {
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000200) != 0)) {
-                subBuilder = enterprise_.toBuilder();
-              }
-              enterprise_ = input.readMessage(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(enterprise_);
-                enterprise_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000200;
-              break;
-            }
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.internal_static_TelemetryStream_descriptor;
@@ -1226,7 +1098,8 @@ private TelemetryStream(
 
     private int bitField0_;
     public static final int SYSTEM_ID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object systemId_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object systemId_ = "";
     /**
      * 
      * router name or export IP address
@@ -1286,7 +1159,7 @@ public java.lang.String getSystemId() {
     }
 
     public static final int COMPONENT_ID_FIELD_NUMBER = 2;
-    private int componentId_;
+    private int componentId_ = 0;
     /**
      * 
      * line card / RE (slot number)
@@ -1313,7 +1186,7 @@ public int getComponentId() {
     }
 
     public static final int SUB_COMPONENT_ID_FIELD_NUMBER = 3;
-    private int subComponentId_;
+    private int subComponentId_ = 0;
     /**
      * 
      * PFE (if applicable)
@@ -1340,7 +1213,8 @@ public int getSubComponentId() {
     }
 
     public static final int SENSOR_NAME_FIELD_NUMBER = 4;
-    private volatile java.lang.Object sensorName_;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object sensorName_ = "";
     /**
      * 
      * configured sensor name
@@ -1400,7 +1274,7 @@ public java.lang.String getSensorName() {
     }
 
     public static final int SEQUENCE_NUMBER_FIELD_NUMBER = 5;
-    private int sequenceNumber_;
+    private int sequenceNumber_ = 0;
     /**
      * 
      * sequence number, monotonically increasesing for each
@@ -1429,7 +1303,7 @@ public int getSequenceNumber() {
     }
 
     public static final int TIMESTAMP_FIELD_NUMBER = 6;
-    private long timestamp_;
+    private long timestamp_ = 0L;
     /**
      * 
      * timestamp (milliseconds since 00:00:00 UTC 1/1/1970)
@@ -1456,7 +1330,7 @@ public long getTimestamp() {
     }
 
     public static final int VERSION_MAJOR_FIELD_NUMBER = 7;
-    private int versionMajor_;
+    private int versionMajor_ = 0;
     /**
      * 
      * major version
@@ -1483,7 +1357,7 @@ public int getVersionMajor() {
     }
 
     public static final int VERSION_MINOR_FIELD_NUMBER = 8;
-    private int versionMinor_;
+    private int versionMinor_ = 0;
     /**
      * 
      * minor version
@@ -1621,7 +1495,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000200) != 0)) {
         output.writeMessage(101, getEnterprise());
       }
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -1668,7 +1542,7 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(101, getEnterprise());
       }
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -1733,7 +1607,7 @@ public boolean equals(final java.lang.Object obj) {
         if (!getEnterprise()
             .equals(other.getEnterprise())) return false;
       }
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       return true;
     }
 
@@ -1785,7 +1659,7 @@ public int hashCode() {
         hash = (37 * hash) + ENTERPRISE_FIELD_NUMBER;
         hash = (53 * hash) + getEnterprise().hashCode();
       }
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -1834,11 +1708,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Telemetry
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1920,34 +1796,25 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        bitField0_ = 0;
         systemId_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
         componentId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
         subComponentId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
         sensorName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
         sequenceNumber_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000010);
         timestamp_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000020);
         versionMajor_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000040);
         versionMinor_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000080);
-        if (ietfBuilder_ == null) {
-          ietf_ = null;
-        } else {
-          ietfBuilder_.clear();
+        ietf_ = null;
+        if (ietfBuilder_ != null) {
+          ietfBuilder_.dispose();
+          ietfBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000100);
-        if (enterpriseBuilder_ == null) {
-          enterprise_ = null;
-        } else {
-          enterpriseBuilder_.clear();
+        enterprise_ = null;
+        if (enterpriseBuilder_ != null) {
+          enterpriseBuilder_.dispose();
+          enterpriseBuilder_ = null;
         }
-        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
 
@@ -1974,12 +1841,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.Tel
       @java.lang.Override
       public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream buildPartial() {
         org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream result = new org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream(this);
+        if (bitField0_ != 0) { buildPartial0(result); }
+        onBuilt();
+        return result;
+      }
+
+      private void buildPartial0(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
+          result.systemId_ = systemId_;
           to_bitField0_ |= 0x00000001;
         }
-        result.systemId_ = systemId_;
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.componentId_ = componentId_;
           to_bitField0_ |= 0x00000002;
@@ -1989,9 +1862,9 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.Tel
           to_bitField0_ |= 0x00000004;
         }
         if (((from_bitField0_ & 0x00000008) != 0)) {
+          result.sensorName_ = sensorName_;
           to_bitField0_ |= 0x00000008;
         }
-        result.sensorName_ = sensorName_;
         if (((from_bitField0_ & 0x00000010) != 0)) {
           result.sequenceNumber_ = sequenceNumber_;
           to_bitField0_ |= 0x00000010;
@@ -2009,24 +1882,18 @@ public org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.Tel
           to_bitField0_ |= 0x00000080;
         }
         if (((from_bitField0_ & 0x00000100) != 0)) {
-          if (ietfBuilder_ == null) {
-            result.ietf_ = ietf_;
-          } else {
-            result.ietf_ = ietfBuilder_.build();
-          }
+          result.ietf_ = ietfBuilder_ == null
+              ? ietf_
+              : ietfBuilder_.build();
           to_bitField0_ |= 0x00000100;
         }
         if (((from_bitField0_ & 0x00000200) != 0)) {
-          if (enterpriseBuilder_ == null) {
-            result.enterprise_ = enterprise_;
-          } else {
-            result.enterprise_ = enterpriseBuilder_.build();
-          }
+          result.enterprise_ = enterpriseBuilder_ == null
+              ? enterprise_
+              : enterpriseBuilder_.build();
           to_bitField0_ |= 0x00000200;
         }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        result.bitField0_ |= to_bitField0_;
       }
 
       @java.lang.Override
@@ -2074,8 +1941,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream.getDefaultInstance()) return this;
         if (other.hasSystemId()) {
-          bitField0_ |= 0x00000001;
           systemId_ = other.systemId_;
+          bitField0_ |= 0x00000001;
           onChanged();
         }
         if (other.hasComponentId()) {
@@ -2085,8 +1952,8 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
           setSubComponentId(other.getSubComponentId());
         }
         if (other.hasSensorName()) {
-          bitField0_ |= 0x00000008;
           sensorName_ = other.sensorName_;
+          bitField0_ |= 0x00000008;
           onChanged();
         }
         if (other.hasSequenceNumber()) {
@@ -2107,7 +1974,7 @@ public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.prot
         if (other.hasEnterprise()) {
           mergeEnterprise(other.getEnterprise());
         }
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -2135,17 +2002,84 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream 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: {
+                systemId_ = input.readBytes();
+                bitField0_ |= 0x00000001;
+                break;
+              } // case 10
+              case 16: {
+                componentId_ = input.readUInt32();
+                bitField0_ |= 0x00000002;
+                break;
+              } // case 16
+              case 24: {
+                subComponentId_ = input.readUInt32();
+                bitField0_ |= 0x00000004;
+                break;
+              } // case 24
+              case 34: {
+                sensorName_ = input.readBytes();
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 34
+              case 40: {
+                sequenceNumber_ = input.readUInt32();
+                bitField0_ |= 0x00000010;
+                break;
+              } // case 40
+              case 48: {
+                timestamp_ = input.readUInt64();
+                bitField0_ |= 0x00000020;
+                break;
+              } // case 48
+              case 56: {
+                versionMajor_ = input.readUInt32();
+                bitField0_ |= 0x00000040;
+                break;
+              } // case 56
+              case 64: {
+                versionMinor_ = input.readUInt32();
+                bitField0_ |= 0x00000080;
+                break;
+              } // case 64
+              case 802: {
+                input.readMessage(
+                    getIetfFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000100;
+                break;
+              } // case 802
+              case 810: {
+                input.readMessage(
+                    getEnterpriseFieldBuilder().getBuilder(),
+                    extensionRegistry);
+                bitField0_ |= 0x00000200;
+                break;
+              } // case 810
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.TelemetryStream) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       private int bitField0_;
@@ -2216,11 +2150,9 @@ public java.lang.String getSystemId() {
        */
       public Builder setSystemId(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         systemId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2233,8 +2165,8 @@ public Builder setSystemId(
        * @return This builder for chaining.
        */
       public Builder clearSystemId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
         systemId_ = getDefaultInstance().getSystemId();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -2249,11 +2181,9 @@ public Builder clearSystemId() {
        */
       public Builder setSystemIdBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
+        if (value == null) { throw new NullPointerException(); }
         systemId_ = value;
+        bitField0_ |= 0x00000001;
         onChanged();
         return this;
       }
@@ -2293,8 +2223,9 @@ public int getComponentId() {
        * @return This builder for chaining.
        */
       public Builder setComponentId(int value) {
-        bitField0_ |= 0x00000002;
+
         componentId_ = value;
+        bitField0_ |= 0x00000002;
         onChanged();
         return this;
       }
@@ -2348,8 +2279,9 @@ public int getSubComponentId() {
        * @return This builder for chaining.
        */
       public Builder setSubComponentId(int value) {
-        bitField0_ |= 0x00000004;
+
         subComponentId_ = value;
+        bitField0_ |= 0x00000004;
         onChanged();
         return this;
       }
@@ -2434,11 +2366,9 @@ public java.lang.String getSensorName() {
        */
       public Builder setSensorName(
           java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         sensorName_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2451,8 +2381,8 @@ public Builder setSensorName(
        * @return This builder for chaining.
        */
       public Builder clearSensorName() {
-        bitField0_ = (bitField0_ & ~0x00000008);
         sensorName_ = getDefaultInstance().getSensorName();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
@@ -2467,11 +2397,9 @@ public Builder clearSensorName() {
        */
       public Builder setSensorNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
+        if (value == null) { throw new NullPointerException(); }
         sensorName_ = value;
+        bitField0_ |= 0x00000008;
         onChanged();
         return this;
       }
@@ -2514,8 +2442,9 @@ public int getSequenceNumber() {
        * @return This builder for chaining.
        */
       public Builder setSequenceNumber(int value) {
-        bitField0_ |= 0x00000010;
+
         sequenceNumber_ = value;
+        bitField0_ |= 0x00000010;
         onChanged();
         return this;
       }
@@ -2570,8 +2499,9 @@ public long getTimestamp() {
        * @return This builder for chaining.
        */
       public Builder setTimestamp(long value) {
-        bitField0_ |= 0x00000020;
+
         timestamp_ = value;
+        bitField0_ |= 0x00000020;
         onChanged();
         return this;
       }
@@ -2625,8 +2555,9 @@ public int getVersionMajor() {
        * @return This builder for chaining.
        */
       public Builder setVersionMajor(int value) {
-        bitField0_ |= 0x00000040;
+
         versionMajor_ = value;
+        bitField0_ |= 0x00000040;
         onChanged();
         return this;
       }
@@ -2680,8 +2611,9 @@ public int getVersionMinor() {
        * @return This builder for chaining.
        */
       public Builder setVersionMinor(int value) {
-        bitField0_ |= 0x00000080;
+
         versionMinor_ = value;
+        bitField0_ |= 0x00000080;
         onChanged();
         return this;
       }
@@ -2730,11 +2662,11 @@ public Builder setIetf(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.
             throw new NullPointerException();
           }
           ietf_ = value;
-          onChanged();
         } else {
           ietfBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -2744,11 +2676,11 @@ public Builder setIetf(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.Builder builderForValue) {
         if (ietfBuilder_ == null) {
           ietf_ = builderForValue.build();
-          onChanged();
         } else {
           ietfBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000100;
+        onChanged();
         return this;
       }
       /**
@@ -2757,31 +2689,32 @@ public Builder setIetf(
       public Builder mergeIetf(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors value) {
         if (ietfBuilder_ == null) {
           if (((bitField0_ & 0x00000100) != 0) &&
-              ietf_ != null &&
-              ietf_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.getDefaultInstance()) {
-            ietf_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.newBuilder(ietf_).mergeFrom(value).buildPartial();
+            ietf_ != null &&
+            ietf_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.getDefaultInstance()) {
+            getIetfBuilder().mergeFrom(value);
           } else {
             ietf_ = value;
           }
-          onChanged();
         } else {
           ietfBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000100;
+        if (ietf_ != null) {
+          bitField0_ |= 0x00000100;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .IETFSensors ietf = 100;
        */
       public Builder clearIetf() {
-        if (ietfBuilder_ == null) {
-          ietf_ = null;
-          onChanged();
-        } else {
-          ietfBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000100);
+        ietf_ = null;
+        if (ietfBuilder_ != null) {
+          ietfBuilder_.dispose();
+          ietfBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2850,11 +2783,11 @@ public Builder setEnterprise(org.opennms.netmgt.telemetry.protocols.jti.adapter.
             throw new NullPointerException();
           }
           enterprise_ = value;
-          onChanged();
         } else {
           enterpriseBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000200;
+        onChanged();
         return this;
       }
       /**
@@ -2864,11 +2797,11 @@ public Builder setEnterprise(
           org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.Builder builderForValue) {
         if (enterpriseBuilder_ == null) {
           enterprise_ = builderForValue.build();
-          onChanged();
         } else {
           enterpriseBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000200;
+        onChanged();
         return this;
       }
       /**
@@ -2877,31 +2810,32 @@ public Builder setEnterprise(
       public Builder mergeEnterprise(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors value) {
         if (enterpriseBuilder_ == null) {
           if (((bitField0_ & 0x00000200) != 0) &&
-              enterprise_ != null &&
-              enterprise_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.getDefaultInstance()) {
-            enterprise_ =
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.newBuilder(enterprise_).mergeFrom(value).buildPartial();
+            enterprise_ != null &&
+            enterprise_ != org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.getDefaultInstance()) {
+            getEnterpriseBuilder().mergeFrom(value);
           } else {
             enterprise_ = value;
           }
-          onChanged();
         } else {
           enterpriseBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000200;
+        if (enterprise_ != null) {
+          bitField0_ |= 0x00000200;
+          onChanged();
+        }
         return this;
       }
       /**
        * optional .EnterpriseSensors enterprise = 101;
        */
       public Builder clearEnterprise() {
-        if (enterpriseBuilder_ == null) {
-          enterprise_ = null;
-          onChanged();
-        } else {
-          enterpriseBuilder_.clear();
-        }
         bitField0_ = (bitField0_ & ~0x00000200);
+        enterprise_ = null;
+        if (enterpriseBuilder_ != null) {
+          enterpriseBuilder_.dispose();
+          enterpriseBuilder_ = null;
+        }
+        onChanged();
         return this;
       }
       /**
@@ -2972,7 +2906,18 @@ public TelemetryStream parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TelemetryStream(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();
       }
     };
 
@@ -3020,48 +2965,6 @@ protected java.lang.Object newInstance(
       return new IETFSensors();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private IETFSensors(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.internal_static_IETFSensors_descriptor;
@@ -3097,7 +3000,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         .ExtendableMessage.ExtensionWriter
           extensionWriter = newExtensionWriter();
       extensionWriter.writeUntil(536870912, output);
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3107,7 +3010,7 @@ public int getSerializedSize() {
 
       size = 0;
       size += extensionsSerializedSize();
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3122,7 +3025,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors other = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors) obj;
 
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       if (!getExtensionFields().equals(other.getExtensionFields()))
         return false;
       return true;
@@ -3136,7 +3039,7 @@ public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = hashFields(hash, getExtensionFields());
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3185,11 +3088,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Telemetry
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3254,18 +3159,13 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
@@ -3354,9 +3254,9 @@ public  Builder addExtension(
         return super.addExtension(extension, value);
       }
       @java.lang.Override
-      public  Builder clearExtension(
+      public  Builder clearExtension(
           com.google.protobuf.GeneratedMessage.GeneratedExtension<
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors, ?> extension) {
+              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors, T> extension) {
         return super.clearExtension(extension);
       }
       @java.lang.Override
@@ -3372,7 +3272,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors.getDefaultInstance()) return this;
         this.mergeExtensionFields(other);
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3390,17 +3290,30 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors 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;
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.IETFSensors) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       @java.lang.Override
@@ -3436,7 +3349,18 @@ public IETFSensors parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new IETFSensors(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();
       }
     };
 
@@ -3484,48 +3408,6 @@ protected java.lang.Object newInstance(
       return new EnterpriseSensors();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private EnterpriseSensors(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.internal_static_EnterpriseSensors_descriptor;
@@ -3561,7 +3443,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         .ExtendableMessage.ExtensionWriter
           extensionWriter = newExtensionWriter();
       extensionWriter.writeUntil(536870912, output);
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -3571,7 +3453,7 @@ public int getSerializedSize() {
 
       size = 0;
       size += extensionsSerializedSize();
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -3586,7 +3468,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors other = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors) obj;
 
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       if (!getExtensionFields().equals(other.getExtensionFields()))
         return false;
       return true;
@@ -3600,7 +3482,7 @@ public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = hashFields(hash, getExtensionFields());
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -3649,11 +3531,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Telemetry
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3718,18 +3602,13 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
@@ -3818,9 +3697,9 @@ public  Builder addExtension(
         return super.addExtension(extension, value);
       }
       @java.lang.Override
-      public  Builder clearExtension(
+      public  Builder clearExtension(
           com.google.protobuf.GeneratedMessage.GeneratedExtension<
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors, ?> extension) {
+              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors, T> extension) {
         return super.clearExtension(extension);
       }
       @java.lang.Override
@@ -3836,7 +3715,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors.getDefaultInstance()) return this;
         this.mergeExtensionFields(other);
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -3854,17 +3733,30 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors 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;
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.EnterpriseSensors) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       @java.lang.Override
@@ -3900,7 +3792,18 @@ public EnterpriseSensors parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new EnterpriseSensors(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();
       }
     };
 
@@ -3948,48 +3851,6 @@ protected java.lang.Object newInstance(
       return new JuniperNetworksSensors();
     }
 
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private JuniperNetworksSensors(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
       return org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.internal_static_JuniperNetworksSensors_descriptor;
@@ -4025,7 +3886,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         .ExtendableMessage.ExtensionWriter
           extensionWriter = newExtensionWriter();
       extensionWriter.writeUntil(536870912, output);
-      unknownFields.writeTo(output);
+      getUnknownFields().writeTo(output);
     }
 
     @java.lang.Override
@@ -4035,7 +3896,7 @@ public int getSerializedSize() {
 
       size = 0;
       size += extensionsSerializedSize();
-      size += unknownFields.getSerializedSize();
+      size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
     }
@@ -4050,7 +3911,7 @@ public boolean equals(final java.lang.Object obj) {
       }
       org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors other = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors) obj;
 
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getUnknownFields().equals(other.getUnknownFields())) return false;
       if (!getExtensionFields().equals(other.getExtensionFields()))
         return false;
       return true;
@@ -4064,7 +3925,7 @@ public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = hashFields(hash, getExtensionFields());
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -4113,11 +3974,13 @@ public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.Telemetry
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
+
     public static org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4182,18 +4045,13 @@ public static final class Builder extends
 
       // Construct using org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors.newBuilder()
       private Builder() {
-        maybeForceBuilderInitialization();
+
       }
 
       private Builder(
           com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
+
       }
       @java.lang.Override
       public Builder clear() {
@@ -4282,9 +4140,9 @@ public  Builder addExtension(
         return super.addExtension(extension, value);
       }
       @java.lang.Override
-      public  Builder clearExtension(
+      public  Builder clearExtension(
           com.google.protobuf.GeneratedMessage.GeneratedExtension<
-              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors, ?> extension) {
+              org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors, T> extension) {
         return super.clearExtension(extension);
       }
       @java.lang.Override
@@ -4300,7 +4158,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       public Builder mergeFrom(org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors other) {
         if (other == org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors.getDefaultInstance()) return this;
         this.mergeExtensionFields(other);
-        this.mergeUnknownFields(other.unknownFields);
+        this.mergeUnknownFields(other.getUnknownFields());
         onChanged();
         return this;
       }
@@ -4318,17 +4176,30 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors 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;
+              default: {
+                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                  done = true; // was an endgroup tag
+                }
+                break;
+              } // default:
+            } // switch (tag)
+          } // while (!done)
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.opennms.netmgt.telemetry.protocols.jti.adapter.proto.TelemetryTop.JuniperNetworksSensors) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
+          onChanged();
+        } // finally
         return this;
       }
       @java.lang.Override
@@ -4364,7 +4235,18 @@ public JuniperNetworksSensors parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JuniperNetworksSensors(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();
       }
     };
 
diff --git a/features/telemetry/protocols/netflow/transport/pom.xml b/features/telemetry/protocols/netflow/transport/pom.xml
index 7b13cdfd955a..d9e705dfc77b 100644
--- a/features/telemetry/protocols/netflow/transport/pom.xml
+++ b/features/telemetry/protocols/netflow/transport/pom.xml
@@ -16,11 +16,11 @@
   
 
     
-
     
@@ -36,14 +36,13 @@
           
         
       
-