Skip to content

support minimumEdition and maximumEdition #437

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −7
Open

support minimumEdition and maximumEdition #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 42 additions & 7 deletions protoc-gen/src/main/scala/protocgen/CodeGenResponse.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,40 @@
package protocgen

import com.google.protobuf.UnknownFieldSet
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import scala.collection.JavaConverters._

sealed trait CodeGenResponse {
def toCodeGeneratorResponse: CodeGeneratorResponse =
this match {
case CodeGenResponse.Internal.Success(files, features) =>
case value: CodeGenResponse.Internal.Success =>
val b = CodeGeneratorResponse.newBuilder()
b.addAllFile(files.asJava)
b.setSupportedFeatures(features.map(_.getNumber()).sum)
b.addAllFile(value.files.asJava)
b.setSupportedFeatures(value.supportedFeatures.map(_.getNumber()).sum)
b.setUnknownFields(
// https://github.com/protocolbuffers/protobuf/blob/1f60d67437d7f57700/src/google/protobuf/compiler/plugin.proto#L105-L115
UnknownFieldSet
Copy link
Contributor Author

@xuwei-k xuwei-k Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

protoc-bridge/build.sbt

Line 15 in 2383edf

val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.25.5"

use UnknownFieldSet because protobuf-java 3.x does not have minimumEdition and maximumEdition.

.newBuilder()
.addField(
3,
UnknownFieldSet.Field
.newBuilder()
.addVarint(
value.minimumEdition
)
.build()
)
.addField(
4,
UnknownFieldSet.Field
.newBuilder()
.addVarint(
value.maximumEdition
)
.build()
)
.build()
)
b.build()
case CodeGenResponse.Internal.Failure(msg) =>
val b = CodeGeneratorResponse.newBuilder()
Expand All @@ -20,22 +45,32 @@ sealed trait CodeGenResponse {

object CodeGenResponse {
def succeed(files: Seq[CodeGeneratorResponse.File]): CodeGenResponse =
Internal.Success(files, Set())
Internal.Success(files, Set(), 0, 0)

def succeed(
files: Seq[CodeGeneratorResponse.File],
supportedFeatures: Set[CodeGeneratorResponse.Feature]
): CodeGenResponse =
Internal.Success(files, supportedFeatures)
Internal.Success(files, supportedFeatures, 0, 0)

def succeed(
files: Seq[CodeGeneratorResponse.File],
supportedFeatures: Set[CodeGeneratorResponse.Feature],
minimumEdition: Int,
maximumEdition: Int
): CodeGenResponse =
Internal.Success(files, supportedFeatures, minimumEdition, maximumEdition)

def fail(message: String): CodeGenResponse = Internal.Failure(message)

private object Internal {
final case class Failure(val message: String) extends CodeGenResponse

final case class Success(
val files: Seq[CodeGeneratorResponse.File],
supportedFeatures: Set[CodeGeneratorResponse.Feature]
files: Seq[CodeGeneratorResponse.File],
supportedFeatures: Set[CodeGeneratorResponse.Feature],
minimumEdition: Int,
maximumEdition: Int
) extends CodeGenResponse
}
}