Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try protobuf-java 4.29.3 #1795

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

try protobuf-java 4.29.3 #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30f5a71
try protobuf-java 4.30.0
pjfanning Mar 9, 2025
db48366
regen code
pjfanning Mar 9, 2025
6dc4d96
javafmt
pjfanning Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .scala-steward.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ updates.pin = [
{ groupId = "com.lightbend.paradox", artifactId = "sbt-paradox", version = "0.9." }
# Scala 3.3 is the latest LTS version
{ groupId = "org.scala-lang", artifactId = "scala3-library", version = "3.3." }
# protobuf 4 is not yet well supported
{ groupId = "com.google.protobuf", artifactId = "protobuf-java", version = "3." }
# aeron 1.46 requires Java 17
{ groupId = "io.aeron", version = "1.45." }
# agrona 1.23 requires Java 17
Expand Down
2 changes: 1 addition & 1 deletion actor/src/main/resources/reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ pekko {
"com.google.protobuf.GeneratedMessage",
"com.google.protobuf.GeneratedMessageV3",
"scalapb.GeneratedMessageCompanion",
"org.apache.pekko.protobufv3.internal.GeneratedMessageV3"
"org.apache.pekko.protobufv3.internal.GeneratedMessage"
]

# Additional classes that are allowed even if they are not defined in `serialization-bindings`.
Expand Down
1,056 changes: 328 additions & 728 deletions ...s/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
View file
Open in desktop

Large diffs are not rendered by default.

117 changes: 43 additions & 74 deletions ...main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,23 @@
*/

// Generated by the protocol buffer compiler. DO NOT EDIT!
// NO CHECKED-IN PROTOBUF GENCODE
// source: ShardingMessages.proto
// Protobuf Java Version: 4.29.3

// Protobuf Java Version: 3.25.6
package org.apache.pekko.cluster.sharding.typed.internal.protobuf;

public final class ShardingMessages {
private ShardingMessages() {}
static {
org.apache.pekko.protobufv3.internal.RuntimeVersion.validateProtobufGencodeVersion(
org.apache.pekko.protobufv3.internal.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 29,
/* patch= */ 3,
/* suffix= */ "",
ShardingMessages.class.getName());
}
public static void registerAllExtensions(
org.apache.pekko.protobufv3.internal.ExtensionRegistryLite registry) {
}
Expand Down Expand Up @@ -68,32 +78,34 @@ public interface ShardingEnvelopeOrBuilder extends
* Protobuf type {@code org.apache.pekko.cluster.sharding.typed.ShardingEnvelope}
*/
public static final class ShardingEnvelope extends
org.apache.pekko.protobufv3.internal.GeneratedMessageV3 implements
org.apache.pekko.protobufv3.internal.GeneratedMessage implements
// @@protoc_insertion_point(message_implements:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
ShardingEnvelopeOrBuilder {
private static final long serialVersionUID = 0L;
static {
org.apache.pekko.protobufv3.internal.RuntimeVersion.validateProtobufGencodeVersion(
org.apache.pekko.protobufv3.internal.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 29,
/* patch= */ 3,
/* suffix= */ "",
ShardingEnvelope.class.getName());
}
// Use ShardingEnvelope.newBuilder() to construct.
private ShardingEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder<?> builder) {
private ShardingEnvelope(org.apache.pekko.protobufv3.internal.GeneratedMessage.Builder<?> builder) {
super(builder);
}
private ShardingEnvelope() {
entityId_ = "";
}

@java.lang.Override
@SuppressWarnings({"unused"})
protected java.lang.Object newInstance(
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.UnusedPrivateParameter unused) {
return new ShardingEnvelope();
}

public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
getDescriptor() {
return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
}

@java.lang.Override
protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
protected org.apache.pekko.protobufv3.internal.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
.ensureFieldAccessorsInitialized(
Expand Down Expand Up @@ -203,7 +215,7 @@ public final boolean isInitialized() {
public void writeTo(org.apache.pekko.protobufv3.internal.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) != 0)) {
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.writeString(output, 1, entityId_);
org.apache.pekko.protobufv3.internal.GeneratedMessage.writeString(output, 1, entityId_);
}
if (((bitField0_ & 0x00000002) != 0)) {
output.writeMessage(2, getMessage());
Expand All @@ -218,7 +230,7 @@ public int getSerializedSize() {

size = 0;
if (((bitField0_ & 0x00000001) != 0)) {
size += org.apache.pekko.protobufv3.internal.GeneratedMessageV3.computeStringSize(1, entityId_);
size += org.apache.pekko.protobufv3.internal.GeneratedMessage.computeStringSize(1, entityId_);
}
if (((bitField0_ & 0x00000002) != 0)) {
size += org.apache.pekko.protobufv3.internal.CodedOutputStream
Expand Down Expand Up @@ -307,41 +319,41 @@ public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.Sharding
}
public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(java.io.InputStream input)
throws java.io.IOException {
return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
return org.apache.pekko.protobufv3.internal.GeneratedMessage
.parseWithIOException(PARSER, input);
}
public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
java.io.InputStream input,
org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
return org.apache.pekko.protobufv3.internal.GeneratedMessage
.parseWithIOException(PARSER, input, extensionRegistry);
}

public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
return org.apache.pekko.protobufv3.internal.GeneratedMessage
.parseDelimitedWithIOException(PARSER, input);
}

public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseDelimitedFrom(
java.io.InputStream input,
org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
return org.apache.pekko.protobufv3.internal.GeneratedMessage
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
org.apache.pekko.protobufv3.internal.CodedInputStream input)
throws java.io.IOException {
return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
return org.apache.pekko.protobufv3.internal.GeneratedMessage
.parseWithIOException(PARSER, input);
}
public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope parseFrom(
org.apache.pekko.protobufv3.internal.CodedInputStream input,
org.apache.pekko.protobufv3.internal.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return org.apache.pekko.protobufv3.internal.GeneratedMessageV3
return org.apache.pekko.protobufv3.internal.GeneratedMessage
.parseWithIOException(PARSER, input, extensionRegistry);
}

Expand All @@ -361,15 +373,15 @@ public Builder toBuilder() {

@java.lang.Override
protected Builder newBuilderForType(
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
org.apache.pekko.protobufv3.internal.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
/**
* Protobuf type {@code org.apache.pekko.cluster.sharding.typed.ShardingEnvelope}
*/
public static final class Builder extends
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.Builder<Builder> implements
org.apache.pekko.protobufv3.internal.GeneratedMessage.Builder<Builder> implements
// @@protoc_insertion_point(builder_implements:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelopeOrBuilder {
public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
Expand All @@ -378,7 +390,7 @@ public static final class Builder extends
}

@java.lang.Override
protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
protected org.apache.pekko.protobufv3.internal.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
.ensureFieldAccessorsInitialized(
Expand All @@ -391,12 +403,12 @@ private Builder() {
}

private Builder(
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
org.apache.pekko.protobufv3.internal.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
if (org.apache.pekko.protobufv3.internal.GeneratedMessageV3
if (org.apache.pekko.protobufv3.internal.GeneratedMessage
.alwaysUseFieldBuilders) {
getMessageFieldBuilder();
}
Expand Down Expand Up @@ -458,38 +470,6 @@ private void buildPartial0(org.apache.pekko.cluster.sharding.typed.internal.prot
result.bitField0_ |= to_bitField0_;
}

@java.lang.Override
public Builder clone() {
return super.clone();
}
@java.lang.Override
public Builder setField(
org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
java.lang.Object value) {
return super.setField(field, value);
}
@java.lang.Override
public Builder clearField(
org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}
@java.lang.Override
public Builder clearOneof(
org.apache.pekko.protobufv3.internal.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}
@java.lang.Override
public Builder setRepeatedField(
org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
int index, java.lang.Object value) {
return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
org.apache.pekko.protobufv3.internal.Descriptors.FieldDescriptor field,
java.lang.Object value) {
return super.addRepeatedField(field, value);
}
@java.lang.Override
public Builder mergeFrom(org.apache.pekko.protobufv3.internal.Message other) {
if (other instanceof org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope) {
Expand Down Expand Up @@ -655,7 +635,7 @@ public Builder setEntityIdBytes(
}

private org.apache.pekko.remote.ContainerFormats.Payload message_;
private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
private org.apache.pekko.protobufv3.internal.SingleFieldBuilder<
org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder> messageBuilder_;
/**
* <code>required .Payload message = 2;</code>
Expand Down Expand Up @@ -761,11 +741,11 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBui
/**
* <code>required .Payload message = 2;</code>
*/
private org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
private org.apache.pekko.protobufv3.internal.SingleFieldBuilder<
org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
getMessageFieldBuilder() {
if (messageBuilder_ == null) {
messageBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilderV3<
messageBuilder_ = new org.apache.pekko.protobufv3.internal.SingleFieldBuilder<
org.apache.pekko.remote.ContainerFormats.Payload, org.apache.pekko.remote.ContainerFormats.Payload.Builder, org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>(
getMessage(),
getParentForChildren(),
Expand All @@ -774,18 +754,6 @@ public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMessageOrBui
}
return messageBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}

@java.lang.Override
public final Builder mergeUnknownFields(
final org.apache.pekko.protobufv3.internal.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
}


// @@protoc_insertion_point(builder_scope:org.apache.pekko.cluster.sharding.typed.ShardingEnvelope)
}
Expand All @@ -800,7 +768,7 @@ public static org.apache.pekko.cluster.sharding.typed.internal.protobuf.Sharding
return DEFAULT_INSTANCE;
}

@java.lang.Deprecated public static final org.apache.pekko.protobufv3.internal.Parser<ShardingEnvelope>
private static final org.apache.pekko.protobufv3.internal.Parser<ShardingEnvelope>
PARSER = new org.apache.pekko.protobufv3.internal.AbstractParser<ShardingEnvelope>() {
@java.lang.Override
public ShardingEnvelope parsePartialFrom(
Expand Down Expand Up @@ -841,7 +809,7 @@ public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessage
private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
private static final
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
org.apache.pekko.protobufv3.internal.GeneratedMessage.FieldAccessorTable
internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable;

public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
Expand All @@ -867,9 +835,10 @@ public org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessage
internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable = new
org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
org.apache.pekko.protobufv3.internal.GeneratedMessage.FieldAccessorTable(
internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor,
new java.lang.String[] { "EntityId", "Message", });
descriptor.resolveAllFeaturesImmutable();
org.apache.pekko.remote.ContainerFormats.getDescriptor();
}

Expand Down
Loading
Loading