Skip to content

Commit ed5436f

Browse files
gae-java-botgae-java-bot
committed
No public description
PiperOrigin-RevId: 877466014 Change-Id: Ia7d8f1732e49d6706647c0cbb7858b78bcd6bc86
1 parent f948131 commit ed5436f

15 files changed

Lines changed: 193 additions & 246 deletions

File tree

‎api_dev/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,12 @@
184184
<dependency>
185185
<groupId>org.eclipse.jetty</groupId>
186186
<artifactId>jetty-server</artifactId>
187-
<version>${jetty121.version}</version>
187+
<version>${jetty.version}</version>
188188
</dependency>
189189
<dependency>
190-
<groupId>org.eclipse.jetty.ee8</groupId>
191-
<artifactId>jetty-ee8-servlet</artifactId>
192-
<version>${jetty121.version}</version>
190+
<groupId>org.eclipse.jetty</groupId>
191+
<artifactId>jetty-servlet</artifactId>
192+
<version>${jetty.version}</version>
193193
</dependency>
194194
<dependency>
195195
<groupId>org.apache.httpcomponents</groupId>

‎api_dev/src/main/java/com/google/appengine/tools/development/HttpApiServer.java‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616

1717
package com.google.appengine.tools.development;
1818

19-
import com.google.common.base.VerifyException;
2019
import com.google.common.flogger.GoogleLogger;
2120
import java.io.Closeable;
2221
import java.io.IOException;
23-
import org.eclipse.jetty.ee8.servlet.ErrorPageErrorHandler;
24-
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
25-
import org.eclipse.jetty.ee8.servlet.ServletHolder;
22+
import java.io.UncheckedIOException;
2623
import org.eclipse.jetty.server.Server;
24+
import org.eclipse.jetty.server.handler.HandlerList;
25+
import org.eclipse.jetty.server.handler.ShutdownHandler;
26+
import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
27+
import org.eclipse.jetty.servlet.ServletHandler;
28+
import org.eclipse.jetty.servlet.ServletHolder;
2729

2830
/**
2931
* Google App Engine API HTTP server, using the SDK API stubs for local testing of API calls.
@@ -44,6 +46,7 @@ public class HttpApiServer implements Closeable {
4446
"Incorrect --runtime_server_port or --runtime_server_host value";
4547
private static final String REQUEST_ENDPOINT = "/rpc_http";
4648
private final Server server;
49+
private final ShutdownHandler shutdownHandler;
4750

4851
/**
4952
* Simple command line interface to start an API server locally.
@@ -86,17 +89,23 @@ public static void main(String[] args) throws IOException {
8689
*/
8790
public HttpApiServer(int apiServerPort, String appEngineServerHost, int appEngineServerPort) {
8891
server = new Server(apiServerPort);
89-
ServletContextHandler context = new ServletContextHandler();
90-
context.setContextPath("/");
91-
ServletHolder servletHolder = new ServletHolder(ApiServlet.class);
92+
93+
HandlerList handlers = new HandlerList();
94+
ServletHandler handler = new ServletHandler();
95+
ServletHolder servletHolder = handler.addServletWithMapping(ApiServlet.class, REQUEST_ENDPOINT);
9296
servletHolder.setInitParameter("java_runtime_port", Integer.toString(appEngineServerPort));
9397
servletHolder.setInitParameter("java_runtime_host", appEngineServerHost);
94-
context.addServlet(servletHolder, REQUEST_ENDPOINT);
98+
9599
ErrorPageErrorHandler error = new ErrorPageErrorHandler();
96100
// Make debugging of config issues easy.
97101
error.setShowStacks(true);
98-
context.setErrorHandler(error);
99-
server.setHandler(context);
102+
error.setServer(server);
103+
server.addBean(error);
104+
server.setHandler(handler);
105+
handlers.addHandler(handler);
106+
shutdownHandler = new ShutdownHandler("stop", false, true);
107+
handlers.addHandler(shutdownHandler);
108+
server.setHandler(handlers);
100109
}
101110

