Skip to content

Commit

Permalink
Remove unused generateInternalFields.
Browse files Browse the repository at this point in the history
  • Loading branch information
thesamet committed Jan 8, 2016
1 parent e0bdb6c commit bf10eac
Showing 1 changed file with 0 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -883,29 +883,6 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
.call(generateMessageCompanion(message))
}

def generateInternalFields(message: Descriptor, fp: FunctionalPrinter): FunctionalPrinter = {
def makeDescriptor(field: FieldDescriptor): String = {
val index = field.getIndex
val label = if (field.isOptional) "Descriptors.Optional"
else if (field.isRepeated) "Descriptors.Repeated"
else if (field.isRequired) "Descriptors.Required"
else throw new IllegalArgumentException()

val t = field.getJavaType match {
case t if !field.isMessage && !field.isEnum =>
s"Descriptors.PrimitiveType(com.google.protobuf.Descriptors.FieldDescriptor.JavaType.$t, " +
s"com.google.protobuf.Descriptors.FieldDescriptor.Type.${field.getType})"
case _ if field.isMessage => "Descriptors.MessageType(" + field.getMessageType.scalaTypeName + ".descriptor)"
case _ if field.isEnum => "Descriptors.EnumType(" + field.getEnumType.scalaTypeName + ".descriptor)"
}
val oneof = field.containingOneOf.map(s => s"""Some("${s.getName()}")""").getOrElse("None")
s"""Descriptors.FieldDescriptor($index, ${field.getNumber}, "${field.getName}", $label, $t, isPacked = ${field.isPacked}, containingOneofName = $oneof)"""
}

fp.add(s"""case "${message.scalaTypeName}" => Seq(${message.fields.filterNot(_.isMap).map(makeDescriptor).mkString(", ")})""")
.print(message.nestedTypes)(generateInternalFields)
}

def scalaFileHeader(file: FileDescriptor): FunctionalPrinter = {
new FunctionalPrinter().addM(
s"""// Generated by the Scala Plugin for the Protocol Buffer Compiler.
Expand Down

0 comments on commit bf10eac

Please sign in to comment.