From 6ff4c84aa26b7c4dc845675b3586d14d3c3aeb53 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 16 Feb 2016 01:02:09 +0900 Subject: [PATCH 01/15] HADOOP-9613. [JDK8] Update jersey version to latest 1.x release. --- hadoop-common-project/hadoop-common/pom.xml | 5 + .../v2/app/webapp/TestAMWebServices.java | 28 +++-- .../app/webapp/TestAMWebServicesAttempts.java | 23 ++-- .../v2/app/webapp/TestAMWebServicesJobs.java | 33 +++--- .../v2/app/webapp/TestAMWebServicesTasks.java | 35 +++--- .../v2/hs/webapp/TestHsWebServices.java | 27 +++-- .../hs/webapp/TestHsWebServicesAttempts.java | 31 +++--- .../v2/hs/webapp/TestHsWebServicesJobs.java | 35 +++--- .../hs/webapp/TestHsWebServicesJobsQuery.java | 69 +++++++----- .../v2/hs/webapp/TestHsWebServicesTasks.java | 35 +++--- hadoop-project/pom.xml | 19 +++- .../hadoop/yarn/client/cli/LogsCLI.java | 3 +- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 6 ++ .../yarn/client/api/impl/TimelineWriter.java | 3 +- .../client/api/impl/TestTimelineClient.java | 4 +- .../api/impl/TestTimelineClientForATS1_5.java | 4 +- .../yarn/webapp/GuiceServletConfig.java | 31 ++++++ .../webapp/TestAHSWebServices.java | 72 +++++++------ .../webapp/TestTimelineWebServices.java | 49 +++++---- .../nodemanager/webapp/TestNMWebServices.java | 10 +- .../webapp/TestNMWebServicesApps.java | 45 ++++---- .../webapp/TestNMWebServicesContainers.java | 29 +++-- .../webapp/TestRMWebServices.java | 26 +++-- .../webapp/TestRMWebServicesApps.java | 55 ++++++---- .../TestRMWebServicesAppsModification.java | 102 ++++++++++-------- .../TestRMWebServicesDelegationTokens.java | 82 ++++++++------ .../webapp/TestRMWebServicesNodes.java | 37 ++++--- .../webapp/TestRMWebServicesReservation.java | 21 ++-- 28 files changed, 516 insertions(+), 403 deletions(-) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 51ff7de5ddc34..c21b81e6a732e 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -115,6 +115,11 @@ jersey-core compile + + com.sun.jersey + jersey-servlet + compile + com.sun.jersey diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java index 21a2611daac62..afa666c3ebb63 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java @@ -33,6 +33,7 @@ import org.apache.hadoop.mapreduce.v2.app.AppContext; import org.apache.hadoop.mapreduce.v2.app.MockAppContext; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; @@ -46,8 +47,6 @@ import com.google.common.collect.Sets; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -69,13 +68,13 @@ public class TestAMWebServices extends JerseyTest { private static Configuration conf = new Configuration(); private static MockAppContext appContext; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { appContext = new MockAppContext(0, 1, 1, 1); appContext.setBlacklistedNodes(Sets.newHashSet("badnode1", "badnode2")); - + bind(JAXBContextResolver.class); bind(AMWebServices.class); bind(GenericExceptionHandler.class); @@ -84,20 +83,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestAMWebServices() { @@ -207,7 +203,8 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -223,7 +220,8 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -239,8 +237,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java index 3c9127fd116c4..53ad73e6f07df 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.common.collect.Sets; import java.io.StringReader; import java.util.List; import java.util.Map; @@ -44,6 +45,7 @@ import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; @@ -56,8 +58,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.UniformInterfaceException; @@ -80,10 +80,10 @@ public class TestAMWebServicesAttempts extends JerseyTest { private static Configuration conf = new Configuration(); private static AppContext appContext; - private Injector injector = Guice.createInjector(new ServletModule() { + + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockAppContext(0, 1, 2, 1); bind(JAXBContextResolver.class); bind(AMWebServices.class); @@ -93,21 +93,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestAMWebServicesAttempts() { @@ -379,7 +375,8 @@ private void testTaskAttemptIdErrorGeneric(String attid, String error) fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java index a61e407ed2f1a..698635935ed34 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java @@ -45,6 +45,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; @@ -57,8 +58,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -82,10 +81,9 @@ public class TestAMWebServicesJobs extends JerseyTest { private static Configuration conf = new Configuration(); private static AppContext appContext; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockAppContext(0, 1, 2, 1); bind(JAXBContextResolver.class); bind(AMWebServices.class); @@ -95,21 +93,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestAMWebServicesJobs() { @@ -256,7 +250,8 @@ public void testJobIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -283,7 +278,8 @@ public void testJobIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -306,7 +302,8 @@ public void testJobIdInvalidDefault() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -329,7 +326,8 @@ public void testJobIdInvalidXML() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); System.out.println(msg); @@ -368,7 +366,8 @@ public void testJobIdInvalidBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java index 15ef5ac2c8d21..a80680071736f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java @@ -41,6 +41,7 @@ import org.apache.hadoop.mapreduce.v2.app.job.Task; import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; @@ -53,8 +54,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -77,7 +76,7 @@ public class TestAMWebServicesTasks extends JerseyTest { private static Configuration conf = new Configuration(); private static AppContext appContext; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { @@ -90,21 +89,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestAMWebServicesTasks() { @@ -254,7 +249,8 @@ public void testTasksQueryInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -348,7 +344,8 @@ public void testTaskIdBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -382,7 +379,8 @@ public void testTaskIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -414,7 +412,8 @@ public void testTaskIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -448,7 +447,8 @@ public void testTaskIdInvalid2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -482,7 +482,8 @@ public void testTaskIdInvalid3() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java index 138554df033a0..568de478f00a9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java @@ -35,6 +35,7 @@ import org.apache.hadoop.mapreduce.v2.hs.MockHistoryContext; import org.apache.hadoop.util.VersionInfo; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -47,8 +48,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -70,10 +69,9 @@ public class TestHsWebServices extends JerseyTest { private static HistoryContext appContext; private static HsWebApp webApp; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockHistoryContext(0, 1, 1, 1); JobHistory jobHistoryService = new JobHistory(); HistoryContext historyContext = (HistoryContext) jobHistoryService; @@ -89,20 +87,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestHsWebServices() { @@ -212,7 +207,8 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -228,7 +224,8 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -244,8 +241,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java index 54c2792b12b32..f49bd6d869a11 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java @@ -46,6 +46,7 @@ import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -59,8 +60,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -85,10 +84,9 @@ public class TestHsWebServicesAttempts extends JerseyTest { private static HistoryContext appContext; private static HsWebApp webApp; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockHistoryContext(0, 1, 2, 1); webApp = mock(HsWebApp.class); when(webApp.name()).thenReturn("hsmockwebapp"); @@ -103,29 +101,25 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestHsWebServicesAttempts() { - super(new WebAppDescriptor.Builder( - "org.apache.hadoop.mapreduce.v2.hs.webapp") - .contextListenerClass(GuiceServletConfig.class) - .filterClass(com.google.inject.servlet.GuiceFilter.class) - .contextPath("jersey-guice-filter").servletPath("/").build()); + super( + new WebAppDescriptor.Builder("org.apache.hadoop.mapreduce.v2.hs.webapp") + .contextListenerClass(GuiceServletConfig.class) + .filterClass(com.google.inject.servlet.GuiceFilter.class) + .contextPath("jersey-guice-filter").servletPath("/").build()); } @Test @@ -397,7 +391,8 @@ private void testTaskAttemptIdErrorGeneric(String attid, String error) fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java index 4c4088fab020f..bad14a5f6f181 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java @@ -44,6 +44,7 @@ import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -57,8 +58,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -82,10 +81,9 @@ public class TestHsWebServicesJobs extends JerseyTest { private static MockHistoryContext appContext; private static HsWebApp webApp; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockHistoryContext(0, 1, 2, 1, false); webApp = mock(HsWebApp.class); when(webApp.name()).thenReturn("hsmockwebapp"); @@ -100,21 +98,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestHsWebServicesJobs() { @@ -331,7 +325,8 @@ public void testJobIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -359,7 +354,8 @@ public void testJobIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -383,7 +379,8 @@ public void testJobIdInvalidDefault() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -407,7 +404,8 @@ public void testJobIdInvalidXML() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); System.out.println(msg); @@ -446,7 +444,8 @@ public void testJobIdInvalidBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -527,7 +526,7 @@ public void testJobCountersSlash() throws JSONException, Exception { public void testJobCountersForKilledJob() throws Exception { WebResource r = resource(); appContext = new MockHistoryContext(0, 1, 1, 1, true); - injector = Guice.createInjector(new ServletModule() { + GuiceServletConfig.injector = Guice.createInjector(new ServletModule() { @Override protected void configureServlets() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java index 8891ec7ef50a8..22e4f5218d8a1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java @@ -39,6 +39,7 @@ import org.apache.hadoop.mapreduce.v2.hs.MockHistoryContext; import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -48,8 +49,6 @@ import org.junit.Test; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -70,10 +69,9 @@ public class TestHsWebServicesJobsQuery extends JerseyTest { private static MockHistoryContext appContext; private static HsWebApp webApp; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockHistoryContext(3, 2, 1); webApp = mock(HsWebApp.class); when(webApp.name()).thenReturn("hsmockwebapp"); @@ -88,21 +86,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestHsWebServicesJobsQuery() { @@ -136,7 +130,8 @@ public void testJobsQueryStateNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs")); + assertEquals("jobs is not empty", + new JSONObject().toString(), json.get("jobs").toString()); } @Test @@ -173,7 +168,8 @@ public void testJobsQueryStateInvalid() throws JSONException, Exception { .path("mapreduce").path("jobs").queryParam("state", "InvalidState") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getReasonPhrase(), + response.getStatusInfo().getReasonPhrase()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -202,7 +198,8 @@ public void testJobsQueryUserNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs")); + assertEquals("jobs is not empty", + new JSONObject().toString(), json.get("jobs").toString()); } @Test @@ -248,7 +245,8 @@ public void testJobsQueryLimitInvalid() throws JSONException, Exception { .path("mapreduce").path("jobs").queryParam("limit", "-1") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -287,7 +285,8 @@ public void testJobsQueryQueueNonExist() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs")); + assertEquals("jobs is not empty", + new JSONObject().toString(), json.get("jobs").toString()); } @Test @@ -319,7 +318,8 @@ public void testJobsQueryStartTimeBegin() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs")); + assertEquals("jobs is not empty", + new JSONObject().toString(), json.get("jobs").toString()); } @Test @@ -360,7 +360,8 @@ public void testJobsQueryStartTimeBeginEndInvalid() throws JSONException, .queryParam("startedTimeBegin", String.valueOf(now)) .queryParam("startedTimeEnd", String.valueOf(40000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -386,7 +387,8 @@ public void testJobsQueryStartTimeInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("startedTimeBegin", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -412,7 +414,8 @@ public void testJobsQueryStartTimeEndInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("startedTimeEnd", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -438,7 +441,8 @@ public void testJobsQueryStartTimeNegative() throws JSONException, Exception { .path("mapreduce").path("jobs") .queryParam("startedTimeBegin", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -464,7 +468,8 @@ public void testJobsQueryStartTimeEndNegative() throws JSONException, .path("mapreduce").path("jobs") .queryParam("startedTimeEnd", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -488,7 +493,8 @@ public void testJobsQueryFinishTimeEndNegative() throws JSONException, .path("mapreduce").path("jobs") .queryParam("finishedTimeEnd", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -512,7 +518,8 @@ public void testJobsQueryFinishTimeBeginNegative() throws JSONException, .path("mapreduce").path("jobs") .queryParam("finishedTimeBegin", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -539,7 +546,8 @@ public void testJobsQueryFinishTimeBeginEndInvalid() throws JSONException, .queryParam("finishedTimeBegin", String.valueOf(now)) .queryParam("finishedTimeEnd", String.valueOf(40000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -565,7 +573,8 @@ public void testJobsQueryFinishTimeInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("finishedTimeBegin", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -591,7 +600,8 @@ public void testJobsQueryFinishTimeEndInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("finishedTimeEnd", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -639,7 +649,8 @@ public void testJobsQueryFinishTimeEnd() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("jobs is not null", JSONObject.NULL, json.get("jobs")); + assertEquals("jobs is not empty", + new JSONObject().toString(), json.get("jobs").toString()); } @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java index 22fa46a47cef4..902be7f84af76 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java @@ -44,6 +44,7 @@ import org.apache.hadoop.mapreduce.v2.hs.MockHistoryContext; import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -57,8 +58,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -82,10 +81,9 @@ public class TestHsWebServicesTasks extends JerseyTest { private static MockHistoryContext appContext; private static HsWebApp webApp; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { - appContext = new MockHistoryContext(0, 1, 2, 1); webApp = mock(HsWebApp.class); when(webApp.name()).thenReturn("hsmockwebapp"); @@ -100,20 +98,17 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestHsWebServicesTasks() { @@ -266,7 +261,8 @@ public void testTasksQueryInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -361,7 +357,8 @@ public void testTaskIdBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -395,7 +392,8 @@ public void testTaskIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -427,7 +425,8 @@ public void testTaskIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -461,7 +460,8 @@ public void testTaskIdInvalid2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -495,7 +495,8 @@ public void testTaskIdInvalid3() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 7558b04233cfc..8810effe5b791 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -65,7 +65,7 @@ 1.7.4 - 1.9 + 1.19 1.9.13 @@ -546,6 +546,11 @@ jersey-core ${jersey.version} + + com.sun.jersey + jersey-servlet + ${jersey.version} + com.sun.jersey jersey-json @@ -946,7 +951,17 @@ org.glassfish.grizzly grizzly-http-servlet - 2.1.2 + 2.2.21 + + + org.glassfish.grizzly + grizzly-http + 2.2.21 + + + org.glassfish.grizzly + grizzly-http-server + 2.2.21 diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index d28c77cdec71e..411d0bc87119d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -342,7 +342,8 @@ private List getContainerLogFiles(Configuration conf, webResource.path("ws").path("v1").path("node").path("containers") .path(containerIdStr).accept(MediaType.APPLICATION_XML) .get(ClientResponse.class); - if (response.getClientResponseStatus().equals(ClientResponse.Status.OK)) { + if (response.getStatusInfo().getStatusCode() == + ClientResponse.Status.OK.getStatusCode()) { try { String xml = response.getEntity(String.class); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 17fc6e264742a..15195531bb226 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -42,12 +42,18 @@ provided + org.apache.hadoop hadoop-yarn-api + + org.apache.hadoop + hadoop-auth + + javax.xml.bind jaxb-api diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java index 9590f4a84acec..8fd0990165768 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java @@ -126,7 +126,8 @@ public ClientResponse run() throws Exception { throw (IOException)new InterruptedIOException().initCause(ie); } if (resp == null || - resp.getClientResponseStatus() != ClientResponse.Status.OK) { + resp.getStatusInfo().getStatusCode() + != ClientResponse.Status.OK.getStatusCode()) { String msg = "Failed to get the response from the timeline server."; LOG.error(msg); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java index 41b788dcbac7c..ddf6c32427153 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java @@ -330,7 +330,7 @@ public static ClientResponse mockEntityClientResponse( } doReturn(response).when(spyTimelineWriter) .doPostingObject(any(TimelineEntities.class), any(String.class)); - when(response.getClientResponseStatus()).thenReturn(status); + when(response.getStatusInfo()).thenReturn(status); TimelinePutResponse.TimelinePutError error = new TimelinePutResponse.TimelinePutError(); error.setEntityId("test entity id"); @@ -356,7 +356,7 @@ private static ClientResponse mockDomainClientResponse( } doReturn(response).when(spyTimelineWriter) .doPostingObject(any(TimelineDomain.class), any(String.class)); - when(response.getClientResponseStatus()).thenReturn(status); + when(response.getStatusInfo()).thenReturn(status); return response; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java index 37eadbfa8dde2..d3826e1a6fe27 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java @@ -208,8 +208,8 @@ protected TimelineWriter createTimelineWriter(Configuration conf, new FileSystemTimelineWriter(conf, authUgi, client, resURI) { public ClientResponse doPostingObject(Object object, String path) { ClientResponse response = mock(ClientResponse.class); - when(response.getClientResponseStatus()).thenReturn( - ClientResponse.Status.OK); + when(response.getStatusInfo()).thenReturn( + ClientResponse.Status.OK); return response; } }; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java new file mode 100644 index 0000000000000..fb9602112037d --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java @@ -0,0 +1,31 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.yarn.webapp; + +import com.google.inject.Injector; +import com.google.inject.servlet.GuiceServletContextListener; + +public class GuiceServletConfig extends GuiceServletContextListener { + + public static Injector injector = null; + + @Override + protected Injector getInjector() { + return injector; + } +} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java index 71b02757c8aa6..f14e6519ead99 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java @@ -67,6 +67,7 @@ import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; @@ -75,15 +76,14 @@ import org.codehaus.jettison.json.JSONObject; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import com.google.inject.Guice; -import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -132,6 +132,7 @@ protected void serviceStart() throws Exception { historyClientService.start(); ahsWebservice = new AHSWebServices(historyClientService, conf); fs = FileSystem.get(conf); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @AfterClass @@ -148,8 +149,7 @@ public static Collection rounds() { return Arrays.asList(new Object[][] { { 0 }, { 1 } }); } - private Injector injector = Guice.createInjector(new ServletModule() { - + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -159,7 +159,13 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); filter("/*").through(TestSimpleAuthFilter.class); } - }); + } + + @Before + public void setUp() throws Exception { + super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + } @Singleton public static class TestSimpleAuthFilter extends AuthenticationFilter { @@ -174,14 +180,6 @@ protected Properties getConfiguration(String configPrefix, } } - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - private int round; public TestAHSWebServices(int round) { @@ -203,8 +201,9 @@ public void testInvalidApp() { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); - assertEquals("404 not found expected", Status.NOT_FOUND, - response.getClientResponseStatus()); + assertEquals("404 not found expected", + Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); } @Test @@ -221,11 +220,14 @@ public void testInvalidAttempt() { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals( + Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } - assertEquals("404 not found expected", Status.NOT_FOUND, - response.getClientResponseStatus()); + assertEquals("404 not found expected", + Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); } @Test @@ -246,11 +248,13 @@ public void testInvalidContainer() throws Exception { .get(ClientResponse.class); if (round == 1) { assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } - assertEquals("404 not found expected", Status.NOT_FOUND, - response.getClientResponseStatus()); + assertEquals("404 not found expected", + Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); } @Test @@ -265,7 +269,8 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); @@ -282,7 +287,8 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -300,8 +306,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -388,8 +394,8 @@ public void testMultipleAttempts() throws Exception { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -415,8 +421,8 @@ public void testSingleAttempt() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -445,8 +451,8 @@ public void testMultipleContainers() throws Exception { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -474,8 +480,8 @@ public void testSingleContainer() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java index 74466a89b0146..7cc846252dcec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java @@ -61,14 +61,14 @@ import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout; import org.apache.hadoop.yarn.util.timeline.TimelineUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -81,11 +81,9 @@ public class TestTimelineWebServices extends JerseyTestBase { private static TimelineStore store; private static TimelineACLsManager timelineACLsManager; private static AdminACLsManager adminACLsManager; - private long beforeTime; + private static long beforeTime; - private Injector injector = Guice.createInjector(new ServletModule() { - - @SuppressWarnings("unchecked") + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(YarnJacksonJaxbJsonProvider.class); @@ -129,7 +127,7 @@ protected void configureServlets() { when(filterConfig.getInitParameterNames()).thenReturn(names); when(filterConfig.getInitParameter( DelegationTokenAuthenticationHandler.TOKEN_KIND)).thenReturn( - TimelineDelegationTokenIdentifier.KIND_NAME.toString()); + TimelineDelegationTokenIdentifier.KIND_NAME.toString()); try { taFilter.init(filterConfig); } catch (ServletException e) { @@ -146,18 +144,19 @@ protected void configureServlets() { } filter("/*").through(taFilter); } + } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + } - @Override - protected Injector getInjector() { - return injector; - } + @Before + public void setUp() throws Exception { + super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } - private TimelineStore mockTimelineStore() + private static TimelineStore mockTimelineStore() throws Exception { beforeTime = System.currentTimeMillis() - 1; TestMemoryTimelineStore store = @@ -477,8 +476,8 @@ public void testPostEntities() throws Exception { .type(MediaType.APPLICATION_JSON) .post(ClientResponse.class, entities); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.FORBIDDEN, - response.getClientResponseStatus()); + assertEquals(ClientResponse.Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); response = r.path("ws").path("v1").path("timeline") .queryParam("user.name", "tester") @@ -519,8 +518,8 @@ public void testPostIncompleteEntities() throws Exception { .queryParam("user.name", "tester").accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON).post(ClientResponse.class, entities); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.BAD_REQUEST, - response.getClientResponseStatus()); + assertEquals(ClientResponse.Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); } @Test @@ -703,8 +702,8 @@ public void testGetEntityWithYarnACLsEnabled() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.NOT_FOUND, - response.getClientResponseStatus()); + assertEquals(ClientResponse.Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } @@ -869,8 +868,8 @@ public void testGetDomainYarnACLsEnabled() { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); Assert.assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - Assert.assertEquals(ClientResponse.Status.NOT_FOUND, - response.getClientResponseStatus()); + Assert.assertEquals(ClientResponse.Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } @@ -938,8 +937,8 @@ public void testPutDomain() throws Exception { .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.FORBIDDEN, - response.getClientResponseStatus()); + assertEquals(ClientResponse.Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); response = r.path("ws").path("v1") .path("timeline").path("domain") diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index a4305da45636d..f18a4a6e380c2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -190,7 +190,8 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -206,8 +207,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -222,7 +223,8 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java index b95b180d1f72f..dbfdb951ab4f4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java @@ -33,7 +33,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.util.NodeHealthScriptRunner; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.conf.YarnConfiguration; @@ -51,6 +50,7 @@ import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -67,8 +67,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -91,8 +89,7 @@ public class TestNMWebServicesApps extends JerseyTestBase { private static File testLogDir = new File("target", TestNMWebServicesApps.class.getSimpleName() + "LogDir"); - private Injector injector = Guice.createInjector(new ServletModule() { - + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { conf.set(YarnConfiguration.NM_LOCAL_DIRS, testRootDir.getAbsolutePath()); @@ -148,20 +145,17 @@ public boolean isPmemCheckEnabled() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); testRootDir.mkdirs(); testLogDir.mkdir(); } @@ -187,7 +181,8 @@ public void testNodeAppsNone() throws JSONException, Exception { .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps isn't NULL", JSONObject.NULL, json.get("apps")); + assertEquals("apps isn't empty", + new JSONObject().toString(), json.get("apps").toString()); } private HashMap addAppContainers(Application app) @@ -297,7 +292,8 @@ public void testNodeAppsUserNone() throws JSONException, Exception { .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); } @Test @@ -317,7 +313,8 @@ public void testNodeAppsUserEmpty() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -379,7 +376,8 @@ public void testNodeAppsStateNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); } @Test @@ -400,7 +398,8 @@ public void testNodeAppsStateInvalid() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -430,7 +429,8 @@ public void testNodeAppsStateInvalidDefault() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -461,7 +461,8 @@ public void testNodeAppsStateInvalidXML() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); @@ -556,7 +557,8 @@ public void testNodeSingleAppsInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -593,7 +595,8 @@ public void testNodeSingleAppsMissing() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java index 7ec8f274051cb..80f4e24dececa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java @@ -38,7 +38,6 @@ import com.sun.jersey.api.client.filter.LoggingFilter; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.util.NodeHealthScriptRunner; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.NodeId; @@ -58,6 +57,7 @@ import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -73,8 +73,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -97,7 +95,7 @@ public class TestNMWebServicesContainers extends JerseyTestBase { private static File testLogDir = new File("target", TestNMWebServicesContainers.class.getSimpleName() + "LogDir"); - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { resourceView = new ResourceView() { @@ -158,20 +156,17 @@ public int getHttpPort() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); testRootDir.mkdirs(); testLogDir.mkdir(); } @@ -198,7 +193,8 @@ public void testNodeContainersNone() throws JSONException, Exception { .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); - assertEquals("apps isn't NULL", JSONObject.NULL, json.get("containers")); + assertEquals("apps isn't empty", + new JSONObject().toString(), json.get("containers").toString()); } private HashMap addAppContainers(Application app) @@ -337,7 +333,8 @@ public void testSingleContainerInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -371,7 +368,8 @@ public void testSingleContainerInvalid2() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -405,7 +403,8 @@ public void testSingleContainerWrong() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index 50a4849e921ee..adc2a0085c639 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -68,6 +68,7 @@ import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.apache.hadoop.yarn.webapp.ForbiddenException; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -81,8 +82,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -95,7 +94,7 @@ public class TestRMWebServices extends JerseyTestBase { private static MockRM rm; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -108,20 +107,17 @@ protected void configureServlets() { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWebServices() { @@ -162,7 +158,8 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); @@ -178,7 +175,8 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -194,8 +192,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR, - response.getClientResponseStatus()); + assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), + response.getStatusInfo().getStatusCode()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 9ba5233f6d1c2..01b6055adf94d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -46,6 +46,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -59,8 +60,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -76,7 +75,7 @@ public class TestRMWebServicesApps extends JerseyTestBase { private static final int CONTAINER_MB = 1024; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -91,20 +90,17 @@ protected void configureServlets() { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWebServicesApps() { @@ -350,7 +346,8 @@ public void testAppsQueryStatesNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -369,7 +366,8 @@ public void testAppsQueryStateNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -388,7 +386,8 @@ public void testAppsQueryStatesInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -425,7 +424,8 @@ public void testAppsQueryStateInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -484,7 +484,8 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not null", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -503,7 +504,8 @@ public void testAppsQueryFinalStatusInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -660,7 +662,8 @@ public void testAppsQueryStartEnd() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("apps is not null", JSONObject.NULL, json.get("apps")); + assertEquals("apps is not empty", + new JSONObject().toString(), json.get("apps").toString()); rm.stop(); } @@ -1070,7 +1073,8 @@ public void testAppStatistics() throws JSONException, Exception { .path("appstatistics") .queryParam("applicationTypes", "MAPREDUCE,OTHER") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); @@ -1117,7 +1121,8 @@ public void testAppStatistics() throws JSONException, Exception { response = r.path("ws").path("v1").path("cluster") .path("appstatistics").queryParam("states", "wrong_state") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); @@ -1185,7 +1190,8 @@ public void testInvalidApp() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1223,7 +1229,8 @@ public void testNonexistApp() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); @@ -1515,7 +1522,8 @@ public void testInvalidAppIdGetAttempts() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1592,7 +1600,8 @@ public void testNonexistAppAttempts() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 682ed75391e1e..b7887332660ce 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -87,6 +87,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LogAggregationContextInfo; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -107,7 +108,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -126,7 +126,6 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { private static final int CONTAINER_MB = 1024; - private static Injector injector; private String webserviceUserName = "testuser"; private boolean setAuthFilter = false; @@ -136,14 +135,6 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { private static final String FS_ALLOC_FILE = new File(TEST_DIR, "test-fs-queues.xml").getAbsolutePath(); - public static class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - /* * Helper class to allow testing of RM web services which require * authorization Add this class as a filter in the Guice injector for the @@ -298,19 +289,19 @@ public TestRMWebServicesAppsModification(int run) { case 0: default: // No Auth Capacity Scheduler - injector = getNoAuthInjectorCap(); + GuiceServletConfig.injector = getNoAuthInjectorCap(); break; case 1: // Simple Auth Capacity Scheduler - injector = getSimpleAuthInjectorCap(); + GuiceServletConfig.injector = getSimpleAuthInjectorCap(); break; case 2: // No Auth Fair Scheduler - injector = getNoAuthInjectorFair(); + GuiceServletConfig.injector = getNoAuthInjectorFair(); break; case 3: // Simple Auth Fair Scheduler - injector = getSimpleAuthInjectorFair(); + GuiceServletConfig.injector = getSimpleAuthInjectorFair(); break; } } @@ -349,7 +340,8 @@ public void testSingleAppState() throws Exception { this .constructWebResource("apps", app.getApplicationId().toString(), "state").accept(mediaType).get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.ACCEPTED); } else if (mediaType.equals(MediaType.APPLICATION_XML)) { @@ -388,10 +380,12 @@ public void testSingleAppKill() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); continue; } - assertEquals(Status.ACCEPTED, response.getClientResponseStatus()); + assertEquals(Status.ACCEPTED.getStatusCode(), + response.getStatusInfo().getStatusCode()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.FINAL_SAVING, RMAppState.KILLED, RMAppState.KILLING, RMAppState.ACCEPTED); @@ -408,7 +402,8 @@ public void testSingleAppKill() throws Exception { tmp = tmp.queryParam("user.name", webserviceUserName); } response = tmp.get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertTrue(locationHeaderValue.endsWith("/ws/v1/cluster/apps/" + app.getApplicationId().toString() + "/state")); @@ -419,9 +414,13 @@ public void testSingleAppKill() throws Exception { .constructWebResource("apps", app.getApplicationId().toString(), "state").accept(mediaType) .entity(entity, contentType).put(ClientResponse.class); - assertTrue((response.getClientResponseStatus() == Status.ACCEPTED) - || (response.getClientResponseStatus() == Status.OK)); - if (response.getClientResponseStatus() == Status.OK) { + assertTrue( + (response.getStatusInfo().getStatusCode() + == Status.ACCEPTED.getStatusCode()) + || (response.getStatusInfo().getStatusCode() + == Status.OK.getStatusCode())); + if (response.getStatusInfo().getStatusCode() + == Status.OK.getStatusCode()) { assertEquals(RMAppState.KILLED, app.getState()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.KILLED); @@ -470,11 +469,12 @@ public void testSingleAppKillInvalidState() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, - response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); continue; } - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); } } } @@ -588,13 +588,16 @@ public void testSingleAppKillInvalidId() throws Exception { .accept(MediaType.APPLICATION_XML) .entity(info, MediaType.APPLICATION_XML).put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); continue; } if (i == 0) { - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); } else { - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); } } rm.stop(); @@ -641,9 +644,11 @@ public void validateResponseStatus(ClientResponse response, public void validateResponseStatus(ClientResponse response, Status expectedUnauthorizedMode, Status expectedAuthorizedMode) { if (!isAuthenticationEnabled()) { - assertEquals(expectedUnauthorizedMode, response.getClientResponseStatus()); + assertEquals(expectedUnauthorizedMode.getStatusCode(), + response.getStatusInfo().getStatusCode()); } else { - assertEquals(expectedAuthorizedMode, response.getClientResponseStatus()); + assertEquals(expectedAuthorizedMode.getStatusCode(), + response.getStatusInfo().getStatusCode()); } } @@ -845,10 +850,12 @@ public void testAppSubmit(String acceptMedia, String contentMedia) .entity(appInfo, contentMedia).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } - assertEquals(Status.ACCEPTED, response.getClientResponseStatus()); + assertEquals(Status.ACCEPTED.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertTrue(!response.getHeaders().getFirst(HttpHeaders.LOCATION).isEmpty()); String locURL = response.getHeaders().getFirst(HttpHeaders.LOCATION); assertTrue(locURL.contains("/apps/application")); @@ -857,7 +864,8 @@ public void testAppSubmit(String acceptMedia, String contentMedia) WebResource res = resource().uri(new URI(locURL)); res = res.queryParam("user.name", webserviceUserName); response = res.get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); RMApp app = rm.getRMContext().getRMApps() @@ -916,7 +924,8 @@ public void testAppSubmit(String acceptMedia, String contentMedia) response = this.constructWebResource("apps", appId).accept(acceptMedia) .get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); } public void testAppSubmitErrors(String acceptMedia, String contentMedia) @@ -1004,7 +1013,8 @@ public void testAppSubmitBadJsonAndXML() throws Exception { ClientResponse response = this.constructWebResource(urlPath).accept(MediaType.APPLICATION_XML) .entity(body, MediaType.APPLICATION_XML).post(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); body = "{\"a\" : \"b\"}"; response = this.constructWebResource(urlPath).accept(MediaType.APPLICATION_XML) @@ -1029,7 +1039,8 @@ public void testGetAppQueue() throws Exception { this .constructWebResource("apps", app.getApplicationId().toString(), "queue").accept(contentType).get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); String expectedQueue = "default"; if(!isCapacityScheduler) { expectedQueue = "root." + webserviceUserName; @@ -1094,10 +1105,12 @@ public void testUpdateAppPriority() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); continue; } - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppPriorityJson(response, modifiedPriority); } else { @@ -1108,7 +1121,8 @@ public void testUpdateAppPriority() throws Exception { .constructWebResource("apps", app.getApplicationId().toString(), "priority") .accept(mediaType).get(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppPriorityJson(response, modifiedPriority); } else { @@ -1123,7 +1137,8 @@ public void testUpdateAppPriority() throws Exception { "priority") .entity(entity, contentType).accept(mediaType) .put(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); } } rm.stop(); @@ -1173,10 +1188,12 @@ public void testAppMove() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); continue; } - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); String expectedQueue = "test"; if(!isCapacityScheduler) { expectedQueue = "root.test"; @@ -1196,7 +1213,8 @@ public void testAppMove() throws Exception { .constructWebResource("apps", app.getApplicationId().toString(), "queue").entity(entity, contentType).accept(mediaType) .put(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); if(isCapacityScheduler) { Assert.assertEquals("default", app.getQueue()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index a6d77443323db..f2da930d0adf5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -54,6 +54,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -79,7 +80,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -97,7 +97,6 @@ public class TestRMWebServicesDelegationTokens extends JerseyTestBase { .getServerPrincipal(); private static MiniKdc testMiniKDC; private static MockRM rm; - private Injector injector; private boolean isKerberosAuth = false; // Make sure the test uses the published header string @@ -200,14 +199,6 @@ protected void configureServlets() { }); } - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - @Parameters public static Collection guiceConfigs() { return Arrays.asList(new Object[][] { { 0 }, { 1 } }); @@ -222,10 +213,10 @@ public TestRMWebServicesDelegationTokens(int run) throws Exception { switch (run) { case 0: default: - injector = getKerberosAuthInjector(); + GuiceServletConfig.injector = getKerberosAuthInjector(); break; case 1: - injector = getSimpleAuthInjector(); + GuiceServletConfig.injector = getSimpleAuthInjector(); break; } } @@ -305,7 +296,8 @@ private void verifySimpleAuthCreate(String mediaType, String contentType, .path("delegation-token").queryParam("user.name", "testuser") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); } private void verifyKerberosAuthCreate(String mType, String cType, @@ -321,7 +313,8 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(body, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); Token token = @@ -334,7 +327,8 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); token = new Token(); @@ -375,7 +369,8 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dummyToken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); String body = generateRenewTokenBody(mediaType, tok.getToken()); @@ -385,8 +380,8 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, tok.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, - response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return tok; } }); @@ -406,7 +401,8 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); String message = "Expiration time not as expected: old = " + oldExpirationTime @@ -421,7 +417,8 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); tok = getDelegationTokenFromResponse(response); message = "Expiration time not as expected: old = " + oldExpirationTime @@ -443,7 +440,8 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); return null; } }); @@ -469,7 +467,8 @@ public Void call() throws Exception { .path("delegation-token").path("expiration") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); return null; } }); @@ -498,7 +497,8 @@ private void verifySimpleAuthRenew(String mediaType, String contentType) { .path("delegation-token").queryParam("user.name", "testuser") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); } // Test to verify cancel functionality - create a token and then try to cancel @@ -528,14 +528,16 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); response = resource().path("ws").path("v1").path("cluster") .path("delegation-token") .header(yarnTokenHeader, tok.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertTokenCancelled(tok.getToken()); return null; } @@ -550,7 +552,8 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -564,7 +567,8 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()) .accept(contentType).delete(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertTokenCancelled(tmpToken.getToken()); return null; } @@ -579,7 +583,8 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -593,7 +598,8 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, tmpToken2.getToken()) .accept(contentType).delete(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertValidRMToken(tmpToken2.getToken()); return null; } @@ -625,7 +631,8 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, "random-string").accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); return null; } }); @@ -638,7 +645,8 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); return null; } @@ -653,7 +661,8 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -667,13 +676,15 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); response = resource().path("ws").path("v1").path("cluster") .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); return null; } }); @@ -686,7 +697,8 @@ private void verifySimpleAuthCancel() { .path("delegation-token").queryParam("user.name", "testuser") .header(RMWebServices.DELEGATION_TOKEN_HEADER, "random") .delete(ClientResponse.class); - assertEquals(Status.FORBIDDEN, response.getClientResponseStatus()); + assertEquals(Status.FORBIDDEN.getStatusCode(), + response.getStatusInfo().getStatusCode()); } private DelegationToken diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 5bcb0e02bcc3e..23c11c9acbe67 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -51,6 +51,7 @@ import org.apache.hadoop.yarn.util.RackResolver; import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -65,8 +66,6 @@ import com.google.common.base.Joiner; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -79,7 +78,7 @@ public class TestRMWebServicesNodes extends JerseyTestBase { private static MockRM rm; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -91,20 +90,17 @@ protected void configureServlets() { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWebServicesNodes() { @@ -227,7 +223,8 @@ public void testNodesQueryStateNone() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("nodes is not null", JSONObject.NULL, json.get("nodes")); + assertEquals("nodes is not empty", + new JSONObject().toString(), json.get("nodes").toString()); } @Test @@ -245,7 +242,8 @@ public void testNodesQueryStateInvalid() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); @@ -357,7 +355,8 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - assertEquals("nodes is not null", JSONObject.NULL, json.get("nodes")); + assertEquals("nodes is not empty", + new JSONObject().toString(), json.get("nodes").toString()); } public void testNodesHelper(String path, String media) throws JSONException, @@ -436,7 +435,8 @@ public void testNonexistNode() throws JSONException, Exception { fail("should have thrown exception on non-existent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -462,7 +462,8 @@ public void testNonexistNodeDefault() throws JSONException, Exception { fail("should have thrown exception on non-existent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -488,7 +489,8 @@ public void testNonexistNodeXML() throws JSONException, Exception { fail("should have thrown exception on non-existent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); + assertEquals(Status.NOT_FOUND.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); System.out.println(msg); @@ -531,7 +533,8 @@ public void testInvalidNode() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertEquals(Status.BAD_REQUEST.getStatusCode(), + response.getStatusInfo().getStatusCode()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 40d46d0ac01f2..990be02581723 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -1013,7 +1013,9 @@ private ClientResponse submitAndVerifyReservation(String path, String media, .accept(media).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); + return null; } return response; @@ -1046,13 +1048,15 @@ private void updateReservationTestHelper(String path, .accept(media).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } System.out.println("RESPONSE:" + response); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); } @@ -1095,13 +1099,15 @@ private void testDeleteReservationHelper(String path, .accept(media).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); return; } System.out.println("RESPONSE:" + response); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(Status.OK, response.getClientResponseStatus()); + assertEquals(Status.OK.getStatusCode(), + response.getStatusInfo().getStatusCode()); } private void testRDLHelper(JSONObject json) throws JSONException { @@ -1126,12 +1132,13 @@ private JSONObject testListReservationHelper(WebResource resource, Status ClientResponse response = resource.get(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertEquals(Status.UNAUTHORIZED.getStatusCode(), + response.getStatusInfo().getStatusCode()); return null; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(status, response.getClientResponseStatus()); + assertEquals(status, response.getStatusInfo().getStatusCode()); return response.getEntity(JSONObject.class); } From c7bc626be88ef55919d4fe53ebca305ea6d593f9 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 16 Feb 2016 01:31:29 +0900 Subject: [PATCH 02/15] Fix a failure of TestNMWebServices Signed-off-by: Tsuyoshi Ozawa --- .../nodemanager/webapp/TestNMWebServices.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index f18a4a6e380c2..9a6f4bd006f0f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; @@ -95,7 +96,7 @@ public class TestNMWebServices extends JerseyTestBase { private static File testLogDir = new File("target", TestNMWebServices.class.getSimpleName() + "LogDir"); - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { @@ -148,14 +149,10 @@ public boolean isPmemCheckEnabled() { serve("/*").with(GuiceContainer.class); } - }); + }; - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @@ -164,6 +161,7 @@ public void setUp() throws Exception { super.setUp(); testRootDir.mkdirs(); testLogDir.mkdir(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @AfterClass From 97c1c154b2e52aa78b18bd4f7795ebdf97cb486b Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 16 Feb 2016 11:44:40 +0900 Subject: [PATCH 03/15] Fixed test failures of TestRMWebServicesFairScheduler, TestRMWebServicesForCSWithPartitions, TestRMWebServicesNodeLabels, TestRMWebServicesReservation Signed-off-by: Tsuyoshi Ozawa --- .../TestRMWebServicesFairScheduler.java | 25 ++-- .../TestRMWebServicesForCSWithPartitions.java | 16 +-- .../webapp/TestRMWebServicesNodeLabels.java | 23 ++-- .../webapp/TestRMWebServicesReservation.java | 127 ++++++++++-------- 4 files changed, 99 insertions(+), 92 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java index 1aed3a6e80ba4..3ffdf0cb2337a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java @@ -30,10 +30,12 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueueManager; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; +import org.junit.Before; import org.junit.Test; import com.google.inject.Guice; @@ -47,9 +49,9 @@ public class TestRMWebServicesFairScheduler extends JerseyTestBase { private static MockRM rm; - private YarnConfiguration conf; + private static YarnConfiguration conf; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -62,16 +64,19 @@ protected void configureServlets() { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } - + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + } + public TestRMWebServicesFairScheduler() { super(new WebAppDescriptor.Builder( "org.apache.hadoop.yarn.server.resourcemanager.webapp") diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index 8087e33d4a6b4..f8b6b888f193e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -38,6 +38,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -78,10 +79,10 @@ public class TestRMWebServicesForCSWithPartitions extends JerseyTestBase { private static final ImmutableSet CLUSTER_LABELS = ImmutableSet.of(LABEL_LX, LABEL_LY, DEFAULT_PARTITION); private static MockRM rm; - private CapacitySchedulerConfiguration csConf; - private YarnConfiguration conf; + static private CapacitySchedulerConfiguration csConf; + static private YarnConfiguration conf; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -106,13 +107,10 @@ protected void configureServlets() { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); + }; - public class GuiceServletConfig extends GuiceServletContextListener { - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } private static void setupQueueConfiguration( diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 7a72cb1f64b89..78a4a6080a7d5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -41,6 +41,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONException; @@ -49,8 +50,6 @@ import org.junit.Test; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.UniformInterfaceException; @@ -69,13 +68,13 @@ public class TestRMWebServicesNodeLabels extends JerseyTestBase { .getLog(TestRMWebServicesNodeLabels.class); private static MockRM rm; - private YarnConfiguration conf; + private static YarnConfiguration conf; - private String userName; - private String notUserName; - private RMWebServices rmWebService; + private static String userName; + private static String notUserName; + private static RMWebServices rmWebService; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { @@ -98,14 +97,10 @@ protected void configureServlets() { TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); serve("/*").with(GuiceContainer.class); } - }); + }; - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWebServicesNodeLabels() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 990be02581723..175f3c49acc17 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -56,6 +56,7 @@ import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.UTCClock; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; @@ -70,7 +71,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; @@ -86,10 +86,9 @@ public class TestRMWebServicesReservation extends JerseyTestBase { private String webserviceUserName = "testuser"; - private boolean setAuthFilter = false; + private static boolean setAuthFilter = false; private static MockRM rm; - private static Injector injector; private static final int MINIMUM_RESOURCE_DURATION = 1000000; private static final Clock clock = new UTCClock(); @@ -103,14 +102,6 @@ public class TestRMWebServicesReservation extends JerseyTestBase { private static final String GET_NEW_RESERVATION_PATH = "reservation/new-reservation"; - public static class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - /* * Helper class to allow testing of RM web services which require * authorization Add this class as a filter in the Guice injector for the @@ -139,7 +130,7 @@ protected Properties getConfiguration(String configPrefix, } - private abstract class TestServletModule extends ServletModule { + private static abstract class TestServletModule extends ServletModule { public Configuration conf = new Configuration(); public abstract void configureScheduler(); @@ -175,7 +166,7 @@ protected void configureServlets() { } } - private class CapTestServletModule extends TestServletModule { + private static class CapTestServletModule extends TestServletModule { @Override public void configureScheduler() { conf.set("yarn.resourcemanager.scheduler.class", @@ -183,7 +174,7 @@ public void configureScheduler() { } } - private class FairTestServletModule extends TestServletModule { + private static class FairTestServletModule extends TestServletModule { @Override public void configureScheduler() { try { @@ -209,52 +200,69 @@ public void configureScheduler() { } } - private Injector getNoAuthInjectorCap() { - return Guice.createInjector(new CapTestServletModule() { - @Override - protected void configureServlets() { - setAuthFilter = false; - super.configureServlets(); - } - }); + private static class NoAuthServletModule extends CapTestServletModule { + @Override + protected void configureServlets() { + setAuthFilter = false; + super.configureServlets(); + } } - private Injector getSimpleAuthInjectorCap() { - return Guice.createInjector(new CapTestServletModule() { - @Override - protected void configureServlets() { - setAuthFilter = true; - conf.setBoolean(YarnConfiguration.YARN_ACL_ENABLE, true); - // set the admin acls otherwise all users are considered admins - // and we can't test authorization - conf.setStrings(YarnConfiguration.YARN_ADMIN_ACL, "testuser1"); - super.configureServlets(); - } - }); + private static class SimpleAuthServletModule extends CapTestServletModule { + @Override + protected void configureServlets() { + setAuthFilter = true; + conf.setBoolean(YarnConfiguration.YARN_ACL_ENABLE, true); + // set the admin acls otherwise all users are considered admins + // and we can't test authorization + conf.setStrings(YarnConfiguration.YARN_ADMIN_ACL, "testuser1"); + super.configureServlets(); + } } - private Injector getNoAuthInjectorFair() { - return Guice.createInjector(new FairTestServletModule() { - @Override - protected void configureServlets() { - setAuthFilter = false; - super.configureServlets(); - } - }); + private static class FairNoAuthServletModule extends FairTestServletModule { + @Override + protected void configureServlets() { + setAuthFilter = false; + super.configureServlets(); + } } - private Injector getSimpleAuthInjectorFair() { - return Guice.createInjector(new FairTestServletModule() { - @Override - protected void configureServlets() { - setAuthFilter = true; - conf.setBoolean(YarnConfiguration.YARN_ACL_ENABLE, true); - // set the admin acls otherwise all users are considered admins - // and we can't test authorization - conf.setStrings(YarnConfiguration.YARN_ADMIN_ACL, "testuser1"); - super.configureServlets(); - } - }); + private static class FairSimpleAuthServletModule extends + FairTestServletModule { + @Override + protected void configureServlets() { + setAuthFilter = true; + conf.setBoolean(YarnConfiguration.YARN_ACL_ENABLE, true); + // set the admin acls otherwise all users are considered admins + // and we can't test authorization + conf.setStrings(YarnConfiguration.YARN_ADMIN_ACL, "testuser1"); + super.configureServlets(); + } + } + + private Injector initNoAuthInjectorCap() { + GuiceServletConfig.injector = + Guice.createInjector(new NoAuthServletModule()); + return GuiceServletConfig.injector; + } + + private Injector initSimpleAuthInjectorCap() { + GuiceServletConfig.injector = + Guice.createInjector(new SimpleAuthServletModule()); + return GuiceServletConfig.injector; + } + + private Injector initNoAuthInjectorFair() { + GuiceServletConfig.injector = + Guice.createInjector(new FairNoAuthServletModule()); + return GuiceServletConfig.injector; + } + + private Injector initSimpleAuthInjectorFair() { + GuiceServletConfig.injector = + Guice.createInjector(new FairSimpleAuthServletModule()); + return GuiceServletConfig.injector; } @Parameters @@ -279,19 +287,19 @@ public TestRMWebServicesReservation(int run) { case 0: default: // No Auth Capacity Scheduler - injector = getNoAuthInjectorCap(); + initNoAuthInjectorCap(); break; case 1: // Simple Auth Capacity Scheduler - injector = getSimpleAuthInjectorCap(); + initSimpleAuthInjectorCap(); break; case 2: // No Auth Fair Scheduler - injector = getNoAuthInjectorFair(); + initNoAuthInjectorFair(); break; case 3: // Simple Auth Fair Scheduler - injector = getSimpleAuthInjectorFair(); + initSimpleAuthInjectorFair(); break; } } @@ -1138,7 +1146,8 @@ private JSONObject testListReservationHelper(WebResource resource, Status } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(status, response.getStatusInfo().getStatusCode()); + assertEquals(status.getStatusCode(), + response.getStatusInfo().getStatusCode()); return response.getEntity(JSONObject.class); } From cd1de76bf1782634c238cd02da0e459b8463e8ba Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 16 Feb 2016 13:11:30 +0900 Subject: [PATCH 04/15] Fix TestRMWebServicesCapacitySched and TestRMWebServicesForCSWithPartitions --- .../TestRMWebServicesCapacitySched.java | 20 ++++++++----------- .../TestRMWebServicesForCSWithPartitions.java | 3 +-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 9379367740c7f..cba5e8425f2c0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -38,6 +38,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.util.resource.Resources; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -53,8 +54,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -64,8 +63,8 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase { private static MockRM rm; - private CapacitySchedulerConfiguration csConf; - private YarnConfiguration conf; + private static CapacitySchedulerConfiguration csConf; + private static YarnConfiguration conf; private class QueueInfo { float capacity; @@ -89,7 +88,7 @@ private class LeafQueueInfo extends QueueInfo { float userLimitFactor; } - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -104,14 +103,10 @@ protected void configureServlets() { bind(ResourceManager.class).toInstance(rm); serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + } - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } private static void setupQueueConfiguration( @@ -160,6 +155,7 @@ private static void setupQueueConfiguration( @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWebServicesCapacitySched() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index f8b6b888f193e..e24b9849e6109 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -54,8 +54,6 @@ import com.google.common.collect.ImmutableSet; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -174,6 +172,7 @@ private static void setupQueueConfiguration( @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWebServicesForCSWithPartitions() { From c3d9e3323565e21a60a09dedbc118e8c699d762d Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 16 Feb 2016 13:42:29 +0900 Subject: [PATCH 05/15] Remove unused imports Signed-off-by: Tsuyoshi Ozawa --- .../yarn/server/nodemanager/webapp/TestNMWebServices.java | 2 -- .../resourcemanager/webapp/TestRMWebServicesFairScheduler.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index 9a6f4bd006f0f..954ef15361fd7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -70,8 +70,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java index 3ffdf0cb2337a..59980fd4775f7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java @@ -39,8 +39,6 @@ import org.junit.Test; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; From b1ec87952bf521d709d9ac2bc7d595fd52a15661 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Sat, 20 Feb 2016 17:40:31 +0900 Subject: [PATCH 06/15] Fix TestHsWebServicesJobConf, TestAMWebServicesJobConf, TestAMWebServicesAttempt and remove unsed imports --- .../app/webapp/TestAMWebServicesAttempt.java | 18 ++++++------- .../app/webapp/TestAMWebServicesJobConf.java | 25 ++++++------------- .../hs/webapp/TestHsWebServicesJobConf.java | 18 ++++++------- 3 files changed, 21 insertions(+), 40 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java index 884e66bd64935..9ac77b27d9055 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java @@ -44,8 +44,8 @@ import org.apache.hadoop.security.authentication.server.AuthenticationFilter; import org.apache.hadoop.security.authentication.server.PseudoAuthenticationHandler; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; -import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.junit.Before; import org.junit.Test; @@ -55,9 +55,7 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; import com.google.inject.Singleton; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -77,7 +75,8 @@ public class TestAMWebServicesAttempt extends JerseyTest { private static AppContext appContext; private String webserviceUserName = "testuser"; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { + @Override protected void configureServlets() { appContext = new MockAppContext(0, 1, 2, 1); @@ -90,7 +89,7 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); filter("/*").through(TestRMCustomAuthFilter.class); } - }); + }; @Singleton public static class TestRMCustomAuthFilter extends AuthenticationFilter { @@ -112,18 +111,15 @@ protected Properties getConfiguration(String configPrefix, } } - - public class GuiceServletConfig extends GuiceServletContextListener { - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestAMWebServicesAttempt() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java index 91e66153ecb3d..4a6a6f1d4f031 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java @@ -40,16 +40,11 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.v2.api.records.JobId; import org.apache.hadoop.mapreduce.v2.app.AppContext; -import org.apache.hadoop.mapreduce.v2.app.ClusterInfo; import org.apache.hadoop.mapreduce.v2.app.MockAppContext; -import org.apache.hadoop.mapreduce.v2.app.MockJobs; import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.util.MRApps; -import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; -import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.event.EventHandler; -import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; @@ -62,10 +57,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import com.google.common.collect.Maps; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -87,7 +79,8 @@ public class TestAMWebServicesJobConf extends JerseyTest { private static File testConfDir = new File("target", TestAMWebServicesJobConf.class.getSimpleName() + "confDir"); - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { + @Override protected void configureServlets() { @@ -124,14 +117,10 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + }; - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @@ -139,7 +128,7 @@ protected Injector getInjector() { public void setUp() throws Exception { super.setUp(); testConfDir.mkdir(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @AfterClass diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java index aeacb955cffa4..65722e668910c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java @@ -47,6 +47,7 @@ import org.apache.hadoop.mapreduce.v2.hs.MockHistoryContext; import org.apache.hadoop.mapreduce.v2.util.MRApps; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; +import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; import org.codehaus.jettison.json.JSONArray; @@ -61,8 +62,6 @@ import org.xml.sax.InputSource; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -85,7 +84,8 @@ public class TestHsWebServicesJobConf extends JerseyTest { private static File testConfDir = new File("target", TestHsWebServicesJobConf.class.getSimpleName() + "confDir"); - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { + @Override protected void configureServlets() { @@ -127,14 +127,10 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { + }; - @Override - protected Injector getInjector() { - return injector; - } + static { + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @Before @@ -142,7 +138,7 @@ protected Injector getInjector() { public void setUp() throws Exception { super.setUp(); testConfDir.mkdir(); - + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } @AfterClass From 06370e1a0cfdae6f2d7ac5e0eee92c44459b4da8 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Sat, 20 Feb 2016 23:13:17 +0900 Subject: [PATCH 07/15] Adding helper method, assertResponseStatusCode, to WebServicesTestUtils --- .../v2/app/webapp/TestAMWebServices.java | 11 ++- .../app/webapp/TestAMWebServicesAttempts.java | 5 +- .../v2/app/webapp/TestAMWebServicesJobs.java | 16 ++-- .../v2/app/webapp/TestAMWebServicesTasks.java | 19 ++--- .../v2/hs/webapp/TestHsWebServices.java | 11 ++- .../hs/webapp/TestHsWebServicesAttempts.java | 4 +- .../v2/hs/webapp/TestHsWebServicesJobs.java | 16 ++-- .../hs/webapp/TestHsWebServicesJobsQuery.java | 37 ++++----- .../v2/hs/webapp/TestHsWebServicesTasks.java | 19 ++--- .../yarn/webapp/WebServicesTestUtils.java | 11 +++ .../webapp/TestAHSWebServices.java | 46 +++++------- .../webapp/TestTimelineWebServices.java | 26 +++---- .../nodemanager/webapp/TestNMWebServices.java | 13 ++-- .../webapp/TestNMWebServicesApps.java | 19 ++--- .../webapp/TestNMWebServicesContainers.java | 10 +-- .../webapp/TestRMWebServices.java | 11 ++- .../webapp/TestRMWebServicesApps.java | 28 +++---- .../TestRMWebServicesAppsModification.java | 75 ++++++++----------- .../TestRMWebServicesDelegationTokens.java | 72 +++++++----------- .../webapp/TestRMWebServicesNodes.java | 16 ++-- .../webapp/TestRMWebServicesReservation.java | 22 ++---- 21 files changed, 197 insertions(+), 290 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java index afa666c3ebb63..075d41124c349 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.app.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -203,8 +204,7 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -220,8 +220,7 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -237,8 +236,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java index 53ad73e6f07df..7ba82a827908e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java @@ -19,12 +19,12 @@ package org.apache.hadoop.mapreduce.v2.app.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.Sets; import java.io.StringReader; import java.util.List; import java.util.Map; @@ -375,8 +375,7 @@ private void testTaskAttemptIdErrorGeneric(String attid, String error) fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java index 698635935ed34..055bf52409de3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java @@ -19,6 +19,7 @@ package org.apache.hadoop.mapreduce.v2.app.webapp; import static org.apache.hadoop.yarn.util.StringHelper.ujoin; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -250,8 +251,7 @@ public void testJobIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -278,8 +278,7 @@ public void testJobIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -302,8 +301,7 @@ public void testJobIdInvalidDefault() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -326,8 +324,7 @@ public void testJobIdInvalidXML() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); System.out.println(msg); @@ -366,8 +363,7 @@ public void testJobIdInvalidBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java index a80680071736f..63cbdb2b7db89 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.app.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -249,8 +250,7 @@ public void testTasksQueryInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -344,8 +344,7 @@ public void testTaskIdBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -379,8 +378,7 @@ public void testTaskIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -412,8 +410,7 @@ public void testTaskIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -447,8 +444,7 @@ public void testTaskIdInvalid2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -482,8 +478,7 @@ public void testTaskIdInvalid3() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java index 568de478f00a9..8f4cacb3d1c8c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.hs.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -207,8 +208,7 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -224,8 +224,7 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -241,8 +240,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java index f49bd6d869a11..0178d4f1a350a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.hs.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -391,8 +392,7 @@ private void testTaskAttemptIdErrorGeneric(String attid, String error) fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java index bad14a5f6f181..6950aeee82844 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java @@ -20,6 +20,7 @@ import static org.apache.hadoop.yarn.util.StringHelper.join; import static org.apache.hadoop.yarn.util.StringHelper.ujoin; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -325,8 +326,7 @@ public void testJobIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -354,8 +354,7 @@ public void testJobIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -379,8 +378,7 @@ public void testJobIdInvalidDefault() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -404,8 +402,7 @@ public void testJobIdInvalidXML() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); System.out.println(msg); @@ -444,8 +441,7 @@ public void testJobIdInvalidBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java index 22e4f5218d8a1..42837ca40c5a5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.hs.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -168,8 +169,7 @@ public void testJobsQueryStateInvalid() throws JSONException, Exception { .path("mapreduce").path("jobs").queryParam("state", "InvalidState") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getReasonPhrase(), - response.getStatusInfo().getReasonPhrase()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -245,8 +245,7 @@ public void testJobsQueryLimitInvalid() throws JSONException, Exception { .path("mapreduce").path("jobs").queryParam("limit", "-1") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -360,8 +359,7 @@ public void testJobsQueryStartTimeBeginEndInvalid() throws JSONException, .queryParam("startedTimeBegin", String.valueOf(now)) .queryParam("startedTimeEnd", String.valueOf(40000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -387,8 +385,7 @@ public void testJobsQueryStartTimeInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("startedTimeBegin", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -414,8 +411,7 @@ public void testJobsQueryStartTimeEndInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("startedTimeEnd", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -441,8 +437,7 @@ public void testJobsQueryStartTimeNegative() throws JSONException, Exception { .path("mapreduce").path("jobs") .queryParam("startedTimeBegin", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -468,8 +463,7 @@ public void testJobsQueryStartTimeEndNegative() throws JSONException, .path("mapreduce").path("jobs") .queryParam("startedTimeEnd", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -493,8 +487,7 @@ public void testJobsQueryFinishTimeEndNegative() throws JSONException, .path("mapreduce").path("jobs") .queryParam("finishedTimeEnd", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -518,8 +511,7 @@ public void testJobsQueryFinishTimeBeginNegative() throws JSONException, .path("mapreduce").path("jobs") .queryParam("finishedTimeBegin", String.valueOf(-1000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -546,8 +538,7 @@ public void testJobsQueryFinishTimeBeginEndInvalid() throws JSONException, .queryParam("finishedTimeBegin", String.valueOf(now)) .queryParam("finishedTimeEnd", String.valueOf(40000)) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -573,8 +564,7 @@ public void testJobsQueryFinishTimeInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("finishedTimeBegin", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -600,8 +590,7 @@ public void testJobsQueryFinishTimeEndInvalidformat() throws JSONException, ClientResponse response = r.path("ws").path("v1").path("history") .path("mapreduce").path("jobs").queryParam("finishedTimeEnd", "efsd") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java index 902be7f84af76..f21d40159b8b2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.hs.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -261,8 +262,7 @@ public void testTasksQueryInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -357,8 +357,7 @@ public void testTaskIdBogus() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -392,8 +391,7 @@ public void testTaskIdNonExist() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -425,8 +423,7 @@ public void testTaskIdInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -460,8 +457,7 @@ public void testTaskIdInvalid2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -495,8 +491,7 @@ public void testTaskIdInvalid3() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/WebServicesTestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/WebServicesTestUtils.java index 0454ce6832cea..c421eb9bf3464 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/WebServicesTestUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/WebServicesTestUtils.java @@ -18,10 +18,12 @@ package org.apache.hadoop.yarn.webapp; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; +import javax.ws.rs.core.Response.StatusType; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -119,4 +121,13 @@ public static void checkStringEqual(String print, String expected, String got) { got.equals(expected)); } + public static void assertResponseStatusCode(StatusType expected, + StatusType actual) { + assertResponseStatusCode(null, expected, actual); + } + + public static void assertResponseStatusCode(String errmsg, + StatusType expected, StatusType actual) { + assertEquals(errmsg, expected.getStatusCode(), actual.getStatusCode()); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java index f14e6519ead99..f68bb3848eebe 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -201,9 +202,8 @@ public void testInvalidApp() { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); - assertEquals("404 not found expected", - Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode("404 not found expected", + Status.NOT_FOUND, response.getStatusInfo()); } @Test @@ -220,14 +220,11 @@ public void testInvalidAttempt() { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } - assertEquals("404 not found expected", - Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode("404 not found expected", + Status.NOT_FOUND, response.getStatusInfo()); } @Test @@ -247,14 +244,11 @@ public void testInvalidContainer() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals( - Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } - assertEquals("404 not found expected", - Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode("404 not found expected", + Status.NOT_FOUND, response.getStatusInfo()); } @Test @@ -269,8 +263,7 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); @@ -287,8 +280,7 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -306,8 +298,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -394,8 +386,7 @@ public void testMultipleAttempts() throws Exception { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); if (round == 1) { - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -421,8 +412,7 @@ public void testSingleAttempt() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -451,8 +441,7 @@ public void testMultipleContainers() throws Exception { .queryParam("user.name", USERS[round]) .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); if (round == 1) { - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); @@ -480,8 +469,7 @@ public void testSingleContainer() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); if (round == 1) { - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); return; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java index 7cc846252dcec..0bb56e761b832 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.timeline.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; @@ -476,8 +477,7 @@ public void testPostEntities() throws Exception { .type(MediaType.APPLICATION_JSON) .post(ClientResponse.class, entities); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); response = r.path("ws").path("v1").path("timeline") .queryParam("user.name", "tester") @@ -518,8 +518,7 @@ public void testPostIncompleteEntities() throws Exception { .queryParam("user.name", "tester").accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON).post(ClientResponse.class, entities); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); } @Test @@ -702,8 +701,7 @@ public void testGetEntityWithYarnACLsEnabled() throws Exception { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } @@ -868,8 +866,7 @@ public void testGetDomainYarnACLsEnabled() { .accept(MediaType.APPLICATION_JSON) .get(ClientResponse.class); Assert.assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - Assert.assertEquals(ClientResponse.Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } @@ -937,8 +934,7 @@ public void testPutDomain() throws Exception { .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(ClientResponse.Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); response = r.path("ws").path("v1") .path("timeline").path("domain") @@ -946,8 +942,8 @@ public void testPutDomain() throws Exception { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.OK.getStatusCode(), response.getStatus()); - + assertResponseStatusCode(Status.OK, response.getStatusInfo()); + // Verify the domain exists response = r.path("ws").path("v1").path("timeline") .path("domain").path("test_domain_id") @@ -968,7 +964,7 @@ public void testPutDomain() throws Exception { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.OK.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); // Verify the domain is updated response = r.path("ws").path("v1").path("timeline") @@ -996,7 +992,7 @@ public void testPutDomainYarnACLsEnabled() throws Exception { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.OK.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); // Update the domain by another user response = r.path("ws").path("v1") @@ -1005,7 +1001,7 @@ public void testPutDomainYarnACLsEnabled() throws Exception { .accept(MediaType.APPLICATION_JSON) .type(MediaType.APPLICATION_JSON) .put(ClientResponse.class, domain); - assertEquals(Status.FORBIDDEN.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } finally { timelineACLsManager.setAdminACLsManager(oldAdminACLsManager); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index 954ef15361fd7..b8764f24190b9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -186,8 +187,7 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -203,8 +203,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -219,8 +219,7 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -416,7 +415,7 @@ public void testContainerLogs() throws IOException { response = r.path("ws").path("v1").path("node") .path("containerlogs").path(containerIdStr).path("uhhh") .accept(MediaType.TEXT_PLAIN).get(ClientResponse.class); - Assert.assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); responseText = response.getEntity(String.class); assertTrue(responseText.contains("Cannot find this log on the local disk.")); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java index dbfdb951ab4f4..63607902747b2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -313,8 +314,7 @@ public void testNodeAppsUserEmpty() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -398,8 +398,7 @@ public void testNodeAppsStateInvalid() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -429,8 +428,7 @@ public void testNodeAppsStateInvalidDefault() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -461,8 +459,7 @@ public void testNodeAppsStateInvalidXML() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); @@ -557,8 +554,7 @@ public void testNodeSingleAppsInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -595,8 +591,7 @@ public void testNodeSingleAppsMissing() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java index 80f4e24dececa..7793975628539 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.apache.hadoop.yarn.util.StringHelper.ujoin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -333,8 +334,7 @@ public void testSingleContainerInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -368,8 +368,7 @@ public void testSingleContainerInvalid2() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -403,8 +402,7 @@ public void testSingleContainerWrong() throws JSONException, Exception { fail("should have thrown exception on invalid user query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index adc2a0085c639..18cb31ccac59c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -158,8 +159,7 @@ public void testInvalidUri() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); @@ -175,8 +175,7 @@ public void testInvalidUri2() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } @@ -192,8 +191,8 @@ public void testInvalidAccept() throws JSONException, Exception { fail("should have thrown exception on invalid uri"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.INTERNAL_SERVER_ERROR, + response.getStatusInfo()); WebServicesTestUtils.checkStringMatch( "error string exists and shouldn't", "", responseStr); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 01b6055adf94d..b5bfbe43866b5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -386,8 +387,7 @@ public void testAppsQueryStatesInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -424,8 +424,7 @@ public void testAppsQueryStateInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -504,8 +503,7 @@ public void testAppsQueryFinalStatusInvalid() throws JSONException, Exception { fail("should have thrown exception on invalid state query"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1073,8 +1071,7 @@ public void testAppStatistics() throws JSONException, Exception { .path("appstatistics") .queryParam("applicationTypes", "MAPREDUCE,OTHER") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); @@ -1121,8 +1118,7 @@ public void testAppStatistics() throws JSONException, Exception { response = r.path("ws").path("v1").path("cluster") .path("appstatistics").queryParam("states", "wrong_state") .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); @@ -1190,8 +1186,7 @@ public void testInvalidApp() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1229,8 +1224,7 @@ public void testNonexistApp() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); @@ -1522,8 +1516,7 @@ public void testInvalidAppIdGetAttempts() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -1600,8 +1593,7 @@ public void testNonexistAppAttempts() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index b7887332660ce..92513c5973dda 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; @@ -340,8 +341,7 @@ public void testSingleAppState() throws Exception { this .constructWebResource("apps", app.getApplicationId().toString(), "state").accept(mediaType).get(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.ACCEPTED); } else if (mediaType.equals(MediaType.APPLICATION_XML)) { @@ -380,12 +380,11 @@ public void testSingleAppKill() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.ACCEPTED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.ACCEPTED, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppStateJson(response, RMAppState.FINAL_SAVING, RMAppState.KILLED, RMAppState.KILLING, RMAppState.ACCEPTED); @@ -402,8 +401,7 @@ public void testSingleAppKill() throws Exception { tmp = tmp.queryParam("user.name", webserviceUserName); } response = tmp.get(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); assertTrue(locationHeaderValue.endsWith("/ws/v1/cluster/apps/" + app.getApplicationId().toString() + "/state")); @@ -469,12 +467,12 @@ public void testSingleAppKillInvalidState() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, + response.getStatusInfo()); } } } @@ -588,8 +586,8 @@ public void testSingleAppKillInvalidId() throws Exception { .accept(MediaType.APPLICATION_XML) .entity(info, MediaType.APPLICATION_XML).put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } if (i == 0) { @@ -644,11 +642,11 @@ public void validateResponseStatus(ClientResponse response, public void validateResponseStatus(ClientResponse response, Status expectedUnauthorizedMode, Status expectedAuthorizedMode) { if (!isAuthenticationEnabled()) { - assertEquals(expectedUnauthorizedMode.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(expectedUnauthorizedMode, + response.getStatusInfo()); } else { - assertEquals(expectedAuthorizedMode.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(expectedAuthorizedMode, + response.getStatusInfo()); } } @@ -850,12 +848,10 @@ public void testAppSubmit(String acceptMedia, String contentMedia) .entity(appInfo, contentMedia).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return; } - assertEquals(Status.ACCEPTED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.ACCEPTED, response.getStatusInfo()); assertTrue(!response.getHeaders().getFirst(HttpHeaders.LOCATION).isEmpty()); String locURL = response.getHeaders().getFirst(HttpHeaders.LOCATION); assertTrue(locURL.contains("/apps/application")); @@ -864,8 +860,7 @@ public void testAppSubmit(String acceptMedia, String contentMedia) WebResource res = resource().uri(new URI(locURL)); res = res.queryParam("user.name", webserviceUserName); response = res.get(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); RMApp app = rm.getRMContext().getRMApps() @@ -924,8 +919,7 @@ public void testAppSubmit(String acceptMedia, String contentMedia) response = this.constructWebResource("apps", appId).accept(acceptMedia) .get(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); } public void testAppSubmitErrors(String acceptMedia, String contentMedia) @@ -1013,8 +1007,7 @@ public void testAppSubmitBadJsonAndXML() throws Exception { ClientResponse response = this.constructWebResource(urlPath).accept(MediaType.APPLICATION_XML) .entity(body, MediaType.APPLICATION_XML).post(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); body = "{\"a\" : \"b\"}"; response = this.constructWebResource(urlPath).accept(MediaType.APPLICATION_XML) @@ -1039,8 +1032,7 @@ public void testGetAppQueue() throws Exception { this .constructWebResource("apps", app.getApplicationId().toString(), "queue").accept(contentType).get(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); String expectedQueue = "default"; if(!isCapacityScheduler) { expectedQueue = "root." + webserviceUserName; @@ -1105,12 +1097,11 @@ public void testUpdateAppPriority() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppPriorityJson(response, modifiedPriority); } else { @@ -1121,8 +1112,7 @@ public void testUpdateAppPriority() throws Exception { .constructWebResource("apps", app.getApplicationId().toString(), "priority") .accept(mediaType).get(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); if (mediaType.equals(MediaType.APPLICATION_JSON)) { verifyAppPriorityJson(response, modifiedPriority); } else { @@ -1137,8 +1127,7 @@ public void testUpdateAppPriority() throws Exception { "priority") .entity(entity, contentType).accept(mediaType) .put(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } } rm.stop(); @@ -1188,12 +1177,11 @@ public void testAppMove() throws Exception { .put(ClientResponse.class); if (!isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, + response.getStatusInfo()); continue; } - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); String expectedQueue = "test"; if(!isCapacityScheduler) { expectedQueue = "root.test"; @@ -1213,8 +1201,7 @@ public void testAppMove() throws Exception { .constructWebResource("apps", app.getApplicationId().toString(), "queue").entity(entity, contentType).accept(mediaType) .put(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); if(isCapacityScheduler) { Assert.assertEquals("default", app.getQueue()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index f2da930d0adf5..7e444a4d7472b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -18,6 +18,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; + import java.io.File; import java.io.IOException; import java.io.StringReader; @@ -296,8 +298,7 @@ private void verifySimpleAuthCreate(String mediaType, String contentType, .path("delegation-token").queryParam("user.name", "testuser") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } private void verifyKerberosAuthCreate(String mType, String cType, @@ -313,8 +314,7 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(body, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); Token token = @@ -327,8 +327,7 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); token = new Token(); @@ -369,8 +368,7 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dummyToken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); assertFalse(tok.getToken().isEmpty()); String body = generateRenewTokenBody(mediaType, tok.getToken()); @@ -380,8 +378,8 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, tok.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, + response.getStatusInfo()); return tok; } }); @@ -401,8 +399,7 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); String message = "Expiration time not as expected: old = " + oldExpirationTime @@ -417,8 +414,7 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); tok = getDelegationTokenFromResponse(response); message = "Expiration time not as expected: old = " + oldExpirationTime @@ -440,8 +436,8 @@ public DelegationToken call() throws Exception { .header(yarnTokenHeader, responseToken.getToken()) .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, + response.getStatusInfo()); return null; } }); @@ -467,8 +463,8 @@ public Void call() throws Exception { .path("delegation-token").path("expiration") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, + response.getStatusInfo()); return null; } }); @@ -497,8 +493,7 @@ private void verifySimpleAuthRenew(String mediaType, String contentType) { .path("delegation-token").queryParam("user.name", "testuser") .accept(contentType).entity(body, mediaType) .post(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } // Test to verify cancel functionality - create a token and then try to cancel @@ -528,16 +523,14 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); response = resource().path("ws").path("v1").path("cluster") .path("delegation-token") .header(yarnTokenHeader, tok.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); assertTokenCancelled(tok.getToken()); return null; } @@ -552,8 +545,7 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -567,8 +559,7 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()) .accept(contentType).delete(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); assertTokenCancelled(tmpToken.getToken()); return null; } @@ -583,8 +574,7 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -598,8 +588,8 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, tmpToken2.getToken()) .accept(contentType).delete(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, + response.getStatusInfo()); assertValidRMToken(tmpToken2.getToken()); return null; } @@ -631,8 +621,7 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, "random-string").accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); return null; } }); @@ -645,8 +634,7 @@ public Void call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); return null; } @@ -661,8 +649,7 @@ public DelegationToken call() throws Exception { resource().path("ws").path("v1").path("cluster") .path("delegation-token").accept(contentType) .entity(dtoken, mediaType).post(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); DelegationToken tok = getDelegationTokenFromResponse(response); return tok; } @@ -676,15 +663,13 @@ public Void call() throws Exception { .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); response = resource().path("ws").path("v1").path("cluster") .path("delegation-token") .header(yarnTokenHeader, tmpToken.getToken()).accept(contentType) .delete(ClientResponse.class); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); return null; } }); @@ -697,8 +682,7 @@ private void verifySimpleAuthCancel() { .path("delegation-token").queryParam("user.name", "testuser") .header(RMWebServices.DELEGATION_TOKEN_HEADER, "random") .delete(ClientResponse.class); - assertEquals(Status.FORBIDDEN.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo()); } private DelegationToken diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 23c11c9acbe67..aa616d354f8ec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -242,8 +243,7 @@ public void testNodesQueryStateInvalid() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); @@ -435,8 +435,7 @@ public void testNonexistNode() throws JSONException, Exception { fail("should have thrown exception on non-existent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -462,8 +461,7 @@ public void testNonexistNodeDefault() throws JSONException, Exception { fail("should have thrown exception on non-existent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); @@ -489,8 +487,7 @@ public void testNonexistNodeXML() throws JSONException, Exception { fail("should have thrown exception on non-existent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_XML_TYPE, response.getType()); String msg = response.getEntity(String.class); System.out.println(msg); @@ -533,8 +530,7 @@ public void testInvalidNode() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 175f3c49acc17..a2a78a802b8ee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -1021,8 +1022,7 @@ private ClientResponse submitAndVerifyReservation(String path, String media, .accept(media).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return null; } @@ -1056,15 +1056,13 @@ private void updateReservationTestHelper(String path, .accept(media).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return; } System.out.println("RESPONSE:" + response); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); } @@ -1107,15 +1105,13 @@ private void testDeleteReservationHelper(String path, .accept(media).post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return; } System.out.println("RESPONSE:" + response); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(Status.OK.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.OK, response.getStatusInfo()); } private void testRDLHelper(JSONObject json) throws JSONException { @@ -1140,14 +1136,12 @@ private JSONObject testListReservationHelper(WebResource resource, Status ClientResponse response = resource.get(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return null; } assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); - assertEquals(status.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(status, response.getStatusInfo()); return response.getEntity(JSONObject.class); } From 01f74ec3e43be9a3536dde2ad9f2640d7a4055d4 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 10 May 2016 07:22:27 -0700 Subject: [PATCH 08/15] v16 Signed-off-by: Tsuyoshi Ozawa --- .../webapp/TestRMWebServicesAppsModification.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 92513c5973dda..1bbc54743cc3c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -591,11 +591,11 @@ public void testSingleAppKillInvalidId() throws Exception { continue; } if (i == 0) { - assertEquals(Status.NOT_FOUND.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.NOT_FOUND, + response.getStatusInfo()); } else { - assertEquals(Status.BAD_REQUEST.getStatusCode(), - response.getStatusInfo().getStatusCode()); + assertResponseStatusCode(Status.BAD_REQUEST, + response.getStatusInfo()); } } rm.stop(); From 52dccd8cd345ae41d9403a1aaed160642a27f467 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 10 May 2016 15:05:27 -0700 Subject: [PATCH 09/15] Fixed TestRMWebServicesNodeLabels and TestRMWithCSRFFilter Signed-off-by: Tsuyoshi Ozawa --- .../webapp/TestRMWebServicesNodeLabels.java | 6 +++++- .../yarn/webapp/TestRMWithCSRFFilter.java | 21 +++---------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 78a4a6080a7d5..0a93d07fe72fb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -47,6 +47,7 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import com.google.inject.Guice; @@ -99,7 +100,10 @@ protected void configureServlets() { } }; - static { + @Override + @Before + public void setUp() throws Exception { + super.setUp(); GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java index 2efbd2d16fcd3..af3ddb74b60a4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java @@ -19,12 +19,9 @@ package org.apache.hadoop.yarn.webapp; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse.Status; -import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import com.sun.jersey.test.framework.WebAppDescriptor; @@ -33,7 +30,6 @@ import org.apache.hadoop.service.Service.STATE; import org.apache.hadoop.util.VersionInfo; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.server.resourcemanager.ClusterMetrics; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; @@ -41,10 +37,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver; import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices; import org.apache.hadoop.yarn.util.YarnVersionInfo; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -60,7 +53,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * Used TestRMWebServices as an example of web invocations of RM and added @@ -70,7 +62,7 @@ public class TestRMWithCSRFFilter extends JerseyTestBase { private static MockRM rm; - private Injector injector = Guice.createInjector(new ServletModule() { + private static class WebServletModule extends ServletModule { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -89,20 +81,13 @@ protected void configureServlets() { "OPTIONS,HEAD,TRACE"); filter("/*").through(csrfFilter, initParams); } - }); - - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } + }; @Before @Override public void setUp() throws Exception { super.setUp(); + GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); } public TestRMWithCSRFFilter() { From 3b32fda8277c9c1f23840ea8422558d72da0d7c2 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Wed, 11 May 2016 06:45:28 -0700 Subject: [PATCH 10/15] v17 Signed-off-by: Tsuyoshi Ozawa --- .../yarn/server/timeline/webapp/TestTimelineWebServices.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java index 0bb56e761b832..e67c195333e4b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java @@ -85,6 +85,7 @@ public class TestTimelineWebServices extends JerseyTestBase { private static long beforeTime; private static class WebServletModule extends ServletModule { + @SuppressWarnings("unchecked") @Override protected void configureServlets() { bind(YarnJacksonJaxbJsonProvider.class); From 64f53596f7582bcab397cab516f2a738054958ea Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Thu, 16 Jun 2016 23:24:32 +0900 Subject: [PATCH 11/15] v18 Signed-off-by: Tsuyoshi Ozawa --- .../yarn/webapp/GuiceServletConfig.java | 7 ++ .../TestRMWebServicesCapacitySched.java | 43 ++++++------ .../TestRMWebServicesForCSWithPartitions.java | 68 +++++++++---------- 3 files changed, 63 insertions(+), 55 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java index fb9602112037d..9eaf629f6923a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java @@ -20,6 +20,13 @@ import com.google.inject.Injector; import com.google.inject.servlet.GuiceServletContextListener; +/** + * GuiceServletConfig is a wrapper class to have a static Injector instance + * instead of having the instance inside test classes. This allow us to use + * Jersey test framework after 1.13. + * Please check test cases to know how to use this class: + * e.g. TestRMWithCSRFFilter.java + */ public class GuiceServletConfig extends GuiceServletContextListener { public static Injector injector = null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index cba5e8425f2c0..e5380dbe4a7fc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -110,45 +110,46 @@ protected void configureServlets() { } private static void setupQueueConfiguration( - CapacitySchedulerConfiguration conf) { + CapacitySchedulerConfiguration config) { // Define top-level queues - conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { "a", "b" }); + config.setQueues(CapacitySchedulerConfiguration.ROOT, + new String[] { "a", "b" }); final String A = CapacitySchedulerConfiguration.ROOT + ".a"; - conf.setCapacity(A, 10.5f); - conf.setMaximumCapacity(A, 50); + config.setCapacity(A, 10.5f); + config.setMaximumCapacity(A, 50); final String B = CapacitySchedulerConfiguration.ROOT + ".b"; - conf.setCapacity(B, 89.5f); + config.setCapacity(B, 89.5f); // Define 2nd-level queues final String A1 = A + ".a1"; final String A2 = A + ".a2"; - conf.setQueues(A, new String[] { "a1", "a2" }); - conf.setCapacity(A1, 30); - conf.setMaximumCapacity(A1, 50); + config.setQueues(A, new String[] { "a1", "a2" }); + config.setCapacity(A1, 30); + config.setMaximumCapacity(A1, 50); - conf.setUserLimitFactor(A1, 100.0f); - conf.setCapacity(A2, 70); - conf.setUserLimitFactor(A2, 100.0f); + config.setUserLimitFactor(A1, 100.0f); + config.setCapacity(A2, 70); + config.setUserLimitFactor(A2, 100.0f); final String B1 = B + ".b1"; final String B2 = B + ".b2"; final String B3 = B + ".b3"; - conf.setQueues(B, new String[] { "b1", "b2", "b3" }); - conf.setCapacity(B1, 60); - conf.setUserLimitFactor(B1, 100.0f); - conf.setCapacity(B2, 39.5f); - conf.setUserLimitFactor(B2, 100.0f); - conf.setCapacity(B3, 0.5f); - conf.setUserLimitFactor(B3, 100.0f); + config.setQueues(B, new String[] { "b1", "b2", "b3" }); + config.setCapacity(B1, 60); + config.setUserLimitFactor(B1, 100.0f); + config.setCapacity(B2, 39.5f); + config.setUserLimitFactor(B2, 100.0f); + config.setCapacity(B3, 0.5f); + config.setUserLimitFactor(B3, 100.0f); - conf.setQueues(A1, new String[] {"a1a", "a1b"}); + config.setQueues(A1, new String[] {"a1a", "a1b"}); final String A1A = A1 + ".a1a"; - conf.setCapacity(A1A, 85); + config.setCapacity(A1A, 85); final String A1B = A1 + ".a1b"; - conf.setCapacity(A1B, 15); + config.setCapacity(A1B, 15); } @Before diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index e24b9849e6109..f79674aafb45f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -112,60 +112,60 @@ protected void configureServlets() { } private static void setupQueueConfiguration( - CapacitySchedulerConfiguration conf, ResourceManager rm) { + CapacitySchedulerConfiguration config, ResourceManager rm) { // Define top-level queues - conf.setQueues(CapacitySchedulerConfiguration.ROOT, + config.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { QUEUE_A, QUEUE_B, QUEUE_C }); String interMediateQueueC = CapacitySchedulerConfiguration.ROOT + "." + QUEUE_C; - conf.setQueues(interMediateQueueC, + config.setQueues(interMediateQueueC, new String[] { LEAF_QUEUE_C1, LEAF_QUEUE_C2 }); - conf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, LABEL_LX, 100); - conf.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, LABEL_LY, 100); + config.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, LABEL_LX, 100); + config.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, LABEL_LY, 100); String leafQueueA = CapacitySchedulerConfiguration.ROOT + "." + QUEUE_A; - conf.setCapacity(leafQueueA, 30); - conf.setMaximumCapacity(leafQueueA, 50); + config.setCapacity(leafQueueA, 30); + config.setMaximumCapacity(leafQueueA, 50); String leafQueueB = CapacitySchedulerConfiguration.ROOT + "." + QUEUE_B; - conf.setCapacity(leafQueueB, 30); - conf.setMaximumCapacity(leafQueueB, 50); + config.setCapacity(leafQueueB, 30); + config.setMaximumCapacity(leafQueueB, 50); - conf.setCapacity(interMediateQueueC, 40); - conf.setMaximumCapacity(interMediateQueueC, 50); + config.setCapacity(interMediateQueueC, 40); + config.setMaximumCapacity(interMediateQueueC, 50); String leafQueueC1 = interMediateQueueC + "." + LEAF_QUEUE_C1; - conf.setCapacity(leafQueueC1, 50); - conf.setMaximumCapacity(leafQueueC1, 60); + config.setCapacity(leafQueueC1, 50); + config.setMaximumCapacity(leafQueueC1, 60); String leafQueueC2 = interMediateQueueC + "." + LEAF_QUEUE_C2; - conf.setCapacity(leafQueueC2, 50); - conf.setMaximumCapacity(leafQueueC2, 70); + config.setCapacity(leafQueueC2, 50); + config.setMaximumCapacity(leafQueueC2, 70); // Define label specific configuration - conf.setAccessibleNodeLabels(leafQueueA, ImmutableSet.of(DEFAULT_PARTITION)); - conf.setAccessibleNodeLabels(leafQueueB, ImmutableSet.of(LABEL_LX)); - conf.setAccessibleNodeLabels(interMediateQueueC, + config.setAccessibleNodeLabels(leafQueueA, ImmutableSet.of(DEFAULT_PARTITION)); + config.setAccessibleNodeLabels(leafQueueB, ImmutableSet.of(LABEL_LX)); + config.setAccessibleNodeLabels(interMediateQueueC, ImmutableSet.of(LABEL_LX, LABEL_LY)); - conf.setAccessibleNodeLabels(leafQueueC1, + config.setAccessibleNodeLabels(leafQueueC1, ImmutableSet.of(LABEL_LX, LABEL_LY)); - conf.setAccessibleNodeLabels(leafQueueC2, + config.setAccessibleNodeLabels(leafQueueC2, ImmutableSet.of(LABEL_LX, LABEL_LY)); - conf.setDefaultNodeLabelExpression(leafQueueB, LABEL_LX); - conf.setDefaultNodeLabelExpression(leafQueueC1, LABEL_LX); - conf.setDefaultNodeLabelExpression(leafQueueC2, LABEL_LY); - - conf.setCapacityByLabel(leafQueueB, LABEL_LX, 30); - conf.setCapacityByLabel(interMediateQueueC, LABEL_LX, 70); - conf.setCapacityByLabel(leafQueueC1, LABEL_LX, 40); - conf.setCapacityByLabel(leafQueueC2, LABEL_LX, 60); - - conf.setCapacityByLabel(interMediateQueueC, LABEL_LY, 100); - conf.setCapacityByLabel(leafQueueC1, LABEL_LY, 50); - conf.setCapacityByLabel(leafQueueC2, LABEL_LY, 50); - conf.setMaximumCapacityByLabel(leafQueueC1, LABEL_LY, 75); - conf.setMaximumCapacityByLabel(leafQueueC2, LABEL_LY, 75); + config.setDefaultNodeLabelExpression(leafQueueB, LABEL_LX); + config.setDefaultNodeLabelExpression(leafQueueC1, LABEL_LX); + config.setDefaultNodeLabelExpression(leafQueueC2, LABEL_LY); + + config.setCapacityByLabel(leafQueueB, LABEL_LX, 30); + config.setCapacityByLabel(interMediateQueueC, LABEL_LX, 70); + config.setCapacityByLabel(leafQueueC1, LABEL_LX, 40); + config.setCapacityByLabel(leafQueueC2, LABEL_LX, 60); + + config.setCapacityByLabel(interMediateQueueC, LABEL_LY, 100); + config.setCapacityByLabel(leafQueueC1, LABEL_LY, 50); + config.setCapacityByLabel(leafQueueC2, LABEL_LY, 50); + config.setMaximumCapacityByLabel(leafQueueC1, LABEL_LY, 75); + config.setMaximumCapacityByLabel(leafQueueC2, LABEL_LY, 75); } @Before From 542e1c9ef3635631795844989fe9a7aca6e55689 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 20 Jun 2016 17:36:54 +0900 Subject: [PATCH 12/15] Introcuding GuiceServletConfig.setInjector Signed-off-by: Tsuyoshi Ozawa --- .../v2/app/webapp/TestAMWebServices.java | 6 +++-- .../app/webapp/TestAMWebServicesAttempt.java | 6 +++-- .../app/webapp/TestAMWebServicesAttempts.java | 6 +++-- .../app/webapp/TestAMWebServicesJobConf.java | 6 +++-- .../v2/app/webapp/TestAMWebServicesJobs.java | 6 +++-- .../v2/app/webapp/TestAMWebServicesTasks.java | 6 +++-- .../v2/hs/webapp/TestHsWebServices.java | 6 +++-- .../hs/webapp/TestHsWebServicesAttempts.java | 6 +++-- .../hs/webapp/TestHsWebServicesJobConf.java | 6 +++-- .../v2/hs/webapp/TestHsWebServicesJobs.java | 10 +++++---- .../hs/webapp/TestHsWebServicesJobsQuery.java | 6 +++-- .../v2/hs/webapp/TestHsWebServicesTasks.java | 6 +++-- .../yarn/webapp/GuiceServletConfig.java | 7 +++++- .../webapp/TestAHSWebServices.java | 6 +++-- .../webapp/TestTimelineWebServices.java | 6 +++-- .../nodemanager/webapp/TestNMWebServices.java | 6 +++-- .../webapp/TestNMWebServicesApps.java | 6 +++-- .../webapp/TestNMWebServicesContainers.java | 6 +++-- .../webapp/TestRMWebServices.java | 8 +++---- .../webapp/TestRMWebServicesApps.java | 8 ++++--- .../TestRMWebServicesAppsModification.java | 8 +++---- .../TestRMWebServicesCapacitySched.java | 6 +++-- .../TestRMWebServicesDelegationTokens.java | 4 ++-- .../TestRMWebServicesFairScheduler.java | 6 +++-- .../TestRMWebServicesForCSWithPartitions.java | 6 +++-- .../webapp/TestRMWebServicesNodeLabels.java | 3 ++- .../webapp/TestRMWebServicesNodes.java | 6 +++-- .../webapp/TestRMWebServicesReservation.java | 22 ++++++++----------- .../yarn/webapp/TestRMWithCSRFFilter.java | 3 ++- .../yarn/webapp/TestRMWithXFSFilter.java | 19 ++-------------- 30 files changed, 122 insertions(+), 90 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java index 075d41124c349..1fb6a08ab40ee 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java @@ -87,14 +87,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestAMWebServices() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java index 9ac77b27d9055..68bb964976655 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java @@ -112,14 +112,16 @@ protected Properties getConfiguration(String configPrefix, } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestAMWebServicesAttempt() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java index 7ba82a827908e..9f2e1b14cb859 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java @@ -96,14 +96,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestAMWebServicesAttempts() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java index 4a6a6f1d4f031..a7958a96e25c9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java @@ -120,7 +120,8 @@ protected void configureServlets() { }; static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @@ -128,7 +129,8 @@ protected void configureServlets() { public void setUp() throws Exception { super.setUp(); testConfDir.mkdir(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @AfterClass diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java index 055bf52409de3..128bb5ac1c6cd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java @@ -97,14 +97,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestAMWebServicesJobs() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java index 63cbdb2b7db89..b9bcc0143bcee 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java @@ -93,14 +93,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestAMWebServicesTasks() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java index 8f4cacb3d1c8c..b9b45afc96edc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServices.java @@ -91,14 +91,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestHsWebServices() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java index 0178d4f1a350a..f7b137fc6018a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java @@ -105,14 +105,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestHsWebServicesAttempts() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java index 65722e668910c..a22230289a965 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobConf.java @@ -130,7 +130,8 @@ protected void configureServlets() { }; static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @@ -138,7 +139,8 @@ protected void configureServlets() { public void setUp() throws Exception { super.setUp(); testConfDir.mkdir(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @AfterClass diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java index 6950aeee82844..b2df3c624b05d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java @@ -102,14 +102,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestHsWebServicesJobs() { @@ -522,7 +524,7 @@ public void testJobCountersSlash() throws JSONException, Exception { public void testJobCountersForKilledJob() throws Exception { WebResource r = resource(); appContext = new MockHistoryContext(0, 1, 1, 1, true); - GuiceServletConfig.injector = Guice.createInjector(new ServletModule() { + GuiceServletConfig.setInjector(Guice.createInjector(new ServletModule() { @Override protected void configureServlets() { @@ -539,7 +541,7 @@ protected void configureServlets() { serve("/*").with(GuiceContainer.class); } - }); + })); Map jobsMap = appContext.getAllJobs(); for (JobId id : jobsMap.keySet()) { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java index 42837ca40c5a5..343fa6debd5b0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobsQuery.java @@ -90,14 +90,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestHsWebServicesJobsQuery() { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java index f21d40159b8b2..c05c15117e18e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesTasks.java @@ -102,14 +102,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestHsWebServicesTasks() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java index 9eaf629f6923a..f571138ff3c4b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java @@ -29,10 +29,15 @@ */ public class GuiceServletConfig extends GuiceServletContextListener { - public static Injector injector = null; + private static Injector injector = null; @Override protected Injector getInjector() { return injector; } + + public static Injector setInjector(Injector in) { + injector = in; + return injector; + } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java index f68bb3848eebe..3428323584fd1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java @@ -133,7 +133,8 @@ protected void serviceStart() throws Exception { historyClientService.start(); ahsWebservice = new AHSWebServices(historyClientService, conf); fs = FileSystem.get(conf); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @AfterClass @@ -165,7 +166,8 @@ protected void configureServlets() { @Before public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Singleton diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java index e67c195333e4b..6fd39dc4cf134 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/webapp/TestTimelineWebServices.java @@ -149,13 +149,15 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } private static TimelineStore mockTimelineStore() diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java index b8764f24190b9..75619f17857bd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServices.java @@ -151,7 +151,8 @@ public boolean isPmemCheckEnabled() { }; static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @@ -160,7 +161,8 @@ public void setUp() throws Exception { super.setUp(); testRootDir.mkdirs(); testLogDir.mkdir(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @AfterClass diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java index 63607902747b2..1c34b44d82186 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java @@ -149,14 +149,16 @@ public boolean isPmemCheckEnabled() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); testRootDir.mkdirs(); testLogDir.mkdir(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java index 7793975628539..bec448de4aec4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java @@ -160,14 +160,16 @@ public int getHttpPort() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); testRootDir.mkdirs(); testLogDir.mkdir(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index 18cb31ccac59c..082d043994776 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -42,9 +42,7 @@ import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.io.TwoDArrayWritable; import org.apache.hadoop.service.Service.STATE; -import org.apache.hadoop.test.GenericTestUtils.SleepAnswer; import org.apache.hadoop.util.VersionInfo; import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest; import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse; @@ -111,14 +109,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServices() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index b5bfbe43866b5..4f99c5cad4b75 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -94,14 +94,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesApps() { @@ -1555,7 +1557,7 @@ public void testInvalidAppAttemptId() throws JSONException, Exception { } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); - assertEquals(Status.BAD_REQUEST, response.getClientResponseStatus()); + assertResponseStatusCode(Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject msg = response.getEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 1bbc54743cc3c..53ef031da8b2e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -290,19 +290,19 @@ public TestRMWebServicesAppsModification(int run) { case 0: default: // No Auth Capacity Scheduler - GuiceServletConfig.injector = getNoAuthInjectorCap(); + GuiceServletConfig.setInjector(getNoAuthInjectorCap()); break; case 1: // Simple Auth Capacity Scheduler - GuiceServletConfig.injector = getSimpleAuthInjectorCap(); + GuiceServletConfig.setInjector(getSimpleAuthInjectorCap()); break; case 2: // No Auth Fair Scheduler - GuiceServletConfig.injector = getNoAuthInjectorFair(); + GuiceServletConfig.setInjector(getNoAuthInjectorFair()); break; case 3: // Simple Auth Fair Scheduler - GuiceServletConfig.injector = getSimpleAuthInjectorFair(); + GuiceServletConfig.setInjector(getSimpleAuthInjectorFair()); break; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index e5380dbe4a7fc..8e0f26b9df328 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -106,7 +106,8 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } private static void setupQueueConfiguration( @@ -156,7 +157,8 @@ private static void setupQueueConfiguration( @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesCapacitySched() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index 7e444a4d7472b..fe01d280bc1d6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -215,10 +215,10 @@ public TestRMWebServicesDelegationTokens(int run) throws Exception { switch (run) { case 0: default: - GuiceServletConfig.injector = getKerberosAuthInjector(); + GuiceServletConfig.setInjector(getKerberosAuthInjector()); break; case 1: - GuiceServletConfig.injector = getSimpleAuthInjector(); + GuiceServletConfig.setInjector(getSimpleAuthInjector()); break; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java index 59980fd4775f7..cbe360a412fed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java @@ -65,14 +65,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesFairScheduler() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index f79674aafb45f..d3594c9c01b7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -108,7 +108,8 @@ protected void configureServlets() { }; static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } private static void setupQueueConfiguration( @@ -172,7 +173,8 @@ private static void setupQueueConfiguration( @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesForCSWithPartitions() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 0a93d07fe72fb..0cfaac19b7919 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -104,7 +104,8 @@ protected void configureServlets() { @Before public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesNodeLabels() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index aa616d354f8ec..718091fed3863 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -94,14 +94,16 @@ protected void configureServlets() { } static { - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } @Before @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWebServicesNodes() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index a2a78a802b8ee..50a2839fac2d7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -243,27 +243,23 @@ protected void configureServlets() { } private Injector initNoAuthInjectorCap() { - GuiceServletConfig.injector = - Guice.createInjector(new NoAuthServletModule()); - return GuiceServletConfig.injector; + return GuiceServletConfig.setInjector( + Guice.createInjector(new NoAuthServletModule())); } private Injector initSimpleAuthInjectorCap() { - GuiceServletConfig.injector = - Guice.createInjector(new SimpleAuthServletModule()); - return GuiceServletConfig.injector; + return GuiceServletConfig.setInjector( + Guice.createInjector(new SimpleAuthServletModule())); } private Injector initNoAuthInjectorFair() { - GuiceServletConfig.injector = - Guice.createInjector(new FairNoAuthServletModule()); - return GuiceServletConfig.injector; + return GuiceServletConfig.setInjector( + Guice.createInjector(new FairNoAuthServletModule())); } private Injector initSimpleAuthInjectorFair() { - GuiceServletConfig.injector = - Guice.createInjector(new FairSimpleAuthServletModule()); - return GuiceServletConfig.injector; + return GuiceServletConfig.setInjector( + Guice.createInjector(new FairSimpleAuthServletModule())); } @Parameters @@ -968,7 +964,7 @@ private ReservationId getReservationIdTestHelper(int fallbackReservationId) .post(ClientResponse.class); if (!this.isAuthenticationEnabled()) { - assertEquals(Status.UNAUTHORIZED, response.getClientResponseStatus()); + assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); return ReservationId.newInstance(clock.getTime(), fallbackReservationId); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java index af3ddb74b60a4..a15d656b52244 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java @@ -87,7 +87,8 @@ protected void configureServlets() { @Override public void setUp() throws Exception { super.setUp(); - GuiceServletConfig.injector = Guice.createInjector(new WebServletModule()); + GuiceServletConfig.setInjector( + Guice.createInjector(new WebServletModule())); } public TestRMWithCSRFFilter() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithXFSFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithXFSFilter.java index a73a0ed332278..bcf2b21f8840e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithXFSFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithXFSFilter.java @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.webapp; import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.servlet.GuiceServletContextListener; import com.google.inject.servlet.ServletModule; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -52,19 +50,6 @@ public class TestRMWithXFSFilter extends JerseyTestBase { private static MockRM rm; - private Injector injector; - - /** - * - */ - public class GuiceServletConfig extends GuiceServletContextListener { - - @Override - protected Injector getInjector() { - return injector; - } - } - @Before @Override public void setUp() throws Exception { @@ -103,7 +88,7 @@ protected void createInjector() { protected void createInjector(final String headerValue, final boolean explicitlyDisabled) { - injector = Guice.createInjector(new ServletModule() { + GuiceServletConfig.setInjector(Guice.createInjector(new ServletModule() { @Override protected void configureServlets() { bind(JAXBContextResolver.class); @@ -127,7 +112,7 @@ protected void configureServlets() { filter("/*").through(xfsFilter, initParams); } - }); + })); } @Test From 09fc27ee40e5b7102905a3a140e923db9c891470 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 20 Jun 2016 17:38:07 +0900 Subject: [PATCH 13/15] Fix checkstyle. Signed-off-by: Tsuyoshi Ozawa --- .../webapp/TestRMWebServicesCapacitySched.java | 6 +++--- .../webapp/TestRMWebServicesForCSWithPartitions.java | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 8e0f26b9df328..05e570b64f0e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -115,7 +115,7 @@ private static void setupQueueConfiguration( // Define top-level queues config.setQueues(CapacitySchedulerConfiguration.ROOT, - new String[] { "a", "b" }); + new String[]{ "a", "b" }); final String A = CapacitySchedulerConfiguration.ROOT + ".a"; config.setCapacity(A, 10.5f); @@ -127,7 +127,7 @@ private static void setupQueueConfiguration( // Define 2nd-level queues final String A1 = A + ".a1"; final String A2 = A + ".a2"; - config.setQueues(A, new String[] { "a1", "a2" }); + config.setQueues(A, new String[]{ "a1", "a2" }); config.setCapacity(A1, 30); config.setMaximumCapacity(A1, 50); @@ -138,7 +138,7 @@ private static void setupQueueConfiguration( final String B1 = B + ".b1"; final String B2 = B + ".b2"; final String B3 = B + ".b3"; - config.setQueues(B, new String[] { "b1", "b2", "b3" }); + config.setQueues(B, new String[]{ "b1", "b2", "b3" }); config.setCapacity(B1, 60); config.setUserLimitFactor(B1, 100.0f); config.setCapacity(B2, 39.5f); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index d3594c9c01b7c..046cf8aa05212 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -113,7 +113,7 @@ protected void configureServlets() { } private static void setupQueueConfiguration( - CapacitySchedulerConfiguration config, ResourceManager rm) { + CapacitySchedulerConfiguration config, ResourceManager resourceManager) { // Define top-level queues config.setQueues(CapacitySchedulerConfiguration.ROOT, @@ -122,8 +122,10 @@ private static void setupQueueConfiguration( CapacitySchedulerConfiguration.ROOT + "." + QUEUE_C; config.setQueues(interMediateQueueC, new String[] { LEAF_QUEUE_C1, LEAF_QUEUE_C2 }); - config.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, LABEL_LX, 100); - config.setCapacityByLabel(CapacitySchedulerConfiguration.ROOT, LABEL_LY, 100); + config.setCapacityByLabel( + CapacitySchedulerConfiguration.ROOT, LABEL_LX, 100); + config.setCapacityByLabel( + CapacitySchedulerConfiguration.ROOT, LABEL_LY, 100); String leafQueueA = CapacitySchedulerConfiguration.ROOT + "." + QUEUE_A; config.setCapacity(leafQueueA, 30); @@ -145,7 +147,8 @@ private static void setupQueueConfiguration( config.setMaximumCapacity(leafQueueC2, 70); // Define label specific configuration - config.setAccessibleNodeLabels(leafQueueA, ImmutableSet.of(DEFAULT_PARTITION)); + config.setAccessibleNodeLabels( + leafQueueA, ImmutableSet.of(DEFAULT_PARTITION)); config.setAccessibleNodeLabels(leafQueueB, ImmutableSet.of(LABEL_LX)); config.setAccessibleNodeLabels(interMediateQueueC, ImmutableSet.of(LABEL_LX, LABEL_LY)); From af820555b3c7a999b97f0d151825b93876d2fff2 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 20 Jun 2016 18:27:19 +0900 Subject: [PATCH 14/15] Fix TestRMWebServicesReservation to use latest Jersey API Signed-off-by: Tsuyoshi Ozawa --- .../org/apache/hadoop/yarn/webapp/GuiceServletConfig.java | 8 ++++---- .../webapp/TestRMWebServicesReservation.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java index f571138ff3c4b..5ce78c057743f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/GuiceServletConfig.java @@ -29,15 +29,15 @@ */ public class GuiceServletConfig extends GuiceServletContextListener { - private static Injector injector = null; + private static Injector internalInjector = null; @Override protected Injector getInjector() { - return injector; + return internalInjector; } public static Injector setInjector(Injector in) { - injector = in; - return injector; + internalInjector = in; + return internalInjector; } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 50a2839fac2d7..5f55e34d668ac 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -1019,7 +1019,6 @@ private ClientResponse submitAndVerifyReservation(String path, String media, if (!this.isAuthenticationEnabled()) { assertResponseStatusCode(Status.UNAUTHORIZED, response.getStatusInfo()); - return null; } return response; @@ -1158,7 +1157,7 @@ private void verifyReservationCount(int count) throws Exception { } private boolean isHttpSuccessResponse(ClientResponse response) { - return (response.getStatus() / 100) == 2; + return (response.getStatusInfo().getStatusCode() / 100) == 2; } private void setupCluster(int nodes) throws Exception { From c019fa9c1ee44b7bff8226c83e2228e6494829a2 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 20 Jun 2016 23:47:05 +0900 Subject: [PATCH 15/15] fix checkstyle Signed-off-by: Tsuyoshi Ozawa --- .../webapp/TestRMWebServicesCapacitySched.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 05e570b64f0e2..649d7192bc745 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -115,7 +115,7 @@ private static void setupQueueConfiguration( // Define top-level queues config.setQueues(CapacitySchedulerConfiguration.ROOT, - new String[]{ "a", "b" }); + new String[] {"a", "b"}); final String A = CapacitySchedulerConfiguration.ROOT + ".a"; config.setCapacity(A, 10.5f); @@ -127,7 +127,7 @@ private static void setupQueueConfiguration( // Define 2nd-level queues final String A1 = A + ".a1"; final String A2 = A + ".a2"; - config.setQueues(A, new String[]{ "a1", "a2" }); + config.setQueues(A, new String[] {"a1", "a2"}); config.setCapacity(A1, 30); config.setMaximumCapacity(A1, 50); @@ -138,7 +138,7 @@ private static void setupQueueConfiguration( final String B1 = B + ".b1"; final String B2 = B + ".b2"; final String B3 = B + ".b3"; - config.setQueues(B, new String[]{ "b1", "b2", "b3" }); + config.setQueues(B, new String[] {"b1", "b2", "b3"}); config.setCapacity(B1, 60); config.setUserLimitFactor(B1, 100.0f); config.setCapacity(B2, 39.5f);