Gradle/java (google proto plugin, our codegen as protoc plugin) #41

raboof · 2018-02-27T13:30:59Z

We can now successfully invoke our protoc plugin, and the (trivial) java helloworld implementation successfully compiles against the generated Java interface.

raboof · 2018-02-27T15:01:03Z

Refs #6

ktoso · 2018-02-28T01:07:54Z

plugin-tester-java/build.gradle

+    artifact = 'com.google.protobuf:protoc:3.4.0'
+  }
+  plugins {
+    akkagrpc {


ktoso · 2018-02-28T01:18:48Z

protoc-plugin/src/main/scala/akka/grpc/gen/Main.scala

+        case -1 ⇒ resultSoFar
+        case b ⇒ read(Array.concat(resultSoFar, buffer.take(b)))
+      }
+    }


val baos = new ByteArrayOutputStream(math.max(64, in.available())) val buffer = Array.ofDim[Byte](32 * 1024) var bytesRead = System.in.read(buffer) while (bytesRead > 0) { baos.write(buffer, 0, bytesRead) bytesRead = System.in.read(buffer) } val bytes: Array[Byte] = baos.toByteArray

Seems to be good enough IMO

ktoso · 2018-02-28T01:24:10Z

protoc-plugin/src/main/scala/akka/grpc/gen/Main.scala

+  //  res.close()
+
+  // Probably not efficient, but this is probably not the bottleneck anyway:
+  outBytes.foreach(byte ⇒ System.out.write(byte.toInt))


val bos = new BufferedOutputStream(System.out) bos.write(outBytes)

Likely already good enough :)

meh checked it writes in one to one flushes anyway, but a bit nicer anyway (then flush/close on it)

jrudolph

LGTM, not sure if we really need the extra project or if we should just use codegen-common for that.

jrudolph · 2018-02-28T14:27:31Z

codegen-common/src/main/scala/akka/http/grpc/JavaServerCodeGenerator.scala

