Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8926B200C03 for ; Fri, 16 Dec 2016 23:02:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 87B9B160B45; Fri, 16 Dec 2016 22:02:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B373160B3B for ; Fri, 16 Dec 2016 23:02:11 +0100 (CET) Received: (qmail 21797 invoked by uid 500); 16 Dec 2016 22:02:10 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 21381 invoked by uid 99); 16 Dec 2016 22:02:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2016 22:02:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 286ECDF9A3; Fri, 16 Dec 2016 22:02:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Fri, 16 Dec 2016 22:02:19 -0000 Message-Id: <3f4fd23496eb4c1eb008e84689a05036@git.apache.org> In-Reply-To: <596fb83c2e2f46969d6527f1ec2096d2@git.apache.org> References: <596fb83c2e2f46969d6527f1ec2096d2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/51] [abbrv] ambari git commit: AMBARI-19149. Code cleanup: compiler warnings (Attila Doroszlai via ncole) archived-at: Fri, 16 Dec 2016 22:02:13 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java index 78b804c..abae5a1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java @@ -105,6 +105,7 @@ import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.State; import org.easymock.Capture; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; @@ -152,7 +153,7 @@ public class AmbariManagementControllerImplTest { public void testgetAmbariServerURI() throws Exception { // create mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); // set expectations injector.injectMembers(capture(controllerCapture)); @@ -222,7 +223,7 @@ public class AmbariManagementControllerImplTest { public void testGetClusters() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); ClusterRequest request1 = new ClusterRequest(null, "cluster1", "1", Collections.emptySet()); Cluster cluster = createNiceMock(Cluster.class); @@ -383,7 +384,7 @@ public class AmbariManagementControllerImplTest { componentsMap.put("component1", component1); componentsMap.put("component2", component2); expect(service.getServiceComponents()).andReturn(componentsMap); - expect(component1.getServiceComponentHosts()).andReturn(Collections.EMPTY_MAP); + expect(component1.getServiceComponentHosts()).andReturn(Collections.emptyMap()); expect(component2.getServiceComponentHosts()).andReturn( Collections.singletonMap("anyHost", null)); @@ -421,7 +422,7 @@ public class AmbariManagementControllerImplTest { componentsMap.put("component1", component1); componentsMap.put("component2", component2); expect(service.getServiceComponents()).andReturn(componentsMap); - expect(component1.getServiceComponentHosts()).andReturn(Collections.EMPTY_MAP); + expect(component1.getServiceComponentHosts()).andReturn(Collections.emptyMap()); expect(component2.getServiceComponentHosts()).andReturn( Collections.singletonMap("anyHost", null)); @@ -447,7 +448,7 @@ public class AmbariManagementControllerImplTest { public void testGetClusters___ClusterNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); // requests ClusterRequest request1 = new ClusterRequest(null, "cluster1", "1", Collections.emptySet()); @@ -490,7 +491,7 @@ public class AmbariManagementControllerImplTest { public void testGetClusters___OR_Predicate_ClusterNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Cluster cluster = createNiceMock(Cluster.class); Cluster cluster2 = createNiceMock(Cluster.class); @@ -556,7 +557,7 @@ public class AmbariManagementControllerImplTest { @Test public void testUpdateClusters() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -576,7 +577,7 @@ public class AmbariManagementControllerImplTest { expect(clusters.getClusterById(1L)).andReturn(cluster).times(2); expect(cluster.getClusterName()).andReturn("clusterOld").times(1); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); cluster.setClusterName("clusterNew"); @@ -605,7 +606,7 @@ public class AmbariManagementControllerImplTest { @Ignore public void testUpdateClustersWithNullConfigPropertyValues() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -639,7 +640,7 @@ public class AmbariManagementControllerImplTest { expect(config.getPropertiesAttributes()).andReturn(new HashMap>()).anyTimes(); expect(cluster.getDesiredConfigByType(anyObject(String.class))).andReturn(config).anyTimes(); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); cluster.setClusterName("clusterNew"); @@ -664,7 +665,7 @@ public class AmbariManagementControllerImplTest { @Test public void testUpdateClustersToggleKerberosNotInvoked() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -683,7 +684,7 @@ public class AmbariManagementControllerImplTest { expect(clusters.getClusterById(1L)).andReturn(cluster).times(2); expect(cluster.getClusterName()).andReturn("cluster").times(1); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); // replay mocks @@ -706,7 +707,7 @@ public class AmbariManagementControllerImplTest { @Test public void testUpdateClustersToggleKerberosReenable() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -727,13 +728,13 @@ public class AmbariManagementControllerImplTest { expect(cluster.getClusterName()).andReturn("cluster").times(1); expect(cluster.getSecurityType()).andReturn(SecurityType.KERBEROS).anyTimes(); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.KERBEROS, null)) .andReturn(false) .once(); - expect(kerberosHelper.getForceToggleKerberosDirective(anyObject(Map.class))) + expect(kerberosHelper.getForceToggleKerberosDirective(EasyMock.>anyObject())) .andReturn(false) .once(); // Note: kerberosHelper.toggleKerberos is not called @@ -756,7 +757,7 @@ public class AmbariManagementControllerImplTest { @Test public void testUpdateClustersToggleKerberosEnable() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -777,7 +778,7 @@ public class AmbariManagementControllerImplTest { expect(cluster.getClusterName()).andReturn("cluster").times(1); expect(cluster.getSecurityType()).andReturn(SecurityType.NONE).anyTimes(); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.KERBEROS, null)) @@ -838,7 +839,7 @@ public class AmbariManagementControllerImplTest { */ private void testUpdateClustersToggleKerberosDisable(Boolean manageIdentities) throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -847,7 +848,7 @@ public class AmbariManagementControllerImplTest { // requests Set setRequests = Collections.singleton(clusterRequest); - Capture manageIdentitiesCapture = new Capture(); + Capture manageIdentitiesCapture = EasyMock.newCapture(); KerberosHelper kerberosHelper = createStrictMock(KerberosHelper.class); // expectations @@ -861,16 +862,16 @@ public class AmbariManagementControllerImplTest { expect(cluster.getClusterName()).andReturn("cluster").times(1); expect(cluster.getSecurityType()).andReturn(SecurityType.KERBEROS).anyTimes(); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.NONE, null)) .andReturn(false) .once(); - expect(kerberosHelper.getForceToggleKerberosDirective(anyObject(Map.class))) + expect(kerberosHelper.getForceToggleKerberosDirective(EasyMock.>anyObject())) .andReturn(false) .once(); - expect(kerberosHelper.getManageIdentitiesDirective(anyObject(Map.class))) + expect(kerberosHelper.getManageIdentitiesDirective(EasyMock.>anyObject())) .andReturn(manageIdentities) .once(); expect(kerberosHelper.toggleKerberos(anyObject(Cluster.class), anyObject(SecurityType.class), anyObject(RequestStageContainer.class), captureBoolean(manageIdentitiesCapture))) @@ -897,7 +898,7 @@ public class AmbariManagementControllerImplTest { @Test public void testUpdateClustersToggleKerberos_Fail() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -928,16 +929,16 @@ public class AmbariManagementControllerImplTest { cluster.setClusterName(anyObject(String.class)); expectLastCall().once(); - cluster.addSessionAttributes(anyObject(Map.class)); + cluster.addSessionAttributes(EasyMock.>anyObject()); expectLastCall().once(); expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.NONE, null)) .andReturn(false) .once(); - expect(kerberosHelper.getForceToggleKerberosDirective(anyObject(Map.class))) + expect(kerberosHelper.getForceToggleKerberosDirective(EasyMock.>anyObject())) .andReturn(false) .once(); - expect(kerberosHelper.getManageIdentitiesDirective(anyObject(Map.class))) + expect(kerberosHelper.getManageIdentitiesDirective(EasyMock.>anyObject())) .andReturn(null) .once(); expect(kerberosHelper.toggleKerberos(anyObject(Cluster.class), anyObject(SecurityType.class), anyObject(RequestStageContainer.class), anyBoolean())) @@ -969,7 +970,7 @@ public class AmbariManagementControllerImplTest { @Test public void testUpdateClusters__RollbackException() throws Exception { // member state mocks - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); Cluster cluster = createNiceMock(Cluster.class); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -1010,7 +1011,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1084,7 +1085,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___ServiceComponentHostNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1146,7 +1147,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___ServiceComponentHostFilteredByState() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1221,7 +1222,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___ServiceComponentHostFilteredByMaintenanceState() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1295,7 +1296,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___OR_Predicate_ServiceComponentHostNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1402,7 +1403,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___OR_Predicate_ServiceNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1505,7 +1506,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___OR_Predicate_ServiceComponentNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1613,7 +1614,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___OR_Predicate_HostNotFoundException_hostProvidedInQuery() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1711,7 +1712,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___OR_Predicate_HostNotFoundException_hostProvidedInURL() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); @@ -1768,7 +1769,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___OR_Predicate_ClusterNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); @@ -1822,7 +1823,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___NullHostName() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1901,7 +1902,7 @@ public class AmbariManagementControllerImplTest { public void testGetHostComponents___NullHostName_NullComponentName() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); StackId stack = createNiceMock(StackId.class); Cluster cluster = createNiceMock(Cluster.class); @@ -1992,7 +1993,7 @@ public class AmbariManagementControllerImplTest { @Test public void testPopulateServicePackagesInfo() throws Exception { - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Injector injector = createStrictMock(Injector.class); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); @@ -2155,7 +2156,7 @@ public class AmbariManagementControllerImplTest { LdapBatchDto ldapBatchDto = createNiceMock(LdapBatchDto.class); - Capture ldapBatchDtoCapture = new Capture(); + Capture ldapBatchDtoCapture = EasyMock.newCapture(); // set expectations expect(ldapDataPopulator.synchronizeAllLdapUsers(capture(ldapBatchDtoCapture))).andReturn(ldapBatchDto); @@ -2231,7 +2232,7 @@ public class AmbariManagementControllerImplTest { public void testVerifyRepositories() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); // expectations // constructor init @@ -2287,7 +2288,7 @@ public class AmbariManagementControllerImplTest { ServiceComponent serviceComponent = createNiceMock(ServiceComponent.class); ServiceComponentHost serviceComponentHost = createNiceMock(ServiceComponentHost.class); StackId stackId = createNiceMock(StackId.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); // expectations // constructor init http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index f351b27..d956953 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -9744,7 +9744,7 @@ public class AmbariManagementControllerTest { public void testGetServices2() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Clusters clusters = createNiceMock(Clusters.class); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); @@ -9792,7 +9792,7 @@ public class AmbariManagementControllerTest { public void testGetServices___ServiceNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Clusters clusters = createNiceMock(Clusters.class); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); Cluster cluster = createNiceMock(Cluster.class); @@ -9839,7 +9839,7 @@ public class AmbariManagementControllerTest { public void testGetServices___OR_Predicate_ServiceNotFoundException() throws Exception { // member state mocks Injector injector = createStrictMock(Injector.class); - Capture controllerCapture = new Capture(); + Capture controllerCapture = EasyMock.newCapture(); Clusters clusters = createNiceMock(Clusters.class); MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java index 90f8098..ba152e6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java @@ -123,6 +123,7 @@ import org.apache.ambari.server.utils.StageUtils; import org.apache.directory.server.kerberos.shared.keytab.Keytab; import org.easymock.Capture; import org.easymock.CaptureType; +import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.easymock.IAnswer; import org.junit.After; @@ -1093,36 +1094,36 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); if (identitiesManaged) { // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); } // Update Configs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // TODO: Add more of these when more stages are added. // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); replayAll(); @@ -1284,36 +1285,36 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); if (identitiesManaged) { // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); } // Update Configs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // TODO: Add more of these when more stages are added. // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); replayAll(); @@ -1468,33 +1469,33 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Update Configs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Destroy Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Delete Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Cleanup Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); replayAll(); @@ -1666,32 +1667,32 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Update Configurations Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); } else { requestStageContainer = null; @@ -1879,15 +1880,15 @@ public class KerberosHelperTest extends EasyMockSupport { final KerberosIdentityDescriptor identityDescriptor1 = createMock(KerberosIdentityDescriptor.class); expect(identityDescriptor1.getPrincipalDescriptor()).andReturn(principalDescriptor1).times(1); - expect(identityDescriptor1.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes(); + expect(identityDescriptor1.shouldInclude(EasyMock.>anyObject())).andReturn(true).anyTimes(); final KerberosIdentityDescriptor identityDescriptor2 = createMock(KerberosIdentityDescriptor.class); expect(identityDescriptor2.getPrincipalDescriptor()).andReturn(principalDescriptor2).times(1); - expect(identityDescriptor2.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes(); + expect(identityDescriptor2.shouldInclude(EasyMock.>anyObject())).andReturn(true).anyTimes(); final KerberosIdentityDescriptor identityDescriptor3 = createMock(KerberosIdentityDescriptor.class); expect(identityDescriptor3.getPrincipalDescriptor()).andReturn(principalDescriptor3).times(1); - expect(identityDescriptor3.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes(); + expect(identityDescriptor3.shouldInclude(EasyMock.>anyObject())).andReturn(true).anyTimes(); final KerberosComponentDescriptor componentDescriptor1 = createMockComponentDescriptor( "COMPONENT1", @@ -1899,7 +1900,7 @@ public class KerberosHelperTest extends EasyMockSupport { null); final KerberosServiceDescriptor serviceDescriptor1 = createMock(KerberosServiceDescriptor.class); - expect(serviceDescriptor1.getIdentities(eq(true), anyObject(Map.class))).andReturn(Arrays.asList( + expect(serviceDescriptor1.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(Arrays.asList( identityDescriptor1, identityDescriptor2 )).times(1); @@ -1917,7 +1918,7 @@ public class KerberosHelperTest extends EasyMockSupport { final KerberosDescriptor kerberosDescriptor = createMock(KerberosDescriptor.class); expect(kerberosDescriptor.getProperty("additional_realms")).andReturn(null).times(1); - expect(kerberosDescriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(null).times(1); + expect(kerberosDescriptor.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(null).times(1); expect(kerberosDescriptor.getAuthToLocalProperties()).andReturn(null).times(1); expect(kerberosDescriptor.getService("SERVICE1")).andReturn(serviceDescriptor1).times(1); @@ -2182,7 +2183,7 @@ public class KerberosHelperTest extends EasyMockSupport { expect(kerberosDescriptor.getService("SERVICE2")).andReturn(serviceDescriptor2).atLeastOnce(); expect(kerberosDescriptor.getService("SERVICE3")).andReturn(serviceDescriptor3).atLeastOnce(); expect(kerberosDescriptor.getProperty("additional_realms")).andReturn(null).atLeastOnce(); - expect(kerberosDescriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(null).atLeastOnce(); + expect(kerberosDescriptor.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(null).atLeastOnce(); expect(kerberosDescriptor.getAuthToLocalProperties()).andReturn(Collections.singleton("core-site/auth.to.local")).atLeastOnce(); setupKerberosDescriptor(kerberosDescriptor, 2); @@ -2281,7 +2282,7 @@ public class KerberosHelperTest extends EasyMockSupport { final Cluster cluster = createMockCluster("c1", hosts, SecurityType.KERBEROS, krb5ConfConfig, kerberosEnvConfig); expect(cluster.getServices()).andReturn(services).anyTimes(); - expect(cluster.getServiceComponentHostMap(anyObject(Set.class), anyObject(Set.class))).andReturn(serviceComponentHostMap).anyTimes(); + expect(cluster.getServiceComponentHostMap(EasyMock.>anyObject(), EasyMock.>anyObject())).andReturn(serviceComponentHostMap).anyTimes(); final Map> existingConfigurations = new HashMap>() { { @@ -2632,20 +2633,20 @@ public class KerberosHelperTest extends EasyMockSupport { Capture capturePrincipalForKeytab = newCapture(CaptureType.ALL); CreatePrincipalsServerAction createPrincipalsServerAction = injector.getInstance(CreatePrincipalsServerAction.class); - expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) + expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), EasyMock.>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) .andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1)) .times(3); if(createAmbariIdentities) { if (ambariServerPrincipalAsService) { - expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) + expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), EasyMock.>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) .andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1)) .times(2); } else { - expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) + expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), EasyMock.>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) .andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1)) .times(1); - expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) + expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), EasyMock.>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class))) .andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1)) .times(1); } @@ -3039,27 +3040,27 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); replayAll(); @@ -3231,22 +3232,22 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Delete Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Delete Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); replayAll(); @@ -3379,7 +3380,7 @@ public class KerberosHelperTest extends EasyMockSupport { .once(); final ConfigHelper configHelper = injector.getInstance(ConfigHelper.class); - expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), anyObject(Map.class))) + expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), EasyMock.>>anyObject())) .andReturn(new HashMap>() { { put("cluster-env", new HashMap() {{ @@ -3398,27 +3399,27 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); } @@ -3537,7 +3538,7 @@ public class KerberosHelperTest extends EasyMockSupport { .once(); final ConfigHelper configHelper = injector.getInstance(ConfigHelper.class); - expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), anyObject(Map.class))) + expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), EasyMock.>>anyObject())) .andReturn(new HashMap>() { { put("cluster-env", new HashMap() { @@ -3560,22 +3561,22 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Delete Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Delete Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(anyObject(List.class)); + requestStageContainer.addStages(EasyMock.>anyObject()); expectLastCall().once(); replayAll(); @@ -3751,7 +3752,7 @@ public class KerberosHelperTest extends EasyMockSupport { .anyTimes(); final ConfigHelper configHelper = injector.getInstance(ConfigHelper.class); - expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), anyObject(Map.class))) + expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), EasyMock.>>anyObject())) .andReturn(new HashMap>() { { put("cluster-env", new HashMap() {{ @@ -3811,7 +3812,7 @@ public class KerberosHelperTest extends EasyMockSupport { expect(identityDescriptor1.getReference()).andReturn(null).anyTimes(); expect(identityDescriptor1.getPrincipalDescriptor()).andReturn(principalDescriptor1).anyTimes(); expect(identityDescriptor1.getKeytabDescriptor()).andReturn(keytabDescriptor1).anyTimes(); - expect(identityDescriptor1.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes(); + expect(identityDescriptor1.shouldInclude(EasyMock.>anyObject())).andReturn(true).anyTimes(); expect(identityDescriptor1.getWhen()).andReturn(null).anyTimes(); final KerberosIdentityDescriptor identityDescriptor2 = createMock(KerberosIdentityDescriptor.class); @@ -3819,7 +3820,7 @@ public class KerberosHelperTest extends EasyMockSupport { expect(identityDescriptor2.getReference()).andReturn(null).anyTimes(); expect(identityDescriptor2.getPrincipalDescriptor()).andReturn(principalDescriptor2).anyTimes(); expect(identityDescriptor2.getKeytabDescriptor()).andReturn(keytabDescriptor2).anyTimes(); - expect(identityDescriptor2.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes(); + expect(identityDescriptor2.shouldInclude(EasyMock.>anyObject())).andReturn(true).anyTimes(); expect(identityDescriptor2.getWhen()).andReturn(null).anyTimes(); final KerberosIdentityDescriptor identityDescriptorService1 = createMock(KerberosIdentityDescriptor.class); @@ -3827,22 +3828,22 @@ public class KerberosHelperTest extends EasyMockSupport { expect(identityDescriptorService1.getReference()).andReturn(null).anyTimes(); expect(identityDescriptorService1.getPrincipalDescriptor()).andReturn(principalDescriptorService1).anyTimes(); expect(identityDescriptorService1.getKeytabDescriptor()).andReturn(keytabDescriptorService1).anyTimes(); - expect(identityDescriptorService1.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes(); + expect(identityDescriptorService1.shouldInclude(EasyMock.>anyObject())).andReturn(true).anyTimes(); expect(identityDescriptorService1.getWhen()).andReturn(null).anyTimes(); final KerberosComponentDescriptor componentDescriptor1 = createMock(KerberosComponentDescriptor.class); - expect(componentDescriptor1.getIdentities(eq(true), anyObject(Map.class))).andReturn(Collections.singletonList(identityDescriptor1)).anyTimes(); + expect(componentDescriptor1.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(Collections.singletonList(identityDescriptor1)).anyTimes(); final KerberosComponentDescriptor componentDescriptor2 = createMock(KerberosComponentDescriptor.class); - expect(componentDescriptor2.getIdentities(eq(true), anyObject(Map.class))).andReturn(Collections.singletonList(identityDescriptor2)).anyTimes(); + expect(componentDescriptor2.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(Collections.singletonList(identityDescriptor2)).anyTimes(); final KerberosServiceDescriptor serviceDescriptor1 = createMock(KerberosServiceDescriptor.class); expect(serviceDescriptor1.getComponent("COMPONENT1")).andReturn(componentDescriptor1).anyTimes(); - expect(serviceDescriptor1.getIdentities(eq(true), anyObject(Map.class))).andReturn(Collections.singletonList(identityDescriptorService1)).anyTimes(); + expect(serviceDescriptor1.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(Collections.singletonList(identityDescriptorService1)).anyTimes(); final KerberosServiceDescriptor serviceDescriptor2 = createMock(KerberosServiceDescriptor.class); expect(serviceDescriptor2.getComponent("COMPONENT2")).andReturn(componentDescriptor2).anyTimes(); - expect(serviceDescriptor2.getIdentities(eq(true), anyObject(Map.class))).andReturn(null).anyTimes(); + expect(serviceDescriptor2.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(null).anyTimes(); final KerberosDescriptor kerberosDescriptor = createMock(KerberosDescriptor.class); expect(kerberosDescriptor.getProperties()).andReturn(new HashMap() { @@ -3960,7 +3961,7 @@ public class KerberosHelperTest extends EasyMockSupport { KerberosServiceDescriptor descriptor = createMock(KerberosServiceDescriptor.class); expect(descriptor.getName()).andReturn(serviceName).anyTimes(); expect(descriptor.getComponents()).andReturn(componentMap).anyTimes(); - expect(descriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(identities).anyTimes(); + expect(descriptor.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(identities).anyTimes(); expect(descriptor.getAuthToLocalProperties()).andReturn(null).anyTimes(); return descriptor; } @@ -3981,7 +3982,7 @@ public class KerberosHelperTest extends EasyMockSupport { throws AmbariException { KerberosComponentDescriptor descriptor = createMock(KerberosComponentDescriptor.class); expect(descriptor.getName()).andReturn(componentName).anyTimes(); - expect(descriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(identities).anyTimes(); + expect(descriptor.getIdentities(eq(true), EasyMock.>anyObject())).andReturn(identities).anyTimes(); expect(descriptor.getConfigurations(true)).andReturn(configurations).anyTimes(); expect(descriptor.getAuthToLocalProperties()).andReturn(null).anyTimes(); return descriptor; http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java index be73a50..05fdb01 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java @@ -355,7 +355,7 @@ public class AlertDefinitionResourceProviderTest { Assert.assertEquals("my_def", resource.getPropertyValue(AlertDefinitionResourceProvider.ALERT_DEF_NAME)); - Map reporting = (Map) resource.getPropertyValue("AlertDefinition/source/reporting"); + Map reporting = (Map) resource.getPropertyValue("AlertDefinition/source/reporting"); Assert.assertTrue(reporting.containsKey("ok")); Assert.assertTrue(reporting.containsKey("critical")); @@ -379,7 +379,7 @@ public class AlertDefinitionResourceProviderTest { "my_def", resource.getPropertyValue(AlertDefinitionResourceProvider.ALERT_DEF_NAME)); - Map reporting = (Map) resource.getPropertyValue("AlertDefinition/source/reporting"); + Map reporting = (Map) resource.getPropertyValue("AlertDefinition/source/reporting"); Assert.assertNull(reporting); } @@ -421,7 +421,7 @@ public class AlertDefinitionResourceProviderTest { expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce(); expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes(); - Capture entityCapture = new Capture(); + Capture entityCapture = EasyMock.newCapture(); dao.create(capture(entityCapture)); expectLastCall(); @@ -571,7 +571,7 @@ public class AlertDefinitionResourceProviderTest { expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce(); expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).atLeastOnce(); - Capture entityCapture = new Capture(); + Capture entityCapture = EasyMock.newCapture(); dao.create(capture(entityCapture)); expectLastCall(); @@ -706,7 +706,7 @@ public class AlertDefinitionResourceProviderTest { expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce(); expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).atLeastOnce(); - Capture entityCapture = new Capture(); + Capture entityCapture = EasyMock.newCapture(); dao.create(capture(entityCapture)); expectLastCall(); @@ -789,7 +789,7 @@ public class AlertDefinitionResourceProviderTest { expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce(); expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes(); - Capture entityCapture = new Capture(); + Capture entityCapture = EasyMock.newCapture(); dao.create(capture(entityCapture)); expectLastCall(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java index 23fe65f..8ad5df2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java @@ -308,7 +308,7 @@ public class AlertGroupResourceProviderTest { // verify definitions and targets come back when requested List definitions = (List) r.getPropertyValue(AlertGroupResourceProvider.ALERT_GROUP_DEFINITIONS); - List targets = (List) r.getPropertyValue(AlertGroupResourceProvider.ALERT_GROUP_TARGETS); + List targets = (List) r.getPropertyValue(AlertGroupResourceProvider.ALERT_GROUP_TARGETS); assertNotNull(definitions); assertEquals(1, definitions.size()); @@ -433,7 +433,7 @@ public class AlertGroupResourceProviderTest { * @throws Exception */ public void testCreateResources(Authentication authentication) throws Exception { - Capture> listCapture = new Capture>(); + Capture> listCapture = EasyMock.newCapture(); // the definition IDs to associate with the group List definitionIds = new ArrayList(); @@ -525,7 +525,7 @@ public class AlertGroupResourceProviderTest { */ @SuppressWarnings("unchecked") public void testUpdateResources(Authentication authentication) throws Exception { - Capture entityCapture = new Capture(); + Capture entityCapture = EasyMock.newCapture(); // the definition IDs to associate with the group List definitionIds = new ArrayList(); @@ -543,7 +543,7 @@ public class AlertGroupResourceProviderTest { List targetEntities = new ArrayList(); targetEntities.addAll(getMockTargets()); - m_dao.createGroups(EasyMock.anyObject(List.class)); + m_dao.createGroups(EasyMock.>anyObject()); expectLastCall().times(1); AlertGroupEntity group = new AlertGroupEntity(); @@ -639,7 +639,7 @@ public class AlertGroupResourceProviderTest { */ @SuppressWarnings("unchecked") private void testUpdateDefaultGroup(Authentication authentication) throws Exception { - Capture entityCapture = new Capture(); + Capture entityCapture = EasyMock.newCapture(); // the definition IDs to associate with the group List definitionIds = new ArrayList(); @@ -750,8 +750,8 @@ public class AlertGroupResourceProviderTest { * @throws Exception */ private void testDeleteResources(Authentication authentication) throws Exception { - Capture entityCapture = new Capture(); - Capture> listCapture = new Capture>(); + Capture entityCapture = EasyMock.newCapture(); + Capture> listCapture = EasyMock.newCapture(); m_dao.createGroups(capture(listCapture)); expectLastCall(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java index 2a4a681..e2ce25f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java @@ -124,7 +124,7 @@ public class AlertHistoryResourceProviderTest { "AlertHistory/cluster_name", "AlertHistory/id"); expect(m_dao.findAll(EasyMock.anyObject(AlertHistoryRequest.class))).andReturn( - Collections.EMPTY_LIST); + Collections.emptyList()); replay(m_dao); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java index 45b4737..901d7b4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java @@ -128,7 +128,7 @@ public class AlertNoticeResourceProviderTest { "AlertHistory/cluster_name", "AlertHistory/id"); expect(m_dao.findAllNotices(EasyMock.anyObject(AlertNoticeRequest.class))).andReturn( - Collections.EMPTY_LIST); + Collections.emptyList()); replay(m_dao); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java index 4705825..e777d5c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java @@ -73,6 +73,7 @@ import org.apache.ambari.server.security.authorization.ResourceType; import org.apache.ambari.server.view.ViewInstanceHandlerList; import org.apache.ambari.server.view.ViewRegistry; import org.apache.ambari.server.view.ViewRegistryTest; +import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.junit.After; import org.junit.Assert; @@ -273,7 +274,7 @@ public class AmbariPrivilegeResourceProviderTest extends EasyMockSupport { expect(privilegeDAO.findAll()).andReturn(privilegeEntities).atLeastOnce(); UserDAO userDAO = injector.getInstance(UserDAO.class); - expect(userDAO.findUsersByPrincipal(anyObject(List.class))).andReturn(userEntities).atLeastOnce(); + expect(userDAO.findUsersByPrincipal(EasyMock.>anyObject())).andReturn(userEntities).atLeastOnce(); replayAll(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java index 5272eb8..a386e7f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java @@ -82,6 +82,7 @@ import org.apache.ambari.server.topology.SecurityConfiguration; import org.apache.ambari.server.topology.SecurityConfigurationFactory; import org.apache.ambari.server.topology.Setting; import org.apache.ambari.server.utils.StageUtils; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -394,7 +395,7 @@ public class BlueprintResourceProviderTest { SecurityConfiguration securityConfiguration = new SecurityConfiguration(SecurityType.KERBEROS, "testRef", null); // set expectations - expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.>anyObject(), anyBoolean())).andReturn (securityConfiguration).once(); expect(blueprintFactory.createBlueprint(setProperties.iterator().next(), securityConfiguration)).andReturn(blueprint).once(); blueprint.validateRequiredProperties(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java index 4be5013..cb88ae1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java @@ -71,6 +71,7 @@ import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.utils.StageUtils; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -280,7 +281,7 @@ public class ClientConfigResourceProviderTest { expect(clusterConfig.getProperties()).andReturn(props); expect(configHelper.getEffectiveDesiredTags(cluster, hostName)).andReturn(allConfigTags); expect(cluster.getClusterName()).andReturn(clusterName); - expect(managementController.getHostComponents((Set) anyObject())).andReturn(responses).anyTimes(); + expect(managementController.getHostComponents(EasyMock.>anyObject())).andReturn(responses).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo"); @@ -483,7 +484,7 @@ public class ClientConfigResourceProviderTest { expect(clusterConfig.getProperties()).andReturn(props); expect(configHelper.getEffectiveDesiredTags(cluster, hostName)).andReturn(allConfigTags); expect(cluster.getClusterName()).andReturn(clusterName); - expect(managementController.getHostComponents((Set) anyObject())).andReturn(responses).anyTimes(); + expect(managementController.getHostComponents(EasyMock.>anyObject())).andReturn(responses).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo"); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java index 9919c8e..0c9f152 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java @@ -894,7 +894,7 @@ public class ClusterControllerImplTest { anyObject(Predicate.class))).andReturn( Collections. emptySet()).anyTimes(); - expect(resourceProvider.checkPropertyIds(EasyMock.anyObject(Set.class))).andReturn( + expect(resourceProvider.checkPropertyIds(EasyMock.>anyObject())).andReturn( new HashSet()).anyTimes(); // strict pageRequest mock to ensure that paging is not performed on http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java index 70f0332..9948bf8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java @@ -152,7 +152,7 @@ public class ClusterResourceProviderTest { expect(request.getProperties()).andReturn(requestProperties).anyTimes(); expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); - expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn(null) + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.>anyObject(), anyBoolean())).andReturn(null) .once(); expect(topologyFactory.createProvisionClusterRequest(properties, null)).andReturn(topologyRequest).once(); expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once(); @@ -185,7 +185,7 @@ public class ClusterResourceProviderTest { expect(request.getProperties()).andReturn(requestProperties).anyTimes(); expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); - expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.>anyObject(), anyBoolean())).andReturn (securityConfiguration).once(); expect(topologyFactory.createProvisionClusterRequest(properties, securityConfiguration)).andReturn(topologyRequest).once(); expect(topologyRequest.getBlueprint()).andReturn(blueprint).anyTimes(); @@ -212,7 +212,7 @@ public class ClusterResourceProviderTest { expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); expect(topologyFactory.createProvisionClusterRequest(properties, securityConfiguration)).andReturn(topologyRequest).once(); - expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.>anyObject(), anyBoolean())).andReturn (securityConfiguration).once(); expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once(); expect(requestStatusResponse.getRequestId()).andReturn(5150L).anyTimes(); @@ -346,7 +346,7 @@ public class ClusterResourceProviderTest { idResponse.add(new ClusterResponse(103L, "Cluster103", State.INSTALLED, SecurityType.NONE, null, null, null, null)); // set expectations - Capture> captureClusterRequests = new Capture>(); + Capture> captureClusterRequests = EasyMock.newCapture(); expect(managementController.getClusters(capture(captureClusterRequests))).andReturn(allResponse).once(); expect(managementController.getClusters(capture(captureClusterRequests))).andReturn(nameResponse).once(); @@ -501,7 +501,7 @@ public class ClusterResourceProviderTest { expect(request.getProperties()).andReturn(requestProperties).anyTimes(); expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); - expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn(null) + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.>anyObject(), anyBoolean())).andReturn(null) .once(); expect(topologyFactory.createProvisionClusterRequest(properties, null)).andReturn(topologyRequest).once(); expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once(); @@ -844,7 +844,7 @@ public class ClusterResourceProviderTest { expect(request.getProperties()).andReturn(requestProperties).anyTimes(); expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); - expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn(null) + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.>anyObject(), anyBoolean())).andReturn(null) .once(); expect(topologyFactory.createProvisionClusterRequest(properties, null)).andReturn(topologyRequest).once(); expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index c157258..98ee64d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -278,11 +278,11 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))). + EasyMock.>anyObject(), anyObject(String.class))). andReturn(packages).times((hostCount - 1) * 2); // 1 host has no versionable components, other hosts have 2 services // // that's why we don't send commands to it - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -498,10 +498,10 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))). + EasyMock.>anyObject(), anyObject(String.class))). andReturn(packages).times(1); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -715,10 +715,10 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))). + EasyMock.>anyObject(), anyObject(String.class))). andReturn(packages).anyTimes(); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -947,10 +947,10 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))). + EasyMock.>anyObject(), anyObject(String.class))). andReturn(packages).anyTimes(); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -1159,15 +1159,15 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))).andReturn(packages).anyTimes(); + EasyMock.>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes(); - Capture capturedStackId = new Capture(); + Capture capturedStackId = EasyMock.newCapture(); cluster.setDesiredStackVersion(capture(capturedStackId)); expectLastCall().once(); expect(cluster.getHosts()).andReturn(hosts).anyTimes(); @@ -1312,9 +1312,9 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))).andReturn(packages).anyTimes(); + EasyMock.>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); @@ -1325,7 +1325,7 @@ public class ClusterStackVersionResourceProviderTest { ClusterVersionEntity current = new ClusterVersionEntity(); current.setRepositoryVersion(currentRepo); - Capture capturedStackId = new Capture(); + Capture capturedStackId = EasyMock.newCapture(); cluster.setDesiredStackVersion(capture(capturedStackId)); expectLastCall().once(); expect(cluster.getHosts()).andReturn(hosts).anyTimes(); @@ -1480,11 +1480,11 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))). + EasyMock.>anyObject(), anyObject(String.class))). andReturn(packages).times((hostCount - 1) * 2); // 1 host has no versionable components, other hosts have 2 services // // that's why we don't send commands to it - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -1699,11 +1699,11 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getAuthName()).andReturn("admin").anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - (Map) anyObject(List.class), anyObject(String.class))).andReturn( + EasyMock.>anyObject(), anyObject(String.class))).andReturn( packages).anyTimes(); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), - anyObject(Map.class), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.>anyObject(), + EasyMock.>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); expect(clusters.getHostsForCluster(anyObject(String.class))).andReturn( http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java index fb640f2..1d7a50b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java @@ -66,6 +66,7 @@ import org.apache.ambari.server.state.Host; import org.apache.ambari.server.state.configgroup.ConfigGroup; import org.apache.ambari.server.state.configgroup.ConfigGroupFactory; import org.easymock.Capture; +import org.easymock.EasyMock; import org.easymock.IAnswer; import org.junit.Assert; import org.junit.Before; @@ -279,8 +280,8 @@ public class ConfigGroupResourceProviderTest { expect(cluster.getConfigGroups()).andReturn(configGroupMap); expect(configGroupFactory.createNew((Cluster) anyObject(), (String) anyObject(), - (String) anyObject(), (String) anyObject(), (HashMap) anyObject(), - (HashMap) anyObject())).andReturn(configGroup).anyTimes(); + (String) anyObject(), (String) anyObject(), EasyMock.>anyObject(), + EasyMock.>anyObject())).andReturn(configGroup).anyTimes(); expect(configGroup.getClusterName()).andReturn("Cluster100").anyTimes(); expect(configGroup.getName()).andReturn("test-1").anyTimes();