2929import java .util .List ;
3030import java .util .Map ;
3131import java .util .Set ;
32- import javax .servlet .DispatcherType ;
33- import javax .servlet .Filter ;
34- import javax .servlet .FilterChain ;
35- import javax .servlet .ServletConfig ;
36- import javax .servlet .ServletContainerInitializer ;
37- import javax .servlet .ServletContext ;
38- import javax .servlet .ServletContextEvent ;
39- import javax .servlet .ServletContextListener ;
40- import javax .servlet .ServletException ;
41- import javax .servlet .http .HttpFilter ;
42- import javax .servlet .http .HttpServlet ;
43- import javax .servlet .http .HttpServletRequest ;
44- import javax .servlet .http .HttpServletResponse ;
32+ import jakarta .servlet .DispatcherType ;
33+ import jakarta .servlet .Filter ;
34+ import jakarta .servlet .FilterChain ;
35+ import jakarta .servlet .ServletConfig ;
36+ import jakarta .servlet .ServletContainerInitializer ;
37+ import jakarta .servlet .ServletContext ;
38+ import jakarta .servlet .ServletContextEvent ;
39+ import jakarta .servlet .ServletContextListener ;
40+ import jakarta .servlet .ServletException ;
41+ import jakarta .servlet .http .HttpFilter ;
42+ import jakarta .servlet .http .HttpServlet ;
43+ import jakarta .servlet .http .HttpServletRequest ;
44+ import jakarta .servlet .http .HttpServletResponse ;
4545
4646import io .undertow .Handlers ;
4747import io .undertow .Undertow ;
7070import io .undertow .servlet .util .ImmediateInstanceFactory ;
7171import io .undertow .util .ETag ;
7272import io .undertow .util .StatusCodes ;
73- import org .junit .Test ;
73+ import org .junit .jupiter . api . Test ;
7474import org .slf4j .Logger ;
7575import org .slf4j .LoggerFactory ;
7676import org .xnio .ChannelListener ;
8383import org .xnio .XnioWorker ;
8484import org .xnio .channels .AcceptingChannel ;
8585
86- import static org .hamcrest .CoreMatchers .equalTo ;
87- import static org .hamcrest .MatcherAssert .assertThat ;
88- import static org .junit .Assert .assertFalse ;
89- import static org .junit .Assert .assertTrue ;
86+ import static org .assertj .core .api .Assertions .assertThat ;
87+ import static org .junit .jupiter .api .Assertions .assertFalse ;
88+ import static org .junit .jupiter .api .Assertions .assertTrue ;
9089
9190public class EmbeddedUndertowTest {
9291
@@ -102,7 +101,7 @@ public void undertowWithSingleContextAndServlet() throws Exception {
102101
103102 HttpServlet servletInstance = new HttpServlet () {
104103 @ Override
105- protected void service (HttpServletRequest req , HttpServletResponse resp ) throws ServletException , IOException {
104+ protected void service (HttpServletRequest req , HttpServletResponse resp ) throws IOException {
106105 LOG .info ("Handling request: {}" , req .toString ());
107106 resp .setContentType ("text/plain" );
108107 resp .setCharacterEncoding ("UTF-8" );
@@ -113,7 +112,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
113112 }
114113 };
115114
116- ServletInfo servlet = Servlets .servlet ("s1" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
115+ ServletInfo servlet = Servlets .servlet ("s1" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
117116 servlet .addMapping ("/s1/*" );
118117
119118 DeploymentInfo deploymentInfo = Servlets .deployment ()
@@ -160,7 +159,7 @@ public void embeddedServerWithUndertowResourceServlet() throws Exception {
160159
161160 HttpServlet servletInstance = new DefaultServlet ();
162161
163- ServletInfo servlet = Servlets .servlet ("default" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
162+ ServletInfo servlet = Servlets .servlet ("default" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
164163 servlet .addInitParam ("directory-listing" , "true" );
165164
166165 // with "/" mapping, io.undertow.servlet.handlers.ServletPathMatch is used with
@@ -231,7 +230,7 @@ public void dynamicListeners() throws Exception {
231230
232231 HttpServlet servletInstance = new HttpServlet () {
233232 @ Override
234- protected void service (HttpServletRequest req , HttpServletResponse resp ) throws ServletException , IOException {
233+ protected void service (HttpServletRequest req , HttpServletResponse resp ) throws IOException {
235234 LOG .info ("Handling request: {}" , req .toString ());
236235 resp .setContentType ("text/plain" );
237236 resp .setCharacterEncoding ("UTF-8" );
@@ -251,7 +250,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
251250 }
252251 };
253252
254- ServletInfo servlet = Servlets .servlet ("default" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
253+ ServletInfo servlet = Servlets .servlet ("default" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
255254 servlet .addMapping ("/s1" );
256255
257256 DeploymentInfo deploymentInfo = Servlets .deployment ()
@@ -282,7 +281,7 @@ public void contextInitialized(ServletContextEvent sce) {
282281 .addServletContainerInitializer (new ServletContainerInitializerInfo (ServletContainerInitializer .class ,
283282 new ImmediateInstanceFactory <ServletContainerInitializer >(new ServletContainerInitializer () {
284283 @ Override
285- public void onStartup (Set <Class <?>> c , ServletContext ctx ) throws ServletException {
284+ public void onStartup (Set <Class <?>> c , ServletContext ctx ) {
286285 // ServletContextListener added from SCI - this is real "programmatic listener"
287286 ctx .addListener (new ServletContextListener () {
288287 @ Override
@@ -354,7 +353,7 @@ public void undertowWithRequestWrappers() throws Exception {
354353
355354 HttpServlet servletInstance = new HttpServlet () {
356355 @ Override
357- protected void service (HttpServletRequest req , HttpServletResponse resp ) throws ServletException , IOException {
356+ protected void service (HttpServletRequest req , HttpServletResponse resp ) throws IOException {
358357 LOG .info ("Handling request: {}" , req .toString ());
359358 resp .setContentType ("text/plain" );
360359 resp .setCharacterEncoding ("UTF-8" );
@@ -372,7 +371,7 @@ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterC
372371 }
373372 };
374373
375- ServletInfo servlet = Servlets .servlet ("s1" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
374+ ServletInfo servlet = Servlets .servlet ("s1" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
376375 servlet .addMapping ("/s1/*" );
377376
378377 FilterInfo filter = Servlets .filter ("f1" , filterInstance .getClass (), new ImmediateInstanceFactory <>(filterInstance ));
@@ -434,7 +433,7 @@ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterC
434433 // "XNIO-1 task-1@2434" prio=5 tid=0x17 nid=NA runnable
435434 // java.lang.Thread.State: RUNNABLE
436435 // at org.ops4j.pax.web.service.undertow.internal.EmbeddedUndertowTest$2.service(EmbeddedUndertowTest.java:139)
437- // at javax .servlet.http.HttpServlet.service(HttpServlet.java:590)
436+ // at jakarta .servlet.http.HttpServlet.service(HttpServlet.java:590)
438437 // at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74)
439438 // at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62)
440439 // at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68)
@@ -559,7 +558,7 @@ public void undertowUsingLowLevelBuilders() throws Exception {
559558
560559 HttpServlet servletInstance = new HttpServlet () {
561560 @ Override
562- protected void service (HttpServletRequest req , HttpServletResponse resp ) throws ServletException , IOException {
561+ protected void service (HttpServletRequest req , HttpServletResponse resp ) throws IOException {
563562 LOG .info ("Handling request: {}" , req .toString ());
564563 resp .setContentType ("text/plain" );
565564 resp .setCharacterEncoding ("UTF-8" );
@@ -570,7 +569,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
570569 }
571570 };
572571
573- ServletInfo servlet = Servlets .servlet ("s1" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
572+ ServletInfo servlet = Servlets .servlet ("s1" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
574573 servlet .addMapping ("/s1/*" );
575574
576575 DeploymentInfo deploymentInfo = Servlets .deployment ()
@@ -606,7 +605,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
606605 response = send (port , "/c1/s2" );
607606 assertTrue (response .contains ("HTTP/1.1 404" ));
608607
609- ServletInfo servlet2 = Servlets .servlet ("s2" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
608+ ServletInfo servlet2 = Servlets .servlet ("s2" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
610609 servlet2 .addMapping ("/s2/*" );
611610 // this is not necessary. Not even reasonable, because the deployment info is originally cloned inside
612611 // the deployment
@@ -963,7 +962,7 @@ public void init(ServletConfig config) throws ServletException {
963962 }
964963
965964 @ Override
966- protected void service (HttpServletRequest req , HttpServletResponse resp ) throws ServletException , IOException {
965+ protected void service (HttpServletRequest req , HttpServletResponse resp ) throws IOException {
967966 LOG .info ("Handling request: {}" , req .toString ());
968967 resp .setContentType ("text/plain" );
969968 resp .setCharacterEncoding ("UTF-8" );
@@ -983,11 +982,11 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
983982
984983 // another example of "info" like class. "servlet info" is added to "deployment info" (directly, not as clone)
985984 // which means "servlet is registered inside servlet context"
986- ServletInfo servlet = Servlets .servlet ("c1s1" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
985+ ServletInfo servlet = Servlets .servlet ("c1s1" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
987986 servlet .addMapping ("/s1/*" );
988987
989988 // "deployment info" represents a full information about single "servlet context" which can simply be
990- // treated as "JavaEE web application" with single context path
989+ // treated as "JakartaEE web application" with single context path
991990 // this info is in 1:1 relation with single web.xml descriptor
992991 DeploymentInfo deploymentInfo1 = Servlets .deployment ()
993992 .setClassLoader (this .getClass ().getClassLoader ())
@@ -1011,15 +1010,15 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
10111010 // - returned as io.undertow.servlet.api.DeploymentManager object that controls the lifecycle of
10121011 // associated "physical deployment"
10131012 DeploymentManager dm1 = container .addDeployment (deploymentInfo1 );
1014- assertThat (dm1 .getState (), equalTo (DeploymentManager .State .UNDEPLOYED ) );
1013+ assertThat (dm1 .getState ()). isEqualTo (DeploymentManager .State .UNDEPLOYED );
10151014
10161015 // "deploying" clones the already cloned "deployment info" again and turns it into "physical deployment"
10171016 // represented by io.undertow.servlet.api.Deployment, which allows read access to various aspects
10181017 // of "web application".
10191018 // the problem with Undertow is that while we can add new servlets to existing "deployment", we can't
10201019 // remove them...
10211020 // "deploy" does few important things:
1022- // - creates instance of io.undertow.servlet.spec.ServletContextImpl (THE javax .servlet.ServletContext)
1021+ // - creates instance of io.undertow.servlet.spec.ServletContextImpl (THE jakarta .servlet.ServletContext)
10231022 // - creates instance of io.undertow.servlet.core.DeploymentImpl
10241023 // - prepares all the "web elements" by turning "info" into "physical representation" of e.g., servlet
10251024 // - e.g., io.undertow.servlet.api.ServletInfo is turned into io.undertow.servlet.core.ManagedServlet
@@ -1032,11 +1031,11 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
10321031 // - the final handler is put as io.undertow.servlet.core.DeploymentImpl.initialHandler and then
10331032 // returned from (as-is) io.undertow.servlet.api.DeploymentManager.start()
10341033 dm1 .deploy ();
1035- assertThat (dm1 .getState (), equalTo (DeploymentManager .State .DEPLOYED ) );
1034+ assertThat (dm1 .getState ()). isEqualTo (DeploymentManager .State .DEPLOYED );
10361035
10371036 // "start" starts all lifecycle objects (servlets, filters, listeners)
10381037 HttpHandler handler = dm1 .start ();
1039- assertThat (dm1 .getState (), equalTo (DeploymentManager .State .STARTED ) );
1038+ assertThat (dm1 .getState ()). isEqualTo (DeploymentManager .State .STARTED );
10401039
10411040 path .addPrefixPath ("/c1" , handler );
10421041
@@ -1056,7 +1055,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
10561055
10571056 // add new context
10581057
1059- ServletInfo servlet2 = Servlets .servlet ("c2s1" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
1058+ ServletInfo servlet2 = Servlets .servlet ("c2s1" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
10601059 servlet2 .addMapping ("/s1/*" );
10611060
10621061 DeploymentInfo deploymentInfo2 = Servlets .deployment ()
@@ -1076,7 +1075,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
10761075
10771076 // add new servlet to existing context
10781077
1079- ServletInfo servlet3 = Servlets .servlet ("c1s2" , servletInstance .getClass (), new ImmediateInstanceFactory <HttpServlet >(servletInstance ));
1078+ ServletInfo servlet3 = Servlets .servlet ("c1s2" , servletInstance .getClass (), new ImmediateInstanceFactory <>(servletInstance ));
10801079 servlet3 .addMapping ("/s2/*" );
10811080
10821081 response = send (port , "/c1/s2" );
@@ -1122,7 +1121,7 @@ private String send(int port, String request, String... headers) throws IOExcept
11221121 s .getOutputStream ().write (("Connection: close\r \n \r \n " ).getBytes ());
11231122
11241123 byte [] buf = new byte [64 ];
1125- int read = - 1 ;
1124+ int read ;
11261125 StringWriter sw = new StringWriter ();
11271126 while ((read = s .getInputStream ().read (buf )) > 0 ) {
11281127 sw .append (new String (buf , 0 , read ));
@@ -1135,7 +1134,7 @@ private String send(int port, String request, String... headers) throws IOExcept
11351134 private Map <String , String > extractHeaders (String response ) throws IOException {
11361135 Map <String , String > headers = new LinkedHashMap <>();
11371136 try (BufferedReader reader = new BufferedReader (new StringReader (response ))) {
1138- String line = null ;
1137+ String line ;
11391138 while ((line = reader .readLine ()) != null ) {
11401139 if (line .trim ().equals ("" )) {
11411140 break ;
0 commit comments