Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion frameworks/Clojure/ring-http-exchange/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<dependency>
<groupId>org.clojars.jj</groupId>
<artifactId>ring-http-exchange</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>metosin</groupId>
Expand Down
4 changes: 2 additions & 2 deletions frameworks/Java/jetty/jetty-servlet.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM maven:3.6.1-jdk-11-slim as maven
FROM maven:3-eclipse-temurin-24-alpine as maven
WORKDIR /jetty
COPY pom.xml pom.xml
COPY src src
RUN mvn compile assembly:single -q -P servlet

FROM openjdk:11.0.3-jdk-slim
FROM openjdk:25-jdk-slim
WORKDIR /jetty
COPY --from=maven /jetty/target/jetty-example-0.1-jar-with-dependencies.jar app.jar

Expand Down
4 changes: 2 additions & 2 deletions frameworks/Java/jetty/jetty.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM maven:3.6.1-jdk-11-slim as maven
FROM maven:3-eclipse-temurin-24-alpine as maven
WORKDIR /jetty
COPY pom.xml pom.xml
COPY src src
RUN mvn compile assembly:single -q

FROM openjdk:11.0.3-jdk-slim
FROM openjdk:25-jdk-slim
WORKDIR /jetty
COPY --from=maven /jetty/target/jetty-example-0.1-jar-with-dependencies.jar app.jar

Expand Down
22 changes: 11 additions & 11 deletions frameworks/Java/jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<jetty.version>10.0.24</jetty.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<jetty.version>12.0.22</jetty.version>
<main.class>hello.handler.HelloWebServer</main.class>
</properties>

