Skip to content

feat(scalasdk): register all extensions #429

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

Merged
octonato merged 1 commit into from
Sep 20, 2021
Merged

feat(scalasdk): register all extensions #429

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions codegen/core/src/main/scala/com/lightbend/akkasls/codegen/DescriptorSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
package com.lightbend.akkasls.codegen

import com.google.protobuf.{ DescriptorProtos, Descriptors }

import java.io.{ File, FileInputStream, FileNotFoundException, IOException }
import java.util.logging.{ Level, Logger }

import scala.jdk.CollectionConverters._
import scala.util.{ Failure, Success, Using }

import com.akkaserverless.Annotations
import com.google.protobuf.ExtensionRegistry

/**
Expand Down Expand Up @@ -53,9 +55,7 @@ object DescriptorSet {
Using[FileInputStream, Either[CannotOpen, Either[ReadFailure, Iterable[Descriptors.FileDescriptor]]]](
new FileInputStream(file)) { fis =>
val registry = ExtensionRegistry.newInstance()
registry.add(com.akkaserverless.Annotations.service)
registry.add(com.akkaserverless.Annotations.file)
registry.add(com.akkaserverless.Annotations.method)
Annotations.registerAllExtensions(registry)

Right(try {
val descriptorProtos =
Expand Down
4 changes: 4 additions & 0 deletions codegen/core/src/main/scala/com/lightbend/akkasls/codegen/ModelBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ object ModelBuilder {
val classNameQualified = s"${fqn.parent.javaPackage}.$className"
val providerNameQualified = s"${fqn.parent.javaPackage}.$providerName"

if (updates.isEmpty)
throw new IllegalArgumentException(
s"At least one view method must have `option (akkaserverless.method).view.update` in ${fqn.protoName} (${fqn.parent.protoFileName}).")

val state = State(updates.head.outputType)
}

Expand Down
4 changes: 2 additions & 2 deletions ...cala-gen/src/main/scala/com/akkaserverless/codegen/scalasdk/AkkaserverlessGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.akkaserverless.codegen.scalasdk

import com.akkaserverless.Annotations
import com.akkaserverless.codegen.scalasdk.impl.SourceGenerator
import com.google.protobuf.ExtensionRegistry
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
Expand All @@ -27,8 +28,7 @@ object AkkaserverlessGenerator extends CodeGenApp {
val enableDebug = "enableDebug"

override def registerExtensions(registry: ExtensionRegistry): Unit = {
registry.add(com.akkaserverless.Annotations.service)
registry.add(com.akkaserverless.Annotations.file)
Annotations.registerAllExtensions(registry)
}

override def process(request: CodeGenRequest): CodeGenResponse = {
Expand Down
4 changes: 2 additions & 2 deletions ...-gen/src/main/scala/com/akkaserverless/codegen/scalasdk/AkkaserverlessTestGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.akkaserverless.codegen.scalasdk

import com.akkaserverless.Annotations
import com.akkaserverless.codegen.scalasdk.impl.SourceGenerator
import com.google.protobuf.ExtensionRegistry
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
Expand All @@ -25,8 +26,7 @@ import protocgen.{ CodeGenApp, CodeGenRequest, CodeGenResponse }

object AkkaserverlessTestGenerator extends CodeGenApp {
override def registerExtensions(registry: ExtensionRegistry): Unit = {
registry.add(com.akkaserverless.Annotations.service)
registry.add(com.akkaserverless.Annotations.file)
Annotations.registerAllExtensions(registry)
}

override def process(request: CodeGenRequest): CodeGenResponse = {
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/scala/com/akkaserverless/codegen/scalasdk/AkkaserverlessUnmanagedGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.akkaserverless.codegen.scalasdk

import com.akkaserverless.Annotations
import com.akkaserverless.codegen.scalasdk.impl.SourceGenerator
import com.google.protobuf.ExtensionRegistry
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
Expand All @@ -25,8 +26,7 @@ import protocgen.{ CodeGenApp, CodeGenRequest, CodeGenResponse }

object AkkaserverlessUnmanagedGenerator extends CodeGenApp {
override def registerExtensions(registry: ExtensionRegistry): Unit = {
registry.add(com.akkaserverless.Annotations.service)
registry.add(com.akkaserverless.Annotations.file)
Annotations.registerAllExtensions(registry)
}

override def process(request: CodeGenRequest): CodeGenResponse = {
Expand Down