diff --git a/CHANGELOG.md b/CHANGELOG.md index 13102d2f..61866b11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.14.9](https://github.com/googleapis/java-analytics-data/compare/v0.14.8...v0.14.9) (2022-10-05) + + +### Bug Fixes + +* update protobuf to v3.21.7 ([b3fb5c5](https://github.com/googleapis/java-analytics-data/commit/b3fb5c5bb57d6c3db8a9ce0a72682fd3411e35e3)) + ## [0.14.8](https://github.com/googleapis/java-analytics-data/compare/v0.14.7...v0.14.8) (2022-10-03) diff --git a/google-analytics-data-bom/pom.xml b/google-analytics-data-bom/pom.xml index cb89fa19..5b729178 100644 --- a/google-analytics-data-bom/pom.xml +++ b/google-analytics-data-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-data-bom - 0.14.8 + 0.14.9 pom com.google.cloud @@ -56,27 +56,27 @@ com.google.analytics google-analytics-data - 0.14.8 + 0.14.9 com.google.api.grpc grpc-google-analytics-data-v1beta - 0.14.8 + 0.14.9 com.google.api.grpc grpc-google-analytics-data-v1alpha - 0.14.8 + 0.14.9 com.google.api.grpc proto-google-analytics-data-v1beta - 0.14.8 + 0.14.9 com.google.api.grpc proto-google-analytics-data-v1alpha - 0.14.8 + 0.14.9 diff --git a/google-analytics-data/pom.xml b/google-analytics-data/pom.xml index e22a90a7..96f92c43 100644 --- a/google-analytics-data/pom.xml +++ b/google-analytics-data/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-data - 0.14.8 + 0.14.9 jar Google Analytics Data https://github.com/googleapis/java-analytics-data @@ -11,7 +11,7 @@ com.google.analytics google-analytics-data-parent - 0.14.8 + 0.14.9 google-analytics-data diff --git a/grpc-google-analytics-data-v1alpha/pom.xml b/grpc-google-analytics-data-v1alpha/pom.xml index df1c52d2..9523586f 100644 --- a/grpc-google-analytics-data-v1alpha/pom.xml +++ b/grpc-google-analytics-data-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-data-v1alpha - 0.14.8 + 0.14.9 grpc-google-analytics-data-v1alpha GRPC library for google-analytics-data com.google.analytics google-analytics-data-parent - 0.14.8 + 0.14.9 diff --git a/grpc-google-analytics-data-v1beta/pom.xml b/grpc-google-analytics-data-v1beta/pom.xml index b0f12fb1..f62a80a6 100644 --- a/grpc-google-analytics-data-v1beta/pom.xml +++ b/grpc-google-analytics-data-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-data-v1beta - 0.14.8 + 0.14.9 grpc-google-analytics-data-v1beta GRPC library for grpc-google-analytics-data-v1beta com.google.analytics google-analytics-data-parent - 0.14.8 + 0.14.9 diff --git a/pom.xml b/pom.xml index 5333e72e..e517cc54 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.analytics google-analytics-data-parent pom - 0.14.8 + 0.14.9 Google Analytics Data Parent https://github.com/googleapis/java-analytics-data @@ -61,27 +61,27 @@ com.google.analytics google-analytics-data - 0.14.8 + 0.14.9 com.google.api.grpc proto-google-analytics-data-v1alpha - 0.14.8 + 0.14.9 com.google.api.grpc grpc-google-analytics-data-v1alpha - 0.14.8 + 0.14.9 com.google.api.grpc proto-google-analytics-data-v1beta - 0.14.8 + 0.14.9 com.google.api.grpc grpc-google-analytics-data-v1beta - 0.14.8 + 0.14.9 diff --git a/proto-google-analytics-data-v1alpha/pom.xml b/proto-google-analytics-data-v1alpha/pom.xml index d8309b55..6f9d31a2 100644 --- a/proto-google-analytics-data-v1alpha/pom.xml +++ b/proto-google-analytics-data-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-data-v1alpha - 0.14.8 + 0.14.9 proto-google-analytics-data-v1alpha Proto library for google-analytics-data com.google.analytics google-analytics-data-parent - 0.14.8 + 0.14.9 diff --git a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/BetweenFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/BetweenFilter.java index d8bf74b5..4e683694 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/BetweenFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/BetweenFilter.java @@ -50,77 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BetweenFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.NumericValue.Builder subBuilder = null; - if (fromValue_ != null) { - subBuilder = fromValue_.toBuilder(); - } - fromValue_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(fromValue_); - fromValue_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1alpha.NumericValue.Builder subBuilder = null; - if (toValue_ != null) { - subBuilder = toValue_.toBuilder(); - } - toValue_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(toValue_); - toValue_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_BetweenFilter_descriptor; @@ -252,7 +181,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (toValue_ != null) { output.writeMessage(2, getToValue()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -267,7 +196,7 @@ public int getSerializedSize() { if (toValue_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getToValue()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -291,7 +220,7 @@ public boolean equals(final java.lang.Object obj) { if (hasToValue()) { if (!getToValue().equals(other.getToValue())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -310,7 +239,7 @@ public int hashCode() { hash = (37 * hash) + TO_VALUE_FIELD_NUMBER; hash = (53 * hash) + getToValue().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -439,17 +368,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.BetweenFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -560,7 +482,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.BetweenFilter other) if (other.hasToValue()) { mergeToValue(other.getToValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -575,17 +497,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.BetweenFilter 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(getFromValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getToValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.BetweenFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -993,7 +941,18 @@ public BetweenFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BetweenFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DateRange.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DateRange.java index c2fda774..04413cfb 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DateRange.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DateRange.java @@ -55,66 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DateRange( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - startDate_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - endDate_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_DateRange_descriptor; @@ -318,7 +258,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -336,7 +276,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -355,7 +295,7 @@ public boolean equals(final java.lang.Object obj) { if (!getStartDate().equals(other.getStartDate())) return false; if (!getEndDate().equals(other.getEndDate())) return false; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -372,7 +312,7 @@ public int hashCode() { hash = (53 * hash) + getEndDate().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -502,17 +442,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.DateRange.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -615,7 +548,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.DateRange other) { name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -630,17 +563,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.DateRange 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: + { + startDate_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + endDate_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + name_ = input.readStringRequireUtf8(); + + 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 = (com.google.analytics.data.v1alpha.DateRange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1039,7 +1004,18 @@ public DateRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DateRange(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Dimension.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Dimension.java index 1f4b3d48..5176e475 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Dimension.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Dimension.java @@ -54,69 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Dimension( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.DimensionExpression.Builder subBuilder = null; - if (dimensionExpression_ != null) { - subBuilder = dimensionExpression_.toBuilder(); - } - dimensionExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.DimensionExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionExpression_); - dimensionExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_Dimension_descriptor; @@ -271,7 +208,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (dimensionExpression_ != null) { output.writeMessage(2, getDimensionExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -286,7 +223,7 @@ public int getSerializedSize() { if (dimensionExpression_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDimensionExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -307,7 +244,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDimensionExpression()) { if (!getDimensionExpression().equals(other.getDimensionExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -324,7 +261,7 @@ public int hashCode() { hash = (37 * hash) + DIMENSION_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getDimensionExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -455,17 +392,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.Dimension.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -568,7 +498,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.Dimension other) { if (other.hasDimensionExpression()) { mergeDimensionExpression(other.getDimensionExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -583,17 +513,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.Dimension 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.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + input.readMessage( + getDimensionExpressionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.Dimension) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -979,7 +936,18 @@ public Dimension parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Dimension(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionExpression.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionExpression.java index 2defd65d..f412ae79 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionExpression.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionExpression.java @@ -53,115 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 34: - { - com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression.Builder - subBuilder = null; - if (oneExpressionCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression) - oneExpression_) - .toBuilder(); - } - oneExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression) - oneExpression_); - oneExpression_ = subBuilder.buildPartial(); - } - oneExpressionCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression.Builder - subBuilder = null; - if (oneExpressionCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression) - oneExpression_) - .toBuilder(); - } - oneExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression) - oneExpression_); - oneExpression_ = subBuilder.buildPartial(); - } - oneExpressionCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression.Builder - subBuilder = null; - if (oneExpressionCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression) - oneExpression_) - .toBuilder(); - } - oneExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression) - oneExpression_); - oneExpression_ = subBuilder.buildPartial(); - } - oneExpressionCase_ = 6; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_DimensionExpression_descriptor; @@ -243,52 +134,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CaseExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - dimensionName_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_DimensionExpression_CaseExpression_descriptor; @@ -372,7 +217,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dimensionName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, dimensionName_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -384,7 +229,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dimensionName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, dimensionName_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -401,7 +246,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression) obj; if (!getDimensionName().equals(other.getDimensionName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -414,7 +259,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + DIMENSION_NAME_FIELD_NUMBER; hash = (53 * hash) + getDimensionName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -548,17 +393,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -656,7 +494,7 @@ public Builder mergeFrom( dimensionName_ = other.dimensionName_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -671,19 +509,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression 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: + { + dimensionName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.DimensionExpression.CaseExpression) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -833,7 +689,19 @@ public CaseExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CaseExpression(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(); } }; @@ -983,66 +851,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ConcatenateExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionNames_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionNames_.add(s); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - delimiter_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionNames_ = dimensionNames_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_DimensionExpression_ConcatenateExpression_descriptor; @@ -1203,7 +1011,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(delimiter_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, delimiter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1223,7 +1031,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(delimiter_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, delimiter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1242,7 +1050,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionNamesList().equals(other.getDimensionNamesList())) return false; if (!getDelimiter().equals(other.getDelimiter())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1259,7 +1067,7 @@ public int hashCode() { } hash = (37 * hash) + DELIMITER_FIELD_NUMBER; hash = (53 * hash) + getDelimiter().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1399,17 +1207,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1528,7 +1329,7 @@ public Builder mergeFrom( delimiter_ = other.delimiter_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1543,20 +1344,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression 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: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDimensionNamesIsMutable(); + dimensionNames_.add(s); + break; + } // case 10 + case 18: + { + delimiter_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1906,7 +1731,19 @@ public ConcatenateExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ConcatenateExpression(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(); } }; @@ -2175,7 +2012,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io (com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression) oneExpression_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2205,7 +2042,7 @@ public int getSerializedSize() { (com.google.analytics.data.v1alpha.DimensionExpression.ConcatenateExpression) oneExpression_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2235,7 +2072,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2262,7 +2099,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2395,22 +2232,24 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.DimensionExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (lowerCaseBuilder_ != null) { + lowerCaseBuilder_.clear(); + } + if (upperCaseBuilder_ != null) { + upperCaseBuilder_.clear(); + } + if (concatenateBuilder_ != null) { + concatenateBuilder_.clear(); + } oneExpressionCase_ = 0; oneExpression_ = null; return this; @@ -2533,7 +2372,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.DimensionExpression o break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2548,18 +2387,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.DimensionExpression 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 34: + { + input.readMessage(getLowerCaseFieldBuilder().getBuilder(), extensionRegistry); + oneExpressionCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getUpperCaseFieldBuilder().getBuilder(), extensionRegistry); + oneExpressionCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getConcatenateFieldBuilder().getBuilder(), extensionRegistry); + oneExpressionCase_ = 6; + break; + } // case 50 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.DimensionExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3335,7 +3205,18 @@ public DimensionExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionExpression(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionHeader.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionHeader.java index 418da030..b62c7c52 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionHeader.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionHeader.java @@ -55,52 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionHeader( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_DimensionHeader_descriptor; @@ -182,7 +136,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -194,7 +148,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -211,7 +165,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.DimensionHeader) obj; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -224,7 +178,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -356,17 +310,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.DimensionHeader.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -456,7 +403,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.DimensionHeader other name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -471,18 +418,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.DimensionHeader 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.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.DimensionHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -624,7 +590,18 @@ public DimensionHeader parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionHeader(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionValue.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionValue.java index b878cc79..6ab62c43 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionValue.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/DimensionValue.java @@ -50,52 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - oneValueCase_ = 1; - oneValue_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_DimensionValue_descriptor; @@ -242,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneValueCase_ == 1) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, oneValue_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -254,7 +208,7 @@ public int getSerializedSize() { if (oneValueCase_ == 1) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, oneValue_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -278,7 +232,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -297,7 +251,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -426,17 +380,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.DimensionValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -538,7 +485,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.DimensionValue other) break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -553,17 +500,38 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.DimensionValue 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: + { + java.lang.String s = input.readStringRequireUtf8(); + oneValueCase_ = 1; + oneValue_ = s; + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.DimensionValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -747,7 +715,18 @@ public DimensionValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionValue(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegment.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegment.java index e0291152..13b9ec3b 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegment.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegment.java @@ -52,79 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EventSegment( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.EventSegmentCriteria.Builder subBuilder = null; - if (eventInclusionCriteria_ != null) { - subBuilder = eventInclusionCriteria_.toBuilder(); - } - eventInclusionCriteria_ = - input.readMessage( - com.google.analytics.data.v1alpha.EventSegmentCriteria.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(eventInclusionCriteria_); - eventInclusionCriteria_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1alpha.EventSegmentExclusion.Builder subBuilder = null; - if (exclusion_ != null) { - subBuilder = exclusion_.toBuilder(); - } - exclusion_ = - input.readMessage( - com.google.analytics.data.v1alpha.EventSegmentExclusion.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(exclusion_); - exclusion_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_EventSegment_descriptor; @@ -257,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exclusion_ != null) { output.writeMessage(2, getExclusion()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -273,7 +200,7 @@ public int getSerializedSize() { if (exclusion_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExclusion()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -297,7 +224,7 @@ public boolean equals(final java.lang.Object obj) { if (hasExclusion()) { if (!getExclusion().equals(other.getExclusion())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -316,7 +243,7 @@ public int hashCode() { hash = (37 * hash) + EXCLUSION_FIELD_NUMBER; hash = (53 * hash) + getExclusion().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -447,17 +374,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.EventSegment.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -567,7 +487,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.EventSegment other) { if (other.hasExclusion()) { mergeExclusion(other.getExclusion()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -582,17 +502,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.EventSegment 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( + getEventInclusionCriteriaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getExclusionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.EventSegment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1015,7 +962,18 @@ public EventSegment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EventSegment(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentConditionGroup.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentConditionGroup.java index a504fc57..afd86f22 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentConditionGroup.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentConditionGroup.java @@ -53,69 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EventSegmentConditionGroup( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - conditionScoping_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SegmentFilterExpression.Builder subBuilder = null; - if (segmentFilterExpression_ != null) { - subBuilder = segmentFilterExpression_.toBuilder(); - } - segmentFilterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(segmentFilterExpression_); - segmentFilterExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_EventSegmentConditionGroup_descriptor; @@ -253,7 +190,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (segmentFilterExpression_ != null) { output.writeMessage(2, getSegmentFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -271,7 +208,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSegmentFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -292,7 +229,7 @@ public boolean equals(final java.lang.Object obj) { if (hasSegmentFilterExpression()) { if (!getSegmentFilterExpression().equals(other.getSegmentFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -309,7 +246,7 @@ public int hashCode() { hash = (37 * hash) + SEGMENT_FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getSegmentFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -440,17 +377,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.EventSegmentConditionGroup.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -555,7 +485,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.EventSegmentCondition if (other.hasSegmentFilterExpression()) { mergeSegmentFilterExpression(other.getSegmentFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -570,18 +500,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.EventSegmentConditionGroup 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: + { + conditionScoping_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getSegmentFilterExpressionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.EventSegmentConditionGroup) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -940,7 +896,18 @@ public EventSegmentConditionGroup parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EventSegmentConditionGroup(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentCriteria.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentCriteria.java index 960c6a2a..0dceb2c7 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentCriteria.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentCriteria.java @@ -53,63 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EventSegmentCriteria( - 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)) { - andConditionGroups_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.EventSegmentConditionGroup>(); - mutable_bitField0_ |= 0x00000001; - } - andConditionGroups_.add( - input.readMessage( - com.google.analytics.data.v1alpha.EventSegmentConditionGroup.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - andConditionGroups_ = java.util.Collections.unmodifiableList(andConditionGroups_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_EventSegmentCriteria_descriptor; @@ -231,7 +174,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < andConditionGroups_.size(); i++) { output.writeMessage(1, andConditionGroups_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -244,7 +187,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, andConditionGroups_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -261,7 +204,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.EventSegmentCriteria) obj; if (!getAndConditionGroupsList().equals(other.getAndConditionGroupsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -276,7 +219,7 @@ public int hashCode() { hash = (37 * hash) + AND_CONDITION_GROUPS_FIELD_NUMBER; hash = (53 * hash) + getAndConditionGroupsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -407,19 +350,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.EventSegmentCriteria.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getAndConditionGroupsFieldBuilder(); - } } @java.lang.Override @@ -427,10 +361,11 @@ public Builder clear() { super.clear(); if (andConditionGroupsBuilder_ == null) { andConditionGroups_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + andConditionGroups_ = null; andConditionGroupsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -545,7 +480,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.EventSegmentCriteria } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -560,18 +495,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.EventSegmentCriteria 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: + { + com.google.analytics.data.v1alpha.EventSegmentConditionGroup m = + input.readMessage( + com.google.analytics.data.v1alpha.EventSegmentConditionGroup.parser(), + extensionRegistry); + if (andConditionGroupsBuilder_ == null) { + ensureAndConditionGroupsIsMutable(); + andConditionGroups_.add(m); + } else { + andConditionGroupsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.EventSegmentCriteria) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1034,7 +996,18 @@ public EventSegmentCriteria parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EventSegmentCriteria(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentExclusion.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentExclusion.java index 952466f7..cb5f63d1 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentExclusion.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/EventSegmentExclusion.java @@ -52,69 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EventSegmentExclusion( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - eventExclusionDuration_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.EventSegmentCriteria.Builder subBuilder = null; - if (eventExclusionCriteria_ != null) { - subBuilder = eventExclusionCriteria_.toBuilder(); - } - eventExclusionCriteria_ = - input.readMessage( - com.google.analytics.data.v1alpha.EventSegmentCriteria.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(eventExclusionCriteria_); - eventExclusionCriteria_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_EventSegmentExclusion_descriptor; @@ -249,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (eventExclusionCriteria_ != null) { output.writeMessage(2, getEventExclusionCriteria()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -268,7 +205,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEventExclusionCriteria()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -289,7 +226,7 @@ public boolean equals(final java.lang.Object obj) { if (hasEventExclusionCriteria()) { if (!getEventExclusionCriteria().equals(other.getEventExclusionCriteria())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -306,7 +243,7 @@ public int hashCode() { hash = (37 * hash) + EVENT_EXCLUSION_CRITERIA_FIELD_NUMBER; hash = (53 * hash) + getEventExclusionCriteria().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -436,17 +373,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.EventSegmentExclusion.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -549,7 +479,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.EventSegmentExclusion if (other.hasEventExclusionCriteria()) { mergeEventExclusionCriteria(other.getEventExclusionCriteria()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -564,18 +494,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.EventSegmentExclusion 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: + { + eventExclusionDuration_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getEventExclusionCriteriaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.EventSegmentExclusion) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -929,7 +885,18 @@ public EventSegmentExclusion parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EventSegmentExclusion(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Filter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Filter.java index 1facc0d4..29038420 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Filter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Filter.java @@ -52,120 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Filter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - fieldName_ = s; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.StringFilter.Builder subBuilder = null; - if (oneFilterCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.StringFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.StringFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.StringFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.InListFilter.Builder subBuilder = null; - if (oneFilterCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.InListFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.InListFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.InListFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.NumericFilter.Builder subBuilder = null; - if (oneFilterCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.BetweenFilter.Builder subBuilder = null; - if (oneFilterCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.BetweenFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 5; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_Filter_descriptor; @@ -518,7 +404,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneFilterCase_ == 5) { output.writeMessage(5, (com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -550,7 +436,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 5, (com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -583,7 +469,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -616,7 +502,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -745,17 +631,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.Filter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -763,6 +642,18 @@ public Builder clear() { super.clear(); fieldName_ = ""; + if (stringFilterBuilder_ != null) { + stringFilterBuilder_.clear(); + } + if (inListFilterBuilder_ != null) { + inListFilterBuilder_.clear(); + } + if (numericFilterBuilder_ != null) { + numericFilterBuilder_.clear(); + } + if (betweenFilterBuilder_ != null) { + betweenFilterBuilder_.clear(); + } oneFilterCase_ = 0; oneFilter_ = null; return this; @@ -901,7 +792,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.Filter other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -916,17 +807,61 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.Filter 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: + { + fieldName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + input.readMessage(getStringFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getInListFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getNumericFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getBetweenFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 5; + 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 = (com.google.analytics.data.v1alpha.Filter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1927,7 +1862,18 @@ public Filter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Filter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpression.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpression.java index 07f68719..5ca3fe51 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpression.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpression.java @@ -51,117 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FilterExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.FilterExpressionList.Builder subBuilder = null; - if (exprCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1alpha.FilterExpressionList) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.FilterExpressionList.Builder subBuilder = null; - if (exprCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.FilterExpressionList) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.FilterExpression.Builder subBuilder = null; - if (exprCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.FilterExpression) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.FilterExpression) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.Filter.Builder subBuilder = null; - if (exprCase_ == 4) { - subBuilder = ((com.google.analytics.data.v1alpha.Filter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.Filter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.Filter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 4; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FilterExpression_descriptor; @@ -463,7 +352,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exprCase_ == 4) { output.writeMessage(4, (com.google.analytics.data.v1alpha.Filter) expr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -492,7 +381,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, (com.google.analytics.data.v1alpha.Filter) expr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -525,7 +414,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -556,7 +445,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -686,22 +575,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FilterExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (andGroupBuilder_ != null) { + andGroupBuilder_.clear(); + } + if (orGroupBuilder_ != null) { + orGroupBuilder_.clear(); + } + if (notExpressionBuilder_ != null) { + notExpressionBuilder_.clear(); + } + if (filterBuilder_ != null) { + filterBuilder_.clear(); + } exprCase_ = 0; expr_ = null; return this; @@ -836,7 +730,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FilterExpression othe break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -851,18 +745,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FilterExpression 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(getAndGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getOrGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getNotExpressionFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 4; + 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 = - (com.google.analytics.data.v1alpha.FilterExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1762,7 +1693,18 @@ public FilterExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FilterExpression(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpressionList.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpressionList.java index edb891d4..f9d4c14e 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpressionList.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FilterExpressionList.java @@ -52,62 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FilterExpressionList( - 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)) { - expressions_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - expressions_.add( - input.readMessage( - com.google.analytics.data.v1alpha.FilterExpression.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - expressions_ = java.util.Collections.unmodifiableList(expressions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FilterExpressionList_descriptor; @@ -210,7 +154,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < expressions_.size(); i++) { output.writeMessage(1, expressions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -222,7 +166,7 @@ public int getSerializedSize() { for (int i = 0; i < expressions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, expressions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -239,7 +183,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.FilterExpressionList) obj; if (!getExpressionsList().equals(other.getExpressionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -254,7 +198,7 @@ public int hashCode() { hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER; hash = (53 * hash) + getExpressionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -384,19 +328,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FilterExpressionList.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getExpressionsFieldBuilder(); - } } @java.lang.Override @@ -404,10 +339,11 @@ public Builder clear() { super.clear(); if (expressionsBuilder_ == null) { expressions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + expressions_ = null; expressionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -522,7 +458,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FilterExpressionList } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -537,18 +473,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FilterExpressionList 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: + { + com.google.analytics.data.v1alpha.FilterExpression m = + input.readMessage( + com.google.analytics.data.v1alpha.FilterExpression.parser(), + extensionRegistry); + if (expressionsBuilder_ == null) { + ensureExpressionsIsMutable(); + expressions_.add(m); + } else { + expressionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FilterExpressionList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -944,7 +907,18 @@ public FilterExpressionList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FilterExpressionList(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Funnel.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Funnel.java index 95c6463f..8dc646e3 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Funnel.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Funnel.java @@ -58,65 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Funnel( - 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: - { - isOpenFunnel_ = input.readBool(); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - steps_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - steps_.add( - input.readMessage( - com.google.analytics.data.v1alpha.FunnelStep.parser(), extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - steps_ = java.util.Collections.unmodifiableList(steps_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_Funnel_descriptor; @@ -241,7 +182,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < steps_.size(); i++) { output.writeMessage(2, steps_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -256,7 +197,7 @@ public int getSerializedSize() { for (int i = 0; i < steps_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, steps_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -273,7 +214,7 @@ public boolean equals(final java.lang.Object obj) { if (getIsOpenFunnel() != other.getIsOpenFunnel()) return false; if (!getStepsList().equals(other.getStepsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -290,7 +231,7 @@ public int hashCode() { hash = (37 * hash) + STEPS_FIELD_NUMBER; hash = (53 * hash) + getStepsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -425,19 +366,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.Funnel.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getStepsFieldBuilder(); - } } @java.lang.Override @@ -447,10 +379,11 @@ public Builder clear() { if (stepsBuilder_ == null) { steps_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + steps_ = null; stepsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -568,7 +501,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.Funnel other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -583,17 +516,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.Funnel 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: + { + isOpenFunnel_ = input.readBool(); + + break; + } // case 8 + case 18: + { + com.google.analytics.data.v1alpha.FunnelStep m = + input.readMessage( + com.google.analytics.data.v1alpha.FunnelStep.parser(), extensionRegistry); + if (stepsBuilder_ == null) { + ensureStepsIsMutable(); + steps_.add(m); + } else { + stepsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.Funnel) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1038,7 +1004,18 @@ public Funnel parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Funnel(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelBreakdown.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelBreakdown.java index 8c6651c5..b1bb9688 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelBreakdown.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelBreakdown.java @@ -50,68 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelBreakdown( - 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.analytics.data.v1alpha.Dimension.Builder subBuilder = null; - if (breakdownDimension_ != null) { - subBuilder = breakdownDimension_.toBuilder(); - } - breakdownDimension_ = - input.readMessage( - com.google.analytics.data.v1alpha.Dimension.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(breakdownDimension_); - breakdownDimension_ = subBuilder.buildPartial(); - } - - break; - } - case 16: - { - bitField0_ |= 0x00000001; - limit_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelBreakdown_descriptor; @@ -239,7 +177,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeInt64(2, limit_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -254,7 +192,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, limit_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -278,7 +216,7 @@ public boolean equals(final java.lang.Object obj) { if (hasLimit()) { if (getLimit() != other.getLimit()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -297,7 +235,7 @@ public int hashCode() { hash = (37 * hash) + LIMIT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getLimit()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -426,17 +364,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelBreakdown.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -545,7 +476,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelBreakdown other if (other.hasLimit()) { setLimit(other.getLimit()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -560,18 +491,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelBreakdown 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( + getBreakdownDimensionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 16: + { + limit_ = input.readInt64(); + bitField0_ |= 0x00000001; + 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 = - (com.google.analytics.data.v1alpha.FunnelBreakdown) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -888,7 +845,18 @@ public FunnelBreakdown parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelBreakdown(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelEventFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelEventFilter.java index f7453ba0..55c83c10 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelEventFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelEventFilter.java @@ -55,71 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelEventFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - eventName_ = s; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.Builder subBuilder = - null; - if (((bitField0_ & 0x00000002) != 0)) { - subBuilder = funnelParameterFilterExpression_.toBuilder(); - } - funnelParameterFilterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(funnelParameterFilterExpression_); - funnelParameterFilterExpression_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelEventFilter_descriptor; @@ -291,7 +226,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeMessage(2, getFunnelParameterFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -308,7 +243,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, getFunnelParameterFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -334,7 +269,7 @@ public boolean equals(final java.lang.Object obj) { if (!getFunnelParameterFilterExpression().equals(other.getFunnelParameterFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -353,7 +288,7 @@ public int hashCode() { hash = (37 * hash) + FUNNEL_PARAMETER_FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getFunnelParameterFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -611,7 +546,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelEventFilter oth if (other.hasFunnelParameterFilterExpression()) { mergeFunnelParameterFilterExpression(other.getFunnelParameterFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -626,18 +561,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelEventFilter 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: + { + eventName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: + { + input.readMessage( + getFunnelParameterFilterExpressionFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FunnelEventFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1042,7 +1004,18 @@ public FunnelEventFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelEventFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFieldFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFieldFilter.java index a613e147..d6b931d0 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFieldFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFieldFilter.java @@ -52,120 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelFieldFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - fieldName_ = s; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.StringFilter.Builder subBuilder = null; - if (oneFilterCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.StringFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.StringFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.StringFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.InListFilter.Builder subBuilder = null; - if (oneFilterCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.InListFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.InListFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.InListFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1alpha.NumericFilter.Builder subBuilder = null; - if (oneFilterCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 6; - break; - } - case 58: - { - com.google.analytics.data.v1alpha.BetweenFilter.Builder subBuilder = null; - if (oneFilterCase_ == 7) { - subBuilder = - ((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.BetweenFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 7; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelFieldFilter_descriptor; @@ -516,7 +402,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneFilterCase_ == 7) { output.writeMessage(7, (com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -548,7 +434,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 7, (com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -582,7 +468,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -615,7 +501,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -744,17 +630,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelFieldFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -762,6 +641,18 @@ public Builder clear() { super.clear(); fieldName_ = ""; + if (stringFilterBuilder_ != null) { + stringFilterBuilder_.clear(); + } + if (inListFilterBuilder_ != null) { + inListFilterBuilder_.clear(); + } + if (numericFilterBuilder_ != null) { + numericFilterBuilder_.clear(); + } + if (betweenFilterBuilder_ != null) { + betweenFilterBuilder_.clear(); + } oneFilterCase_ = 0; oneFilter_ = null; return this; @@ -901,7 +792,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelFieldFilter oth break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -916,18 +807,61 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelFieldFilter 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: + { + fieldName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 34: + { + input.readMessage(getStringFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getInListFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getNumericFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 6; + break; + } // case 50 + case 58: + { + input.readMessage(getBetweenFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 7; + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FunnelFieldFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1923,7 +1857,18 @@ public FunnelFieldFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelFieldFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpression.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpression.java index ec95a99a..1ec4a4a5 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpression.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpression.java @@ -50,142 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelFilterExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.FunnelFilterExpressionList.Builder subBuilder = - null; - if (exprCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelFilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.FunnelFilterExpressionList.Builder subBuilder = - null; - if (exprCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelFilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.FunnelFilterExpression.Builder subBuilder = null; - if (exprCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelFilterExpression) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelFilterExpression) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.FunnelFieldFilter.Builder subBuilder = null; - if (exprCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelFieldFilter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelFieldFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.FunnelFieldFilter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.FunnelEventFilter.Builder subBuilder = null; - if (exprCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelEventFilter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelEventFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.FunnelEventFilter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 5; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelFilterExpression_descriptor; @@ -555,7 +419,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exprCase_ == 5) { output.writeMessage(5, (com.google.analytics.data.v1alpha.FunnelEventFilter) expr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -589,7 +453,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 5, (com.google.analytics.data.v1alpha.FunnelEventFilter) expr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -625,7 +489,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -660,7 +524,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -790,22 +654,30 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelFilterExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (andGroupBuilder_ != null) { + andGroupBuilder_.clear(); + } + if (orGroupBuilder_ != null) { + orGroupBuilder_.clear(); + } + if (notExpressionBuilder_ != null) { + notExpressionBuilder_.clear(); + } + if (funnelFieldFilterBuilder_ != null) { + funnelFieldFilterBuilder_.clear(); + } + if (funnelEventFilterBuilder_ != null) { + funnelEventFilterBuilder_.clear(); + } exprCase_ = 0; expr_ = null; return this; @@ -952,7 +824,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelFilterExpressio break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -967,18 +839,63 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelFilterExpression 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(getAndGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getOrGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getNotExpressionFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage( + getFunnelFieldFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage( + getFunnelEventFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 5; + 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 = - (com.google.analytics.data.v1alpha.FunnelFilterExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2126,7 +2043,18 @@ public FunnelFilterExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelFilterExpression(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpressionList.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpressionList.java index 7f953c6e..3aa39d25 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpressionList.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelFilterExpressionList.java @@ -52,63 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelFilterExpressionList( - 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)) { - expressions_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.FunnelFilterExpression>(); - mutable_bitField0_ |= 0x00000001; - } - expressions_.add( - input.readMessage( - com.google.analytics.data.v1alpha.FunnelFilterExpression.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - expressions_ = java.util.Collections.unmodifiableList(expressions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelFilterExpressionList_descriptor; @@ -212,7 +155,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < expressions_.size(); i++) { output.writeMessage(1, expressions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -224,7 +167,7 @@ public int getSerializedSize() { for (int i = 0; i < expressions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, expressions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -241,7 +184,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.FunnelFilterExpressionList) obj; if (!getExpressionsList().equals(other.getExpressionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -256,7 +199,7 @@ public int hashCode() { hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER; hash = (53 * hash) + getExpressionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -386,19 +329,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelFilterExpressionList.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getExpressionsFieldBuilder(); - } } @java.lang.Override @@ -406,10 +340,11 @@ public Builder clear() { super.clear(); if (expressionsBuilder_ == null) { expressions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + expressions_ = null; expressionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -526,7 +461,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelFilterExpressio } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -541,18 +476,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelFilterExpressionList 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: + { + com.google.analytics.data.v1alpha.FunnelFilterExpression m = + input.readMessage( + com.google.analytics.data.v1alpha.FunnelFilterExpression.parser(), + extensionRegistry); + if (expressionsBuilder_ == null) { + ensureExpressionsIsMutable(); + expressions_.add(m); + } else { + expressionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FunnelFilterExpressionList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -956,7 +918,18 @@ public FunnelFilterExpressionList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelFilterExpressionList(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelNextAction.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelNextAction.java index 25c03ce9..4024e3e3 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelNextAction.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelNextAction.java @@ -55,68 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelNextAction( - 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.analytics.data.v1alpha.Dimension.Builder subBuilder = null; - if (nextActionDimension_ != null) { - subBuilder = nextActionDimension_.toBuilder(); - } - nextActionDimension_ = - input.readMessage( - com.google.analytics.data.v1alpha.Dimension.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(nextActionDimension_); - nextActionDimension_ = subBuilder.buildPartial(); - } - - break; - } - case 16: - { - bitField0_ |= 0x00000001; - limit_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelNextAction_descriptor; @@ -253,7 +191,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeInt64(2, limit_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -268,7 +206,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, limit_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -292,7 +230,7 @@ public boolean equals(final java.lang.Object obj) { if (hasLimit()) { if (getLimit() != other.getLimit()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -311,7 +249,7 @@ public int hashCode() { hash = (37 * hash) + LIMIT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getLimit()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -445,17 +383,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelNextAction.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -564,7 +495,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelNextAction othe if (other.hasLimit()) { setLimit(other.getLimit()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -579,18 +510,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelNextAction 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( + getNextActionDimensionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 16: + { + limit_ = input.readInt64(); + bitField0_ |= 0x00000001; + 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 = - (com.google.analytics.data.v1alpha.FunnelNextAction) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -934,7 +891,18 @@ public FunnelNextAction parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelNextAction(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilter.java index 51fc8320..3308080e 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilter.java @@ -50,127 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelParameterFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - oneParameterCase_ = 1; - oneParameter_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - oneParameterCase_ = 2; - oneParameter_ = s; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.StringFilter.Builder subBuilder = null; - if (oneFilterCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.StringFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.StringFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.StringFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.InListFilter.Builder subBuilder = null; - if (oneFilterCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.InListFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.InListFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.InListFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1alpha.NumericFilter.Builder subBuilder = null; - if (oneFilterCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 6; - break; - } - case 58: - { - com.google.analytics.data.v1alpha.BetweenFilter.Builder subBuilder = null; - if (oneFilterCase_ == 7) { - subBuilder = - ((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.BetweenFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 7; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelParameterFilter_descriptor; @@ -704,7 +583,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneFilterCase_ == 7) { output.writeMessage(7, (com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -739,7 +618,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 7, (com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -783,7 +662,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -826,7 +705,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -956,22 +835,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelParameterFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (stringFilterBuilder_ != null) { + stringFilterBuilder_.clear(); + } + if (inListFilterBuilder_ != null) { + inListFilterBuilder_.clear(); + } + if (numericFilterBuilder_ != null) { + numericFilterBuilder_.clear(); + } + if (betweenFilterBuilder_ != null) { + betweenFilterBuilder_.clear(); + } oneParameterCase_ = 0; oneParameter_ = null; oneFilterCase_ = 0; @@ -1135,7 +1019,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelParameterFilter break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1150,18 +1034,69 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelParameterFilter 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: + { + java.lang.String s = input.readStringRequireUtf8(); + oneParameterCase_ = 1; + oneParameter_ = s; + break; + } // case 10 + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + oneParameterCase_ = 2; + oneParameter_ = s; + break; + } // case 18 + case 34: + { + input.readMessage(getStringFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getInListFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getNumericFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 6; + break; + } // case 50 + case 58: + { + input.readMessage(getBetweenFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 7; + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FunnelParameterFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2417,7 +2352,18 @@ public FunnelParameterFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelParameterFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpression.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpression.java index 8ac838fb..7a325168 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpression.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpression.java @@ -51,129 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelParameterFilterExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList.Builder - subBuilder = null; - if (exprCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList.Builder - subBuilder = null; - if (exprCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.Builder subBuilder = - null; - if (exprCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelParameterFilterExpression) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelParameterFilterExpression) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.FunnelParameterFilter.Builder subBuilder = null; - if (exprCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.FunnelParameterFilter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelParameterFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.FunnelParameterFilter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 4; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelParameterFilterExpression_descriptor; @@ -489,7 +366,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exprCase_ == 4) { output.writeMessage(4, (com.google.analytics.data.v1alpha.FunnelParameterFilter) expr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -518,7 +395,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, (com.google.analytics.data.v1alpha.FunnelParameterFilter) expr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -551,7 +428,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -582,7 +459,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -714,22 +591,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (andGroupBuilder_ != null) { + andGroupBuilder_.clear(); + } + if (orGroupBuilder_ != null) { + orGroupBuilder_.clear(); + } + if (notExpressionBuilder_ != null) { + notExpressionBuilder_.clear(); + } + if (funnelParameterFilterBuilder_ != null) { + funnelParameterFilterBuilder_.clear(); + } exprCase_ = 0; expr_ = null; return this; @@ -867,7 +749,7 @@ public Builder mergeFrom( break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -882,19 +764,56 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression 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(getAndGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getOrGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getNotExpressionFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage( + getFunnelParameterFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 4; + 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 = - (com.google.analytics.data.v1alpha.FunnelParameterFilterExpression) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1871,7 +1790,18 @@ public FunnelParameterFilterExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelParameterFilterExpression(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpressionList.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpressionList.java index 87989ee0..70a53aa9 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpressionList.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelParameterFilterExpressionList.java @@ -54,63 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelParameterFilterExpressionList( - 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)) { - expressions_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression>(); - mutable_bitField0_ |= 0x00000001; - } - expressions_.add( - input.readMessage( - com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - expressions_ = java.util.Collections.unmodifiableList(expressions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelParameterFilterExpressionList_descriptor; @@ -222,7 +165,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < expressions_.size(); i++) { output.writeMessage(1, expressions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -234,7 +177,7 @@ public int getSerializedSize() { for (int i = 0; i < expressions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, expressions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -251,7 +194,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList) obj; if (!getExpressionsList().equals(other.getExpressionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -266,7 +209,7 @@ public int hashCode() { hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER; hash = (53 * hash) + getExpressionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -398,19 +341,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getExpressionsFieldBuilder(); - } } @java.lang.Override @@ -418,10 +352,11 @@ public Builder clear() { super.clear(); if (expressionsBuilder_ == null) { expressions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + expressions_ = null; expressionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -541,7 +476,7 @@ public Builder mergeFrom( } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -556,19 +491,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList 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: + { + com.google.analytics.data.v1alpha.FunnelParameterFilterExpression m = + input.readMessage( + com.google.analytics.data.v1alpha.FunnelParameterFilterExpression.parser(), + extensionRegistry); + if (expressionsBuilder_ == null) { + ensureExpressionsIsMutable(); + expressions_.add(m); + } else { + expressionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FunnelParameterFilterExpressionList) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1015,7 +976,18 @@ public FunnelParameterFilterExpressionList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelParameterFilterExpressionList(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelResponseMetadata.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelResponseMetadata.java index 716b8362..dafde6a2 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelResponseMetadata.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelResponseMetadata.java @@ -53,62 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelResponseMetadata( - 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)) { - samplingMetadatas_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - samplingMetadatas_.add( - input.readMessage( - com.google.analytics.data.v1alpha.SamplingMetadata.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - samplingMetadatas_ = java.util.Collections.unmodifiableList(samplingMetadatas_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelResponseMetadata_descriptor; @@ -242,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < samplingMetadatas_.size(); i++) { output.writeMessage(1, samplingMetadatas_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -255,7 +199,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, samplingMetadatas_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -272,7 +216,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.FunnelResponseMetadata) obj; if (!getSamplingMetadatasList().equals(other.getSamplingMetadatasList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -287,7 +231,7 @@ public int hashCode() { hash = (37 * hash) + SAMPLING_METADATAS_FIELD_NUMBER; hash = (53 * hash) + getSamplingMetadatasList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -418,19 +362,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelResponseMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getSamplingMetadatasFieldBuilder(); - } } @java.lang.Override @@ -438,10 +373,11 @@ public Builder clear() { super.clear(); if (samplingMetadatasBuilder_ == null) { samplingMetadatas_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + samplingMetadatas_ = null; samplingMetadatasBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -556,7 +492,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelResponseMetadat } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -571,18 +507,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelResponseMetadata 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: + { + com.google.analytics.data.v1alpha.SamplingMetadata m = + input.readMessage( + com.google.analytics.data.v1alpha.SamplingMetadata.parser(), + extensionRegistry); + if (samplingMetadatasBuilder_ == null) { + ensureSamplingMetadatasIsMutable(); + samplingMetadatas_.add(m); + } else { + samplingMetadatasBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.FunnelResponseMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1091,7 +1054,18 @@ public FunnelResponseMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelResponseMetadata(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelStep.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelStep.java index e55b7100..23fae198 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelStep.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelStep.java @@ -54,90 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelStep( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 16: - { - isDirectlyFollowedBy_ = input.readBool(); - break; - } - case 26: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = withinDurationFromPriorStep_.toBuilder(); - } - withinDurationFromPriorStep_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(withinDurationFromPriorStep_); - withinDurationFromPriorStep_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.FunnelFilterExpression.Builder subBuilder = null; - if (filterExpression_ != null) { - subBuilder = filterExpression_.toBuilder(); - } - filterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(filterExpression_); - filterExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelStep_descriptor; @@ -377,7 +293,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (filterExpression_ != null) { output.writeMessage(4, getFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -400,7 +316,7 @@ public int getSerializedSize() { if (filterExpression_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -427,7 +343,7 @@ public boolean equals(final java.lang.Object obj) { if (hasFilterExpression()) { if (!getFilterExpression().equals(other.getFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -450,7 +366,7 @@ public int hashCode() { hash = (37 * hash) + FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -722,7 +638,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelStep other) { if (other.hasFilterExpression()) { mergeFilterExpression(other.getFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -737,17 +653,57 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelStep 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.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + isDirectlyFollowedBy_ = input.readBool(); + + break; + } // case 16 + case 26: + { + input.readMessage( + getWithinDurationFromPriorStepFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 26 + case 34: + { + input.readMessage( + getFilterExpressionFieldBuilder().getBuilder(), extensionRegistry); + + 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 = (com.google.analytics.data.v1alpha.FunnelStep) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1409,7 +1365,18 @@ public FunnelStep parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelStep(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelSubReport.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelSubReport.java index f7d89e9b..ba9ad5e9 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelSubReport.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/FunnelSubReport.java @@ -55,108 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FunnelSubReport( - 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)) { - dimensionHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionHeaders_.add( - input.readMessage( - com.google.analytics.data.v1alpha.DimensionHeader.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metricHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metricHeaders_.add( - input.readMessage( - com.google.analytics.data.v1alpha.MetricHeader.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - rows_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - rows_.add( - input.readMessage( - com.google.analytics.data.v1alpha.Row.parser(), extensionRegistry)); - break; - } - case 34: - { - com.google.analytics.data.v1alpha.FunnelResponseMetadata.Builder subBuilder = null; - if (metadata_ != null) { - subBuilder = metadata_.toBuilder(); - } - metadata_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelResponseMetadata.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metadata_); - metadata_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionHeaders_ = java.util.Collections.unmodifiableList(dimensionHeaders_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metricHeaders_ = java.util.Collections.unmodifiableList(metricHeaders_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - rows_ = java.util.Collections.unmodifiableList(rows_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_FunnelSubReport_descriptor; @@ -476,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (metadata_ != null) { output.writeMessage(4, getMetadata()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -497,7 +395,7 @@ public int getSerializedSize() { if (metadata_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getMetadata()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -520,7 +418,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMetadata()) { if (!getMetadata().equals(other.getMetadata())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -547,7 +445,7 @@ public int hashCode() { hash = (37 * hash) + METADATA_FIELD_NUMBER; hash = (53 * hash) + getMetadata().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -677,21 +575,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.FunnelSubReport.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionHeadersFieldBuilder(); - getMetricHeadersFieldBuilder(); - getRowsFieldBuilder(); - } } @java.lang.Override @@ -699,22 +586,25 @@ public Builder clear() { super.clear(); if (dimensionHeadersBuilder_ == null) { dimensionHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionHeaders_ = null; dimensionHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricHeadersBuilder_ == null) { metricHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metricHeaders_ = null; metricHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (rowsBuilder_ == null) { rows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + rows_ = null; rowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (metadataBuilder_ == null) { metadata_ = null; } else { @@ -915,7 +805,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.FunnelSubReport other if (other.hasMetadata()) { mergeMetadata(other.getMetadata()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -930,18 +820,77 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.FunnelSubReport 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: + { + com.google.analytics.data.v1alpha.DimensionHeader m = + input.readMessage( + com.google.analytics.data.v1alpha.DimensionHeader.parser(), + extensionRegistry); + if (dimensionHeadersBuilder_ == null) { + ensureDimensionHeadersIsMutable(); + dimensionHeaders_.add(m); + } else { + dimensionHeadersBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1alpha.MetricHeader m = + input.readMessage( + com.google.analytics.data.v1alpha.MetricHeader.parser(), extensionRegistry); + if (metricHeadersBuilder_ == null) { + ensureMetricHeadersIsMutable(); + metricHeaders_.add(m); + } else { + metricHeadersBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1alpha.Row m = + input.readMessage( + com.google.analytics.data.v1alpha.Row.parser(), extensionRegistry); + if (rowsBuilder_ == null) { + ensureRowsIsMutable(); + rows_.add(m); + } else { + rowsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry); + + 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 = - (com.google.analytics.data.v1alpha.FunnelSubReport) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2307,7 +2256,18 @@ public FunnelSubReport parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FunnelSubReport(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/InListFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/InListFilter.java index b25649d5..6a231ef5 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/InListFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/InListFilter.java @@ -52,64 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private InListFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - values_.add(s); - break; - } - case 16: - { - caseSensitive_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = values_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_InListFilter_descriptor; @@ -228,7 +170,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (caseSensitive_ != false) { output.writeBool(2, caseSensitive_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -248,7 +190,7 @@ public int getSerializedSize() { if (caseSensitive_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, caseSensitive_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -266,7 +208,7 @@ public boolean equals(final java.lang.Object obj) { if (!getValuesList().equals(other.getValuesList())) return false; if (getCaseSensitive() != other.getCaseSensitive()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -283,7 +225,7 @@ public int hashCode() { } hash = (37 * hash) + CASE_SENSITIVE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCaseSensitive()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -412,17 +354,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.InListFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -528,7 +463,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.InListFilter other) { if (other.getCaseSensitive() != false) { setCaseSensitive(other.getCaseSensitive()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -543,17 +478,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.InListFilter 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: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureValuesIsMutable(); + values_.add(s); + break; + } // case 10 + case 16: + { + caseSensitive_ = input.readBool(); + + 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 = (com.google.analytics.data.v1alpha.InListFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -820,7 +782,18 @@ public InListFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new InListFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricHeader.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricHeader.java index b2605e77..aacf6b5c 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricHeader.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricHeader.java @@ -56,59 +56,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricHeader( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 16: - { - int rawValue = input.readEnum(); - - type_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_MetricHeader_descriptor; @@ -229,7 +176,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (type_ != com.google.analytics.data.v1alpha.MetricType.METRIC_TYPE_UNSPECIFIED.getNumber()) { output.writeEnum(2, type_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -244,7 +191,7 @@ public int getSerializedSize() { if (type_ != com.google.analytics.data.v1alpha.MetricType.METRIC_TYPE_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, type_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -262,7 +209,7 @@ public boolean equals(final java.lang.Object obj) { if (!getName().equals(other.getName())) return false; if (type_ != other.type_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -277,7 +224,7 @@ public int hashCode() { hash = (53 * hash) + getName().hashCode(); hash = (37 * hash) + TYPE_FIELD_NUMBER; hash = (53 * hash) + type_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -409,17 +356,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.MetricHeader.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -514,7 +454,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.MetricHeader other) { if (other.type_ != 0) { setTypeValue(other.getTypeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -529,17 +469,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.MetricHeader 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.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + type_ = input.readEnum(); + + 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 = (com.google.analytics.data.v1alpha.MetricHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -772,7 +738,18 @@ public MetricHeader parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricHeader(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricValue.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricValue.java index 98b33c48..40c0bc74 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricValue.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/MetricValue.java @@ -50,52 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - oneValueCase_ = 4; - oneValue_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_MetricValue_descriptor; @@ -242,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneValueCase_ == 4) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, oneValue_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -254,7 +208,7 @@ public int getSerializedSize() { if (oneValueCase_ == 4) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, oneValue_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -278,7 +232,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -297,7 +251,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -426,17 +380,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.MetricValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -537,7 +484,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.MetricValue other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -552,17 +499,38 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.MetricValue 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 34: + { + java.lang.String s = input.readStringRequireUtf8(); + oneValueCase_ = 4; + oneValue_ = s; + 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 = (com.google.analytics.data.v1alpha.MetricValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -746,7 +714,18 @@ public MetricValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricValue(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericFilter.java index 63121287..1c481699 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericFilter.java @@ -52,68 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private NumericFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - operation_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.NumericValue.Builder subBuilder = null; - if (value_ != null) { - subBuilder = value_.toBuilder(); - } - value_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(value_); - value_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_NumericFilter_descriptor; @@ -460,7 +398,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (value_ != null) { output.writeMessage(2, getValue()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -477,7 +415,7 @@ public int getSerializedSize() { if (value_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getValue()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -498,7 +436,7 @@ public boolean equals(final java.lang.Object obj) { if (hasValue()) { if (!getValue().equals(other.getValue())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -515,7 +453,7 @@ public int hashCode() { hash = (37 * hash) + VALUE_FIELD_NUMBER; hash = (53 * hash) + getValue().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -644,17 +582,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.NumericFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -757,7 +688,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.NumericFilter other) if (other.hasValue()) { mergeValue(other.getValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -772,17 +703,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.NumericFilter 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: + { + operation_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.NumericFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1097,7 +1054,18 @@ public NumericFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new NumericFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericValue.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericValue.java index 6dc7d01d..5b5fd408 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericValue.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/NumericValue.java @@ -50,57 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private NumericValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - oneValue_ = input.readInt64(); - oneValueCase_ = 1; - break; - } - case 17: - { - oneValue_ = input.readDouble(); - oneValueCase_ = 2; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_NumericValue_descriptor; @@ -253,7 +202,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneValueCase_ == 2) { output.writeDouble(2, (double) ((java.lang.Double) oneValue_)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -272,7 +221,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeDoubleSize( 2, (double) ((java.lang.Double) oneValue_)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -300,7 +249,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -326,7 +275,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -455,17 +404,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.NumericValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -572,7 +514,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.NumericValue other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -587,17 +529,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.NumericValue 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: + { + oneValue_ = input.readInt64(); + oneValueCase_ = 1; + break; + } // case 8 + case 17: + { + oneValue_ = input.readDouble(); + oneValueCase_ = 2; + break; + } // case 17 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.NumericValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -785,7 +753,18 @@ public NumericValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new NumericValue(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/PropertyQuota.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/PropertyQuota.java index 975f743d..95e5b149 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/PropertyQuota.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/PropertyQuota.java @@ -52,125 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PropertyQuota( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.QuotaStatus.Builder subBuilder = null; - if (tokensPerDay_ != null) { - subBuilder = tokensPerDay_.toBuilder(); - } - tokensPerDay_ = - input.readMessage( - com.google.analytics.data.v1alpha.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(tokensPerDay_); - tokensPerDay_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1alpha.QuotaStatus.Builder subBuilder = null; - if (tokensPerHour_ != null) { - subBuilder = tokensPerHour_.toBuilder(); - } - tokensPerHour_ = - input.readMessage( - com.google.analytics.data.v1alpha.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(tokensPerHour_); - tokensPerHour_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.analytics.data.v1alpha.QuotaStatus.Builder subBuilder = null; - if (concurrentRequests_ != null) { - subBuilder = concurrentRequests_.toBuilder(); - } - concurrentRequests_ = - input.readMessage( - com.google.analytics.data.v1alpha.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(concurrentRequests_); - concurrentRequests_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.analytics.data.v1alpha.QuotaStatus.Builder subBuilder = null; - if (serverErrorsPerProjectPerHour_ != null) { - subBuilder = serverErrorsPerProjectPerHour_.toBuilder(); - } - serverErrorsPerProjectPerHour_ = - input.readMessage( - com.google.analytics.data.v1alpha.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(serverErrorsPerProjectPerHour_); - serverErrorsPerProjectPerHour_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.analytics.data.v1alpha.QuotaStatus.Builder subBuilder = null; - if (potentiallyThresholdedRequestsPerHour_ != null) { - subBuilder = potentiallyThresholdedRequestsPerHour_.toBuilder(); - } - potentiallyThresholdedRequestsPerHour_ = - input.readMessage( - com.google.analytics.data.v1alpha.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(potentiallyThresholdedRequestsPerHour_); - potentiallyThresholdedRequestsPerHour_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_PropertyQuota_descriptor; @@ -493,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (potentiallyThresholdedRequestsPerHour_ != null) { output.writeMessage(5, getPotentiallyThresholdedRequestsPerHour()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -521,7 +402,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 5, getPotentiallyThresholdedRequestsPerHour()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -561,7 +442,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPotentiallyThresholdedRequestsPerHour() .equals(other.getPotentiallyThresholdedRequestsPerHour())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -592,7 +473,7 @@ public int hashCode() { hash = (37 * hash) + POTENTIALLY_THRESHOLDED_REQUESTS_PER_HOUR_FIELD_NUMBER; hash = (53 * hash) + getPotentiallyThresholdedRequestsPerHour().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -723,17 +604,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.PropertyQuota.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -888,7 +762,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.PropertyQuota other) mergePotentiallyThresholdedRequestsPerHour( other.getPotentiallyThresholdedRequestsPerHour()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -903,17 +777,65 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.PropertyQuota 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(getTokensPerDayFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getTokensPerHourFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage( + getConcurrentRequestsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage( + getServerErrorsPerProjectPerHourFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage( + getPotentiallyThresholdedRequestsPerHourFieldBuilder().getBuilder(), + extensionRegistry); + + 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 = (com.google.analytics.data.v1alpha.PropertyQuota) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2018,7 +1940,18 @@ public PropertyQuota parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyQuota(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/QuotaStatus.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/QuotaStatus.java index 24e81a62..ad09707e 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/QuotaStatus.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/QuotaStatus.java @@ -50,55 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private QuotaStatus( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - consumed_ = input.readInt32(); - break; - } - case 16: - { - remaining_ = input.readInt32(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_QuotaStatus_descriptor; @@ -170,7 +121,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (remaining_ != 0) { output.writeInt32(2, remaining_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -185,7 +136,7 @@ public int getSerializedSize() { if (remaining_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, remaining_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -203,7 +154,7 @@ public boolean equals(final java.lang.Object obj) { if (getConsumed() != other.getConsumed()) return false; if (getRemaining() != other.getRemaining()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -218,7 +169,7 @@ public int hashCode() { hash = (53 * hash) + getConsumed(); hash = (37 * hash) + REMAINING_FIELD_NUMBER; hash = (53 * hash) + getRemaining(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -347,17 +298,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.QuotaStatus.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -451,7 +395,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.QuotaStatus other) { if (other.getRemaining() != 0) { setRemaining(other.getRemaining()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -466,17 +410,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.QuotaStatus 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: + { + consumed_ = input.readInt32(); + + break; + } // case 8 + case 16: + { + remaining_ = input.readInt32(); + + 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 = (com.google.analytics.data.v1alpha.QuotaStatus) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -616,7 +586,18 @@ public QuotaStatus parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QuotaStatus(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Row.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Row.java index 9e8d5452..fbef5ac2 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Row.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Row.java @@ -86,77 +86,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Row( - 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)) { - dimensionValues_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionValues_.add( - input.readMessage( - com.google.analytics.data.v1alpha.DimensionValue.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metricValues_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metricValues_.add( - input.readMessage( - com.google.analytics.data.v1alpha.MetricValue.parser(), extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionValues_ = java.util.Collections.unmodifiableList(dimensionValues_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metricValues_ = java.util.Collections.unmodifiableList(metricValues_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_Row_descriptor; @@ -337,7 +266,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < metricValues_.size(); i++) { output.writeMessage(2, metricValues_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -352,7 +281,7 @@ public int getSerializedSize() { for (int i = 0; i < metricValues_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, metricValues_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -369,7 +298,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionValuesList().equals(other.getDimensionValuesList())) return false; if (!getMetricValuesList().equals(other.getMetricValuesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -388,7 +317,7 @@ public int hashCode() { hash = (37 * hash) + METRIC_VALUES_FIELD_NUMBER; hash = (53 * hash) + getMetricValuesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -549,20 +478,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.Row.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionValuesFieldBuilder(); - getMetricValuesFieldBuilder(); - } } @java.lang.Override @@ -570,16 +489,18 @@ public Builder clear() { super.clear(); if (dimensionValuesBuilder_ == null) { dimensionValues_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionValues_ = null; dimensionValuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricValuesBuilder_ == null) { metricValues_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metricValues_ = null; metricValuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -729,7 +650,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.Row other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -744,17 +665,58 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.Row 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: + { + com.google.analytics.data.v1alpha.DimensionValue m = + input.readMessage( + com.google.analytics.data.v1alpha.DimensionValue.parser(), + extensionRegistry); + if (dimensionValuesBuilder_ == null) { + ensureDimensionValuesIsMutable(); + dimensionValues_.add(m); + } else { + dimensionValuesBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1alpha.MetricValue m = + input.readMessage( + com.google.analytics.data.v1alpha.MetricValue.parser(), extensionRegistry); + if (metricValuesBuilder_ == null) { + ensureMetricValuesIsMutable(); + metricValues_.add(m); + } else { + metricValuesBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.Row) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1523,7 +1485,18 @@ public Row parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Row(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportRequest.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportRequest.java index 40f94f8e..1a8ed6ff 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportRequest.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportRequest.java @@ -55,166 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunFunnelReportRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dateRanges_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dateRanges_.add( - input.readMessage( - com.google.analytics.data.v1alpha.DateRange.parser(), extensionRegistry)); - break; - } - case 26: - { - com.google.analytics.data.v1alpha.Funnel.Builder subBuilder = null; - if (funnel_ != null) { - subBuilder = funnel_.toBuilder(); - } - funnel_ = - input.readMessage( - com.google.analytics.data.v1alpha.Funnel.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(funnel_); - funnel_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.analytics.data.v1alpha.FunnelBreakdown.Builder subBuilder = null; - if (funnelBreakdown_ != null) { - subBuilder = funnelBreakdown_.toBuilder(); - } - funnelBreakdown_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelBreakdown.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(funnelBreakdown_); - funnelBreakdown_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.analytics.data.v1alpha.FunnelNextAction.Builder subBuilder = null; - if (funnelNextAction_ != null) { - subBuilder = funnelNextAction_.toBuilder(); - } - funnelNextAction_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelNextAction.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(funnelNextAction_); - funnelNextAction_ = subBuilder.buildPartial(); - } - - break; - } - case 48: - { - int rawValue = input.readEnum(); - - funnelVisualizationType_ = rawValue; - break; - } - case 58: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - segments_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - segments_.add( - input.readMessage( - com.google.analytics.data.v1alpha.Segment.parser(), extensionRegistry)); - break; - } - case 72: - { - limit_ = input.readInt64(); - break; - } - case 82: - { - com.google.analytics.data.v1alpha.FilterExpression.Builder subBuilder = null; - if (dimensionFilter_ != null) { - subBuilder = dimensionFilter_.toBuilder(); - } - dimensionFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionFilter_); - dimensionFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 96: - { - returnPropertyQuota_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dateRanges_ = java.util.Collections.unmodifiableList(dateRanges_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - segments_ = java.util.Collections.unmodifiableList(segments_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.AnalyticsDataApiProto .internal_static_google_analytics_data_v1alpha_RunFunnelReportRequest_descriptor; @@ -1009,7 +849,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (returnPropertyQuota_ != false) { output.writeBool(12, returnPropertyQuota_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1051,7 +891,7 @@ public int getSerializedSize() { if (returnPropertyQuota_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(12, returnPropertyQuota_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1089,7 +929,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionFilter().equals(other.getDimensionFilter())) return false; } if (getReturnPropertyQuota() != other.getReturnPropertyQuota()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1132,7 +972,7 @@ public int hashCode() { } hash = (37 * hash) + RETURN_PROPERTY_QUOTA_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getReturnPropertyQuota()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1262,20 +1102,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.RunFunnelReportRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDateRangesFieldBuilder(); - getSegmentsFieldBuilder(); - } } @java.lang.Override @@ -1285,10 +1115,11 @@ public Builder clear() { if (dateRangesBuilder_ == null) { dateRanges_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dateRanges_ = null; dateRangesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (funnelBuilder_ == null) { funnel_ = null; } else { @@ -1311,10 +1142,11 @@ public Builder clear() { if (segmentsBuilder_ == null) { segments_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + segments_ = null; segmentsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); limit_ = 0L; if (dimensionFilterBuilder_ == null) { @@ -1524,7 +1356,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.RunFunnelReportReques if (other.getReturnPropertyQuota() != false) { setReturnPropertyQuota(other.getReturnPropertyQuota()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1539,18 +1371,106 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.RunFunnelReportRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1alpha.DateRange m = + input.readMessage( + com.google.analytics.data.v1alpha.DateRange.parser(), extensionRegistry); + if (dateRangesBuilder_ == null) { + ensureDateRangesIsMutable(); + dateRanges_.add(m); + } else { + dateRangesBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + input.readMessage(getFunnelFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getFunnelBreakdownFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage( + getFunnelNextActionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 48: + { + funnelVisualizationType_ = input.readEnum(); + + break; + } // case 48 + case 58: + { + com.google.analytics.data.v1alpha.Segment m = + input.readMessage( + com.google.analytics.data.v1alpha.Segment.parser(), extensionRegistry); + if (segmentsBuilder_ == null) { + ensureSegmentsIsMutable(); + segments_.add(m); + } else { + segmentsBuilder_.addMessage(m); + } + break; + } // case 58 + case 72: + { + limit_ = input.readInt64(); + + break; + } // case 72 + case 82: + { + input.readMessage(getDimensionFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 82 + case 96: + { + returnPropertyQuota_ = input.readBool(); + + 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 = - (com.google.analytics.data.v1alpha.RunFunnelReportRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3676,7 +3596,18 @@ public RunFunnelReportRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunFunnelReportRequest(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportResponse.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportResponse.java index 226bd180..d2872b7a 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportResponse.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/RunFunnelReportResponse.java @@ -53,102 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunFunnelReportResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.FunnelSubReport.Builder subBuilder = null; - if (funnelTable_ != null) { - subBuilder = funnelTable_.toBuilder(); - } - funnelTable_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelSubReport.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(funnelTable_); - funnelTable_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1alpha.FunnelSubReport.Builder subBuilder = null; - if (funnelVisualization_ != null) { - subBuilder = funnelVisualization_.toBuilder(); - } - funnelVisualization_ = - input.readMessage( - com.google.analytics.data.v1alpha.FunnelSubReport.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(funnelVisualization_); - funnelVisualization_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.analytics.data.v1alpha.PropertyQuota.Builder subBuilder = null; - if (propertyQuota_ != null) { - subBuilder = propertyQuota_.toBuilder(); - } - propertyQuota_ = - input.readMessage( - com.google.analytics.data.v1alpha.PropertyQuota.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(propertyQuota_); - propertyQuota_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.AnalyticsDataApiProto .internal_static_google_analytics_data_v1alpha_RunFunnelReportResponse_descriptor; @@ -418,7 +322,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, kind_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -439,7 +343,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, kind_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -468,7 +372,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } if (!getKind().equals(other.getKind())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -493,7 +397,7 @@ public int hashCode() { } hash = (37 * hash) + KIND_FIELD_NUMBER; hash = (53 * hash) + getKind().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -624,17 +528,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.RunFunnelReportResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -766,7 +663,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.RunFunnelReportRespon kind_ = other.kind_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -781,18 +678,56 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.RunFunnelReportResponse 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(getFunnelTableFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getFunnelVisualizationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getPropertyQuotaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + kind_ = input.readStringRequireUtf8(); + + 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 = - (com.google.analytics.data.v1alpha.RunFunnelReportResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1595,7 +1530,18 @@ public RunFunnelReportResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunFunnelReportResponse(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SamplingMetadata.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SamplingMetadata.java index 120c1be0..b90307ed 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SamplingMetadata.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SamplingMetadata.java @@ -55,55 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SamplingMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - samplesReadCount_ = input.readInt64(); - break; - } - case 16: - { - samplingSpaceSize_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SamplingMetadata_descriptor; @@ -182,7 +133,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (samplingSpaceSize_ != 0L) { output.writeInt64(2, samplingSpaceSize_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -197,7 +148,7 @@ public int getSerializedSize() { if (samplingSpaceSize_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, samplingSpaceSize_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -215,7 +166,7 @@ public boolean equals(final java.lang.Object obj) { if (getSamplesReadCount() != other.getSamplesReadCount()) return false; if (getSamplingSpaceSize() != other.getSamplingSpaceSize()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -230,7 +181,7 @@ public int hashCode() { hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSamplesReadCount()); hash = (37 * hash) + SAMPLING_SPACE_SIZE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSamplingSpaceSize()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -364,17 +315,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SamplingMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -469,7 +413,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SamplingMetadata othe if (other.getSamplingSpaceSize() != 0L) { setSamplingSpaceSize(other.getSamplingSpaceSize()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -484,18 +428,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SamplingMetadata 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: + { + samplesReadCount_ = input.readInt64(); + + break; + } // case 8 + case 16: + { + samplingSpaceSize_ = input.readInt64(); + + 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 = - (com.google.analytics.data.v1alpha.SamplingMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -656,7 +625,18 @@ public SamplingMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SamplingMetadata(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Segment.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Segment.java index 55ada788..2d153afb 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Segment.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/Segment.java @@ -57,107 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Segment( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.UserSegment.Builder subBuilder = null; - if (oneSegmentScopeCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.UserSegment) oneSegmentScope_).toBuilder(); - } - oneSegmentScope_ = - input.readMessage( - com.google.analytics.data.v1alpha.UserSegment.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.UserSegment) oneSegmentScope_); - oneSegmentScope_ = subBuilder.buildPartial(); - } - oneSegmentScopeCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.SessionSegment.Builder subBuilder = null; - if (oneSegmentScopeCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.SessionSegment) oneSegmentScope_) - .toBuilder(); - } - oneSegmentScope_ = - input.readMessage( - com.google.analytics.data.v1alpha.SessionSegment.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SessionSegment) oneSegmentScope_); - oneSegmentScope_ = subBuilder.buildPartial(); - } - oneSegmentScopeCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.EventSegment.Builder subBuilder = null; - if (oneSegmentScopeCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.EventSegment) oneSegmentScope_).toBuilder(); - } - oneSegmentScope_ = - input.readMessage( - com.google.analytics.data.v1alpha.EventSegment.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.EventSegment) oneSegmentScope_); - oneSegmentScope_ = subBuilder.buildPartial(); - } - oneSegmentScopeCase_ = 4; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_Segment_descriptor; @@ -463,7 +362,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneSegmentScopeCase_ == 4) { output.writeMessage(4, (com.google.analytics.data.v1alpha.EventSegment) oneSegmentScope_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -490,7 +389,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, (com.google.analytics.data.v1alpha.EventSegment) oneSegmentScope_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -521,7 +420,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -550,7 +449,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -684,17 +583,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.Segment.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -702,6 +594,15 @@ public Builder clear() { super.clear(); name_ = ""; + if (userSegmentBuilder_ != null) { + userSegmentBuilder_.clear(); + } + if (sessionSegmentBuilder_ != null) { + sessionSegmentBuilder_.clear(); + } + if (eventSegmentBuilder_ != null) { + eventSegmentBuilder_.clear(); + } oneSegmentScopeCase_ = 0; oneSegmentScope_ = null; return this; @@ -828,7 +729,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.Segment other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -843,17 +744,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.Segment 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.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + input.readMessage(getUserSegmentFieldBuilder().getBuilder(), extensionRegistry); + oneSegmentScopeCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getSessionSegmentFieldBuilder().getBuilder(), extensionRegistry); + oneSegmentScopeCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getEventSegmentFieldBuilder().getBuilder(), extensionRegistry); + oneSegmentScopeCase_ = 4; + 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 = (com.google.analytics.data.v1alpha.Segment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1675,7 +1614,18 @@ public Segment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Segment(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentEventFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentEventFilter.java index c1813e67..95101994 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentEventFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentEventFilter.java @@ -55,71 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentEventFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - eventName_ = s; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.Builder - subBuilder = null; - if (((bitField0_ & 0x00000002) != 0)) { - subBuilder = segmentParameterFilterExpression_.toBuilder(); - } - segmentParameterFilterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(segmentParameterFilterExpression_); - segmentParameterFilterExpression_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentEventFilter_descriptor; @@ -291,7 +226,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeMessage(2, getSegmentParameterFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -308,7 +243,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, getSegmentParameterFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -334,7 +269,7 @@ public boolean equals(final java.lang.Object obj) { if (!getSegmentParameterFilterExpression() .equals(other.getSegmentParameterFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -353,7 +288,7 @@ public int hashCode() { hash = (37 * hash) + SEGMENT_PARAMETER_FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getSegmentParameterFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -612,7 +547,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SegmentEventFilter ot if (other.hasSegmentParameterFilterExpression()) { mergeSegmentParameterFilterExpression(other.getSegmentParameterFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -627,18 +562,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentEventFilter 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: + { + eventName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: + { + input.readMessage( + getSegmentParameterFilterExpressionFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SegmentEventFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1046,7 +1008,18 @@ public SegmentEventFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentEventFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilter.java index fc4cec18..88bad8dd 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilter.java @@ -52,137 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - fieldName_ = s; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.StringFilter.Builder subBuilder = null; - if (oneFilterCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.StringFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.StringFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.StringFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.InListFilter.Builder subBuilder = null; - if (oneFilterCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.InListFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.InListFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.InListFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1alpha.NumericFilter.Builder subBuilder = null; - if (oneFilterCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 6; - break; - } - case 58: - { - com.google.analytics.data.v1alpha.BetweenFilter.Builder subBuilder = null; - if (oneFilterCase_ == 7) { - subBuilder = - ((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.BetweenFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 7; - break; - } - case 66: - { - com.google.analytics.data.v1alpha.SegmentFilterScoping.Builder subBuilder = null; - if (filterScoping_ != null) { - subBuilder = filterScoping_.toBuilder(); - } - filterScoping_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterScoping.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(filterScoping_); - filterScoping_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentFilter_descriptor; @@ -585,7 +454,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (filterScoping_ != null) { output.writeMessage(8, getFilterScoping()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -620,7 +489,7 @@ public int getSerializedSize() { if (filterScoping_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getFilterScoping()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -658,7 +527,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -695,7 +564,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -824,17 +693,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SegmentFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -842,6 +704,18 @@ public Builder clear() { super.clear(); fieldName_ = ""; + if (stringFilterBuilder_ != null) { + stringFilterBuilder_.clear(); + } + if (inListFilterBuilder_ != null) { + inListFilterBuilder_.clear(); + } + if (numericFilterBuilder_ != null) { + numericFilterBuilder_.clear(); + } + if (betweenFilterBuilder_ != null) { + betweenFilterBuilder_.clear(); + } if (filterScopingBuilder_ == null) { filterScoping_ = null; } else { @@ -995,7 +869,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SegmentFilter other) break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1010,17 +884,67 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentFilter 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: + { + fieldName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 34: + { + input.readMessage(getStringFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getInListFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getNumericFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 6; + break; + } // case 50 + case 58: + { + input.readMessage(getBetweenFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 7; + break; + } // case 58 + case 66: + { + input.readMessage(getFilterScopingFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.SegmentFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2205,7 +2129,18 @@ public SegmentFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpression.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpression.java index 1bec940c..dcd0479c 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpression.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpression.java @@ -50,140 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentFilterExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.SegmentFilterExpressionList.Builder subBuilder = - null; - if (exprCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SegmentFilterExpressionList.Builder subBuilder = - null; - if (exprCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.SegmentFilterExpression.Builder subBuilder = null; - if (exprCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentFilterExpression) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentFilterExpression) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.SegmentFilter.Builder subBuilder = null; - if (exprCase_ == 4) { - subBuilder = ((com.google.analytics.data.v1alpha.SegmentFilter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.SegmentFilter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.SegmentEventFilter.Builder subBuilder = null; - if (exprCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentEventFilter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentEventFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.SegmentEventFilter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 5; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentFilterExpression_descriptor; @@ -552,7 +418,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exprCase_ == 5) { output.writeMessage(5, (com.google.analytics.data.v1alpha.SegmentEventFilter) expr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -586,7 +452,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 5, (com.google.analytics.data.v1alpha.SegmentEventFilter) expr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -622,7 +488,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -657,7 +523,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -787,22 +653,30 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SegmentFilterExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (andGroupBuilder_ != null) { + andGroupBuilder_.clear(); + } + if (orGroupBuilder_ != null) { + orGroupBuilder_.clear(); + } + if (notExpressionBuilder_ != null) { + notExpressionBuilder_.clear(); + } + if (segmentFilterBuilder_ != null) { + segmentFilterBuilder_.clear(); + } + if (segmentEventFilterBuilder_ != null) { + segmentEventFilterBuilder_.clear(); + } exprCase_ = 0; expr_ = null; return this; @@ -949,7 +823,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SegmentFilterExpressi break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -964,18 +838,62 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentFilterExpression 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(getAndGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getOrGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getNotExpressionFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getSegmentFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage( + getSegmentEventFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 5; + 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 = - (com.google.analytics.data.v1alpha.SegmentFilterExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2124,7 +2042,18 @@ public SegmentFilterExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentFilterExpression(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpressionList.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpressionList.java index a54e845a..29032528 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpressionList.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterExpressionList.java @@ -52,63 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentFilterExpressionList( - 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)) { - expressions_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.SegmentFilterExpression>(); - mutable_bitField0_ |= 0x00000001; - } - expressions_.add( - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - expressions_ = java.util.Collections.unmodifiableList(expressions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentFilterExpressionList_descriptor; @@ -213,7 +156,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < expressions_.size(); i++) { output.writeMessage(1, expressions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -225,7 +168,7 @@ public int getSerializedSize() { for (int i = 0; i < expressions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, expressions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -242,7 +185,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.SegmentFilterExpressionList) obj; if (!getExpressionsList().equals(other.getExpressionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -257,7 +200,7 @@ public int hashCode() { hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER; hash = (53 * hash) + getExpressionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -387,19 +330,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SegmentFilterExpressionList.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getExpressionsFieldBuilder(); - } } @java.lang.Override @@ -407,10 +341,11 @@ public Builder clear() { super.clear(); if (expressionsBuilder_ == null) { expressions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + expressions_ = null; expressionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -527,7 +462,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SegmentFilterExpressi } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -542,19 +477,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentFilterExpressionList 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: + { + com.google.analytics.data.v1alpha.SegmentFilterExpression m = + input.readMessage( + com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), + extensionRegistry); + if (expressionsBuilder_ == null) { + ensureExpressionsIsMutable(); + expressions_.add(m); + } else { + expressionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SegmentFilterExpressionList) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -959,7 +920,18 @@ public SegmentFilterExpressionList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentFilterExpressionList(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterScoping.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterScoping.java index 2aa3bf96..b2ccd188 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterScoping.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentFilterScoping.java @@ -51,52 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentFilterScoping( - 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; - atAnyPointInTime_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentFilterScoping_descriptor; @@ -183,7 +137,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeBool(1, atAnyPointInTime_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -195,7 +149,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, atAnyPointInTime_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -215,7 +169,7 @@ public boolean equals(final java.lang.Object obj) { if (hasAtAnyPointInTime()) { if (getAtAnyPointInTime() != other.getAtAnyPointInTime()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -230,7 +184,7 @@ public int hashCode() { hash = (37 * hash) + AT_ANY_POINT_IN_TIME_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAtAnyPointInTime()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -361,17 +315,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SegmentFilterScoping.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -466,7 +413,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SegmentFilterScoping if (other.hasAtAnyPointInTime()) { setAtAnyPointInTime(other.getAtAnyPointInTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -481,18 +428,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentFilterScoping 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: + { + atAnyPointInTime_ = input.readBool(); + bitField0_ |= 0x00000001; + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SegmentFilterScoping) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -637,7 +603,18 @@ public SegmentFilterScoping parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentFilterScoping(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilter.java index 7016948b..96bd55a4 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilter.java @@ -50,145 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentParameterFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - oneParameterCase_ = 1; - oneParameter_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - oneParameterCase_ = 2; - oneParameter_ = s; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.StringFilter.Builder subBuilder = null; - if (oneFilterCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.StringFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.StringFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.StringFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1alpha.InListFilter.Builder subBuilder = null; - if (oneFilterCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1alpha.InListFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.InListFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.InListFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1alpha.NumericFilter.Builder subBuilder = null; - if (oneFilterCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.NumericFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.NumericFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 6; - break; - } - case 58: - { - com.google.analytics.data.v1alpha.BetweenFilter.Builder subBuilder = null; - if (oneFilterCase_ == 7) { - subBuilder = - ((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1alpha.BetweenFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1alpha.BetweenFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 7; - break; - } - case 66: - { - com.google.analytics.data.v1alpha.SegmentParameterFilterScoping.Builder subBuilder = - null; - if (filterScoping_ != null) { - subBuilder = filterScoping_.toBuilder(); - } - filterScoping_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilterScoping.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(filterScoping_); - filterScoping_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentParameterFilter_descriptor; @@ -774,7 +635,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (filterScoping_ != null) { output.writeMessage(8, getFilterScoping()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -812,7 +673,7 @@ public int getSerializedSize() { if (filterScoping_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getFilterScoping()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -860,7 +721,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -907,7 +768,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1037,22 +898,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SegmentParameterFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (stringFilterBuilder_ != null) { + stringFilterBuilder_.clear(); + } + if (inListFilterBuilder_ != null) { + inListFilterBuilder_.clear(); + } + if (numericFilterBuilder_ != null) { + numericFilterBuilder_.clear(); + } + if (betweenFilterBuilder_ != null) { + betweenFilterBuilder_.clear(); + } if (filterScopingBuilder_ == null) { filterScoping_ = null; } else { @@ -1230,7 +1096,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SegmentParameterFilte break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1245,18 +1111,75 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentParameterFilter 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: + { + java.lang.String s = input.readStringRequireUtf8(); + oneParameterCase_ = 1; + oneParameter_ = s; + break; + } // case 10 + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + oneParameterCase_ = 2; + oneParameter_ = s; + break; + } // case 18 + case 34: + { + input.readMessage(getStringFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getInListFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getNumericFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 6; + break; + } // case 50 + case 58: + { + input.readMessage(getBetweenFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 7; + break; + } // case 58 + case 66: + { + input.readMessage(getFilterScopingFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SegmentParameterFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2703,7 +2626,18 @@ public SegmentParameterFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentParameterFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpression.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpression.java index a1160cd0..ce22e1c3 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpression.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpression.java @@ -51,129 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentParameterFilterExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList.Builder - subBuilder = null; - if (exprCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList.Builder - subBuilder = null; - if (exprCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.Builder - subBuilder = null; - if (exprCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentParameterFilterExpression) expr_) - .toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentParameterFilterExpression) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1alpha.SegmentParameterFilter.Builder subBuilder = null; - if (exprCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1alpha.SegmentParameterFilter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1alpha.SegmentParameterFilter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 4; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentParameterFilterExpression_descriptor; @@ -495,7 +372,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exprCase_ == 4) { output.writeMessage(4, (com.google.analytics.data.v1alpha.SegmentParameterFilter) expr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -524,7 +401,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, (com.google.analytics.data.v1alpha.SegmentParameterFilter) expr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -557,7 +434,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -588,7 +465,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -720,22 +597,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (andGroupBuilder_ != null) { + andGroupBuilder_.clear(); + } + if (orGroupBuilder_ != null) { + orGroupBuilder_.clear(); + } + if (notExpressionBuilder_ != null) { + notExpressionBuilder_.clear(); + } + if (segmentParameterFilterBuilder_ != null) { + segmentParameterFilterBuilder_.clear(); + } exprCase_ = 0; expr_ = null; return this; @@ -875,7 +757,7 @@ public Builder mergeFrom( break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -890,19 +772,56 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression 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(getAndGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getOrGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getNotExpressionFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage( + getSegmentParameterFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 4; + 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 = - (com.google.analytics.data.v1alpha.SegmentParameterFilterExpression) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1891,7 +1810,18 @@ public SegmentParameterFilterExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentParameterFilterExpression(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpressionList.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpressionList.java index 73967881..d66536db 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpressionList.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterExpressionList.java @@ -54,63 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentParameterFilterExpressionList( - 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)) { - expressions_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression>(); - mutable_bitField0_ |= 0x00000001; - } - expressions_.add( - input.readMessage( - com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - expressions_ = java.util.Collections.unmodifiableList(expressions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentParameterFilterExpressionList_descriptor; @@ -222,7 +165,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < expressions_.size(); i++) { output.writeMessage(1, expressions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -234,7 +177,7 @@ public int getSerializedSize() { for (int i = 0; i < expressions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, expressions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -251,7 +194,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList) obj; if (!getExpressionsList().equals(other.getExpressionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -266,7 +209,7 @@ public int hashCode() { hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER; hash = (53 * hash) + getExpressionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -398,19 +341,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getExpressionsFieldBuilder(); - } } @java.lang.Override @@ -418,10 +352,11 @@ public Builder clear() { super.clear(); if (expressionsBuilder_ == null) { expressions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + expressions_ = null; expressionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -542,7 +477,7 @@ public Builder mergeFrom( } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -557,19 +492,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList 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: + { + com.google.analytics.data.v1alpha.SegmentParameterFilterExpression m = + input.readMessage( + com.google.analytics.data.v1alpha.SegmentParameterFilterExpression.parser(), + extensionRegistry); + if (expressionsBuilder_ == null) { + ensureExpressionsIsMutable(); + expressions_.add(m); + } else { + expressionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SegmentParameterFilterExpressionList) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1020,7 +981,18 @@ public SegmentParameterFilterExpressionList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentParameterFilterExpressionList(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterScoping.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterScoping.java index 8c3d9a2a..57f3da35 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterScoping.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SegmentParameterFilterScoping.java @@ -51,52 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SegmentParameterFilterScoping( - 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; - inAnyNDayPeriod_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SegmentParameterFilterScoping_descriptor; @@ -203,7 +157,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeInt64(1, inAnyNDayPeriod_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -215,7 +169,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(1, inAnyNDayPeriod_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -235,7 +189,7 @@ public boolean equals(final java.lang.Object obj) { if (hasInAnyNDayPeriod()) { if (getInAnyNDayPeriod() != other.getInAnyNDayPeriod()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -250,7 +204,7 @@ public int hashCode() { hash = (37 * hash) + IN_ANY_N_DAY_PERIOD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getInAnyNDayPeriod()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -381,17 +335,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SegmentParameterFilterScoping.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -489,7 +436,7 @@ public Builder mergeFrom( if (other.hasInAnyNDayPeriod()) { setInAnyNDayPeriod(other.getInAnyNDayPeriod()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -504,19 +451,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SegmentParameterFilterScoping 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: + { + inAnyNDayPeriod_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SegmentParameterFilterScoping) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -703,7 +668,18 @@ public SegmentParameterFilterScoping parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SegmentParameterFilterScoping(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegment.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegment.java index 028aef36..ada286f7 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegment.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegment.java @@ -52,79 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SessionSegment( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.SessionSegmentCriteria.Builder subBuilder = null; - if (sessionInclusionCriteria_ != null) { - subBuilder = sessionInclusionCriteria_.toBuilder(); - } - sessionInclusionCriteria_ = - input.readMessage( - com.google.analytics.data.v1alpha.SessionSegmentCriteria.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(sessionInclusionCriteria_); - sessionInclusionCriteria_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SessionSegmentExclusion.Builder subBuilder = null; - if (exclusion_ != null) { - subBuilder = exclusion_.toBuilder(); - } - exclusion_ = - input.readMessage( - com.google.analytics.data.v1alpha.SessionSegmentExclusion.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(exclusion_); - exclusion_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SessionSegment_descriptor; @@ -261,7 +188,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exclusion_ != null) { output.writeMessage(2, getExclusion()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -278,7 +205,7 @@ public int getSerializedSize() { if (exclusion_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExclusion()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -302,7 +229,7 @@ public boolean equals(final java.lang.Object obj) { if (hasExclusion()) { if (!getExclusion().equals(other.getExclusion())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -321,7 +248,7 @@ public int hashCode() { hash = (37 * hash) + EXCLUSION_FIELD_NUMBER; hash = (53 * hash) + getExclusion().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -452,17 +379,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SessionSegment.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -573,7 +493,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SessionSegment other) if (other.hasExclusion()) { mergeExclusion(other.getExclusion()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -588,17 +508,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SessionSegment 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( + getSessionInclusionCriteriaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getExclusionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.SessionSegment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1021,7 +968,18 @@ public SessionSegment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SessionSegment(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentConditionGroup.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentConditionGroup.java index 6c6029b2..f54841fe 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentConditionGroup.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentConditionGroup.java @@ -53,69 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SessionSegmentConditionGroup( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - conditionScoping_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SegmentFilterExpression.Builder subBuilder = null; - if (segmentFilterExpression_ != null) { - subBuilder = segmentFilterExpression_.toBuilder(); - } - segmentFilterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(segmentFilterExpression_); - segmentFilterExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SessionSegmentConditionGroup_descriptor; @@ -272,7 +209,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (segmentFilterExpression_ != null) { output.writeMessage(2, getSegmentFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -291,7 +228,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSegmentFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -312,7 +249,7 @@ public boolean equals(final java.lang.Object obj) { if (hasSegmentFilterExpression()) { if (!getSegmentFilterExpression().equals(other.getSegmentFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -329,7 +266,7 @@ public int hashCode() { hash = (37 * hash) + SEGMENT_FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getSegmentFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -460,17 +397,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SessionSegmentConditionGroup.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -575,7 +505,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SessionSegmentConditi if (other.hasSegmentFilterExpression()) { mergeSegmentFilterExpression(other.getSegmentFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -590,19 +520,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SessionSegmentConditionGroup 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: + { + conditionScoping_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getSegmentFilterExpressionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SessionSegmentConditionGroup) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1007,7 +962,18 @@ public SessionSegmentConditionGroup parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SessionSegmentConditionGroup(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentCriteria.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentCriteria.java index a9feec05..e42b69d7 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentCriteria.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentCriteria.java @@ -53,63 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SessionSegmentCriteria( - 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)) { - andConditionGroups_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.SessionSegmentConditionGroup>(); - mutable_bitField0_ |= 0x00000001; - } - andConditionGroups_.add( - input.readMessage( - com.google.analytics.data.v1alpha.SessionSegmentConditionGroup.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - andConditionGroups_ = java.util.Collections.unmodifiableList(andConditionGroups_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SessionSegmentCriteria_descriptor; @@ -231,7 +174,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < andConditionGroups_.size(); i++) { output.writeMessage(1, andConditionGroups_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -244,7 +187,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, andConditionGroups_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -261,7 +204,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1alpha.SessionSegmentCriteria) obj; if (!getAndConditionGroupsList().equals(other.getAndConditionGroupsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -276,7 +219,7 @@ public int hashCode() { hash = (37 * hash) + AND_CONDITION_GROUPS_FIELD_NUMBER; hash = (53 * hash) + getAndConditionGroupsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -407,19 +350,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SessionSegmentCriteria.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getAndConditionGroupsFieldBuilder(); - } } @java.lang.Override @@ -427,10 +361,11 @@ public Builder clear() { super.clear(); if (andConditionGroupsBuilder_ == null) { andConditionGroups_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + andConditionGroups_ = null; andConditionGroupsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -545,7 +480,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SessionSegmentCriteri } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -560,18 +495,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SessionSegmentCriteria 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: + { + com.google.analytics.data.v1alpha.SessionSegmentConditionGroup m = + input.readMessage( + com.google.analytics.data.v1alpha.SessionSegmentConditionGroup.parser(), + extensionRegistry); + if (andConditionGroupsBuilder_ == null) { + ensureAndConditionGroupsIsMutable(); + andConditionGroups_.add(m); + } else { + andConditionGroupsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SessionSegmentCriteria) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1034,7 +996,18 @@ public SessionSegmentCriteria parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SessionSegmentCriteria(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentExclusion.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentExclusion.java index 83a236a2..fdcbe5da 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentExclusion.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/SessionSegmentExclusion.java @@ -52,69 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SessionSegmentExclusion( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - sessionExclusionDuration_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SessionSegmentCriteria.Builder subBuilder = null; - if (sessionExclusionCriteria_ != null) { - subBuilder = sessionExclusionCriteria_.toBuilder(); - } - sessionExclusionCriteria_ = - input.readMessage( - com.google.analytics.data.v1alpha.SessionSegmentCriteria.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(sessionExclusionCriteria_); - sessionExclusionCriteria_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_SessionSegmentExclusion_descriptor; @@ -255,7 +192,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (sessionExclusionCriteria_ != null) { output.writeMessage(2, getSessionExclusionCriteria()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -275,7 +212,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, getSessionExclusionCriteria()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -296,7 +233,7 @@ public boolean equals(final java.lang.Object obj) { if (hasSessionExclusionCriteria()) { if (!getSessionExclusionCriteria().equals(other.getSessionExclusionCriteria())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -313,7 +250,7 @@ public int hashCode() { hash = (37 * hash) + SESSION_EXCLUSION_CRITERIA_FIELD_NUMBER; hash = (53 * hash) + getSessionExclusionCriteria().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -443,17 +380,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.SessionSegmentExclusion.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -556,7 +486,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.SessionSegmentExclusi if (other.hasSessionExclusionCriteria()) { mergeSessionExclusionCriteria(other.getSessionExclusionCriteria()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -571,18 +501,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.SessionSegmentExclusion 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: + { + sessionExclusionDuration_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getSessionExclusionCriteriaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.SessionSegmentExclusion) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -943,7 +899,18 @@ public SessionSegmentExclusion parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SessionSegmentExclusion(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/StringFilter.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/StringFilter.java index 18da13e9..5a6a7345 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/StringFilter.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/StringFilter.java @@ -53,64 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private StringFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - matchType_ = rawValue; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - value_ = s; - break; - } - case 24: - { - caseSensitive_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_StringFilter_descriptor; @@ -501,7 +443,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (caseSensitive_ != false) { output.writeBool(3, caseSensitive_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -521,7 +463,7 @@ public int getSerializedSize() { if (caseSensitive_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, caseSensitive_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -540,7 +482,7 @@ public boolean equals(final java.lang.Object obj) { if (matchType_ != other.matchType_) return false; if (!getValue().equals(other.getValue())) return false; if (getCaseSensitive() != other.getCaseSensitive()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -557,7 +499,7 @@ public int hashCode() { hash = (53 * hash) + getValue().hashCode(); hash = (37 * hash) + CASE_SENSITIVE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCaseSensitive()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -686,17 +628,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.StringFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -797,7 +732,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.StringFilter other) { if (other.getCaseSensitive() != false) { setCaseSensitive(other.getCaseSensitive()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -812,17 +747,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.StringFilter 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: + { + matchType_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + value_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 24: + { + caseSensitive_ = input.readBool(); + + 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 = (com.google.analytics.data.v1alpha.StringFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1109,7 +1076,18 @@ public StringFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StringFilter(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegment.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegment.java index 36ca8735..d4e5f41a 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegment.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegment.java @@ -52,79 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private UserSegment( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1alpha.UserSegmentCriteria.Builder subBuilder = null; - if (userInclusionCriteria_ != null) { - subBuilder = userInclusionCriteria_.toBuilder(); - } - userInclusionCriteria_ = - input.readMessage( - com.google.analytics.data.v1alpha.UserSegmentCriteria.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(userInclusionCriteria_); - userInclusionCriteria_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1alpha.UserSegmentExclusion.Builder subBuilder = null; - if (exclusion_ != null) { - subBuilder = exclusion_.toBuilder(); - } - exclusion_ = - input.readMessage( - com.google.analytics.data.v1alpha.UserSegmentExclusion.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(exclusion_); - exclusion_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_UserSegment_descriptor; @@ -257,7 +184,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exclusion_ != null) { output.writeMessage(2, getExclusion()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -273,7 +200,7 @@ public int getSerializedSize() { if (exclusion_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getExclusion()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -297,7 +224,7 @@ public boolean equals(final java.lang.Object obj) { if (hasExclusion()) { if (!getExclusion().equals(other.getExclusion())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -316,7 +243,7 @@ public int hashCode() { hash = (37 * hash) + EXCLUSION_FIELD_NUMBER; hash = (53 * hash) + getExclusion().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -447,17 +374,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.UserSegment.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -567,7 +487,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.UserSegment other) { if (other.hasExclusion()) { mergeExclusion(other.getExclusion()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -582,17 +502,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.UserSegment 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( + getUserInclusionCriteriaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getExclusionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1alpha.UserSegment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1005,7 +952,18 @@ public UserSegment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSegment(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentConditionGroup.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentConditionGroup.java index 9be45faa..5ddf79db 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentConditionGroup.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentConditionGroup.java @@ -53,69 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private UserSegmentConditionGroup( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - conditionScoping_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.SegmentFilterExpression.Builder subBuilder = null; - if (segmentFilterExpression_ != null) { - subBuilder = segmentFilterExpression_.toBuilder(); - } - segmentFilterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(segmentFilterExpression_); - segmentFilterExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_UserSegmentConditionGroup_descriptor; @@ -271,7 +208,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (segmentFilterExpression_ != null) { output.writeMessage(2, getSegmentFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -289,7 +226,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSegmentFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -310,7 +247,7 @@ public boolean equals(final java.lang.Object obj) { if (hasSegmentFilterExpression()) { if (!getSegmentFilterExpression().equals(other.getSegmentFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -327,7 +264,7 @@ public int hashCode() { hash = (37 * hash) + SEGMENT_FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getSegmentFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -458,17 +395,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.UserSegmentConditionGroup.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -571,7 +501,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.UserSegmentConditionG if (other.hasSegmentFilterExpression()) { mergeSegmentFilterExpression(other.getSegmentFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -586,18 +516,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.UserSegmentConditionGroup 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: + { + conditionScoping_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getSegmentFilterExpressionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.UserSegmentConditionGroup) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1000,7 +956,18 @@ public UserSegmentConditionGroup parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSegmentConditionGroup(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentCriteria.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentCriteria.java index 8fe0780d..dd51e165 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentCriteria.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentCriteria.java @@ -54,80 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private UserSegmentCriteria( - 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)) { - andConditionGroups_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.UserSegmentConditionGroup>(); - mutable_bitField0_ |= 0x00000001; - } - andConditionGroups_.add( - input.readMessage( - com.google.analytics.data.v1alpha.UserSegmentConditionGroup.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - andSequenceGroups_ = - new java.util.ArrayList< - com.google.analytics.data.v1alpha.UserSegmentSequenceGroup>(); - mutable_bitField0_ |= 0x00000002; - } - andSequenceGroups_.add( - input.readMessage( - com.google.analytics.data.v1alpha.UserSegmentSequenceGroup.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - andConditionGroups_ = java.util.Collections.unmodifiableList(andConditionGroups_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - andSequenceGroups_ = java.util.Collections.unmodifiableList(andSequenceGroups_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_UserSegmentCriteria_descriptor; @@ -346,7 +272,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < andSequenceGroups_.size(); i++) { output.writeMessage(2, andSequenceGroups_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -363,7 +289,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, andSequenceGroups_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -381,7 +307,7 @@ public boolean equals(final java.lang.Object obj) { if (!getAndConditionGroupsList().equals(other.getAndConditionGroupsList())) return false; if (!getAndSequenceGroupsList().equals(other.getAndSequenceGroupsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -400,7 +326,7 @@ public int hashCode() { hash = (37 * hash) + AND_SEQUENCE_GROUPS_FIELD_NUMBER; hash = (53 * hash) + getAndSequenceGroupsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -531,20 +457,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.UserSegmentCriteria.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getAndConditionGroupsFieldBuilder(); - getAndSequenceGroupsFieldBuilder(); - } } @java.lang.Override @@ -552,16 +468,18 @@ public Builder clear() { super.clear(); if (andConditionGroupsBuilder_ == null) { andConditionGroups_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + andConditionGroups_ = null; andConditionGroupsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (andSequenceGroupsBuilder_ == null) { andSequenceGroups_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + andSequenceGroups_ = null; andSequenceGroupsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -712,7 +630,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.UserSegmentCriteria o } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -727,18 +645,59 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.UserSegmentCriteria 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: + { + com.google.analytics.data.v1alpha.UserSegmentConditionGroup m = + input.readMessage( + com.google.analytics.data.v1alpha.UserSegmentConditionGroup.parser(), + extensionRegistry); + if (andConditionGroupsBuilder_ == null) { + ensureAndConditionGroupsIsMutable(); + andConditionGroups_.add(m); + } else { + andConditionGroupsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1alpha.UserSegmentSequenceGroup m = + input.readMessage( + com.google.analytics.data.v1alpha.UserSegmentSequenceGroup.parser(), + extensionRegistry); + if (andSequenceGroupsBuilder_ == null) { + ensureAndSequenceGroupsIsMutable(); + andSequenceGroups_.add(m); + } else { + andSequenceGroupsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.UserSegmentCriteria) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1662,7 +1621,18 @@ public UserSegmentCriteria parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSegmentCriteria(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentExclusion.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentExclusion.java index 51f70dcb..d16ce809 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentExclusion.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentExclusion.java @@ -52,69 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private UserSegmentExclusion( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - userExclusionDuration_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1alpha.UserSegmentCriteria.Builder subBuilder = null; - if (userExclusionCriteria_ != null) { - subBuilder = userExclusionCriteria_.toBuilder(); - } - userExclusionCriteria_ = - input.readMessage( - com.google.analytics.data.v1alpha.UserSegmentCriteria.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(userExclusionCriteria_); - userExclusionCriteria_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_UserSegmentExclusion_descriptor; @@ -249,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (userExclusionCriteria_ != null) { output.writeMessage(2, getUserExclusionCriteria()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -268,7 +205,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUserExclusionCriteria()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -289,7 +226,7 @@ public boolean equals(final java.lang.Object obj) { if (hasUserExclusionCriteria()) { if (!getUserExclusionCriteria().equals(other.getUserExclusionCriteria())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -306,7 +243,7 @@ public int hashCode() { hash = (37 * hash) + USER_EXCLUSION_CRITERIA_FIELD_NUMBER; hash = (53 * hash) + getUserExclusionCriteria().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -436,17 +373,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.UserSegmentExclusion.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -549,7 +479,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.UserSegmentExclusion if (other.hasUserExclusionCriteria()) { mergeUserExclusionCriteria(other.getUserExclusionCriteria()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -564,18 +494,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.UserSegmentExclusion 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: + { + userExclusionDuration_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getUserExclusionCriteriaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1alpha.UserSegmentExclusion) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -925,7 +881,18 @@ public UserSegmentExclusion parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSegmentExclusion(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentSequenceGroup.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentSequenceGroup.java index 08fb0db0..fdbf2c80 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentSequenceGroup.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSegmentSequenceGroup.java @@ -54,84 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private UserSegmentSequenceGroup( - 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(); - - sequenceScoping_ = rawValue; - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (sequenceMaximumDuration_ != null) { - subBuilder = sequenceMaximumDuration_.toBuilder(); - } - sequenceMaximumDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(sequenceMaximumDuration_); - sequenceMaximumDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - userSequenceSteps_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - userSequenceSteps_.add( - input.readMessage( - com.google.analytics.data.v1alpha.UserSequenceStep.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - userSequenceSteps_ = java.util.Collections.unmodifiableList(userSequenceSteps_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_UserSegmentSequenceGroup_descriptor; @@ -369,7 +291,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < userSequenceSteps_.size(); i++) { output.writeMessage(3, userSequenceSteps_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -391,7 +313,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, userSequenceSteps_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -413,7 +335,7 @@ public boolean equals(final java.lang.Object obj) { if (!getSequenceMaximumDuration().equals(other.getSequenceMaximumDuration())) return false; } if (!getUserSequenceStepsList().equals(other.getUserSequenceStepsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -434,7 +356,7 @@ public int hashCode() { hash = (37 * hash) + USER_SEQUENCE_STEPS_FIELD_NUMBER; hash = (53 * hash) + getUserSequenceStepsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -565,19 +487,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.UserSegmentSequenceGroup.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getUserSequenceStepsFieldBuilder(); - } } @java.lang.Override @@ -593,10 +506,11 @@ public Builder clear() { } if (userSequenceStepsBuilder_ == null) { userSequenceSteps_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + userSequenceSteps_ = null; userSequenceStepsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -723,7 +637,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.UserSegmentSequenceGr } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -738,18 +652,58 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.UserSegmentSequenceGroup 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: + { + sequenceScoping_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getSequenceMaximumDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1alpha.UserSequenceStep m = + input.readMessage( + com.google.analytics.data.v1alpha.UserSequenceStep.parser(), + extensionRegistry); + if (userSequenceStepsBuilder_ == null) { + ensureUserSequenceStepsIsMutable(); + userSequenceSteps_.add(m); + } else { + userSequenceStepsBuilder_.addMessage(m); + } + 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 = - (com.google.analytics.data.v1alpha.UserSegmentSequenceGroup) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1567,7 +1521,18 @@ public UserSegmentSequenceGroup parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSegmentSequenceGroup(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/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSequenceStep.java b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSequenceStep.java index ce982040..92e78fa8 100644 --- a/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSequenceStep.java +++ b/proto-google-analytics-data-v1alpha/src/main/java/com/google/analytics/data/v1alpha/UserSequenceStep.java @@ -53,74 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private UserSequenceStep( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - isDirectlyFollowedBy_ = input.readBool(); - break; - } - case 16: - { - int rawValue = input.readEnum(); - - stepScoping_ = rawValue; - break; - } - case 26: - { - com.google.analytics.data.v1alpha.SegmentFilterExpression.Builder subBuilder = null; - if (segmentFilterExpression_ != null) { - subBuilder = segmentFilterExpression_.toBuilder(); - } - segmentFilterExpression_ = - input.readMessage( - com.google.analytics.data.v1alpha.SegmentFilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(segmentFilterExpression_); - segmentFilterExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1alpha.ReportingApiProto .internal_static_google_analytics_data_v1alpha_UserSequenceStep_descriptor; @@ -293,7 +225,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (segmentFilterExpression_ != null) { output.writeMessage(3, getSegmentFilterExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -314,7 +246,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getSegmentFilterExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -336,7 +268,7 @@ public boolean equals(final java.lang.Object obj) { if (hasSegmentFilterExpression()) { if (!getSegmentFilterExpression().equals(other.getSegmentFilterExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -355,7 +287,7 @@ public int hashCode() { hash = (37 * hash) + SEGMENT_FILTER_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getSegmentFilterExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -485,17 +417,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1alpha.UserSequenceStep.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -604,7 +529,7 @@ public Builder mergeFrom(com.google.analytics.data.v1alpha.UserSequenceStep othe if (other.hasSegmentFilterExpression()) { mergeSegmentFilterExpression(other.getSegmentFilterExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -619,18 +544,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1alpha.UserSequenceStep 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: + { + isDirectlyFollowedBy_ = input.readBool(); + + break; + } // case 8 + case 16: + { + stepScoping_ = input.readEnum(); + + break; + } // case 16 + case 26: + { + input.readMessage( + getSegmentFilterExpressionFieldBuilder().getBuilder(), extensionRegistry); + + 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 = - (com.google.analytics.data.v1alpha.UserSequenceStep) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1076,7 +1033,18 @@ public UserSequenceStep parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSequenceStep(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/proto-google-analytics-data-v1beta/pom.xml b/proto-google-analytics-data-v1beta/pom.xml index 8f6491e8..78097993 100644 --- a/proto-google-analytics-data-v1beta/pom.xml +++ b/proto-google-analytics-data-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-data-v1beta - 0.14.8 + 0.14.9 proto-google-analytics-data-v1beta PROTO library for proto-google-analytics-data-v1beta com.google.analytics google-analytics-data-parent - 0.14.8 + 0.14.9 diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsRequest.java index 3e3757a4..de898540 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsRequest.java @@ -53,70 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BatchRunPivotReportsRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - requests_ = - new java.util.ArrayList< - com.google.analytics.data.v1beta.RunPivotReportRequest>(); - mutable_bitField0_ |= 0x00000001; - } - requests_.add( - input.readMessage( - com.google.analytics.data.v1beta.RunPivotReportRequest.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - requests_ = java.util.Collections.unmodifiableList(requests_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_BatchRunPivotReportsRequest_descriptor; @@ -290,7 +226,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < requests_.size(); i++) { output.writeMessage(2, requests_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -305,7 +241,7 @@ public int getSerializedSize() { for (int i = 0; i < requests_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, requests_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -323,7 +259,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProperty().equals(other.getProperty())) return false; if (!getRequestsList().equals(other.getRequestsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -340,7 +276,7 @@ public int hashCode() { hash = (37 * hash) + REQUESTS_FIELD_NUMBER; hash = (53 * hash) + getRequestsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -470,19 +406,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.BatchRunPivotReportsRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getRequestsFieldBuilder(); - } } @java.lang.Override @@ -492,10 +419,11 @@ public Builder clear() { if (requestsBuilder_ == null) { requests_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + requests_ = null; requestsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -617,7 +545,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.BatchRunPivotReportsRe } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -632,18 +560,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.BatchRunPivotReportsRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.RunPivotReportRequest m = + input.readMessage( + com.google.analytics.data.v1beta.RunPivotReportRequest.parser(), + extensionRegistry); + if (requestsBuilder_ == null) { + ensureRequestsIsMutable(); + requests_.add(m); + } else { + requestsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.BatchRunPivotReportsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1201,7 +1162,18 @@ public BatchRunPivotReportsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchRunPivotReportsRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java index 870058c6..69fc9c16 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java @@ -53,70 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BatchRunPivotReportsResponse( - 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)) { - pivotReports_ = - new java.util.ArrayList< - com.google.analytics.data.v1beta.RunPivotReportResponse>(); - mutable_bitField0_ |= 0x00000001; - } - pivotReports_.add( - input.readMessage( - com.google.analytics.data.v1beta.RunPivotReportResponse.parser(), - extensionRegistry)); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - pivotReports_ = java.util.Collections.unmodifiableList(pivotReports_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_BatchRunPivotReportsResponse_descriptor; @@ -276,7 +212,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kind_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -291,7 +227,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kind_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -309,7 +245,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPivotReportsList().equals(other.getPivotReportsList())) return false; if (!getKind().equals(other.getKind())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -326,7 +262,7 @@ public int hashCode() { } hash = (37 * hash) + KIND_FIELD_NUMBER; hash = (53 * hash) + getKind().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -456,19 +392,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.BatchRunPivotReportsResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPivotReportsFieldBuilder(); - } } @java.lang.Override @@ -476,10 +403,11 @@ public Builder clear() { super.clear(); if (pivotReportsBuilder_ == null) { pivotReports_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + pivotReports_ = null; pivotReportsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); kind_ = ""; return this; @@ -603,7 +531,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.BatchRunPivotReportsRe kind_ = other.kind_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -618,19 +546,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.BatchRunPivotReportsResponse 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: + { + com.google.analytics.data.v1beta.RunPivotReportResponse m = + input.readMessage( + com.google.analytics.data.v1beta.RunPivotReportResponse.parser(), + extensionRegistry); + if (pivotReportsBuilder_ == null) { + ensurePivotReportsIsMutable(); + pivotReports_.add(m); + } else { + pivotReportsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + kind_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.BatchRunPivotReportsResponse) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1149,7 +1109,18 @@ public BatchRunPivotReportsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchRunPivotReportsResponse(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsRequest.java index b2fa5e94..f341323f 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsRequest.java @@ -53,69 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BatchRunReportsRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - requests_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - requests_.add( - input.readMessage( - com.google.analytics.data.v1beta.RunReportRequest.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - requests_ = java.util.Collections.unmodifiableList(requests_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_BatchRunReportsRequest_descriptor; @@ -289,7 +226,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < requests_.size(); i++) { output.writeMessage(2, requests_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -304,7 +241,7 @@ public int getSerializedSize() { for (int i = 0; i < requests_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, requests_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -322,7 +259,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProperty().equals(other.getProperty())) return false; if (!getRequestsList().equals(other.getRequestsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -339,7 +276,7 @@ public int hashCode() { hash = (37 * hash) + REQUESTS_FIELD_NUMBER; hash = (53 * hash) + getRequestsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -469,19 +406,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.BatchRunReportsRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getRequestsFieldBuilder(); - } } @java.lang.Override @@ -491,10 +419,11 @@ public Builder clear() { if (requestsBuilder_ == null) { requests_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + requests_ = null; requestsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -614,7 +543,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.BatchRunReportsRequest } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -629,18 +558,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.BatchRunReportsRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.RunReportRequest m = + input.readMessage( + com.google.analytics.data.v1beta.RunReportRequest.parser(), + extensionRegistry); + if (requestsBuilder_ == null) { + ensureRequestsIsMutable(); + requests_.add(m); + } else { + requestsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.BatchRunReportsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1190,7 +1152,18 @@ public BatchRunReportsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchRunReportsRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java index 6ea58ea2..d3190c0e 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java @@ -53,69 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BatchRunReportsResponse( - 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)) { - reports_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - reports_.add( - input.readMessage( - com.google.analytics.data.v1beta.RunReportResponse.parser(), - extensionRegistry)); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - reports_ = java.util.Collections.unmodifiableList(reports_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_BatchRunReportsResponse_descriptor; @@ -274,7 +211,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kind_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -289,7 +226,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kind_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -307,7 +244,7 @@ public boolean equals(final java.lang.Object obj) { if (!getReportsList().equals(other.getReportsList())) return false; if (!getKind().equals(other.getKind())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -324,7 +261,7 @@ public int hashCode() { } hash = (37 * hash) + KIND_FIELD_NUMBER; hash = (53 * hash) + getKind().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -454,19 +391,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.BatchRunReportsResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getReportsFieldBuilder(); - } } @java.lang.Override @@ -474,10 +402,11 @@ public Builder clear() { super.clear(); if (reportsBuilder_ == null) { reports_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + reports_ = null; reportsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); kind_ = ""; return this; @@ -599,7 +528,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.BatchRunReportsRespons kind_ = other.kind_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -614,18 +543,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.BatchRunReportsResponse 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: + { + com.google.analytics.data.v1beta.RunReportResponse m = + input.readMessage( + com.google.analytics.data.v1beta.RunReportResponse.parser(), + extensionRegistry); + if (reportsBuilder_ == null) { + ensureReportsIsMutable(); + reports_.add(m); + } else { + reportsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + kind_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.BatchRunReportsResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1132,7 +1094,18 @@ public BatchRunReportsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchRunReportsResponse(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityRequest.java index 7486453c..d4602992 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityRequest.java @@ -58,122 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CheckCompatibilityRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensions_.add( - input.readMessage( - com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metrics_.add( - input.readMessage( - com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry)); - break; - } - case 34: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (dimensionFilter_ != null) { - subBuilder = dimensionFilter_.toBuilder(); - } - dimensionFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionFilter_); - dimensionFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (metricFilter_ != null) { - subBuilder = metricFilter_.toBuilder(); - } - metricFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metricFilter_); - metricFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 48: - { - int rawValue = input.readEnum(); - - compatibilityFilter_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = java.util.Collections.unmodifiableList(dimensions_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_CheckCompatibilityRequest_descriptor; @@ -575,7 +459,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.analytics.data.v1beta.Compatibility.COMPATIBILITY_UNSPECIFIED.getNumber()) { output.writeEnum(6, compatibilityFilter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -603,7 +487,7 @@ public int getSerializedSize() { != com.google.analytics.data.v1beta.Compatibility.COMPATIBILITY_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(6, compatibilityFilter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -631,7 +515,7 @@ public boolean equals(final java.lang.Object obj) { if (!getMetricFilter().equals(other.getMetricFilter())) return false; } if (compatibilityFilter_ != other.compatibilityFilter_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -662,7 +546,7 @@ public int hashCode() { } hash = (37 * hash) + COMPATIBILITY_FILTER_FIELD_NUMBER; hash = (53 * hash) + compatibilityFilter_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -795,20 +679,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.CheckCompatibilityRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionsFieldBuilder(); - getMetricsFieldBuilder(); - } } @java.lang.Override @@ -818,16 +692,18 @@ public Builder clear() { if (dimensionsBuilder_ == null) { dimensions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensions_ = null; dimensionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metrics_ = null; metricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (dimensionFilterBuilder_ == null) { dimensionFilter_ = null; } else { @@ -1017,7 +893,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.CheckCompatibilityRequ if (other.compatibilityFilter_ != 0) { setCompatibilityFilterValue(other.getCompatibilityFilterValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1032,18 +908,81 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.CheckCompatibilityRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.Dimension m = + input.readMessage( + com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry); + if (dimensionsBuilder_ == null) { + ensureDimensionsIsMutable(); + dimensions_.add(m); + } else { + dimensionsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.Metric m = + input.readMessage( + com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry); + if (metricsBuilder_ == null) { + ensureMetricsIsMutable(); + metrics_.add(m); + } else { + metricsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + input.readMessage(getDimensionFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage(getMetricFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 48: + { + compatibilityFilter_ = input.readEnum(); + + break; + } // case 48 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.CheckCompatibilityRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2449,7 +2388,18 @@ public CheckCompatibilityRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CheckCompatibilityRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityResponse.java index f0b227ba..cc01a017 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CheckCompatibilityResponse.java @@ -53,80 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CheckCompatibilityResponse( - 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)) { - dimensionCompatibilities_ = - new java.util.ArrayList< - com.google.analytics.data.v1beta.DimensionCompatibility>(); - mutable_bitField0_ |= 0x00000001; - } - dimensionCompatibilities_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionCompatibility.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metricCompatibilities_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metricCompatibilities_.add( - input.readMessage( - com.google.analytics.data.v1beta.MetricCompatibility.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionCompatibilities_ = - java.util.Collections.unmodifiableList(dimensionCompatibilities_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metricCompatibilities_ = java.util.Collections.unmodifiableList(metricCompatibilities_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_CheckCompatibilityResponse_descriptor; @@ -322,7 +248,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < metricCompatibilities_.size(); i++) { output.writeMessage(2, metricCompatibilities_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -341,7 +267,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, metricCompatibilities_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -360,7 +286,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionCompatibilitiesList().equals(other.getDimensionCompatibilitiesList())) return false; if (!getMetricCompatibilitiesList().equals(other.getMetricCompatibilitiesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -379,7 +305,7 @@ public int hashCode() { hash = (37 * hash) + METRIC_COMPATIBILITIES_FIELD_NUMBER; hash = (53 * hash) + getMetricCompatibilitiesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -509,20 +435,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.CheckCompatibilityResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionCompatibilitiesFieldBuilder(); - getMetricCompatibilitiesFieldBuilder(); - } } @java.lang.Override @@ -530,16 +446,18 @@ public Builder clear() { super.clear(); if (dimensionCompatibilitiesBuilder_ == null) { dimensionCompatibilities_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionCompatibilities_ = null; dimensionCompatibilitiesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricCompatibilitiesBuilder_ == null) { metricCompatibilities_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metricCompatibilities_ = null; metricCompatibilitiesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -691,7 +609,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.CheckCompatibilityResp } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -706,18 +624,59 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.CheckCompatibilityResponse 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: + { + com.google.analytics.data.v1beta.DimensionCompatibility m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionCompatibility.parser(), + extensionRegistry); + if (dimensionCompatibilitiesBuilder_ == null) { + ensureDimensionCompatibilitiesIsMutable(); + dimensionCompatibilities_.add(m); + } else { + dimensionCompatibilitiesBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.MetricCompatibility m = + input.readMessage( + com.google.analytics.data.v1beta.MetricCompatibility.parser(), + extensionRegistry); + if (metricCompatibilitiesBuilder_ == null) { + ensureMetricCompatibilitiesIsMutable(); + metricCompatibilities_.add(m); + } else { + metricCompatibilitiesBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.CheckCompatibilityResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1543,7 +1502,18 @@ public CheckCompatibilityResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CheckCompatibilityResponse(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Cohort.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Cohort.java index 01718c73..1ff8fb34 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Cohort.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Cohort.java @@ -55,75 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Cohort( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - dimension_ = s; - break; - } - case 26: - { - com.google.analytics.data.v1beta.DateRange.Builder subBuilder = null; - if (dateRange_ != null) { - subBuilder = dateRange_.toBuilder(); - } - dateRange_ = - input.readMessage( - com.google.analytics.data.v1beta.DateRange.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dateRange_); - dateRange_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Cohort_descriptor; @@ -355,7 +286,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (dateRange_ != null) { output.writeMessage(3, getDateRange()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -373,7 +304,7 @@ public int getSerializedSize() { if (dateRange_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getDateRange()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -394,7 +325,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDateRange()) { if (!getDateRange().equals(other.getDateRange())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -413,7 +344,7 @@ public int hashCode() { hash = (37 * hash) + DATE_RANGE_FIELD_NUMBER; hash = (53 * hash) + getDateRange().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -544,17 +475,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Cohort.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -664,7 +588,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Cohort other) { if (other.hasDateRange()) { mergeDateRange(other.getDateRange()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -679,17 +603,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Cohort 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.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + dimension_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + input.readMessage(getDateRangeFieldBuilder().getBuilder(), extensionRegistry); + + 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 = (com.google.analytics.data.v1beta.Cohort) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1260,7 +1216,18 @@ public Cohort parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Cohort(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortReportSettings.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortReportSettings.java index 8fb6d206..abc5491d 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortReportSettings.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortReportSettings.java @@ -50,50 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CohortReportSettings( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - accumulate_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_CohortReportSettings_descriptor; @@ -145,7 +101,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (accumulate_ != false) { output.writeBool(1, accumulate_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -157,7 +113,7 @@ public int getSerializedSize() { if (accumulate_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, accumulate_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -174,7 +130,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.CohortReportSettings) obj; if (getAccumulate() != other.getAccumulate()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -187,7 +143,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + ACCUMULATE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAccumulate()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -317,17 +273,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.CohortReportSettings.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -416,7 +365,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.CohortReportSettings o if (other.getAccumulate() != false) { setAccumulate(other.getAccumulate()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -431,18 +380,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.CohortReportSettings 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: + { + accumulate_ = input.readBool(); + + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.CohortReportSettings) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -533,7 +501,18 @@ public CohortReportSettings parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CohortReportSettings(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortSpec.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortSpec.java index afa54f35..a38360ca 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortSpec.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortSpec.java @@ -64,93 +64,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CohortSpec( - 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)) { - cohorts_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - cohorts_.add( - input.readMessage( - com.google.analytics.data.v1beta.Cohort.parser(), extensionRegistry)); - break; - } - case 18: - { - com.google.analytics.data.v1beta.CohortsRange.Builder subBuilder = null; - if (cohortsRange_ != null) { - subBuilder = cohortsRange_.toBuilder(); - } - cohortsRange_ = - input.readMessage( - com.google.analytics.data.v1beta.CohortsRange.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(cohortsRange_); - cohortsRange_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.analytics.data.v1beta.CohortReportSettings.Builder subBuilder = null; - if (cohortReportSettings_ != null) { - subBuilder = cohortReportSettings_.toBuilder(); - } - cohortReportSettings_ = - input.readMessage( - com.google.analytics.data.v1beta.CohortReportSettings.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(cohortReportSettings_); - cohortReportSettings_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - cohorts_ = java.util.Collections.unmodifiableList(cohorts_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_CohortSpec_descriptor; @@ -368,7 +281,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (cohortReportSettings_ != null) { output.writeMessage(3, getCohortReportSettings()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -387,7 +300,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getCohortReportSettings()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -412,7 +325,7 @@ public boolean equals(final java.lang.Object obj) { if (hasCohortReportSettings()) { if (!getCohortReportSettings().equals(other.getCohortReportSettings())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -435,7 +348,7 @@ public int hashCode() { hash = (37 * hash) + COHORT_REPORT_SETTINGS_FIELD_NUMBER; hash = (53 * hash) + getCohortReportSettings().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -576,19 +489,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.CohortSpec.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getCohortsFieldBuilder(); - } } @java.lang.Override @@ -596,10 +500,11 @@ public Builder clear() { super.clear(); if (cohortsBuilder_ == null) { cohorts_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + cohorts_ = null; cohortsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (cohortsRangeBuilder_ == null) { cohortsRange_ = null; } else { @@ -741,7 +646,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.CohortSpec other) { if (other.hasCohortReportSettings()) { mergeCohortReportSettings(other.getCohortReportSettings()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -756,17 +661,57 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.CohortSpec 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: + { + com.google.analytics.data.v1beta.Cohort m = + input.readMessage( + com.google.analytics.data.v1beta.Cohort.parser(), extensionRegistry); + if (cohortsBuilder_ == null) { + ensureCohortsIsMutable(); + cohorts_.add(m); + } else { + cohortsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + input.readMessage(getCohortsRangeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage( + getCohortReportSettingsFieldBuilder().getBuilder(), extensionRegistry); + + 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 = (com.google.analytics.data.v1beta.CohortSpec) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1574,7 +1519,18 @@ public CohortSpec parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CohortSpec(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortsRange.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortsRange.java index 01288a51..33ec2be8 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortsRange.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/CohortsRange.java @@ -53,62 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CohortsRange( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - granularity_ = rawValue; - break; - } - case 16: - { - startOffset_ = input.readInt32(); - break; - } - case 24: - { - endOffset_ = input.readInt32(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_CohortsRange_descriptor; @@ -430,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (endOffset_ != 0) { output.writeInt32(3, endOffset_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -450,7 +394,7 @@ public int getSerializedSize() { if (endOffset_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, endOffset_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -469,7 +413,7 @@ public boolean equals(final java.lang.Object obj) { if (granularity_ != other.granularity_) return false; if (getStartOffset() != other.getStartOffset()) return false; if (getEndOffset() != other.getEndOffset()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -486,7 +430,7 @@ public int hashCode() { hash = (53 * hash) + getStartOffset(); hash = (37 * hash) + END_OFFSET_FIELD_NUMBER; hash = (53 * hash) + getEndOffset(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -616,17 +560,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.CohortsRange.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -726,7 +663,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.CohortsRange other) { if (other.getEndOffset() != 0) { setEndOffset(other.getEndOffset()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -741,17 +678,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.CohortsRange 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: + { + granularity_ = input.readEnum(); + + break; + } // case 8 + case 16: + { + startOffset_ = input.readInt32(); + + break; + } // case 16 + case 24: + { + endOffset_ = input.readInt32(); + + 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 = (com.google.analytics.data.v1beta.CohortsRange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1040,7 +1009,18 @@ public CohortsRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CohortsRange(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DateRange.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DateRange.java index 5627b500..f4093172 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DateRange.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DateRange.java @@ -55,66 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DateRange( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - startDate_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - endDate_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DateRange_descriptor; @@ -318,7 +258,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -336,7 +276,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -355,7 +295,7 @@ public boolean equals(final java.lang.Object obj) { if (!getStartDate().equals(other.getStartDate())) return false; if (!getEndDate().equals(other.getEndDate())) return false; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -372,7 +312,7 @@ public int hashCode() { hash = (53 * hash) + getEndDate().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -502,17 +442,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.DateRange.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -615,7 +548,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.DateRange other) { name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -630,17 +563,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DateRange 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: + { + startDate_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + endDate_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + name_ = input.readStringRequireUtf8(); + + 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 = (com.google.analytics.data.v1beta.DateRange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1039,7 +1004,18 @@ public DateRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DateRange(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Dimension.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Dimension.java index ca2201ab..667aeb29 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Dimension.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Dimension.java @@ -55,69 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Dimension( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 18: - { - com.google.analytics.data.v1beta.DimensionExpression.Builder subBuilder = null; - if (dimensionExpression_ != null) { - subBuilder = dimensionExpression_.toBuilder(); - } - dimensionExpression_ = - input.readMessage( - com.google.analytics.data.v1beta.DimensionExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionExpression_); - dimensionExpression_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Dimension_descriptor; @@ -272,7 +209,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (dimensionExpression_ != null) { output.writeMessage(2, getDimensionExpression()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -287,7 +224,7 @@ public int getSerializedSize() { if (dimensionExpression_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDimensionExpression()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -308,7 +245,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDimensionExpression()) { if (!getDimensionExpression().equals(other.getDimensionExpression())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -325,7 +262,7 @@ public int hashCode() { hash = (37 * hash) + DIMENSION_EXPRESSION_FIELD_NUMBER; hash = (53 * hash) + getDimensionExpression().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -457,17 +394,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Dimension.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -570,7 +500,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Dimension other) { if (other.hasDimensionExpression()) { mergeDimensionExpression(other.getDimensionExpression()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -585,17 +515,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Dimension 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.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + input.readMessage( + getDimensionExpressionFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.Dimension) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -981,7 +938,18 @@ public Dimension parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Dimension(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionCompatibility.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionCompatibility.java index 52282ece..99439508 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionCompatibility.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionCompatibility.java @@ -52,70 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionCompatibility( - 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.analytics.data.v1beta.DimensionMetadata.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = dimensionMetadata_.toBuilder(); - } - dimensionMetadata_ = - input.readMessage( - com.google.analytics.data.v1beta.DimensionMetadata.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionMetadata_); - dimensionMetadata_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 16: - { - int rawValue = input.readEnum(); - bitField0_ |= 0x00000002; - compatibility_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionCompatibility_descriptor; @@ -263,7 +199,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeEnum(2, compatibility_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -278,7 +214,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, compatibility_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -302,7 +238,7 @@ public boolean equals(final java.lang.Object obj) { if (hasCompatibility()) { if (compatibility_ != other.compatibility_) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -321,7 +257,7 @@ public int hashCode() { hash = (37 * hash) + COMPATIBILITY_FIELD_NUMBER; hash = (53 * hash) + compatibility_; } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -575,7 +511,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.DimensionCompatibility if (other.hasCompatibility()) { setCompatibility(other.getCompatibility()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -590,18 +526,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionCompatibility 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( + getDimensionMetadataFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: + { + compatibility_ = input.readEnum(); + 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 = - (com.google.analytics.data.v1beta.DimensionCompatibility) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -960,7 +922,18 @@ public DimensionCompatibility parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionCompatibility(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionExpression.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionExpression.java index 1f39bcb5..53ab9b0e 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionExpression.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionExpression.java @@ -53,115 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 34: - { - com.google.analytics.data.v1beta.DimensionExpression.CaseExpression.Builder - subBuilder = null; - if (oneExpressionCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1beta.DimensionExpression.CaseExpression) - oneExpression_) - .toBuilder(); - } - oneExpression_ = - input.readMessage( - com.google.analytics.data.v1beta.DimensionExpression.CaseExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.DimensionExpression.CaseExpression) - oneExpression_); - oneExpression_ = subBuilder.buildPartial(); - } - oneExpressionCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1beta.DimensionExpression.CaseExpression.Builder - subBuilder = null; - if (oneExpressionCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1beta.DimensionExpression.CaseExpression) - oneExpression_) - .toBuilder(); - } - oneExpression_ = - input.readMessage( - com.google.analytics.data.v1beta.DimensionExpression.CaseExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.DimensionExpression.CaseExpression) - oneExpression_); - oneExpression_ = subBuilder.buildPartial(); - } - oneExpressionCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression.Builder - subBuilder = null; - if (oneExpressionCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression) - oneExpression_) - .toBuilder(); - } - oneExpression_ = - input.readMessage( - com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression) - oneExpression_); - oneExpression_ = subBuilder.buildPartial(); - } - oneExpressionCase_ = 6; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionExpression_descriptor; @@ -243,52 +134,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CaseExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - dimensionName_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionExpression_CaseExpression_descriptor; @@ -372,7 +217,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dimensionName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, dimensionName_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -384,7 +229,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dimensionName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, dimensionName_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -401,7 +246,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.DimensionExpression.CaseExpression) obj; if (!getDimensionName().equals(other.getDimensionName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -414,7 +259,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + DIMENSION_NAME_FIELD_NUMBER; hash = (53 * hash) + getDimensionName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -548,17 +393,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1beta.DimensionExpression.CaseExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -655,7 +493,7 @@ public Builder mergeFrom( dimensionName_ = other.dimensionName_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -670,19 +508,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionExpression.CaseExpression 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: + { + dimensionName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.DimensionExpression.CaseExpression) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -832,7 +688,19 @@ public CaseExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CaseExpression(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(); } }; @@ -982,66 +850,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ConcatenateExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionNames_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionNames_.add(s); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - delimiter_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionNames_ = dimensionNames_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionExpression_ConcatenateExpression_descriptor; @@ -1202,7 +1010,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(delimiter_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, delimiter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1222,7 +1030,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(delimiter_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, delimiter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1241,7 +1049,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionNamesList().equals(other.getDimensionNamesList())) return false; if (!getDelimiter().equals(other.getDelimiter())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1258,7 +1066,7 @@ public int hashCode() { } hash = (37 * hash) + DELIMITER_FIELD_NUMBER; hash = (53 * hash) + getDelimiter().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1398,17 +1206,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1526,7 +1327,7 @@ public Builder mergeFrom( delimiter_ = other.delimiter_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1541,20 +1342,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression 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: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDimensionNamesIsMutable(); + dimensionNames_.add(s); + break; + } // case 10 + case 18: + { + delimiter_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1904,7 +1729,19 @@ public ConcatenateExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ConcatenateExpression(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(); } }; @@ -2169,7 +2006,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io (com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression) oneExpression_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2197,7 +2034,7 @@ public int getSerializedSize() { (com.google.analytics.data.v1beta.DimensionExpression.ConcatenateExpression) oneExpression_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2227,7 +2064,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2254,7 +2091,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2386,22 +2223,24 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.DimensionExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (lowerCaseBuilder_ != null) { + lowerCaseBuilder_.clear(); + } + if (upperCaseBuilder_ != null) { + upperCaseBuilder_.clear(); + } + if (concatenateBuilder_ != null) { + concatenateBuilder_.clear(); + } oneExpressionCase_ = 0; oneExpression_ = null; return this; @@ -2524,7 +2363,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.DimensionExpression ot break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2539,18 +2378,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionExpression 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 34: + { + input.readMessage(getLowerCaseFieldBuilder().getBuilder(), extensionRegistry); + oneExpressionCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getUpperCaseFieldBuilder().getBuilder(), extensionRegistry); + oneExpressionCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getConcatenateFieldBuilder().getBuilder(), extensionRegistry); + oneExpressionCase_ = 6; + break; + } // case 50 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.DimensionExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3307,7 +3177,18 @@ public DimensionExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionExpression(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionHeader.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionHeader.java index 4b1356ab..5168ca32 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionHeader.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionHeader.java @@ -55,52 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionHeader( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionHeader_descriptor; @@ -182,7 +136,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -194,7 +148,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -211,7 +165,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.DimensionHeader) obj; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -224,7 +178,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -356,17 +310,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.DimensionHeader.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -456,7 +403,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.DimensionHeader other) name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -471,17 +418,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionHeader 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.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.DimensionHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -623,7 +590,18 @@ public DimensionHeader parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionHeader(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionMetadata.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionMetadata.java index 16328792..40932d8f 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionMetadata.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionMetadata.java @@ -56,92 +56,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - apiName_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - uiName_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - description_ = s; - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - deprecatedApiNames_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - deprecatedApiNames_.add(s); - break; - } - case 40: - { - customDefinition_ = input.readBool(); - break; - } - case 58: - { - java.lang.String s = input.readStringRequireUtf8(); - - category_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - deprecatedApiNames_ = deprecatedApiNames_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionMetadata_descriptor; @@ -482,7 +396,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(category_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, category_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -514,7 +428,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(category_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, category_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -536,7 +450,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDeprecatedApiNamesList().equals(other.getDeprecatedApiNamesList())) return false; if (getCustomDefinition() != other.getCustomDefinition()) return false; if (!getCategory().equals(other.getCategory())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -561,7 +475,7 @@ public int hashCode() { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCustomDefinition()); hash = (37 * hash) + CATEGORY_FIELD_NUMBER; hash = (53 * hash) + getCategory().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -690,17 +604,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.DimensionMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -835,7 +742,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.DimensionMetadata othe category_ = other.category_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -850,18 +757,68 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionMetadata 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: + { + apiName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + uiName_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + description_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDeprecatedApiNamesIsMutable(); + deprecatedApiNames_.add(s); + break; + } // case 34 + case 40: + { + customDefinition_ = input.readBool(); + + break; + } // case 40 + case 58: + { + category_ = input.readStringRequireUtf8(); + + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.DimensionMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1585,7 +1542,18 @@ public DimensionMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionMetadata(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionValue.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionValue.java index de0488c7..853be477 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionValue.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/DimensionValue.java @@ -50,52 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - oneValueCase_ = 1; - oneValue_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_DimensionValue_descriptor; @@ -242,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneValueCase_ == 1) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, oneValue_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -254,7 +208,7 @@ public int getSerializedSize() { if (oneValueCase_ == 1) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, oneValue_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -278,7 +232,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -297,7 +251,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -426,17 +380,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.DimensionValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -538,7 +485,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.DimensionValue other) break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -553,17 +500,38 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.DimensionValue 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: + { + java.lang.String s = input.readStringRequireUtf8(); + oneValueCase_ = 1; + oneValue_ = s; + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.DimensionValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -747,7 +715,18 @@ public DimensionValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionValue(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Filter.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Filter.java index 1c439269..bd7a0694 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Filter.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Filter.java @@ -52,130 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Filter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - fieldName_ = s; - break; - } - case 26: - { - com.google.analytics.data.v1beta.Filter.StringFilter.Builder subBuilder = null; - if (oneFilterCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1beta.Filter.StringFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.Filter.StringFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.Filter.StringFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1beta.Filter.InListFilter.Builder subBuilder = null; - if (oneFilterCase_ == 4) { - subBuilder = - ((com.google.analytics.data.v1beta.Filter.InListFilter) oneFilter_).toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.Filter.InListFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.Filter.InListFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 4; - break; - } - case 42: - { - com.google.analytics.data.v1beta.Filter.NumericFilter.Builder subBuilder = null; - if (oneFilterCase_ == 5) { - subBuilder = - ((com.google.analytics.data.v1beta.Filter.NumericFilter) oneFilter_) - .toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.Filter.NumericFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.Filter.NumericFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 5; - break; - } - case 50: - { - com.google.analytics.data.v1beta.Filter.BetweenFilter.Builder subBuilder = null; - if (oneFilterCase_ == 6) { - subBuilder = - ((com.google.analytics.data.v1beta.Filter.BetweenFilter) oneFilter_) - .toBuilder(); - } - oneFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.Filter.BetweenFilter.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.Filter.BetweenFilter) oneFilter_); - oneFilter_ = subBuilder.buildPartial(); - } - oneFilterCase_ = 6; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Filter_descriptor; @@ -294,64 +170,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private StringFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - matchType_ = rawValue; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - value_ = s; - break; - } - case 24: - { - caseSensitive_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Filter_StringFilter_descriptor; @@ -744,7 +562,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (caseSensitive_ != false) { output.writeBool(3, caseSensitive_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -764,7 +582,7 @@ public int getSerializedSize() { if (caseSensitive_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, caseSensitive_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -783,7 +601,7 @@ public boolean equals(final java.lang.Object obj) { if (matchType_ != other.matchType_) return false; if (!getValue().equals(other.getValue())) return false; if (getCaseSensitive() != other.getCaseSensitive()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -800,7 +618,7 @@ public int hashCode() { hash = (53 * hash) + getValue().hashCode(); hash = (37 * hash) + CASE_SENSITIVE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCaseSensitive()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -932,17 +750,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Filter.StringFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1046,7 +857,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Filter.StringFilter ot if (other.getCaseSensitive() != false) { setCaseSensitive(other.getCaseSensitive()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1061,18 +872,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Filter.StringFilter 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: + { + matchType_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + value_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 24: + { + caseSensitive_ = input.readBool(); + + 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 = - (com.google.analytics.data.v1beta.Filter.StringFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1361,7 +1203,19 @@ public StringFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StringFilter(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(); } }; @@ -1487,64 +1341,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private InListFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - values_.add(s); - break; - } - case 16: - { - caseSensitive_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = values_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Filter_InListFilter_descriptor; @@ -1663,7 +1459,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (caseSensitive_ != false) { output.writeBool(2, caseSensitive_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1683,7 +1479,7 @@ public int getSerializedSize() { if (caseSensitive_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, caseSensitive_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1701,7 +1497,7 @@ public boolean equals(final java.lang.Object obj) { if (!getValuesList().equals(other.getValuesList())) return false; if (getCaseSensitive() != other.getCaseSensitive()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1718,7 +1514,7 @@ public int hashCode() { } hash = (37 * hash) + CASE_SENSITIVE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCaseSensitive()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1850,17 +1646,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Filter.InListFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1969,7 +1758,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Filter.InListFilter ot if (other.getCaseSensitive() != false) { setCaseSensitive(other.getCaseSensitive()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1984,18 +1773,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Filter.InListFilter 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: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureValuesIsMutable(); + values_.add(s); + break; + } // case 10 + case 16: + { + caseSensitive_ = input.readBool(); + + 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 = - (com.google.analytics.data.v1beta.Filter.InListFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2263,7 +2078,19 @@ public InListFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new InListFilter(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(); } }; @@ -2381,68 +2208,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private NumericFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - operation_ = rawValue; - break; - } - case 18: - { - com.google.analytics.data.v1beta.NumericValue.Builder subBuilder = null; - if (value_ != null) { - subBuilder = value_.toBuilder(); - } - value_ = - input.readMessage( - com.google.analytics.data.v1beta.NumericValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(value_); - value_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Filter_NumericFilter_descriptor; @@ -2791,7 +2556,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (value_ != null) { output.writeMessage(2, getValue()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2808,7 +2573,7 @@ public int getSerializedSize() { if (value_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getValue()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2829,7 +2594,7 @@ public boolean equals(final java.lang.Object obj) { if (hasValue()) { if (!getValue().equals(other.getValue())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2846,7 +2611,7 @@ public int hashCode() { hash = (37 * hash) + VALUE_FIELD_NUMBER; hash = (53 * hash) + getValue().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2978,17 +2743,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Filter.NumericFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -3093,7 +2851,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Filter.NumericFilter o if (other.hasValue()) { mergeValue(other.getValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3108,18 +2866,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Filter.NumericFilter 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: + { + operation_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.Filter.NumericFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3436,7 +3219,19 @@ public NumericFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new NumericFilter(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(); } }; @@ -3562,77 +3357,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BetweenFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1beta.NumericValue.Builder subBuilder = null; - if (fromValue_ != null) { - subBuilder = fromValue_.toBuilder(); - } - fromValue_ = - input.readMessage( - com.google.analytics.data.v1beta.NumericValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(fromValue_); - fromValue_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1beta.NumericValue.Builder subBuilder = null; - if (toValue_ != null) { - subBuilder = toValue_.toBuilder(); - } - toValue_ = - input.readMessage( - com.google.analytics.data.v1beta.NumericValue.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(toValue_); - toValue_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Filter_BetweenFilter_descriptor; @@ -3764,7 +3488,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (toValue_ != null) { output.writeMessage(2, getToValue()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3779,7 +3503,7 @@ public int getSerializedSize() { if (toValue_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getToValue()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3803,7 +3527,7 @@ public boolean equals(final java.lang.Object obj) { if (hasToValue()) { if (!getToValue().equals(other.getToValue())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3822,7 +3546,7 @@ public int hashCode() { hash = (37 * hash) + TO_VALUE_FIELD_NUMBER; hash = (53 * hash) + getToValue().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3954,17 +3678,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Filter.BetweenFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -4077,7 +3794,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Filter.BetweenFilter o if (other.hasToValue()) { mergeToValue(other.getToValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4092,18 +3809,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Filter.BetweenFilter 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(getFromValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getToValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.Filter.BetweenFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4512,7 +4254,19 @@ public BetweenFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BetweenFilter(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(); } }; @@ -4870,7 +4624,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneFilterCase_ == 6) { output.writeMessage(6, (com.google.analytics.data.v1beta.Filter.BetweenFilter) oneFilter_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -4902,7 +4656,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 6, (com.google.analytics.data.v1beta.Filter.BetweenFilter) oneFilter_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -4935,7 +4689,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4968,7 +4722,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -5097,17 +4851,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Filter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -5115,6 +4862,18 @@ public Builder clear() { super.clear(); fieldName_ = ""; + if (stringFilterBuilder_ != null) { + stringFilterBuilder_.clear(); + } + if (inListFilterBuilder_ != null) { + inListFilterBuilder_.clear(); + } + if (numericFilterBuilder_ != null) { + numericFilterBuilder_.clear(); + } + if (betweenFilterBuilder_ != null) { + betweenFilterBuilder_.clear(); + } oneFilterCase_ = 0; oneFilter_ = null; return this; @@ -5253,7 +5012,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Filter other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5268,17 +5027,61 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Filter 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: + { + fieldName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 26: + { + input.readMessage(getStringFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getInListFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getNumericFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getBetweenFilterFieldBuilder().getBuilder(), extensionRegistry); + oneFilterCase_ = 6; + break; + } // case 50 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.Filter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -6287,7 +6090,18 @@ public Filter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Filter(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpression.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpression.java index bdbc736c..d4660213 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpression.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpression.java @@ -52,115 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FilterExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1beta.FilterExpressionList.Builder subBuilder = null; - if (exprCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1beta.FilterExpressionList) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1beta.FilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1beta.FilterExpressionList.Builder subBuilder = null; - if (exprCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1beta.FilterExpressionList) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpressionList.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1beta.FilterExpressionList) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (exprCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1beta.FilterExpression) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1beta.FilterExpression) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 3; - break; - } - case 34: - { - com.google.analytics.data.v1beta.Filter.Builder subBuilder = null; - if (exprCase_ == 4) { - subBuilder = ((com.google.analytics.data.v1beta.Filter) expr_).toBuilder(); - } - expr_ = - input.readMessage( - com.google.analytics.data.v1beta.Filter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.analytics.data.v1beta.Filter) expr_); - expr_ = subBuilder.buildPartial(); - } - exprCase_ = 4; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_FilterExpression_descriptor; @@ -465,7 +356,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (exprCase_ == 4) { output.writeMessage(4, (com.google.analytics.data.v1beta.Filter) expr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -494,7 +385,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, (com.google.analytics.data.v1beta.Filter) expr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -527,7 +418,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -558,7 +449,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -689,22 +580,27 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.FilterExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (andGroupBuilder_ != null) { + andGroupBuilder_.clear(); + } + if (orGroupBuilder_ != null) { + orGroupBuilder_.clear(); + } + if (notExpressionBuilder_ != null) { + notExpressionBuilder_.clear(); + } + if (filterBuilder_ != null) { + filterBuilder_.clear(); + } exprCase_ = 0; expr_ = null; return this; @@ -839,7 +735,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.FilterExpression other break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -854,18 +750,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.FilterExpression 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(getAndGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getOrGroupFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getNotExpressionFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 3; + break; + } // case 26 + case 34: + { + input.readMessage(getFilterFieldBuilder().getBuilder(), extensionRegistry); + exprCase_ = 4; + 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 = - (com.google.analytics.data.v1beta.FilterExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1772,7 +1705,18 @@ public FilterExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FilterExpression(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpressionList.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpressionList.java index bc5d8d6f..369d11a0 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpressionList.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/FilterExpressionList.java @@ -52,62 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FilterExpressionList( - 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)) { - expressions_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - expressions_.add( - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - expressions_ = java.util.Collections.unmodifiableList(expressions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_FilterExpressionList_descriptor; @@ -210,7 +154,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < expressions_.size(); i++) { output.writeMessage(1, expressions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -222,7 +166,7 @@ public int getSerializedSize() { for (int i = 0; i < expressions_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, expressions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -239,7 +183,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.FilterExpressionList) obj; if (!getExpressionsList().equals(other.getExpressionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -254,7 +198,7 @@ public int hashCode() { hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER; hash = (53 * hash) + getExpressionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -384,19 +328,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.FilterExpressionList.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getExpressionsFieldBuilder(); - } } @java.lang.Override @@ -404,10 +339,11 @@ public Builder clear() { super.clear(); if (expressionsBuilder_ == null) { expressions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + expressions_ = null; expressionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -522,7 +458,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.FilterExpressionList o } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -537,18 +473,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.FilterExpressionList 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: + { + com.google.analytics.data.v1beta.FilterExpression m = + input.readMessage( + com.google.analytics.data.v1beta.FilterExpression.parser(), + extensionRegistry); + if (expressionsBuilder_ == null) { + ensureExpressionsIsMutable(); + expressions_.add(m); + } else { + expressionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.FilterExpressionList) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -944,7 +907,18 @@ public FilterExpressionList parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FilterExpressionList(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/GetMetadataRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/GetMetadataRequest.java index f91837b8..31e12f14 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/GetMetadataRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/GetMetadataRequest.java @@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private GetMetadataRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_GetMetadataRequest_descriptor; @@ -199,7 +153,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -211,7 +165,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -228,7 +182,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.GetMetadataRequest) obj; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -241,7 +195,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -370,17 +324,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.GetMetadataRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -470,7 +417,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.GetMetadataRequest oth name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -485,18 +432,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.GetMetadataRequest 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.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.GetMetadataRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -688,7 +654,18 @@ public GetMetadataRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GetMetadataRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metadata.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metadata.java index 6dbfe59f..5f807a18 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metadata.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metadata.java @@ -54,84 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Metadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensions_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionMetadata.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metrics_.add( - input.readMessage( - com.google.analytics.data.v1beta.MetricMetadata.parser(), extensionRegistry)); - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = java.util.Collections.unmodifiableList(dimensions_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_Metadata_descriptor; @@ -358,7 +280,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -376,7 +298,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -395,7 +317,7 @@ public boolean equals(final java.lang.Object obj) { if (!getName().equals(other.getName())) return false; if (!getDimensionsList().equals(other.getDimensionsList())) return false; if (!getMetricsList().equals(other.getMetricsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -416,7 +338,7 @@ public int hashCode() { hash = (37 * hash) + METRICS_FIELD_NUMBER; hash = (53 * hash) + getMetricsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -545,20 +467,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Metadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionsFieldBuilder(); - getMetricsFieldBuilder(); - } } @java.lang.Override @@ -568,16 +480,18 @@ public Builder clear() { if (dimensionsBuilder_ == null) { dimensions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensions_ = null; dimensionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metrics_ = null; metricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -732,7 +646,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Metadata other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -747,17 +661,65 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Metadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.analytics.data.v1beta.DimensionMetadata m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionMetadata.parser(), + extensionRegistry); + if (dimensionsBuilder_ == null) { + ensureDimensionsIsMutable(); + dimensions_.add(m); + } else { + dimensionsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.MetricMetadata m = + input.readMessage( + com.google.analytics.data.v1beta.MetricMetadata.parser(), + extensionRegistry); + if (metricsBuilder_ == null) { + ensureMetricsIsMutable(); + metrics_.add(m); + } else { + metricsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + name_ = input.readStringRequireUtf8(); + + 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 = (com.google.analytics.data.v1beta.Metadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1610,7 +1572,18 @@ public Metadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Metadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metric.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metric.java index 4f0b200e..c9bed466 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metric.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Metric.java @@ -55,64 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Metric( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - expression_ = s; - break; - } - case 24: - { - invisible_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Metric_descriptor; @@ -289,7 +231,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (invisible_ != false) { output.writeBool(3, invisible_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -307,7 +249,7 @@ public int getSerializedSize() { if (invisible_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, invisible_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -325,7 +267,7 @@ public boolean equals(final java.lang.Object obj) { if (!getName().equals(other.getName())) return false; if (!getExpression().equals(other.getExpression())) return false; if (getInvisible() != other.getInvisible()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -342,7 +284,7 @@ public int hashCode() { hash = (53 * hash) + getExpression().hashCode(); hash = (37 * hash) + INVISIBLE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getInvisible()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -473,17 +415,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Metric.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -585,7 +520,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Metric other) { if (other.getInvisible() != false) { setInvisible(other.getInvisible()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -600,17 +535,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Metric 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.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + expression_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 24: + { + invisible_ = input.readBool(); + + 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 = (com.google.analytics.data.v1beta.Metric) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -966,7 +933,18 @@ public Metric parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Metric(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricCompatibility.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricCompatibility.java index 4ddddcda..a1d6b89e 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricCompatibility.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricCompatibility.java @@ -52,69 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricCompatibility( - 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.analytics.data.v1beta.MetricMetadata.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = metricMetadata_.toBuilder(); - } - metricMetadata_ = - input.readMessage( - com.google.analytics.data.v1beta.MetricMetadata.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metricMetadata_); - metricMetadata_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 16: - { - int rawValue = input.readEnum(); - bitField0_ |= 0x00000002; - compatibility_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_MetricCompatibility_descriptor; @@ -261,7 +198,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeEnum(2, compatibility_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -276,7 +213,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, compatibility_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -300,7 +237,7 @@ public boolean equals(final java.lang.Object obj) { if (hasCompatibility()) { if (compatibility_ != other.compatibility_) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -319,7 +256,7 @@ public int hashCode() { hash = (37 * hash) + COMPATIBILITY_FIELD_NUMBER; hash = (53 * hash) + compatibility_; } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -572,7 +509,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.MetricCompatibility ot if (other.hasCompatibility()) { setCompatibility(other.getCompatibility()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -587,18 +524,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.MetricCompatibility 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(getMetricMetadataFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: + { + compatibility_ = input.readEnum(); + 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 = - (com.google.analytics.data.v1beta.MetricCompatibility) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -954,7 +916,18 @@ public MetricCompatibility parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricCompatibility(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricHeader.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricHeader.java index dd6797f6..e32de147 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricHeader.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricHeader.java @@ -56,59 +56,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricHeader( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 16: - { - int rawValue = input.readEnum(); - - type_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_MetricHeader_descriptor; @@ -229,7 +176,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (type_ != com.google.analytics.data.v1beta.MetricType.METRIC_TYPE_UNSPECIFIED.getNumber()) { output.writeEnum(2, type_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -244,7 +191,7 @@ public int getSerializedSize() { if (type_ != com.google.analytics.data.v1beta.MetricType.METRIC_TYPE_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, type_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -262,7 +209,7 @@ public boolean equals(final java.lang.Object obj) { if (!getName().equals(other.getName())) return false; if (type_ != other.type_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -277,7 +224,7 @@ public int hashCode() { hash = (53 * hash) + getName().hashCode(); hash = (37 * hash) + TYPE_FIELD_NUMBER; hash = (53 * hash) + type_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -409,17 +356,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.MetricHeader.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -514,7 +454,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.MetricHeader other) { if (other.type_ != 0) { setTypeValue(other.getTypeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -529,17 +469,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.MetricHeader 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.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + type_ = input.readEnum(); + + 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 = (com.google.analytics.data.v1beta.MetricHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -772,7 +738,18 @@ public MetricHeader parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricHeader(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricMetadata.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricMetadata.java index 08239153..f232167c 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricMetadata.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricMetadata.java @@ -59,134 +59,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - apiName_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - uiName_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - description_ = s; - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - deprecatedApiNames_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - deprecatedApiNames_.add(s); - break; - } - case 40: - { - int rawValue = input.readEnum(); - - type_ = rawValue; - break; - } - case 50: - { - java.lang.String s = input.readStringRequireUtf8(); - - expression_ = s; - break; - } - case 56: - { - customDefinition_ = input.readBool(); - break; - } - case 64: - { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - blockedReasons_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - blockedReasons_.add(rawValue); - break; - } - case 66: - { - int length = input.readRawVarint32(); - int oldLimit = input.pushLimit(length); - while (input.getBytesUntilLimit() > 0) { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - blockedReasons_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - blockedReasons_.add(rawValue); - } - input.popLimit(oldLimit); - break; - } - case 82: - { - java.lang.String s = input.readStringRequireUtf8(); - - category_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - deprecatedApiNames_ = deprecatedApiNames_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - blockedReasons_ = java.util.Collections.unmodifiableList(blockedReasons_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_MetricMetadata_descriptor; @@ -927,7 +799,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(category_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 10, category_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -978,7 +850,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(category_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, category_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1003,7 +875,7 @@ public boolean equals(final java.lang.Object obj) { if (getCustomDefinition() != other.getCustomDefinition()) return false; if (!blockedReasons_.equals(other.blockedReasons_)) return false; if (!getCategory().equals(other.getCategory())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1036,7 +908,7 @@ public int hashCode() { } hash = (37 * hash) + CATEGORY_FIELD_NUMBER; hash = (53 * hash) + getCategory().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1165,17 +1037,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.MetricMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1340,7 +1205,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.MetricMetadata other) category_ = other.category_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1355,17 +1220,99 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.MetricMetadata 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: + { + apiName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + uiName_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + description_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDeprecatedApiNamesIsMutable(); + deprecatedApiNames_.add(s); + break; + } // case 34 + case 40: + { + type_ = input.readEnum(); + + break; + } // case 40 + case 50: + { + expression_ = input.readStringRequireUtf8(); + + break; + } // case 50 + case 56: + { + customDefinition_ = input.readBool(); + + break; + } // case 56 + case 64: + { + int tmpRaw = input.readEnum(); + ensureBlockedReasonsIsMutable(); + blockedReasons_.add(tmpRaw); + break; + } // case 64 + case 66: + { + int length = input.readRawVarint32(); + int oldLimit = input.pushLimit(length); + while (input.getBytesUntilLimit() > 0) { + int tmpRaw = input.readEnum(); + ensureBlockedReasonsIsMutable(); + blockedReasons_.add(tmpRaw); + } + input.popLimit(oldLimit); + break; + } // case 66 + case 82: + { + category_ = input.readStringRequireUtf8(); + + break; + } // case 82 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.MetricMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2618,7 +2565,18 @@ public MetricMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricMetadata(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricValue.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricValue.java index 3cbd35f6..1b0784dd 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricValue.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MetricValue.java @@ -50,52 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - oneValueCase_ = 4; - oneValue_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_MetricValue_descriptor; @@ -242,7 +196,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneValueCase_ == 4) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, oneValue_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -254,7 +208,7 @@ public int getSerializedSize() { if (oneValueCase_ == 4) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, oneValue_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -278,7 +232,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -297,7 +251,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -426,17 +380,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.MetricValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -537,7 +484,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.MetricValue other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -552,17 +499,38 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.MetricValue 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 34: + { + java.lang.String s = input.readStringRequireUtf8(); + oneValueCase_ = 4; + oneValue_ = s; + 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 = (com.google.analytics.data.v1beta.MetricValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -746,7 +714,18 @@ public MetricValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricValue(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MinuteRange.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MinuteRange.java index ddadc997..f874cfb5 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MinuteRange.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/MinuteRange.java @@ -53,65 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MinuteRange( - 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; - startMinutesAgo_ = input.readInt32(); - break; - } - case 16: - { - bitField0_ |= 0x00000002; - endMinutesAgo_ = input.readInt32(); - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_MinuteRange_descriptor; @@ -298,7 +239,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -316,7 +257,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -341,7 +282,7 @@ public boolean equals(final java.lang.Object obj) { if (getEndMinutesAgo() != other.getEndMinutesAgo()) return false; } if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -362,7 +303,7 @@ public int hashCode() { } hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -492,17 +433,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.MinuteRange.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -612,7 +546,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.MinuteRange other) { name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -627,17 +561,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.MinuteRange 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: + { + startMinutesAgo_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: + { + endMinutesAgo_ = input.readInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: + { + name_ = input.readStringRequireUtf8(); + + 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 = (com.google.analytics.data.v1beta.MinuteRange) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -982,7 +948,18 @@ public MinuteRange parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MinuteRange(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/NumericValue.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/NumericValue.java index a3863b5a..3888b3fb 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/NumericValue.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/NumericValue.java @@ -50,57 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private NumericValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - oneValue_ = input.readInt64(); - oneValueCase_ = 1; - break; - } - case 17: - { - oneValue_ = input.readDouble(); - oneValueCase_ = 2; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_NumericValue_descriptor; @@ -253,7 +202,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (oneValueCase_ == 2) { output.writeDouble(2, (double) ((java.lang.Double) oneValue_)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -272,7 +221,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeDoubleSize( 2, (double) ((java.lang.Double) oneValue_)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -300,7 +249,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -326,7 +275,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -455,17 +404,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.NumericValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -572,7 +514,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.NumericValue other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -587,17 +529,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.NumericValue 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: + { + oneValue_ = input.readInt64(); + oneValueCase_ = 1; + break; + } // case 8 + case 17: + { + oneValue_ = input.readDouble(); + oneValueCase_ = 2; + break; + } // case 17 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.NumericValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -785,7 +753,18 @@ public NumericValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new NumericValue(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/OrderBy.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/OrderBy.java index 0c1ec818..263d70da 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/OrderBy.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/OrderBy.java @@ -50,110 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private OrderBy( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1beta.OrderBy.MetricOrderBy.Builder subBuilder = null; - if (oneOrderByCase_ == 1) { - subBuilder = - ((com.google.analytics.data.v1beta.OrderBy.MetricOrderBy) oneOrderBy_) - .toBuilder(); - } - oneOrderBy_ = - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.MetricOrderBy.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.OrderBy.MetricOrderBy) oneOrderBy_); - oneOrderBy_ = subBuilder.buildPartial(); - } - oneOrderByCase_ = 1; - break; - } - case 18: - { - com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy.Builder subBuilder = null; - if (oneOrderByCase_ == 2) { - subBuilder = - ((com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy) oneOrderBy_) - .toBuilder(); - } - oneOrderBy_ = - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy) oneOrderBy_); - oneOrderBy_ = subBuilder.buildPartial(); - } - oneOrderByCase_ = 2; - break; - } - case 26: - { - com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.Builder subBuilder = null; - if (oneOrderByCase_ == 3) { - subBuilder = - ((com.google.analytics.data.v1beta.OrderBy.PivotOrderBy) oneOrderBy_) - .toBuilder(); - } - oneOrderBy_ = - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.analytics.data.v1beta.OrderBy.PivotOrderBy) oneOrderBy_); - oneOrderBy_ = subBuilder.buildPartial(); - } - oneOrderByCase_ = 3; - break; - } - case 32: - { - desc_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_OrderBy_descriptor; @@ -233,52 +129,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MetricOrderBy( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - metricName_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_OrderBy_MetricOrderBy_descriptor; @@ -360,7 +210,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(metricName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, metricName_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -372,7 +222,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(metricName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, metricName_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -389,7 +239,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.OrderBy.MetricOrderBy) obj; if (!getMetricName().equals(other.getMetricName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -402,7 +252,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + METRIC_NAME_FIELD_NUMBER; hash = (53 * hash) + getMetricName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -534,17 +384,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.OrderBy.MetricOrderBy.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -636,7 +479,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.OrderBy.MetricOrderBy metricName_ = other.metricName_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -651,18 +494,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.OrderBy.MetricOrderBy 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: + { + metricName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.OrderBy.MetricOrderBy) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -805,7 +667,19 @@ public MetricOrderBy parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MetricOrderBy(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(); } }; @@ -914,59 +788,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DimensionOrderBy( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - dimensionName_ = s; - break; - } - case 16: - { - int rawValue = input.readEnum(); - - orderType_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_OrderBy_DimensionOrderBy_descriptor; @@ -1283,7 +1104,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io .getNumber()) { output.writeEnum(2, orderType_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1301,7 +1122,7 @@ public int getSerializedSize() { .getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, orderType_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1319,7 +1140,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionName().equals(other.getDimensionName())) return false; if (orderType_ != other.orderType_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1334,7 +1155,7 @@ public int hashCode() { hash = (53 * hash) + getDimensionName().hashCode(); hash = (37 * hash) + ORDER_TYPE_FIELD_NUMBER; hash = (53 * hash) + orderType_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1466,17 +1287,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1574,7 +1388,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.OrderBy.DimensionOrder if (other.orderType_ != 0) { setOrderTypeValue(other.getOrderTypeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1589,18 +1403,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy 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: + { + dimensionName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + orderType_ = input.readEnum(); + + 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 = - (com.google.analytics.data.v1beta.OrderBy.DimensionOrderBy) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1842,7 +1681,19 @@ public DimensionOrderBy parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DimensionOrderBy(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(); } }; @@ -2009,71 +1860,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PivotOrderBy( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - metricName_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - pivotSelections_ = - new java.util.ArrayList< - com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection>(); - mutable_bitField0_ |= 0x00000001; - } - pivotSelections_.add( - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection - .parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - pivotSelections_ = java.util.Collections.unmodifiableList(pivotSelections_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_OrderBy_PivotOrderBy_descriptor; @@ -2192,60 +1978,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PivotSelection( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - dimensionName_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - dimensionValue_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_OrderBy_PivotOrderBy_PivotSelection_descriptor; @@ -2379,7 +2111,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dimensionValue_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, dimensionValue_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2394,7 +2126,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dimensionValue_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, dimensionValue_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2413,7 +2145,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionName().equals(other.getDimensionName())) return false; if (!getDimensionValue().equals(other.getDimensionValue())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2428,7 +2160,7 @@ public int hashCode() { hash = (53 * hash) + getDimensionName().hashCode(); hash = (37 * hash) + DIMENSION_VALUE_FIELD_NUMBER; hash = (53 * hash) + getDimensionValue().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2577,17 +2309,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -2693,7 +2418,7 @@ public Builder mergeFrom( dimensionValue_ = other.dimensionValue_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2708,19 +2433,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection 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: + { + dimensionName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + dimensionValue_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2972,7 +2721,19 @@ public PivotSelection parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PivotSelection(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(); } }; @@ -3162,7 +2923,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < pivotSelections_.size(); i++) { output.writeMessage(2, pivotSelections_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3178,7 +2939,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, pivotSelections_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3196,7 +2957,7 @@ public boolean equals(final java.lang.Object obj) { if (!getMetricName().equals(other.getMetricName())) return false; if (!getPivotSelectionsList().equals(other.getPivotSelectionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3213,7 +2974,7 @@ public int hashCode() { hash = (37 * hash) + PIVOT_SELECTIONS_FIELD_NUMBER; hash = (53 * hash) + getPivotSelectionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3345,19 +3106,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPivotSelectionsFieldBuilder(); - } } @java.lang.Override @@ -3367,10 +3119,11 @@ public Builder clear() { if (pivotSelectionsBuilder_ == null) { pivotSelections_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + pivotSelections_ = null; pivotSelectionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -3492,7 +3245,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.OrderBy.PivotOrderBy o } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3507,18 +3260,52 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.OrderBy.PivotOrderBy 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: + { + metricName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection m = + input.readMessage( + com.google.analytics.data.v1beta.OrderBy.PivotOrderBy.PivotSelection + .parser(), + extensionRegistry); + if (pivotSelectionsBuilder_ == null) { + ensurePivotSelectionsIsMutable(); + pivotSelections_.add(m); + } else { + pivotSelectionsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.OrderBy.PivotOrderBy) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4138,7 +3925,19 @@ public PivotOrderBy parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PivotOrderBy(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(); } }; @@ -4406,7 +4205,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (desc_ != false) { output.writeBool(4, desc_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -4433,7 +4232,7 @@ public int getSerializedSize() { if (desc_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, desc_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -4463,7 +4262,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4492,7 +4291,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -4621,22 +4420,24 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.OrderBy.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} 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(); + if (metricBuilder_ != null) { + metricBuilder_.clear(); + } + if (dimensionBuilder_ != null) { + dimensionBuilder_.clear(); + } + if (pivotBuilder_ != null) { + pivotBuilder_.clear(); + } desc_ = false; oneOrderByCase_ = 0; @@ -4764,7 +4565,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.OrderBy other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4779,17 +4580,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.OrderBy 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(getMetricFieldBuilder().getBuilder(), extensionRegistry); + oneOrderByCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getDimensionFieldBuilder().getBuilder(), extensionRegistry); + oneOrderByCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage(getPivotFieldBuilder().getBuilder(), extensionRegistry); + oneOrderByCase_ = 3; + break; + } // case 26 + case 32: + { + desc_ = input.readBool(); + + 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 = (com.google.analytics.data.v1beta.OrderBy) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5526,7 +5365,18 @@ public OrderBy parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new OrderBy(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java index 7cc8e955..b1a85480 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java @@ -54,111 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Pivot( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - fieldNames_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - fieldNames_.add(s); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - orderBys_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - orderBys_.add( - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.parser(), extensionRegistry)); - break; - } - case 24: - { - offset_ = input.readInt64(); - break; - } - case 32: - { - limit_ = input.readInt64(); - break; - } - case 40: - { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - metricAggregations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - metricAggregations_.add(rawValue); - break; - } - case 42: - { - int length = input.readRawVarint32(); - int oldLimit = input.pushLimit(length); - while (input.getBytesUntilLimit() > 0) { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - metricAggregations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - metricAggregations_.add(rawValue); - } - input.popLimit(oldLimit); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - fieldNames_ = fieldNames_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - orderBys_ = java.util.Collections.unmodifiableList(orderBys_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - metricAggregations_ = java.util.Collections.unmodifiableList(metricAggregations_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Pivot_descriptor; @@ -516,7 +411,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < metricAggregations_.size(); i++) { output.writeEnumNoTag(metricAggregations_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -555,7 +450,7 @@ public int getSerializedSize() { } metricAggregationsMemoizedSerializedSize = dataSize; } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -575,7 +470,7 @@ public boolean equals(final java.lang.Object obj) { if (getOffset() != other.getOffset()) return false; if (getLimit() != other.getLimit()) return false; if (!metricAggregations_.equals(other.metricAggregations_)) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -602,7 +497,7 @@ public int hashCode() { hash = (37 * hash) + METRIC_AGGREGATIONS_FIELD_NUMBER; hash = (53 * hash) + metricAggregations_.hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -731,19 +626,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Pivot.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getOrderBysFieldBuilder(); - } } @java.lang.Override @@ -753,10 +639,11 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000001); if (orderBysBuilder_ == null) { orderBys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + orderBys_ = null; orderBysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); offset_ = 0L; limit_ = 0L; @@ -914,7 +801,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Pivot other) { } onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -929,17 +816,82 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Pivot 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: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureFieldNamesIsMutable(); + fieldNames_.add(s); + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.OrderBy m = + input.readMessage( + com.google.analytics.data.v1beta.OrderBy.parser(), extensionRegistry); + if (orderBysBuilder_ == null) { + ensureOrderBysIsMutable(); + orderBys_.add(m); + } else { + orderBysBuilder_.addMessage(m); + } + break; + } // case 18 + case 24: + { + offset_ = input.readInt64(); + + break; + } // case 24 + case 32: + { + limit_ = input.readInt64(); + + break; + } // case 32 + case 40: + { + int tmpRaw = input.readEnum(); + ensureMetricAggregationsIsMutable(); + metricAggregations_.add(tmpRaw); + break; + } // case 40 + case 42: + { + int length = input.readRawVarint32(); + int oldLimit = input.pushLimit(length); + while (input.getBytesUntilLimit() > 0) { + int tmpRaw = input.readEnum(); + ensureMetricAggregationsIsMutable(); + metricAggregations_.add(tmpRaw); + } + input.popLimit(oldLimit); + 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 = (com.google.analytics.data.v1beta.Pivot) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1960,7 +1912,18 @@ public Pivot parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Pivot(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotDimensionHeader.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotDimensionHeader.java index 2052de33..d4ff72a1 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotDimensionHeader.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotDimensionHeader.java @@ -52,61 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PivotDimensionHeader( - 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)) { - dimensionValues_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionValues_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionValue.parser(), extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionValues_ = java.util.Collections.unmodifiableList(dimensionValues_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_PivotDimensionHeader_descriptor; @@ -209,7 +154,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < dimensionValues_.size(); i++) { output.writeMessage(1, dimensionValues_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -221,7 +166,7 @@ public int getSerializedSize() { for (int i = 0; i < dimensionValues_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, dimensionValues_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -238,7 +183,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.PivotDimensionHeader) obj; if (!getDimensionValuesList().equals(other.getDimensionValuesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -253,7 +198,7 @@ public int hashCode() { hash = (37 * hash) + DIMENSION_VALUES_FIELD_NUMBER; hash = (53 * hash) + getDimensionValuesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -383,19 +328,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.PivotDimensionHeader.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionValuesFieldBuilder(); - } } @java.lang.Override @@ -403,10 +339,11 @@ public Builder clear() { super.clear(); if (dimensionValuesBuilder_ == null) { dimensionValues_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionValues_ = null; dimensionValuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -521,7 +458,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.PivotDimensionHeader o } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -536,18 +473,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.PivotDimensionHeader 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: + { + com.google.analytics.data.v1beta.DimensionValue m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionValue.parser(), + extensionRegistry); + if (dimensionValuesBuilder_ == null) { + ensureDimensionValuesIsMutable(); + dimensionValues_.add(m); + } else { + dimensionValuesBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.PivotDimensionHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -946,7 +910,18 @@ public PivotDimensionHeader parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PivotDimensionHeader(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotHeader.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotHeader.java index de283d5e..db0945bc 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotHeader.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotHeader.java @@ -52,68 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PivotHeader( - 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)) { - pivotDimensionHeaders_ = - new java.util.ArrayList< - com.google.analytics.data.v1beta.PivotDimensionHeader>(); - mutable_bitField0_ |= 0x00000001; - } - pivotDimensionHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.PivotDimensionHeader.parser(), - extensionRegistry)); - break; - } - case 16: - { - rowCount_ = input.readInt32(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - pivotDimensionHeaders_ = java.util.Collections.unmodifiableList(pivotDimensionHeaders_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_PivotHeader_descriptor; @@ -251,7 +189,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (rowCount_ != 0) { output.writeInt32(2, rowCount_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -268,7 +206,7 @@ public int getSerializedSize() { if (rowCount_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, rowCount_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -286,7 +224,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPivotDimensionHeadersList().equals(other.getPivotDimensionHeadersList())) return false; if (getRowCount() != other.getRowCount()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -303,7 +241,7 @@ public int hashCode() { } hash = (37 * hash) + ROW_COUNT_FIELD_NUMBER; hash = (53 * hash) + getRowCount(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -432,19 +370,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.PivotHeader.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPivotDimensionHeadersFieldBuilder(); - } } @java.lang.Override @@ -452,10 +381,11 @@ public Builder clear() { super.clear(); if (pivotDimensionHeadersBuilder_ == null) { pivotDimensionHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + pivotDimensionHeaders_ = null; pivotDimensionHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); rowCount_ = 0; return this; @@ -575,7 +505,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.PivotHeader other) { if (other.getRowCount() != 0) { setRowCount(other.getRowCount()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -590,17 +520,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.PivotHeader 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: + { + com.google.analytics.data.v1beta.PivotDimensionHeader m = + input.readMessage( + com.google.analytics.data.v1beta.PivotDimensionHeader.parser(), + extensionRegistry); + if (pivotDimensionHeadersBuilder_ == null) { + ensurePivotDimensionHeadersIsMutable(); + pivotDimensionHeaders_.add(m); + } else { + pivotDimensionHeadersBuilder_.addMessage(m); + } + break; + } // case 10 + case 16: + { + rowCount_ = input.readInt32(); + + 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 = (com.google.analytics.data.v1beta.PivotHeader) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1116,7 +1080,18 @@ public PivotHeader parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PivotHeader(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java index ea83a8f6..d4917d57 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java @@ -52,125 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PropertyQuota( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.analytics.data.v1beta.QuotaStatus.Builder subBuilder = null; - if (tokensPerDay_ != null) { - subBuilder = tokensPerDay_.toBuilder(); - } - tokensPerDay_ = - input.readMessage( - com.google.analytics.data.v1beta.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(tokensPerDay_); - tokensPerDay_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.analytics.data.v1beta.QuotaStatus.Builder subBuilder = null; - if (tokensPerHour_ != null) { - subBuilder = tokensPerHour_.toBuilder(); - } - tokensPerHour_ = - input.readMessage( - com.google.analytics.data.v1beta.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(tokensPerHour_); - tokensPerHour_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.analytics.data.v1beta.QuotaStatus.Builder subBuilder = null; - if (concurrentRequests_ != null) { - subBuilder = concurrentRequests_.toBuilder(); - } - concurrentRequests_ = - input.readMessage( - com.google.analytics.data.v1beta.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(concurrentRequests_); - concurrentRequests_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.analytics.data.v1beta.QuotaStatus.Builder subBuilder = null; - if (serverErrorsPerProjectPerHour_ != null) { - subBuilder = serverErrorsPerProjectPerHour_.toBuilder(); - } - serverErrorsPerProjectPerHour_ = - input.readMessage( - com.google.analytics.data.v1beta.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(serverErrorsPerProjectPerHour_); - serverErrorsPerProjectPerHour_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.analytics.data.v1beta.QuotaStatus.Builder subBuilder = null; - if (potentiallyThresholdedRequestsPerHour_ != null) { - subBuilder = potentiallyThresholdedRequestsPerHour_.toBuilder(); - } - potentiallyThresholdedRequestsPerHour_ = - input.readMessage( - com.google.analytics.data.v1beta.QuotaStatus.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(potentiallyThresholdedRequestsPerHour_); - potentiallyThresholdedRequestsPerHour_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_PropertyQuota_descriptor; @@ -493,7 +374,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (potentiallyThresholdedRequestsPerHour_ != null) { output.writeMessage(5, getPotentiallyThresholdedRequestsPerHour()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -521,7 +402,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 5, getPotentiallyThresholdedRequestsPerHour()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -561,7 +442,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPotentiallyThresholdedRequestsPerHour() .equals(other.getPotentiallyThresholdedRequestsPerHour())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -592,7 +473,7 @@ public int hashCode() { hash = (37 * hash) + POTENTIALLY_THRESHOLDED_REQUESTS_PER_HOUR_FIELD_NUMBER; hash = (53 * hash) + getPotentiallyThresholdedRequestsPerHour().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -723,17 +604,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.PropertyQuota.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -887,7 +761,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.PropertyQuota other) { mergePotentiallyThresholdedRequestsPerHour( other.getPotentiallyThresholdedRequestsPerHour()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -902,17 +776,65 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.PropertyQuota 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(getTokensPerDayFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getTokensPerHourFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage( + getConcurrentRequestsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage( + getServerErrorsPerProjectPerHourFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage( + getPotentiallyThresholdedRequestsPerHourFieldBuilder().getBuilder(), + extensionRegistry); + + 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 = (com.google.analytics.data.v1beta.PropertyQuota) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2016,7 +1938,18 @@ public PropertyQuota parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyQuota(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/QuotaStatus.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/QuotaStatus.java index 1ad1d455..e34c6c1c 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/QuotaStatus.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/QuotaStatus.java @@ -50,55 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private QuotaStatus( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - consumed_ = input.readInt32(); - break; - } - case 16: - { - remaining_ = input.readInt32(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_QuotaStatus_descriptor; @@ -170,7 +121,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (remaining_ != 0) { output.writeInt32(2, remaining_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -185,7 +136,7 @@ public int getSerializedSize() { if (remaining_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, remaining_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -203,7 +154,7 @@ public boolean equals(final java.lang.Object obj) { if (getConsumed() != other.getConsumed()) return false; if (getRemaining() != other.getRemaining()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -218,7 +169,7 @@ public int hashCode() { hash = (53 * hash) + getConsumed(); hash = (37 * hash) + REMAINING_FIELD_NUMBER; hash = (53 * hash) + getRemaining(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -347,17 +298,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.QuotaStatus.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -451,7 +395,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.QuotaStatus other) { if (other.getRemaining() != 0) { setRemaining(other.getRemaining()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -466,17 +410,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.QuotaStatus 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: + { + consumed_ = input.readInt32(); + + break; + } // case 8 + case 16: + { + remaining_ = input.readInt32(); + + 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 = (com.google.analytics.data.v1beta.QuotaStatus) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -616,7 +586,18 @@ public QuotaStatus parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QuotaStatus(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ResponseMetaData.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ResponseMetaData.java index a1a6e56a..2eacb4cc 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ResponseMetaData.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ResponseMetaData.java @@ -54,91 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ResponseMetaData( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 24: - { - dataLossFromOtherRow_ = input.readBool(); - break; - } - case 34: - { - com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse.Builder - subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = schemaRestrictionResponse_.toBuilder(); - } - schemaRestrictionResponse_ = - input.readMessage( - com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(schemaRestrictionResponse_); - schemaRestrictionResponse_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 42: - { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - currencyCode_ = s; - break; - } - case 50: - { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; - timeZone_ = s; - break; - } - case 58: - { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000008; - emptyReason_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_ResponseMetaData_descriptor; @@ -282,66 +197,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SchemaRestrictionResponse( - 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)) { - activeMetricRestrictions_ = - new java.util.ArrayList< - com.google.analytics.data.v1beta.ResponseMetaData - .SchemaRestrictionResponse.ActiveMetricRestriction>(); - mutable_bitField0_ |= 0x00000001; - } - activeMetricRestrictions_.add( - input.readMessage( - com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse - .ActiveMetricRestriction.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - activeMetricRestrictions_ = - java.util.Collections.unmodifiableList(activeMetricRestrictions_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_ResponseMetaData_SchemaRestrictionResponse_descriptor; @@ -510,82 +365,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ActiveMetricRestriction( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - metricName_ = s; - break; - } - case 16: - { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - restrictedMetricTypes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - restrictedMetricTypes_.add(rawValue); - break; - } - case 18: - { - int length = input.readRawVarint32(); - int oldLimit = input.pushLimit(length); - while (input.getBytesUntilLimit() > 0) { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - restrictedMetricTypes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - restrictedMetricTypes_.add(rawValue); - } - input.popLimit(oldLimit); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - restrictedMetricTypes_ = java.util.Collections.unmodifiableList(restrictedMetricTypes_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_ResponseMetaData_SchemaRestrictionResponse_ActiveMetricRestriction_descriptor; @@ -804,7 +583,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < restrictedMetricTypes_.size(); i++) { output.writeEnumNoTag(restrictedMetricTypes_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -830,7 +609,7 @@ public int getSerializedSize() { } restrictedMetricTypesMemoizedSerializedSize = dataSize; } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -858,7 +637,7 @@ public boolean equals(final java.lang.Object obj) { if (!getMetricName().equals(other.getMetricName())) return false; } if (!restrictedMetricTypes_.equals(other.restrictedMetricTypes_)) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -877,7 +656,7 @@ public int hashCode() { hash = (37 * hash) + RESTRICTED_METRIC_TYPES_FIELD_NUMBER; hash = (53 * hash) + restrictedMetricTypes_.hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1036,17 +815,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse.ActiveMetricRestriction.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1184,7 +956,7 @@ public Builder mergeFrom( } onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1199,22 +971,56 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse - .ActiveMetricRestriction - 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: + { + metricName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: + { + int tmpRaw = input.readEnum(); + ensureRestrictedMetricTypesIsMutable(); + restrictedMetricTypes_.add(tmpRaw); + break; + } // case 16 + case 18: + { + int length = input.readRawVarint32(); + int oldLimit = input.pushLimit(length); + while (input.getBytesUntilLimit() > 0) { + int tmpRaw = input.readEnum(); + ensureRestrictedMetricTypesIsMutable(); + restrictedMetricTypes_.add(tmpRaw); + } + input.popLimit(oldLimit); + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse - .ActiveMetricRestriction) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1632,7 +1438,19 @@ public ActiveMetricRestriction parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ActiveMetricRestriction(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(); } }; @@ -1777,7 +1595,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < activeMetricRestrictions_.size(); i++) { output.writeMessage(1, activeMetricRestrictions_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1791,7 +1609,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 1, activeMetricRestrictions_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1810,7 +1628,7 @@ public boolean equals(final java.lang.Object obj) { if (!getActiveMetricRestrictionsList().equals(other.getActiveMetricRestrictionsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1825,7 +1643,7 @@ public int hashCode() { hash = (37 * hash) + ACTIVE_METRIC_RESTRICTIONS_FIELD_NUMBER; hash = (53 * hash) + getActiveMetricRestrictionsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1967,19 +1785,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getActiveMetricRestrictionsFieldBuilder(); - } } @java.lang.Override @@ -1987,10 +1796,11 @@ public Builder clear() { super.clear(); if (activeMetricRestrictionsBuilder_ == null) { activeMetricRestrictions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + activeMetricRestrictions_ = null; activeMetricRestrictionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -2117,7 +1927,7 @@ public Builder mergeFrom( } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2132,20 +1942,48 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse 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: + { + com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse + .ActiveMetricRestriction + m = + input.readMessage( + com.google.analytics.data.v1beta.ResponseMetaData + .SchemaRestrictionResponse.ActiveMetricRestriction.parser(), + extensionRegistry); + if (activeMetricRestrictionsBuilder_ == null) { + ensureActiveMetricRestrictionsIsMutable(); + activeMetricRestrictions_.add(m); + } else { + activeMetricRestrictionsBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.ResponseMetaData.SchemaRestrictionResponse) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2690,7 +2528,19 @@ public SchemaRestrictionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SchemaRestrictionResponse(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(); } }; @@ -3051,7 +2901,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000008) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, emptyReason_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3077,7 +2927,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000008) != 0)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, emptyReason_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3111,7 +2961,7 @@ public boolean equals(final java.lang.Object obj) { if (hasEmptyReason()) { if (!getEmptyReason().equals(other.getEmptyReason())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3140,7 +2990,7 @@ public int hashCode() { hash = (37 * hash) + EMPTY_REASON_FIELD_NUMBER; hash = (53 * hash) + getEmptyReason().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3423,7 +3273,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.ResponseMetaData other emptyReason_ = other.emptyReason_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3438,18 +3288,62 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.ResponseMetaData parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 24: + { + dataLossFromOtherRow_ = input.readBool(); + + break; + } // case 24 + case 34: + { + input.readMessage( + getSchemaRestrictionResponseFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 34 + case 42: + { + currencyCode_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 42 + case 50: + { + timeZone_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 50 + case 58: + { + emptyReason_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000008; + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.ResponseMetaData) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4204,7 +4098,18 @@ public ResponseMetaData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ResponseMetaData(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Row.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Row.java index 88f8faac..326d6631 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Row.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Row.java @@ -86,76 +86,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Row( - 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)) { - dimensionValues_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionValues_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionValue.parser(), extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metricValues_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metricValues_.add( - input.readMessage( - com.google.analytics.data.v1beta.MetricValue.parser(), extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionValues_ = java.util.Collections.unmodifiableList(dimensionValues_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metricValues_ = java.util.Collections.unmodifiableList(metricValues_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.ReportingApiProto .internal_static_google_analytics_data_v1beta_Row_descriptor; @@ -335,7 +265,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < metricValues_.size(); i++) { output.writeMessage(2, metricValues_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -350,7 +280,7 @@ public int getSerializedSize() { for (int i = 0; i < metricValues_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, metricValues_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -367,7 +297,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDimensionValuesList().equals(other.getDimensionValuesList())) return false; if (!getMetricValuesList().equals(other.getMetricValuesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -386,7 +316,7 @@ public int hashCode() { hash = (37 * hash) + METRIC_VALUES_FIELD_NUMBER; hash = (53 * hash) + getMetricValuesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -547,20 +477,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.Row.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionValuesFieldBuilder(); - getMetricValuesFieldBuilder(); - } } @java.lang.Override @@ -568,16 +488,18 @@ public Builder clear() { super.clear(); if (dimensionValuesBuilder_ == null) { dimensionValues_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionValues_ = null; dimensionValuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricValuesBuilder_ == null) { metricValues_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metricValues_ = null; metricValuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -726,7 +648,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.Row other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -741,17 +663,58 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.Row 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: + { + com.google.analytics.data.v1beta.DimensionValue m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionValue.parser(), + extensionRegistry); + if (dimensionValuesBuilder_ == null) { + ensureDimensionValuesIsMutable(); + dimensionValues_.add(m); + } else { + dimensionValuesBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.MetricValue m = + input.readMessage( + com.google.analytics.data.v1beta.MetricValue.parser(), extensionRegistry); + if (metricValuesBuilder_ == null) { + ensureMetricValuesIsMutable(); + metricValues_.add(m); + } else { + metricValuesBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.analytics.data.v1beta.Row) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1520,7 +1483,18 @@ public Row parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Row(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportRequest.java index a75a6e88..67b5d684 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportRequest.java @@ -57,176 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunPivotReportRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensions_.add( - input.readMessage( - com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metrics_.add( - input.readMessage( - com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry)); - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - dateRanges_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - dateRanges_.add( - input.readMessage( - com.google.analytics.data.v1beta.DateRange.parser(), extensionRegistry)); - break; - } - case 42: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - pivots_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - pivots_.add( - input.readMessage( - com.google.analytics.data.v1beta.Pivot.parser(), extensionRegistry)); - break; - } - case 50: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (dimensionFilter_ != null) { - subBuilder = dimensionFilter_.toBuilder(); - } - dimensionFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionFilter_); - dimensionFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (metricFilter_ != null) { - subBuilder = metricFilter_.toBuilder(); - } - metricFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metricFilter_); - metricFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 66: - { - java.lang.String s = input.readStringRequireUtf8(); - - currencyCode_ = s; - break; - } - case 74: - { - com.google.analytics.data.v1beta.CohortSpec.Builder subBuilder = null; - if (cohortSpec_ != null) { - subBuilder = cohortSpec_.toBuilder(); - } - cohortSpec_ = - input.readMessage( - com.google.analytics.data.v1beta.CohortSpec.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(cohortSpec_); - cohortSpec_ = subBuilder.buildPartial(); - } - - break; - } - case 80: - { - keepEmptyRows_ = input.readBool(); - break; - } - case 88: - { - returnPropertyQuota_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = java.util.Collections.unmodifiableList(dimensions_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - dateRanges_ = java.util.Collections.unmodifiableList(dateRanges_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - pivots_ = java.util.Collections.unmodifiableList(pivots_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_RunPivotReportRequest_descriptor; @@ -922,7 +752,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (returnPropertyQuota_ != false) { output.writeBool(11, returnPropertyQuota_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -964,7 +794,7 @@ public int getSerializedSize() { if (returnPropertyQuota_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(11, returnPropertyQuota_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1000,7 +830,7 @@ public boolean equals(final java.lang.Object obj) { } if (getKeepEmptyRows() != other.getKeepEmptyRows()) return false; if (getReturnPropertyQuota() != other.getReturnPropertyQuota()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1047,7 +877,7 @@ public int hashCode() { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getKeepEmptyRows()); hash = (37 * hash) + RETURN_PROPERTY_QUOTA_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getReturnPropertyQuota()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1177,22 +1007,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.RunPivotReportRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionsFieldBuilder(); - getMetricsFieldBuilder(); - getDateRangesFieldBuilder(); - getPivotsFieldBuilder(); - } } @java.lang.Override @@ -1202,28 +1020,32 @@ public Builder clear() { if (dimensionsBuilder_ == null) { dimensions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensions_ = null; dimensionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metrics_ = null; metricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (dateRangesBuilder_ == null) { dateRanges_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + dateRanges_ = null; dateRangesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (pivotsBuilder_ == null) { pivots_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + pivots_ = null; pivotsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); if (dimensionFilterBuilder_ == null) { dimensionFilter_ = null; } else { @@ -1512,7 +1334,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunPivotReportRequest if (other.getReturnPropertyQuota() != false) { setReturnPropertyQuota(other.getReturnPropertyQuota()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1527,18 +1349,125 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.RunPivotReportRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.Dimension m = + input.readMessage( + com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry); + if (dimensionsBuilder_ == null) { + ensureDimensionsIsMutable(); + dimensions_.add(m); + } else { + dimensionsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.Metric m = + input.readMessage( + com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry); + if (metricsBuilder_ == null) { + ensureMetricsIsMutable(); + metrics_.add(m); + } else { + metricsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + com.google.analytics.data.v1beta.DateRange m = + input.readMessage( + com.google.analytics.data.v1beta.DateRange.parser(), extensionRegistry); + if (dateRangesBuilder_ == null) { + ensureDateRangesIsMutable(); + dateRanges_.add(m); + } else { + dateRangesBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + com.google.analytics.data.v1beta.Pivot m = + input.readMessage( + com.google.analytics.data.v1beta.Pivot.parser(), extensionRegistry); + if (pivotsBuilder_ == null) { + ensurePivotsIsMutable(); + pivots_.add(m); + } else { + pivotsBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + input.readMessage(getDimensionFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + input.readMessage(getMetricFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + case 66: + { + currencyCode_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + input.readMessage(getCohortSpecFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 74 + case 80: + { + keepEmptyRows_ = input.readBool(); + + break; + } // case 80 + case 88: + { + returnPropertyQuota_ = input.readBool(); + + break; + } // case 88 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.RunPivotReportRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4109,7 +4038,18 @@ public RunPivotReportRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunPivotReportRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java index 475def98..e27a33e2 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java @@ -57,160 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunPivotReportResponse( - 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)) { - pivotHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - pivotHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.PivotHeader.parser(), extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - dimensionHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - dimensionHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionHeader.parser(), - extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - metricHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - metricHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.MetricHeader.parser(), extensionRegistry)); - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - rows_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - rows_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 42: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - aggregates_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - aggregates_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 50: - { - com.google.analytics.data.v1beta.ResponseMetaData.Builder subBuilder = null; - if (metadata_ != null) { - subBuilder = metadata_.toBuilder(); - } - metadata_ = - input.readMessage( - com.google.analytics.data.v1beta.ResponseMetaData.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metadata_); - metadata_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - com.google.analytics.data.v1beta.PropertyQuota.Builder subBuilder = null; - if (propertyQuota_ != null) { - subBuilder = propertyQuota_.toBuilder(); - } - propertyQuota_ = - input.readMessage( - com.google.analytics.data.v1beta.PropertyQuota.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(propertyQuota_); - propertyQuota_ = subBuilder.buildPartial(); - } - - break; - } - case 66: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - pivotHeaders_ = java.util.Collections.unmodifiableList(pivotHeaders_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - dimensionHeaders_ = java.util.Collections.unmodifiableList(dimensionHeaders_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - metricHeaders_ = java.util.Collections.unmodifiableList(metricHeaders_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - rows_ = java.util.Collections.unmodifiableList(rows_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - aggregates_ = java.util.Collections.unmodifiableList(aggregates_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_RunPivotReportResponse_descriptor; @@ -946,7 +792,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 8, kind_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -979,7 +825,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, kind_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1009,7 +855,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } if (!getKind().equals(other.getKind())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1050,7 +896,7 @@ public int hashCode() { } hash = (37 * hash) + KIND_FIELD_NUMBER; hash = (53 * hash) + getKind().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1180,23 +1026,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.RunPivotReportResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPivotHeadersFieldBuilder(); - getDimensionHeadersFieldBuilder(); - getMetricHeadersFieldBuilder(); - getRowsFieldBuilder(); - getAggregatesFieldBuilder(); - } } @java.lang.Override @@ -1204,34 +1037,39 @@ public Builder clear() { super.clear(); if (pivotHeadersBuilder_ == null) { pivotHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + pivotHeaders_ = null; pivotHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (dimensionHeadersBuilder_ == null) { dimensionHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + dimensionHeaders_ = null; dimensionHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (metricHeadersBuilder_ == null) { metricHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + metricHeaders_ = null; metricHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (rowsBuilder_ == null) { rows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + rows_ = null; rowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); if (aggregatesBuilder_ == null) { aggregates_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + aggregates_ = null; aggregatesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); if (metadataBuilder_ == null) { metadata_ = null; } else { @@ -1525,7 +1363,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunPivotReportResponse kind_ = other.kind_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1540,18 +1378,115 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.RunPivotReportResponse 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: + { + com.google.analytics.data.v1beta.PivotHeader m = + input.readMessage( + com.google.analytics.data.v1beta.PivotHeader.parser(), extensionRegistry); + if (pivotHeadersBuilder_ == null) { + ensurePivotHeadersIsMutable(); + pivotHeaders_.add(m); + } else { + pivotHeadersBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.DimensionHeader m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionHeader.parser(), + extensionRegistry); + if (dimensionHeadersBuilder_ == null) { + ensureDimensionHeadersIsMutable(); + dimensionHeaders_.add(m); + } else { + dimensionHeadersBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.MetricHeader m = + input.readMessage( + com.google.analytics.data.v1beta.MetricHeader.parser(), extensionRegistry); + if (metricHeadersBuilder_ == null) { + ensureMetricHeadersIsMutable(); + metricHeaders_.add(m); + } else { + metricHeadersBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (rowsBuilder_ == null) { + ensureRowsIsMutable(); + rows_.add(m); + } else { + rowsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (aggregatesBuilder_ == null) { + ensureAggregatesIsMutable(); + aggregates_.add(m); + } else { + aggregatesBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + input.readMessage(getPropertyQuotaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + case 66: + { + kind_ = input.readStringRequireUtf8(); + + break; + } // case 66 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.RunPivotReportResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4511,7 +4446,18 @@ public RunPivotReportResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunPivotReportResponse(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java index e6acee8e..704e8151 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java @@ -57,182 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunRealtimeReportRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensions_.add( - input.readMessage( - com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metrics_.add( - input.readMessage( - com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry)); - break; - } - case 34: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (dimensionFilter_ != null) { - subBuilder = dimensionFilter_.toBuilder(); - } - dimensionFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionFilter_); - dimensionFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (metricFilter_ != null) { - subBuilder = metricFilter_.toBuilder(); - } - metricFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metricFilter_); - metricFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 48: - { - limit_ = input.readInt64(); - break; - } - case 56: - { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - metricAggregations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - metricAggregations_.add(rawValue); - break; - } - case 58: - { - int length = input.readRawVarint32(); - int oldLimit = input.pushLimit(length); - while (input.getBytesUntilLimit() > 0) { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - metricAggregations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - metricAggregations_.add(rawValue); - } - input.popLimit(oldLimit); - break; - } - case 66: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - orderBys_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - orderBys_.add( - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.parser(), extensionRegistry)); - break; - } - case 72: - { - returnPropertyQuota_ = input.readBool(); - break; - } - case 82: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - minuteRanges_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - minuteRanges_.add( - input.readMessage( - com.google.analytics.data.v1beta.MinuteRange.parser(), extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = java.util.Collections.unmodifiableList(dimensions_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - metricAggregations_ = java.util.Collections.unmodifiableList(metricAggregations_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - orderBys_ = java.util.Collections.unmodifiableList(orderBys_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - minuteRanges_ = java.util.Collections.unmodifiableList(minuteRanges_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_RunRealtimeReportRequest_descriptor; @@ -904,7 +728,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < minuteRanges_.size(); i++) { output.writeMessage(10, minuteRanges_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -953,7 +777,7 @@ public int getSerializedSize() { for (int i = 0; i < minuteRanges_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, minuteRanges_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -985,7 +809,7 @@ public boolean equals(final java.lang.Object obj) { if (!getOrderBysList().equals(other.getOrderBysList())) return false; if (getReturnPropertyQuota() != other.getReturnPropertyQuota()) return false; if (!getMinuteRangesList().equals(other.getMinuteRangesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1030,7 +854,7 @@ public int hashCode() { hash = (37 * hash) + MINUTE_RANGES_FIELD_NUMBER; hash = (53 * hash) + getMinuteRangesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1160,22 +984,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.RunRealtimeReportRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionsFieldBuilder(); - getMetricsFieldBuilder(); - getOrderBysFieldBuilder(); - getMinuteRangesFieldBuilder(); - } } @java.lang.Override @@ -1185,16 +997,18 @@ public Builder clear() { if (dimensionsBuilder_ == null) { dimensions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensions_ = null; dimensionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metrics_ = null; metricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (dimensionFilterBuilder_ == null) { dimensionFilter_ = null; } else { @@ -1213,18 +1027,20 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000004); if (orderBysBuilder_ == null) { orderBys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + orderBys_ = null; orderBysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); returnPropertyQuota_ = false; if (minuteRangesBuilder_ == null) { minuteRanges_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + minuteRanges_ = null; minuteRangesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -1491,7 +1307,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunRealtimeReportReque } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1506,18 +1322,132 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.RunRealtimeReportRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.Dimension m = + input.readMessage( + com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry); + if (dimensionsBuilder_ == null) { + ensureDimensionsIsMutable(); + dimensions_.add(m); + } else { + dimensionsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.Metric m = + input.readMessage( + com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry); + if (metricsBuilder_ == null) { + ensureMetricsIsMutable(); + metrics_.add(m); + } else { + metricsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + input.readMessage(getDimensionFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage(getMetricFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 48: + { + limit_ = input.readInt64(); + + break; + } // case 48 + case 56: + { + int tmpRaw = input.readEnum(); + ensureMetricAggregationsIsMutable(); + metricAggregations_.add(tmpRaw); + break; + } // case 56 + case 58: + { + int length = input.readRawVarint32(); + int oldLimit = input.pushLimit(length); + while (input.getBytesUntilLimit() > 0) { + int tmpRaw = input.readEnum(); + ensureMetricAggregationsIsMutable(); + metricAggregations_.add(tmpRaw); + } + input.popLimit(oldLimit); + break; + } // case 58 + case 66: + { + com.google.analytics.data.v1beta.OrderBy m = + input.readMessage( + com.google.analytics.data.v1beta.OrderBy.parser(), extensionRegistry); + if (orderBysBuilder_ == null) { + ensureOrderBysIsMutable(); + orderBys_.add(m); + } else { + orderBysBuilder_.addMessage(m); + } + break; + } // case 66 + case 72: + { + returnPropertyQuota_ = input.readBool(); + + break; + } // case 72 + case 82: + { + com.google.analytics.data.v1beta.MinuteRange m = + input.readMessage( + com.google.analytics.data.v1beta.MinuteRange.parser(), extensionRegistry); + if (minuteRangesBuilder_ == null) { + ensureMinuteRangesIsMutable(); + minuteRanges_.add(m); + } else { + minuteRangesBuilder_.addMessage(m); + } + break; + } // case 82 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.RunRealtimeReportRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3929,7 +3859,18 @@ public RunRealtimeReportRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunRealtimeReportRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java index 299b42e9..24cb18f3 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java @@ -58,161 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunRealtimeReportResponse( - 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)) { - dimensionHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionHeader.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metricHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metricHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.MetricHeader.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - rows_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - rows_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - totals_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - totals_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 42: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - maximums_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - maximums_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 50: - { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - minimums_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; - } - minimums_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 56: - { - rowCount_ = input.readInt32(); - break; - } - case 66: - { - com.google.analytics.data.v1beta.PropertyQuota.Builder subBuilder = null; - if (propertyQuota_ != null) { - subBuilder = propertyQuota_.toBuilder(); - } - propertyQuota_ = - input.readMessage( - com.google.analytics.data.v1beta.PropertyQuota.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(propertyQuota_); - propertyQuota_ = subBuilder.buildPartial(); - } - - break; - } - case 74: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionHeaders_ = java.util.Collections.unmodifiableList(dimensionHeaders_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metricHeaders_ = java.util.Collections.unmodifiableList(metricHeaders_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - rows_ = java.util.Collections.unmodifiableList(rows_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - totals_ = java.util.Collections.unmodifiableList(totals_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - maximums_ = java.util.Collections.unmodifiableList(maximums_); - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - minimums_ = java.util.Collections.unmodifiableList(minimums_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_RunRealtimeReportResponse_descriptor; @@ -819,7 +664,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, kind_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -855,7 +700,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, kind_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -883,7 +728,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } if (!getKind().equals(other.getKind())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -926,7 +771,7 @@ public int hashCode() { } hash = (37 * hash) + KIND_FIELD_NUMBER; hash = (53 * hash) + getKind().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1056,24 +901,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.RunRealtimeReportResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionHeadersFieldBuilder(); - getMetricHeadersFieldBuilder(); - getRowsFieldBuilder(); - getTotalsFieldBuilder(); - getMaximumsFieldBuilder(); - getMinimumsFieldBuilder(); - } } @java.lang.Override @@ -1081,40 +912,46 @@ public Builder clear() { super.clear(); if (dimensionHeadersBuilder_ == null) { dimensionHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionHeaders_ = null; dimensionHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricHeadersBuilder_ == null) { metricHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metricHeaders_ = null; metricHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (rowsBuilder_ == null) { rows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + rows_ = null; rowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (totalsBuilder_ == null) { totals_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + totals_ = null; totalsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); if (maximumsBuilder_ == null) { maximums_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + maximums_ = null; maximumsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); if (minimumsBuilder_ == null) { minimums_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); } else { + minimums_ = null; minimumsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000020); rowCount_ = 0; if (propertyQuotaBuilder_ == null) { @@ -1436,7 +1273,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunRealtimeReportRespo kind_ = other.kind_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1451,18 +1288,128 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.RunRealtimeReportResponse 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: + { + com.google.analytics.data.v1beta.DimensionHeader m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionHeader.parser(), + extensionRegistry); + if (dimensionHeadersBuilder_ == null) { + ensureDimensionHeadersIsMutable(); + dimensionHeaders_.add(m); + } else { + dimensionHeadersBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.MetricHeader m = + input.readMessage( + com.google.analytics.data.v1beta.MetricHeader.parser(), extensionRegistry); + if (metricHeadersBuilder_ == null) { + ensureMetricHeadersIsMutable(); + metricHeaders_.add(m); + } else { + metricHeadersBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (rowsBuilder_ == null) { + ensureRowsIsMutable(); + rows_.add(m); + } else { + rowsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (totalsBuilder_ == null) { + ensureTotalsIsMutable(); + totals_.add(m); + } else { + totalsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (maximumsBuilder_ == null) { + ensureMaximumsIsMutable(); + maximums_.add(m); + } else { + maximumsBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (minimumsBuilder_ == null) { + ensureMinimumsIsMutable(); + minimums_.add(m); + } else { + minimumsBuilder_.addMessage(m); + } + break; + } // case 50 + case 56: + { + rowCount_ = input.readInt32(); + + break; + } // case 56 + case 66: + { + input.readMessage(getPropertyQuotaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + case 74: + { + kind_ = input.readStringRequireUtf8(); + + 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 = - (com.google.analytics.data.v1beta.RunRealtimeReportResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4014,7 +3961,18 @@ public RunRealtimeReportResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunRealtimeReportResponse(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java index 8e358f9e..86ae063d 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java @@ -58,214 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunReportRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - property_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensions_.add( - input.readMessage( - com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metrics_.add( - input.readMessage( - com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry)); - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - dateRanges_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - dateRanges_.add( - input.readMessage( - com.google.analytics.data.v1beta.DateRange.parser(), extensionRegistry)); - break; - } - case 42: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (dimensionFilter_ != null) { - subBuilder = dimensionFilter_.toBuilder(); - } - dimensionFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dimensionFilter_); - dimensionFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 50: - { - com.google.analytics.data.v1beta.FilterExpression.Builder subBuilder = null; - if (metricFilter_ != null) { - subBuilder = metricFilter_.toBuilder(); - } - metricFilter_ = - input.readMessage( - com.google.analytics.data.v1beta.FilterExpression.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metricFilter_); - metricFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 56: - { - offset_ = input.readInt64(); - break; - } - case 64: - { - limit_ = input.readInt64(); - break; - } - case 72: - { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - metricAggregations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - metricAggregations_.add(rawValue); - break; - } - case 74: - { - int length = input.readRawVarint32(); - int oldLimit = input.pushLimit(length); - while (input.getBytesUntilLimit() > 0) { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - metricAggregations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - metricAggregations_.add(rawValue); - } - input.popLimit(oldLimit); - break; - } - case 82: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - orderBys_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - orderBys_.add( - input.readMessage( - com.google.analytics.data.v1beta.OrderBy.parser(), extensionRegistry)); - break; - } - case 90: - { - java.lang.String s = input.readStringRequireUtf8(); - - currencyCode_ = s; - break; - } - case 98: - { - com.google.analytics.data.v1beta.CohortSpec.Builder subBuilder = null; - if (cohortSpec_ != null) { - subBuilder = cohortSpec_.toBuilder(); - } - cohortSpec_ = - input.readMessage( - com.google.analytics.data.v1beta.CohortSpec.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(cohortSpec_); - cohortSpec_ = subBuilder.buildPartial(); - } - - break; - } - case 104: - { - keepEmptyRows_ = input.readBool(); - break; - } - case 112: - { - returnPropertyQuota_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensions_ = java.util.Collections.unmodifiableList(dimensions_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metrics_ = java.util.Collections.unmodifiableList(metrics_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - dateRanges_ = java.util.Collections.unmodifiableList(dateRanges_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - metricAggregations_ = java.util.Collections.unmodifiableList(metricAggregations_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - orderBys_ = java.util.Collections.unmodifiableList(orderBys_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_RunReportRequest_descriptor; @@ -1104,7 +896,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (returnPropertyQuota_ != false) { output.writeBool(14, returnPropertyQuota_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1165,7 +957,7 @@ public int getSerializedSize() { if (returnPropertyQuota_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(14, returnPropertyQuota_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1204,7 +996,7 @@ public boolean equals(final java.lang.Object obj) { } if (getKeepEmptyRows() != other.getKeepEmptyRows()) return false; if (getReturnPropertyQuota() != other.getReturnPropertyQuota()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1259,7 +1051,7 @@ public int hashCode() { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getKeepEmptyRows()); hash = (37 * hash) + RETURN_PROPERTY_QUOTA_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getReturnPropertyQuota()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1388,22 +1180,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.RunReportRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionsFieldBuilder(); - getMetricsFieldBuilder(); - getDateRangesFieldBuilder(); - getOrderBysFieldBuilder(); - } } @java.lang.Override @@ -1413,22 +1193,25 @@ public Builder clear() { if (dimensionsBuilder_ == null) { dimensions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensions_ = null; dimensionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metrics_ = null; metricsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (dateRangesBuilder_ == null) { dateRanges_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + dateRanges_ = null; dateRangesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (dimensionFilterBuilder_ == null) { dimensionFilter_ = null; } else { @@ -1449,10 +1232,11 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000008); if (orderBysBuilder_ == null) { orderBys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + orderBys_ = null; orderBysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); currencyCode_ = ""; if (cohortSpecBuilder_ == null) { @@ -1752,7 +1536,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunReportRequest other if (other.getReturnPropertyQuota() != false) { setReturnPropertyQuota(other.getReturnPropertyQuota()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1767,18 +1551,156 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.RunReportRequest 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: + { + property_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.Dimension m = + input.readMessage( + com.google.analytics.data.v1beta.Dimension.parser(), extensionRegistry); + if (dimensionsBuilder_ == null) { + ensureDimensionsIsMutable(); + dimensions_.add(m); + } else { + dimensionsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.Metric m = + input.readMessage( + com.google.analytics.data.v1beta.Metric.parser(), extensionRegistry); + if (metricsBuilder_ == null) { + ensureMetricsIsMutable(); + metrics_.add(m); + } else { + metricsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + com.google.analytics.data.v1beta.DateRange m = + input.readMessage( + com.google.analytics.data.v1beta.DateRange.parser(), extensionRegistry); + if (dateRangesBuilder_ == null) { + ensureDateRangesIsMutable(); + dateRanges_.add(m); + } else { + dateRangesBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + input.readMessage(getDimensionFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 50: + { + input.readMessage(getMetricFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 56: + { + offset_ = input.readInt64(); + + break; + } // case 56 + case 64: + { + limit_ = input.readInt64(); + + break; + } // case 64 + case 72: + { + int tmpRaw = input.readEnum(); + ensureMetricAggregationsIsMutable(); + metricAggregations_.add(tmpRaw); + break; + } // case 72 + case 74: + { + int length = input.readRawVarint32(); + int oldLimit = input.pushLimit(length); + while (input.getBytesUntilLimit() > 0) { + int tmpRaw = input.readEnum(); + ensureMetricAggregationsIsMutable(); + metricAggregations_.add(tmpRaw); + } + input.popLimit(oldLimit); + break; + } // case 74 + case 82: + { + com.google.analytics.data.v1beta.OrderBy m = + input.readMessage( + com.google.analytics.data.v1beta.OrderBy.parser(), extensionRegistry); + if (orderBysBuilder_ == null) { + ensureOrderBysIsMutable(); + orderBys_.add(m); + } else { + orderBysBuilder_.addMessage(m); + } + break; + } // case 82 + case 90: + { + currencyCode_ = input.readStringRequireUtf8(); + + break; + } // case 90 + case 98: + { + input.readMessage(getCohortSpecFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 98 + case 104: + { + keepEmptyRows_ = input.readBool(); + + break; + } // case 104 + case 112: + { + returnPropertyQuota_ = input.readBool(); + + break; + } // case 112 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.RunReportRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4648,7 +4570,18 @@ public RunReportRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunReportRequest(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/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java index 934ed440..0dee52f8 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java @@ -58,178 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunReportResponse( - 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)) { - dimensionHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - dimensionHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.DimensionHeader.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - metricHeaders_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - metricHeaders_.add( - input.readMessage( - com.google.analytics.data.v1beta.MetricHeader.parser(), extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - rows_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - rows_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - totals_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - totals_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 42: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - maximums_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - maximums_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 50: - { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - minimums_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; - } - minimums_.add( - input.readMessage( - com.google.analytics.data.v1beta.Row.parser(), extensionRegistry)); - break; - } - case 56: - { - rowCount_ = input.readInt32(); - break; - } - case 66: - { - com.google.analytics.data.v1beta.ResponseMetaData.Builder subBuilder = null; - if (metadata_ != null) { - subBuilder = metadata_.toBuilder(); - } - metadata_ = - input.readMessage( - com.google.analytics.data.v1beta.ResponseMetaData.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metadata_); - metadata_ = subBuilder.buildPartial(); - } - - break; - } - case 74: - { - com.google.analytics.data.v1beta.PropertyQuota.Builder subBuilder = null; - if (propertyQuota_ != null) { - subBuilder = propertyQuota_.toBuilder(); - } - propertyQuota_ = - input.readMessage( - com.google.analytics.data.v1beta.PropertyQuota.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(propertyQuota_); - propertyQuota_ = subBuilder.buildPartial(); - } - - break; - } - case 82: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - dimensionHeaders_ = java.util.Collections.unmodifiableList(dimensionHeaders_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - metricHeaders_ = java.util.Collections.unmodifiableList(metricHeaders_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - rows_ = java.util.Collections.unmodifiableList(rows_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - totals_ = java.util.Collections.unmodifiableList(totals_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - maximums_ = java.util.Collections.unmodifiableList(maximums_); - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - minimums_ = java.util.Collections.unmodifiableList(minimums_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.analytics.data.v1beta.AnalyticsDataApiProto .internal_static_google_analytics_data_v1beta_RunReportResponse_descriptor; @@ -889,7 +717,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 10, kind_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -928,7 +756,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, kind_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -960,7 +788,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } if (!getKind().equals(other.getKind())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1007,7 +835,7 @@ public int hashCode() { } hash = (37 * hash) + KIND_FIELD_NUMBER; hash = (53 * hash) + getKind().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1136,24 +964,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.analytics.data.v1beta.RunReportResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDimensionHeadersFieldBuilder(); - getMetricHeadersFieldBuilder(); - getRowsFieldBuilder(); - getTotalsFieldBuilder(); - getMaximumsFieldBuilder(); - getMinimumsFieldBuilder(); - } } @java.lang.Override @@ -1161,40 +975,46 @@ public Builder clear() { super.clear(); if (dimensionHeadersBuilder_ == null) { dimensionHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + dimensionHeaders_ = null; dimensionHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (metricHeadersBuilder_ == null) { metricHeaders_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + metricHeaders_ = null; metricHeadersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (rowsBuilder_ == null) { rows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + rows_ = null; rowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (totalsBuilder_ == null) { totals_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + totals_ = null; totalsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); if (maximumsBuilder_ == null) { maximums_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + maximums_ = null; maximumsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); if (minimumsBuilder_ == null) { minimums_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); } else { + minimums_ = null; minimumsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000020); rowCount_ = 0; if (metadataBuilder_ == null) { @@ -1530,7 +1350,7 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunReportResponse othe kind_ = other.kind_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1545,18 +1365,134 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.analytics.data.v1beta.RunReportResponse 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: + { + com.google.analytics.data.v1beta.DimensionHeader m = + input.readMessage( + com.google.analytics.data.v1beta.DimensionHeader.parser(), + extensionRegistry); + if (dimensionHeadersBuilder_ == null) { + ensureDimensionHeadersIsMutable(); + dimensionHeaders_.add(m); + } else { + dimensionHeadersBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.analytics.data.v1beta.MetricHeader m = + input.readMessage( + com.google.analytics.data.v1beta.MetricHeader.parser(), extensionRegistry); + if (metricHeadersBuilder_ == null) { + ensureMetricHeadersIsMutable(); + metricHeaders_.add(m); + } else { + metricHeadersBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (rowsBuilder_ == null) { + ensureRowsIsMutable(); + rows_.add(m); + } else { + rowsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (totalsBuilder_ == null) { + ensureTotalsIsMutable(); + totals_.add(m); + } else { + totalsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (maximumsBuilder_ == null) { + ensureMaximumsIsMutable(); + maximums_.add(m); + } else { + maximumsBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + com.google.analytics.data.v1beta.Row m = + input.readMessage( + com.google.analytics.data.v1beta.Row.parser(), extensionRegistry); + if (minimumsBuilder_ == null) { + ensureMinimumsIsMutable(); + minimums_.add(m); + } else { + minimumsBuilder_.addMessage(m); + } + break; + } // case 50 + case 56: + { + rowCount_ = input.readInt32(); + + break; + } // case 56 + case 66: + { + input.readMessage(getMetadataFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + case 74: + { + input.readMessage(getPropertyQuotaFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 74 + case 82: + { + kind_ = input.readStringRequireUtf8(); + + break; + } // case 82 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.analytics.data.v1beta.RunReportResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4300,7 +4236,18 @@ public RunReportResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunReportResponse(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/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 95f1353e..d0f8a81a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -40,7 +40,7 @@ com.google.analytics google-analytics-data - 0.14.8 + 0.14.9 diff --git a/versions.txt b/versions.txt index 9fc2e865..456e375c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-analytics-data:0.14.8:0.14.8 -grpc-google-analytics-data-v1beta:0.14.8:0.14.8 -proto-google-analytics-data-v1beta:0.14.8:0.14.8 -proto-google-analytics-data-v1alpha:0.14.8:0.14.8 -grpc-google-analytics-data-v1alpha:0.14.8:0.14.8 +google-analytics-data:0.14.9:0.14.9 +grpc-google-analytics-data-v1beta:0.14.9:0.14.9 +proto-google-analytics-data-v1beta:0.14.9:0.14.9 +proto-google-analytics-data-v1alpha:0.14.9:0.14.9 +grpc-google-analytics-data-v1alpha:0.14.9:0.14.9