Simplify

1 files changed, 20 insertions, 20 deletions

diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
index 606060bc6b4..7cf86013d9b 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
@@ -38,7 +38,7 @@ public class DiscFilterRequestTest {
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
 		httpReq.headers().add("X-Custom-Header", "custom_header");
-		List<Cookie> cookies = new ArrayList<Cookie>();
+		List<Cookie> cookies = new ArrayList<>();
 		cookies.add(new Cookie("XYZ", "value"));
 		cookies.add(new Cookie("ABC", "value"));
 		httpReq.encodeCookieHeader(cookies);
@@ -77,7 +77,7 @@ public class DiscFilterRequestTest {
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
 		request.setAttribute("some_attr", "some_value");
 
-		Assert.assertEquals(request.containsAttribute("some_attr"),true);
+		Assert.assertTrue(request.containsAttribute("some_attr"));
 
 		Assert.assertEquals(request.getAttribute("some_attr"),"some_value");
 
@@ -94,8 +94,8 @@ public class DiscFilterRequestTest {
 		Enumeration<String> e = request.getAttributeNames();
 		List<String> attrList = Collections.list(e);
 		Assert.assertEquals(2, attrList.size());
-		Assert.assertEquals(attrList.contains("some_attr_1"), true);
-		Assert.assertEquals(attrList.contains("some_attr_2"), true);
+		Assert.assertTrue(attrList.contains("some_attr_1"));
+		Assert.assertTrue(attrList.contains("some_attr_2"));
 
 	}
 
@@ -106,11 +106,11 @@ public class DiscFilterRequestTest {
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
         request.setAttribute("some_attr", "some_value");
 
-		Assert.assertEquals(request.containsAttribute("some_attr"),true);
+		Assert.assertTrue(request.containsAttribute("some_attr"));
 
 		request.removeAttribute("some_attr");
 
-		Assert.assertEquals(request.containsAttribute("some_attr"),false);
+		Assert.assertFalse(request.containsAttribute("some_attr"));
 	}
 
 	@Test
@@ -182,7 +182,7 @@ public class DiscFilterRequestTest {
         httpReq.headers().add("header_2", "value2");
         DiscFilterRequest request = new JdiscFilterRequest(httpReq);
 
-        Assert.assertEquals(request.getHeaderNamesAsList() instanceof List, true);
+        Assert.assertNotNull(request.getHeaderNamesAsList());
         Assert.assertEquals(request.getHeaderNamesAsList().size(), 3);
 	}
 
@@ -192,7 +192,7 @@ public class DiscFilterRequestTest {
         HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         DiscFilterRequest request = new JdiscFilterRequest(httpReq);
 
-        Assert.assertEquals(request.getHeaderNamesAsList() instanceof List, true);
+        Assert.assertNotNull(request.getHeaderNamesAsList());
         Assert.assertEquals(request.getHeaderNamesAsList().size(), 0);
 
         httpReq.headers().add("header_1", "value1");
@@ -209,20 +209,20 @@ public class DiscFilterRequestTest {
 		httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data");
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
 
-		Assert.assertEquals(true,DiscFilterRequest.isMultipart(request));
+		Assert.assertTrue(DiscFilterRequest.isMultipart(request));
 
 		httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
 		request = new JdiscFilterRequest(httpReq);
 
-		Assert.assertEquals(DiscFilterRequest.isMultipart(request),false);
+		Assert.assertFalse(DiscFilterRequest.isMultipart(request));
 
-		Assert.assertEquals(DiscFilterRequest.isMultipart(null),false);
+		Assert.assertFalse(DiscFilterRequest.isMultipart(null));
 
 
 		httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		request = new JdiscFilterRequest(httpReq);
-		Assert.assertEquals(DiscFilterRequest.isMultipart(request),false);
+		Assert.assertFalse(DiscFilterRequest.isMultipart(request));
      }
 
 	@Test
@@ -244,7 +244,7 @@ public class DiscFilterRequestTest {
 	}
 
 	@Test
-	public void testCharacterEncoding() throws Exception {
+	public void testCharacterEncoding() {
 		URI uri = URI.create("http://example.yahoo.com:8080/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
@@ -264,7 +264,7 @@ public class DiscFilterRequestTest {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	public void testSetScheme() throws Exception {
+	public void testSetScheme() {
 		URI uri = URI.create("https://example.yahoo.com:8080/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
@@ -276,7 +276,7 @@ public class DiscFilterRequestTest {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	public void testGetServerPort() throws Exception {
+	public void testGetServerPort() {
 		URI uri = URI.create("http://example.yahoo.com/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
@@ -289,14 +289,14 @@ public class DiscFilterRequestTest {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	public void testIsSecure() throws Exception {
+	public void testIsSecure() {
 		URI uri = URI.create("http://example.yahoo.com/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		DiscFilterRequest request = new JdiscFilterRequest(httpReq);
-		Assert.assertEquals(request.isSecure(), false);
+		Assert.assertFalse(request.isSecure());
 
 		request.setUri(URI.create("https://example.yahoo.com/test"));
-		Assert.assertEquals(request.isSecure(), true);
+		Assert.assertTrue(request.isSecure());
 
 	}
 
@@ -324,7 +324,7 @@ public class DiscFilterRequestTest {
     }
 
 	@Test
-	public void testClearCookies() throws Exception {
+	public void testClearCookies() {
 		URI uri = URI.create("http://example.yahoo.com/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value");
@@ -334,7 +334,7 @@ public class DiscFilterRequestTest {
 	}
 
 	@Test
-	public void testGetWrapedCookies() throws Exception {
+	public void testGetWrapedCookies() {
 		URI uri = URI.create("http://example.yahoo.com/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
 		httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value");