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

Add Scala support #382

Merged
merged 3 commits into from
Nov 14, 2023
+152 −4
Merged

Add Scala support #382

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
1a4ad99
Add Scala/Maven starter
oliver-brm Nov 13, 2023
2c3e3e4
Fix test scope for vertx-lang-scala3-test
oliver-brm Nov 13, 2023
c068a5c
Add Scala/Gradle starter
oliver-brm Nov 13, 2023
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
5 changes: 4 additions & 1 deletion src/main/java/io/vertx/starter/model/Language.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ public enum Language {
JAVA("java", ".java"),

@JsonProperty("kotlin")
KOTLIN("kotlin", ".kt", "vertx-lang-kotlin");
KOTLIN("kotlin", ".kt", "vertx-lang-kotlin"),

@JsonProperty("scala")
SCALA("scala", ".scala");

private final String name;
private final String extension;
Expand Down
11 changes: 10 additions & 1 deletion src/main/resources/templates/build.gradle.kts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
<#if language == "kotlin">
kotlin ("jvm") version "1.7.21"
<#elseif language == "scala">
scala
<#else>
java
</#if>
Expand Down Expand Up @@ -54,11 +56,18 @@ dependencies {
</#list>
<#if language == "kotlin">
implementation(kotlin("stdlib-jdk8"))
<#elseif language == "scala">
implementation("org.scala-lang:scala3-library_3:3.3.1")
implementation("io.vertx:vertx-lang-scala3:${vertxVersion}")
</#if>
<#if hasPgClient>
implementation("com.ongres.scram:client:2.1")
</#if>
<#if hasVertxJUnit5>
<#if language == "scala">
testImplementation("io.vertx:vertx-lang-scala3-test:${vertxVersion}")
testImplementation("org.scalatest:scalatest_3:3.2.17")
testRuntimeOnly("org.scalatestplus:junit-5-10_3:3.2.17.0")
<#elseif hasVertxJUnit5>
testImplementation("io.vertx:vertx-junit5")
testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion")
<#elseif hasVertxUnit>
Expand Down
88 changes: 86 additions & 2 deletions src/main/resources/templates/pom.xml.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

<#if language == "kotlin">
<kotlin.version>1.7.21</kotlin.version>

<#elseif language == "scala">
<scala.version>3.3.1</scala.version>
<#else>
<#if jdkVersion == "1.8">
<maven.compiler.source>${jdkVersion}</maven.compiler.source>
Expand Down Expand Up @@ -70,6 +71,19 @@
<version>${kotlin.version}</version>
</dependency>
</#noparse>
<#elseif language == "scala">
<#noparse>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala3-library_3</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala3</artifactId>
<version>${vertx.version}</version>
</dependency>
</#noparse>
</#if>
<#if hasPgClient>
<dependency>
Expand All @@ -79,7 +93,20 @@
</dependency>
</#if>

<#if hasVertxJUnit5>
<#if language == "scala">
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala3-test</artifactId>
<version>${vertx.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_3</artifactId>
<version>3.2.17</version>
<scope>test</scope>
</dependency>
<#elseif hasVertxJUnit5>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-junit5</artifactId>
Expand Down Expand Up @@ -122,6 +149,11 @@
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
</#noparse>
<#elseif language == "scala">
<#noparse>
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
</#noparse>
</#if>
<plugins>
<#if language == "kotlin">
Expand Down Expand Up @@ -149,6 +181,53 @@
</execution>
</executions>
</plugin>
<#elseif language == "scala">
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.8.1</version>
<configuration>
<args>
<arg>java-output-version 8</arg>
<arg>-feature</arg>
<arg>-deprecation</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>2.2.0</version>
<configuration>
<#noparse>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
</#noparse>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
</configuration>
<executions>
<execution>
<id>test</id>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<#else>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -199,6 +278,11 @@
<#noparse>
<version>${maven-surefire-plugin.version}</version>
</#noparse>
<#if language == "scala">
<configuration>
<skipTests>true</skipTests>
</configuration>
</#if>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
28 changes: 28 additions & 0 deletions src/main/resources/templates/src/main/scala/MainVerticle.scala.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package ${packageName}

import io.vertx.core.{AbstractVerticle, Promise}
import io.vertx.lang.scala.ScalaVerticle
import io.vertx.lang.scala.ImplicitConversions.vertxFutureToScalaFuture

import scala.concurrent.Future
import scala.language.implicitConversions

class MainVerticle extends AbstractVerticle:

override def start(startPromise: Promise[Void]): Unit =
vertx
.deployVerticle(HttpVerticle().asJava)
.onSuccess(_ => startPromise.complete)
.onFailure(e => startPromise.fail(e))


class HttpVerticle extends ScalaVerticle:

override def asyncStart: Future[Unit] =
vertx
.createHttpServer()
.requestHandler(_.response
.putHeader("content-type", "text/plain")
.end("Hello from Vert.x!"))
.listen(8888)
.mapEmpty[Unit]()
24 changes: 24 additions & 0 deletions src/main/resources/templates/src/test/scala/TestMainVerticle.scala.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package ${packageName}

import io.vertx.core.http.HttpMethod

import io.vertx.lang.scala.ImplicitConversions.vertxFutureToScalaFuture
import io.vertx.lang.scala.testing.VerticleTesting

import org.scalatest.matchers.should.Matchers

import scala.language.implicitConversions


class HttpVerticleSpec extends VerticleTesting[HttpVerticle], Matchers:

"HttpVerticle" should "bind to 8888 and answer with 'Hello from Vert.x!'" in {
val httpClient = vertx.createHttpClient()

for {
req <- httpClient.request(HttpMethod.GET, 8888, "127.0.0.1", "/")
res <- req.send()
body <- res.body.map(_.toString)
assertion = body should equal("Hello from Vert.x!")
} yield assertion
}
Loading