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.

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

Upgrade Play Framework projects to Play 3.0 #8722

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions frameworks/Java/play2-java/benchmark_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"database": "None",
"approach": "Realistic",
"classification": "Fullstack",
"platform": "Akka",
"platform": "Pekko",
"webserver": "None",
"database_os": "Linux",
"notes": "",
"versus": "akka-http",
"versus": "pekko-http",
"port": "9000",
"json_url": "/json",
"plaintext_url": "/plaintext"
Expand Down Expand Up @@ -47,11 +47,11 @@
"database": "MySQL",
"approach": "Realistic",
"classification": "Fullstack",
"platform": "Akka",
"platform": "Pekko",
"webserver": "None",
"database_os": "Linux",
"notes": "",
"versus": "akka-http",
"versus": "pekko-http",
"port": "9000",
"db_url": "/db",
"query_url": "/queries?queries=",
Expand Down Expand Up @@ -87,11 +87,11 @@
"database": "MySQL",
"approach": "Realistic",
"classification": "Fullstack",
"platform": "Akka",
"platform": "Pekko",
"webserver": "None",
"database_os": "Linux",
"notes": "",
"versus": "akka-http",
"versus": "pekko-http",
"port": "9000",
"db_url": "/db",
"query_url": "/queries?queries=",
Expand Down Expand Up @@ -127,11 +127,11 @@
"database": "MySQL",
"approach": "Realistic",
"classification": "Fullstack",
"platform": "Akka",
"platform": "Pekko",
"webserver": "None",
"database_os": "Linux",
"notes": "",
"versus": "akka-http",
"versus": "pekko-http",
"port": "9000",
"db_url": "/db",
"query_url": "/queries?queries=",
Expand Down
16 changes: 8 additions & 8 deletions frameworks/Java/play2-java/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ database = "MySQL"
database_os = "Linux"
os = "Linux"
orm = "Full"
platform = "Akka"
platform = "Pekko"
webserver = "None"
versus = "akka-http"
versus = "pekko-http"

[main]
urls.plaintext = "/plaintext"
Expand All @@ -38,9 +38,9 @@ database = "None"
database_os = "Linux"
os = "Linux"
orm = "Raw"
platform = "Akka"
platform = "Pekko"
webserver = "None"
versus = "akka-http"
versus = "pekko-http"

[jpa-hikaricp-netty]
urls.db = "/db"
Expand Down Expand Up @@ -83,9 +83,9 @@ database = "MySQL"
database_os = "Linux"
os = "Linux"
orm = "Full"
platform = "Akka"
platform = "Pekko"
webserver = "None"
versus = "akka-http"
versus = "pekko-http"

[jooq-hikaricp]
urls.db = "/db"
Expand All @@ -98,9 +98,9 @@ database = "MySQL"
database_os = "Linux"
os = "Linux"
orm = "Full"
platform = "Akka"
platform = "Pekko"
webserver = "None"
versus = "akka-http"
versus = "pekko-http"

[ebean-hikaricp-netty]
urls.db = "/db"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.1_12_1.9.8_2.13.12
WORKDIR /play2
COPY play2-java-ebean-hikaricp .

RUN sed -i 's/.enablePlugins(PlayMinimalJava, PlayEbean, PlayNettyServer)/.enablePlugins(PlayMinimalJava, PlayEbean, PlayNettyServer).disablePlugins(PlayAkkaHttpServer)/g' build.sbt
RUN sed -i 's/.enablePlugins(PlayMinimalJava, PlayEbean, PlayNettyServer)/.enablePlugins(PlayMinimalJava, PlayEbean, PlayNettyServer).disablePlugins(PlayPekkoHttpServer)/g' build.sbt

RUN sbt stage

EXPOSE 9000

CMD target/universal/stage/bin/play2-java-ebean-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:-UseBiasedLocking -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
CMD target/universal/stage/bin/play2-java-ebean-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.1_12_1.9.8_2.13.12
WORKDIR /play2
COPY play2-java-ebean-hikaricp .

Expand All @@ -8,4 +8,4 @@ RUN sbt stage

EXPOSE 9000

CMD target/universal/stage/bin/play2-java-ebean-hikaricp -Dplay.server.provider=play.core.server.AkkaHttpServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:-UseBiasedLocking -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
CMD target/universal/stage/bin/play2-java-ebean-hikaricp -Dplay.server.provider=play.core.server.PekkoHttpServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ThreadLocalRandom;

import javax.inject.Inject;
import jakarta.inject.Inject;

import models.Fortune;
import models.World;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;

import io.ebean.Finder;
import io.ebean.Model;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import java.util.List;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;

import io.ebean.DB;
import io.ebean.Finder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.typesafe.config.Config;
import play.Logger;

import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;