+import scala.collection.JavaConverters._
+
+class JavaServerCodeGenerator extends CodeGenerator {
+  def name = "grpc-akka-javadsl"


Should we use "akka-grpc-javadsl" to be consistent with the overall naming?

jrudolph · 2018-02-28T14:29:32Z

plugin-tester-java/build.gradle

+}
+
+ext {
+  akkaGrpcVersion = '286bc6ae+20180227-1623'


We need to get that from somewhere so it doesn't need to be manually changed all the time.

The best thing I can come up with is taking it from an environment variable... (and perhaps default to the name sbt-dynver generates for a non-dirty repo). Perhaps something for a separate task though?

Yep, separate tasks sounds fine for me.

jrudolph · 2018-02-28T14:43:01Z

protoc-plugin/src/main/scala/akka/grpc/gen/Main.scala

+import scala.annotation.tailrec
+import akka.http.grpc._
+
+object Main extends App {


I think we can put that into codegen-common (and call it just codegen).

jrudolph · 2018-02-28T14:43:35Z

protoc-plugin/src/main/scala/akka/grpc/gen/Main.scala

+
+  // For now we hard-code the Java Server code generator here,
+  // but options can be passed in via `request.getParameter` to
+  // make this more flexible in the future


Exactly, let's create a ticket to implement that.

Not sure if a ticket is needed, we can add parameters as soon as we need them? (already added one in #44)

raboof · 2018-02-28T14:57:20Z

Renaming codegen-common to codegen and configuring it to also be published as an assembly makes sense to me, I'll update

jrudolph · 2018-02-28T15:51:21Z

codegen/src/main/scala/akka/grpc/gen/Main.scala

+
+  val inBytes: Array[Byte] = {
+    val baos = new ByteArrayOutputStream(math.max(64, System.in.available()))
+    val buffer = Array.ofDim[Byte](32 * 1024)


Should be new Array[Byte](32 * 1024). Doesn't matter here but in general ofDim is a performance problem.

(Because it uses a ClassTag to make new Array[T](n) work which compiles down to using reflection for creating the array).

Ah right, forgot about that.

…that So far it seems protobuf-gradle-plugin correctly invokes our codegen plugin and our codegen plugin can parse the input, but protoc from protobuf-gradle-plugin cannot parse our plugin output.

Because it uses a `ClassTag` to make `new Array[T](n)` work which compiles down to using reflection for creating the array

jrudolph · 2018-02-28T16:35:13Z

codegen/src/main/twirl/templates/JavaServer/ApiInterface.scala.txt

+import akka.NotUsed;
+import akka.stream.javadsl.Source;
+
+interface @service.name


If you use @{service.name} you can put the brace on the same line.

jrudolph · 2018-02-28T16:35:49Z

codegen/src/main/twirl/templates/JavaServer/ApiInterface.scala.txt

+
+interface @service.name
+{
+    @for(method <- service.methods) {


In my PR I cleaned up indentation in the other generated files even if it looks a bit weirder in the generator files.

jrudolph · 2018-02-28T16:36:41Z

project/plugins.sbt

@@ -6,6 +6,7 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.1.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.13")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.8.0")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")


Is that really needed? ;)

Best plugin evaaarrr ;-)

jrudolph · 2018-02-28T16:36:50Z

protoc-plugin/src/main/scala/akka/grpc/gen/Main.scala

@@ -0,0 +1,40 @@
+package akka.grpc.gen


jrudolph

LGTM, can be merged from my side once the left-overs are removed. Whitespace of generated files can be fixed later.

This was referenced Feb 27, 2018

Code generation for Java client API #37

Closed

Gradle/scala example project #44

Merged

raboof changed the title ~~[wip] Gradle/java w/ the google proto plugin and our codegen as plugin for that~~ Gradle/java w/ the google proto plugin and our codegen as plugin for that Feb 27, 2018

raboof changed the title ~~Gradle/java w/ the google proto plugin and our codegen as plugin for that~~ Gradle/java (google proto plugin, our codegen as protoc plugin) Feb 27, 2018

ktoso reviewed Feb 28, 2018

View reviewed changes

plugin-tester-java/build.gradle Outdated

artifact = 'com.google.protobuf:protoc:3.4.0'

}

plugins {

akkagrpc {

Copy link

Member

ktoso Feb 28, 2018

Choose a reason for hiding this comment

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

akkaGrpc?

ktoso reviewed Feb 28, 2018

View reviewed changes

jrudolph approved these changes Feb 28, 2018

View reviewed changes

jrudolph reviewed Feb 28, 2018

View reviewed changes

raboof force-pushed the gradle-java branch from 4d95edd to 7f7d5c6 Compare February 28, 2018 15:59

Gradle/java w/ the google proto plugin and our codegen as plugin for …

3deae43

…that So far it seems protobuf-gradle-plugin correctly invokes our codegen plugin and our codegen plugin can parse the input, but protoc from protobuf-gradle-plugin cannot parse our plugin output.

raboof force-pushed the gradle-java branch from 7f7d5c6 to 3deae43 Compare February 28, 2018 16:03

Avoid Array.ofDim

33793d3

Because it uses a `ClassTag` to make `new Array[T](n)` work which compiles down to using reflection for creating the array

jrudolph reviewed Feb 28, 2018

View reviewed changes

protoc-plugin/src/main/scala/akka/grpc/gen/Main.scala Outdated

@@ -0,0 +1,40 @@

package akka.grpc.gen

Copy link

Member

jrudolph Feb 28, 2018

Choose a reason for hiding this comment

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

Left over?

jrudolph approved these changes Feb 28, 2018

View reviewed changes

raboof added 2 commits February 28, 2018 17:44

Remove old codegen Main

1531458

Nicer formatting of generated code

6877f00

raboof merged commit feb72ee into master Feb 28, 2018

raboof deleted the gradle-java branch February 28, 2018 16:56

raboof mentioned this pull request Feb 28, 2018

Testing codegen out of the main sbt project #43

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gradle/java (google proto plugin, our codegen as protoc plugin) #41

Gradle/java (google proto plugin, our codegen as protoc plugin) #41

raboof commented Feb 27, 2018 •

edited

Loading

raboof commented Feb 27, 2018

ktoso Feb 28, 2018

ktoso Feb 28, 2018 •

edited

Loading

ktoso Feb 28, 2018

ktoso Feb 28, 2018

jrudolph left a comment •

edited

Loading

jrudolph Feb 28, 2018

jrudolph Feb 28, 2018

raboof Feb 28, 2018 •

edited

Loading

jrudolph Feb 28, 2018

jrudolph Feb 28, 2018

jrudolph Feb 28, 2018

raboof Feb 28, 2018

raboof commented Feb 28, 2018

jrudolph Feb 28, 2018

jrudolph Feb 28, 2018

ktoso Feb 28, 2018

jrudolph Feb 28, 2018

jrudolph Feb 28, 2018

jrudolph Feb 28, 2018

ktoso Mar 1, 2018

jrudolph Feb 28, 2018

jrudolph left a comment

Gradle/java (google proto plugin, our codegen as protoc plugin) #41

Gradle/java (google proto plugin, our codegen as protoc plugin) #41

Conversation

raboof commented Feb 27, 2018 • edited Loading

raboof commented Feb 27, 2018

Choose a reason for hiding this comment

ktoso Feb 28, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrudolph left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raboof Feb 28, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raboof commented Feb 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrudolph left a comment

Choose a reason for hiding this comment

raboof commented Feb 27, 2018 •

edited

Loading

ktoso Feb 28, 2018 •

edited

Loading

jrudolph left a comment •

edited

Loading

raboof Feb 28, 2018 •

edited

Loading