Expand All @@ -23,8 +23,8 @@
</activation>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
</dependencies>
Expand All @@ -34,7 +34,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.14.0</version>
<configuration>
<excludes>
<exclude>hello/servlet/**</exclude>
Expand All @@ -52,14 +52,14 @@
</properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>1.2.1</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.3</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
package hello.handler;

import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.AbstractHandlerContainer;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.util.Callback;


/**
* An implementation of the TechEmpower benchmark tests using the Jetty web
* server.
* server.
*/
public final class HelloWebServer
{
public static void main(String[] args) throws Exception
{
public final class HelloWebServer {
public static void main(String[] args) throws Exception {
Server server = new Server(8080);
ServerConnector connector = server.getBean(ServerConnector.class);
HttpConfiguration config = connector.getBean(HttpConnectionFactory.class).getHttpConfiguration();
Expand All @@ -36,34 +22,33 @@ public static void main(String[] args) throws Exception
server.start();
server.join();
}

public static class PathHandler extends AbstractHandler
{
JsonHandler _jsonHandler=new JsonHandler();
PlainTextHandler _plainHandler=new PlainTextHandler();

public PathHandler()
{

public static class PathHandler extends Handler.Abstract {
JsonHandler _jsonHandler = new JsonHandler();
PlainTextHandler _plainHandler = new PlainTextHandler();

public PathHandler() {
addBean(_jsonHandler);
addBean(_plainHandler);
}

@Override
public void setServer(Server server)
{
public void setServer(Server server) {
super.setServer(server);
_jsonHandler.setServer(server);
_plainHandler.setServer(server);
}

@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
if ("/plaintext".equals(target))
_plainHandler.handle(target,baseRequest,request,response);
else if ("/json".equals(target))
_jsonHandler.handle(target,baseRequest,request,response);
public boolean handle(Request request, Response response, Callback callback) {
String uri = request.getHttpURI().getPath();

if ("/plaintext".equals(uri))
return _plainHandler.handle(request, response, callback);
else if ("/json".equals(uri))
return _jsonHandler.handle(request, response, callback);
else
return false;
}

}
}
49 changes: 25 additions & 24 deletions frameworks/Java/jetty/src/main/java/hello/handler/JsonHandler.java
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
package hello.handler;

import java.io.IOException;
import java.util.Collections;
import java.util.Map;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.PreEncodedHttpField;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.util.ajax.JSON;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.Callback;

import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;


public class JsonHandler extends Handler.Abstract {

private static final HttpField JSON_HEADER = new HttpField("Content-Type", "application/json");
private static final String JSON_RESPONSE = "{\"message\": \"Hello, World!\"}";

public class JsonHandler extends AbstractHandler
{
private JSON json = new JSON();
HttpField contentType = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,"application/json");

@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
baseRequest.setHandled(true);
baseRequest.getResponse().getHttpFields().add(contentType);
Map<String,String> map = Collections.singletonMap("message","Hello, World!");
json.append(response.getWriter(),map);
public boolean handle(Request request, Response response, Callback callback) {
try {
response.setStatus(200);
response.getHeaders().add(JSON_HEADER);

byte[] contentBytes = JSON_RESPONSE.getBytes(StandardCharsets.UTF_8);
ByteBuffer contentBuffer = ByteBuffer.wrap(contentBytes);
response.getHeaders().put("Content-Length", String.valueOf(contentBytes.length));

response.write(true, contentBuffer, callback);
} catch (Exception e) {
callback.failed(e);
}
return true;
}

}
}
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
package hello.handler;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.http.PreEncodedHttpField;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.Callback;

public class PlainTextHandler extends AbstractHandler
{
ByteBuffer helloWorld = BufferUtil.toBuffer("Hello, World!");
HttpField contentType = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,MimeTypes.Type.TEXT_PLAIN.asString());
public class PlainTextHandler extends Handler.Abstract {
private static final String RESPONSE_BODY = "Hello, World!";
private static final HttpField contentType = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE, MimeTypes.Type.TEXT_PLAIN.asString());

@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
baseRequest.setHandled(true);
baseRequest.getResponse().getHttpFields().add(contentType);
baseRequest.getResponse().getHttpOutput().sendContent(helloWorld.slice());
public boolean handle(Request request, Response response, Callback callback) {
try {
response.setStatus(200);
response.getHeaders().put(contentType);

byte[] contentBytes = RESPONSE_BODY.getBytes(StandardCharsets.UTF_8);
ByteBuffer contentBuffer = ByteBuffer.wrap(contentBytes);
response.getHeaders().put("Content-Length", String.valueOf(contentBytes.length));

response.write(true, contentBuffer, callback);
} catch (Exception e) {
callback.failed(e);
}
return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;


/**
* An implementation of the TechEmpower benchmark tests using the Jetty web
* server.
*/
public final class HelloWebServerServlet
public final class HelloWebServerServlet
{

public static void main(String[] args) throws Exception
Expand All @@ -26,7 +26,7 @@ public static void main(String[] args) throws Exception
context.setContextPath("/");
server.setHandler(context);

context.addServlet(org.eclipse.jetty.servlet.DefaultServlet.class,"/");
context.addServlet(org.eclipse.jetty.ee10.servlet.DefaultServlet.class,"/");
context.addServlet(JsonServlet.class,"/json");
context.addServlet(PlaintextServlet.class,"/plaintext");

Expand Down
18 changes: 8 additions & 10 deletions frameworks/Java/jetty/src/main/java/hello/servlet/JsonServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,26 @@
import java.util.Collections;
import java.util.Map;

import javax.servlet.GenericServlet;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.GenericServlet;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;

import org.eclipse.jetty.util.ajax.JSON;



public class JsonServlet extends GenericServlet
{
private JSON json = new JSON();
private final JSON json = new JSON();

@Override
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException
public void service(ServletRequest req, ServletResponse res) throws IOException
{
HttpServletResponse response= (HttpServletResponse)res;
response.setContentType("application/json");
Map<String,String> map = Collections.singletonMap("message","Hello, World!");

json.append(response.getWriter(),map);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,19 @@

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Map;

import javax.activation.MimeType;
import javax.servlet.GenericServlet;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.GenericServlet;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;

import org.eclipse.jetty.http.MimeTypes;

public class PlaintextServlet extends GenericServlet
{
byte[] helloWorld = "Hello, World!".getBytes(StandardCharsets.ISO_8859_1);
@Override
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException
public void service(ServletRequest req, ServletResponse res) throws IOException
{
HttpServletResponse response= (HttpServletResponse)res;
response.setContentType(MimeTypes.Type.TEXT_PLAIN.asString());
Expand Down
Loading