Merge pull request #19 from janweinschenker/feature/jdk9

janweinschenker · web-flow · commit 20408b6fc6c7 · 2017-11-03T15:04:24.000+01:00
Feature/jdk9
diff --git a/server-glassfish/src/main/java/de/holisticon/servlet4demo/serverglassfish/Http2Servlet.java b/server-glassfish/src/main/java/de/holisticon/servlet4demo/serverglassfish/Http2Servlet.java
@@ -29,7 +29,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
           .addHeader("content-type", "application/json")
           .push();
     }
-    try (PrintWriter respWriter = resp.getWriter();) {
+    try (PrintWriter respWriter = resp.getWriter()) {
       respWriter.write(new StringBuilder()
                            .append("<html>")
                            .append("<img src='images/cat.jpg'>")
diff --git a/server-jetty/src/test/java/de/holisticon/servlet4demo/serverjetty/ApplicationTest.java b/server-jetty/src/test/java/de/holisticon/servlet4demo/serverjetty/ApplicationTest.java
@@ -10,7 +10,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-public class ApplicationTests {
+public class ApplicationTest {
 
   @Autowired
   private GreetingController greetingController;
diff --git a/server-tomcat/src/test/java/de/holisticon/servlet4demo/servertomcat/ApplicationTest.java b/server-tomcat/src/test/java/de/holisticon/servlet4demo/servertomcat/ApplicationTest.java
@@ -35,13 +35,15 @@ public void setUp() {
   @Test
   public void testTomcatCustomizer() {
     TomcatServletWebServerFactory factory = sut.tomcatCustomizer();
+    @SuppressWarnings("unchecked")
     List<TomcatConnectorCustomizer> tomcatConnectorCustomizers = new ArrayList(factory.getTomcatConnectorCustomizers());
     assertTrue(tomcatConnectorCustomizers.size() == 1);
   }
 
   @Test
   public void testCustomize() {
     TomcatServletWebServerFactory factory = sut.tomcatCustomizer();
+    @SuppressWarnings("unchecked")
     List<TomcatConnectorCustomizer> tomcatConnectorCustomizers = new ArrayList(factory.getTomcatConnectorCustomizers());
     TomcatConnectorCustomizer customizer = tomcatConnectorCustomizers.get(0);
 
diff --git a/server-undertow/src/test/java/de/holisticon/servlet4demo/serverundertow/ApplicationTest.java b/server-undertow/src/test/java/de/holisticon/servlet4demo/serverundertow/ApplicationTest.java
@@ -28,6 +28,7 @@ public class ApplicationTest {
   private GreetingController greetingController;
 
   @Before
+  @SuppressWarnings("unchecked")
   public void setUp() {
     sut = new Application();
     builder = mock(Undertow.Builder.class);
@@ -40,6 +41,7 @@ public void contextLoads() {
   }
 
   @Test
+  @SuppressWarnings("unchecked")
   public void testCustomize() {
     sut.customize(builder);
     verify(builder, times(2)).setServerOption(any(Option.class), any());

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)`
`29`	`29`	`.addHeader("content-type", "application/json")`
`30`	`30`	`.push();`
`31`	`31`	`}`
`32`		`- try (PrintWriter respWriter = resp.getWriter();) {`
	`32`	`+ try (PrintWriter respWriter = resp.getWriter()) {`
`33`	`33`	`respWriter.write(new StringBuilder()`
`34`	`34`	`.append("<html>")`
`35`	`35`	`.append("<img src='images/cat.jpg'>")`