102111
/**
@@ -119,9 +128,9 @@ public void start(boolean blocking) {
119128
@Override
120129
public void close() {
121130
try {
122-
server.stop();
123-
} catch (Exception e) {
124-
throw new VerifyException(e);
131+
shutdownHandler.sendShutdown();
132+
} catch (IOException e) {
133+
throw new UncheckedIOException(e);
125134
}
126135
}
127136

‎api_dev/src/test/java/com/google/appengine/api/urlfetch/URLFetchServiceImplTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
import javax.servlet.http.HttpServlet;
5959
import javax.servlet.http.HttpServletRequest;
6060
import javax.servlet.http.HttpServletResponse;
61-
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
62-
import org.eclipse.jetty.ee8.servlet.ServletHolder;
6361
import org.eclipse.jetty.server.Server;
62+
import org.eclipse.jetty.servlet.ServletHandler;
63+
import org.eclipse.jetty.servlet.ServletHolder;
6464
import org.junit.After;
6565
import org.junit.Before;
6666
import org.junit.Test;
@@ -1040,7 +1040,7 @@ public void testCookieReuse() throws Exception {
10401040

10411041
int port = PortPicker.create().pickUnusedPort();
10421042
Server server = new Server(port);
1043-
ServletContextHandler handler = new ServletContextHandler();
1043+
ServletHandler handler = new ServletHandler();
10441044
server.setHandler(handler);
10451045

10461046
HttpServlet setCookieServlet = new HttpServlet() {
@@ -1052,7 +1052,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
10521052
resp.setStatus(200);
10531053
}
10541054
};
1055-
handler.addServlet(new ServletHolder(setCookieServlet), "/setcookie");
1055+
handler.addServletWithMapping(new ServletHolder(setCookieServlet), "/setcookie");
10561056

10571057
HttpServlet getCookieServlet = new HttpServlet() {
10581058
@Override
@@ -1067,7 +1067,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
10671067
resp.setHeader("Content-Type", "text/txt");
10681068
}
10691069
};
1070-
handler.addServlet(new ServletHolder(getCookieServlet), "/getcookie");
1070+
handler.addServletWithMapping(new ServletHolder(getCookieServlet), "/getcookie");
10711071
server.start();
10721072

10731073
try {

‎api_dev/src/test/java/com/google/appengine/api/urlfetch/dev/LocalURLFetchServiceIntegrationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import com.google.common.collect.ImmutableList;
4242
import com.google.common.collect.ImmutableMap;
4343
import com.google.common.collect.ImmutableSet;
44-
import com.google.common.flogger.GoogleLogger;
4544
import com.google.common.io.CharStreams;
45+
import com.google.common.flogger.GoogleLogger;
4646
import java.io.BufferedReader;
4747
import java.io.IOException;
4848
import java.io.PrintWriter;
@@ -60,9 +60,9 @@
6060
import javax.servlet.http.HttpServlet;
6161
import javax.servlet.http.HttpServletRequest;
6262
import javax.servlet.http.HttpServletResponse;
63-
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
64-
import org.eclipse.jetty.ee8.servlet.ServletHolder;
6563
import org.eclipse.jetty.server.Server;
64+
import org.eclipse.jetty.servlet.ServletHandler;
65+
import org.eclipse.jetty.servlet.ServletHolder;
6666
import org.junit.After;
6767
import org.junit.Before;
6868
import org.junit.Test;
@@ -88,7 +88,7 @@ public class LocalURLFetchServiceIntegrationTest {
8888

8989
private URLFetchService fetchService;
9090
private Server server;
91-
private ServletContextHandler servletHandler;
91+
private ServletHandler servletHandler;
9292
private int port;
9393

9494
@Before
@@ -100,7 +100,7 @@ public final void setUp() throws Exception {
100100
fetchService = URLFetchServiceFactory.getURLFetchService();
101101
port = portPicker.pickUnusedPort();
102102
server = new Server(port);
103-
servletHandler = new ServletContextHandler();
103+
servletHandler = new ServletHandler();
104104
server.setHandler(servletHandler);
105105
}
106106

@@ -768,7 +768,7 @@ private void startServer() throws Exception {
768768
}
769769

770770
private void addServlet(String servletPath, HttpServlet servlet) {
771-
servletHandler.addServlet(new ServletHolder(servlet), servletPath);
771+
servletHandler.addServletWithMapping(new ServletHolder(servlet), servletPath);
772772
}
773773

774774
private static final class TestServlet extends HttpServlet {

‎e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,8 +1692,7 @@ public void testMimetypes() throws Exception {
16921692
assertThat(Application.guessContentTypeFromName("foo.class")).isEqualTo("application/java-vm");
16931693
assertThat(Application.guessContentTypeFromName("foo.css")).isEqualTo("text/css");
16941694
assertThat(Application.guessContentTypeFromName("foo.gif")).isEqualTo("image/gif");
1695-
assertThat(Application.guessContentTypeFromName("foo.ico"))
1696-
.isIn(Arrays.asList("image/vnd.microsoft.icon", "image/x-icon"));
1695+
assertThat(Application.guessContentTypeFromName("foo.ico")).isEqualTo("image/x-icon");
16971696
assertThat(Application.guessContentTypeFromName("foo.java")).isEqualTo("text/plain");
16981697
assertThat(Application.guessContentTypeFromName("foo.jar"))
16991698
.isEqualTo("application/java-archive");

‎lib/tools_api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
<include>org.apache.ant:ant</include>
304304
<include>org.apache.httpcomponents:httpclient</include>
305305
<include>org.apache.httpcomponents:httpcore:*</include>
306-
<!-- Jetty here for mimetype only, can be 12.1.x -->
306+
<!-- Jetty here for mimetype only, can be either 9 or 12.-->
307307
<include>org.eclipse.jetty:jetty-http</include>
308308
<include>org.eclipse.jetty:jetty-util</include>
309309
<include>org.slf4j:slf4j-api</include>

‎runtime/test/pom.xml‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,14 @@
4343
<artifactId>appengine-api-stubs</artifactId>
4444
</dependency>
4545
<dependency>
46-
<groupId>org.eclipse.jetty</groupId>
47-
<artifactId>jetty-server</artifactId>
48-
<version>${jetty121.version}</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.eclipse.jetty.ee8</groupId>
52-
<artifactId>jetty-ee8-servlet</artifactId>
53-
<version>${jetty121.version}</version>
46+
<groupId>org.eclipse.jetty</groupId>
47+
<artifactId>jetty-server</artifactId>
48+
<version>${jetty.version}</version>
5449
</dependency>
55-
<dependency>
56-
<groupId>org.eclipse.jetty</groupId>
57-
<artifactId>jetty-util</artifactId>
58-
<version>${jetty121.version}</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.eclipse.jetty</groupId>
62-
<artifactId>jetty-client</artifactId>
63-
<version>${jetty121.version}</version>
64-
<scope>test</scope>
50+
<dependency>
51+
<groupId>org.eclipse.jetty</groupId>
52+
<artifactId>jetty-servlet</artifactId>
53+
<version>${jetty.version}</version>
6554
</dependency>
6655
<dependency>
6756
<groupId>com.google.appengine</groupId>
@@ -90,8 +79,8 @@
9079
<scope>runtime</scope>
9180
</dependency>
9281
<dependency>
93-
<groupId>javax.activation</groupId>
94-
<artifactId>activation</artifactId>
82+
<groupId>javax.activation</groupId>
83+
<artifactId>activation</artifactId>
9584
</dependency>
9685
<dependency>
9786
<groupId>com.google.flogger</groupId>
@@ -123,17 +112,23 @@
123112
<artifactId>appengine-utils</artifactId>
124113
<scope>test</scope>
125114
</dependency>
115+
<dependency>
116+
<groupId>org.eclipse.jetty</groupId>
117+
<artifactId>jetty-client</artifactId>
118+
<version>${jetty.version}</version>
119+
<scope>test</scope>
120+
</dependency>
126121
<dependency>
127122
<groupId>org.awaitility</groupId>
128123
<artifactId>awaitility</artifactId>
129124
<version>4.3.0</version>
130125
<scope>test</scope>
131126
</dependency>
132-
<dependency>
127+
<dependency>
133128
<groupId>com.google.appengine</groupId>
134129
<artifactId>appengine-tools-sdk</artifactId>
135130
<scope>test</scope>
136-
</dependency>
131+
</dependency>
137132
</dependencies>
138133

139134
<build>

0 commit comments

Comments
 (0)