@Singleton
public class Startup {
Expand All @@ -21,7 +21,7 @@ public Startup(final Config config) {
logger.info("");
logger.info("Configuration");
logger.info("-------------");
logger.info("akka.actor.default-dispatcher.fork-join-executor.parallelism-max: {}", config.getInt("akka.actor.default-dispatcher.fork-join-executor.parallelism-max"));
logger.info("pekko.actor.default-dispatcher.fork-join-executor.parallelism-max: {}", config.getInt("pekko.actor.default-dispatcher.fork-join-executor.parallelism-max"));
logger.info("fixedConnectionPool: {}", config.getInt("fixedConnectionPool"));
logger.info("database.dispatcher.thread-pool-executor.fixed-pool-size: {}", config.getInt("database.dispatcher.thread-pool-executor.fixed-pool-size"));
logger.info("db.default.hikaricp.maximumPoolSize: {}", config.getInt("db.default.hikaricp.maximumPoolSize"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package utils;

import javax.inject.Inject;
import jakarta.inject.Inject;

import akka.actor.ActorSystem;
import org.apache.pekko.actor.ActorSystem;
import play.libs.concurrent.CustomExecutionContext;

public class DatabaseExecutionContext extends CustomExecutionContext {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version := "1.0-SNAPSHOT"

lazy val root = (project in file(".")).enablePlugins(PlayMinimalJava, PlayEbean, PlayNettyServer).disablePlugins(PlayFilters)

scalaVersion := "2.13.1"
scalaVersion := "2.13.12"

libraryDependencies ++= Seq(
guice,
javaJdbc,
"mysql" % "mysql-connector-java" % "8.0.19"
"com.mysql" % "mysql-connector-j" % "8.3.0",
)
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ play.server {
option {
SO_BACKLOG = 8192
SO_REUSEADDR = true
"io.netty.channel.epoll.EpollChannelOption#SO_REUSEPORT" = true
"io.netty.channel.epoll.EpollChannelOption#TCP_FASTOPEN" = 1
"io.netty.channel.unix.UnixChannelOption#SO_REUSEPORT" = true
"io.netty.channel.ChannelOption#TCP_FASTOPEN" = 1

child {
SO_KEEPALIVE = true
Expand All @@ -40,13 +40,13 @@ play.server {
# The default is 1 since Linux Kernel 3.13
# You can check via "cat /proc/sys/net/ipv4/tcp_fastopen"
# However 3 would be better, but we can't change it to that value because we don't have root permission when running the benchmarks
"io.netty.channel.epoll.EpollChannelOption#TCP_FASTOPEN" = 1
"io.netty.channel.ChannelOption#TCP_FASTOPEN" = 1
}
}
}
}

akka {
pekko {
actor {
default-dispatcher {
fork-join-executor {
Expand All @@ -63,7 +63,7 @@ akka {
task-peeking-mode="LIFO" # based on https://www.playframework.com/documentation/2.7.x/Migration24#Thread-pool-configuration
}

# https://doc.akka.io/docs/akka/2.5.11/dispatchers.html#looking-up-a-dispatcher
# https://pekko.apache.org/docs/pekko/current/dispatchers.html#looking-up-a-dispatcher
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
# Set to 1 for as fair as possible.
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.8
sbt.version=1.9.8
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "6.0.0")
addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.1.0")
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.1_12_1.9.8_2.13.12
WORKDIR /play2
COPY play2-java-jooq-hikaricp .

RUN sed -i 's/.enablePlugins(PlayMinimalJava, PlayNettyServer)/.enablePlugins(PlayMinimalJava, PlayNettyServer).disablePlugins(PlayAkkaHttpServer)/g' build.sbt
RUN sed -i 's/.enablePlugins(PlayMinimalJava, PlayNettyServer)/.enablePlugins(PlayMinimalJava, PlayNettyServer).disablePlugins(PlayPekkoHttpServer)/g' build.sbt

RUN sbt stage

EXPOSE 9000

CMD target/universal/stage/bin/play2-java-jooq-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:-UseBiasedLocking -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
CMD target/universal/stage/bin/play2-java-jooq-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21.0.1_12_1.9.8_2.13.12
WORKDIR /play2
COPY play2-java-jooq-hikaricp .

Expand All @@ -8,4 +8,4 @@ RUN sbt stage

EXPOSE 9000

CMD target/universal/stage/bin/play2-java-jooq-hikaricp -Dplay.server.provider=play.core.server.AkkaHttpServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:-UseBiasedLocking -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
CMD target/universal/stage/bin/play2-java-jooq-hikaricp -Dplay.server.provider=play.core.server.PekkoHttpServerProvider -J-server -J-Xms1g -J-Xmx1g -J-XX:NewSize=512m -J-XX:+UseG1GC -J-XX:MaxGCPauseMillis=30 -J-XX:+AlwaysPreTouch -Dthread_count=$(nproc) -Dphysical_cpu_count=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}') -Ddb_pool_size=$(( $(( $(nproc) * 2 )) + 1 ))
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ThreadLocalRandom;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.jooq.DSLContext;
import org.jooq.JSONFormat;
Expand All @@ -29,7 +29,7 @@

public class Application extends Controller {

private static final SQLDialect DIALECT = SQLDialect.MYSQL_5_7;
private static final SQLDialect DIALECT = SQLDialect.MYSQL;
private static final JSONFormat JSON_FORMAT = JSONFormat.DEFAULT_FOR_RECORDS.recordFormat(RecordFormat.OBJECT);

private final Database db;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.